shjung 9 months ago
parent
commit
c3a06d0db2

+ 1 - 0
conf/ggits-etlp-server.pid

@@ -0,0 +1 @@
+24728

+ 1 - 1
ggits-etlp-server/src/main/java/com/sig/ggits/etlp/server/entity/ggits/TbScsTConIntLc.java

@@ -76,7 +76,7 @@ public class TbScsTConIntLc implements Serializable {
         param.put("INT_LCTYPE",   this.intLcType);
         // 등화기유형(3:3색등화기, 4:4색등화기)
         param.put("INT_LAMPTYPE", this.intLampType == 1 ? 4 : 3);
-        param.put("MAIN_INTNO",   this.mainLcNo);
+        param.put("MAIN_INTNO",   this.intType == 1 ? this.mainLcNo : 0);
         param.put("GROUP_NO",     this.saNo);
         param.put("X_COORD",      this.intLng);
         param.put("Y_COORD",      this.intLat);

+ 4 - 2
sig-common/build.gradle

@@ -40,7 +40,7 @@ test {
     useJUnitPlatform()
 }
 
-task runInstallJarLibrary(type:Exec) {
+tasks.register('runInstallJarLibrary', Exec) {
     doFirst {
         println "sig-common library install mvn repository..."
         workingDir = file('.')
@@ -50,7 +50,9 @@ task runInstallJarLibrary(type:Exec) {
 }
 jar.finalizedBy runInstallJarLibrary
 
-tasks.withType(JavaCompile) {
+compileJava.options.encoding = 'UTF-8'
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
     options.deprecation = true
+    options.encoding = 'UTF-8'
 }