浏览代码

2025-12-18 update pom.xml

junggilpark 15 小时之前
父节点
当前提交
fcf178779f

+ 42 - 1
pom.xml

@@ -18,19 +18,53 @@
 
     <packaging>war</packaging>
 
+    <repositories>
+        <repository>
+            <id>oracle</id>
+            <url>https://maven.jahia.org/maven2</url>
+        </repository>
+    </repositories>
+
+    <profiles>
+        <profile>
+            <id>windows</id>
+            <activation>
+                <os>
+                    <family>windows</family>
+                </os>
+            </activation>
+            <properties>
+                <webapp.lib>C:\java\repository</webapp.lib>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>mac</id>
+            <activation>
+                <os>
+                    <family>mac</family>
+                </os>
+            </activation>
+            <properties>
+                <webapp.lib>/Users/openvalue/Projects/java/repository/</webapp.lib>
+            </properties>
+        </profile>
+    </profiles>
+
     <properties>
         <java.version>11</java.version>
         <swagger.version>2.9.2</swagger.version>
         <org.projectlombok.version>1.18.20</org.projectlombok.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <jackson.version>2.13.1</jackson.version>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <!--main 함수가 있는 class 경로-->
         <start-class>com.its.op.ItsOpServerApplication</start-class>
-        <webapp.lib>C:/java/repository</webapp.lib>
+        <!--        <webapp.lib>C:/java/repository</webapp.lib>-->
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
@@ -82,10 +116,17 @@
             <version>4.5.13</version>
         </dependency>
 
+        <!--        <dependency>-->
+        <!--            <groupId>com.oracle</groupId>-->
+        <!--            <artifactId>ojdbc7</artifactId>-->
+        <!--            <version>12.1.0.2</version>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc7</artifactId>
             <version>12.1.0.2</version>
+            <scope>system</scope>
+            <systemPath>${webapp.lib}/ojdbc7-12.1.0.2.jar</systemPath>
         </dependency>
 
         <dependency>

+ 4 - 3
src/main/resources/static/application/op/09.cros/03.statistics/01.drct-statistics/drct-statistics.js

@@ -378,12 +378,13 @@ function getFormatData(obj, columns){
                 }
             }
         }
+        const uturnTfvl = item.lrg_uturn_tfvl + item.mddl_uturn_tfvl + item.smal_uturn_tfvl;
         data['go_tfvl' + item.drct_dvsn_cd]   = go_tfvl;
         data['left_tfvl' + item.drct_dvsn_cd] = left_tfvl;
         data['rght_tfvl' + item.drct_dvsn_cd] = rght_tfvl;
-        data['uturn_tfvl' + item.drct_dvsn_cd] = item.uturn_tfvl;
-        data['tfvl' + item.drct_dvsn_cd ] = go_tfvl + left_tfvl + rght_tfvl + item.uturn_tfvl;
-        tfvl += go_tfvl + left_tfvl + rght_tfvl + item.uturn_tfvl;
+        data['uturn_tfvl' + item.drct_dvsn_cd] = uturnTfvl
+        data['tfvl' + item.drct_dvsn_cd ] = go_tfvl + left_tfvl + rght_tfvl + uturnTfvl;
+        tfvl += go_tfvl + left_tfvl + rght_tfvl + uturnTfvl;
     })
     data.tfvl = tfvl;
     return data;