Browse Source

Merge remote-tracking branch 'origin/master'

zhangweixin 4 years ago
parent
commit
3d52b84e2f

+ 6 - 3
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt

@@ -27,7 +27,8 @@
 package com.persagy.server.datacenter.models.entities.dictnew
 
 
-import com.persagy.server.datacenter.models.tools.DictInfoTools
+
+import com.persagy.server.datacenter.models.entities.tool.DictInfoTools
 import io.swagger.v3.oas.annotations.media.Schema
 import java.io.Serializable
 import javax.persistence.Column
@@ -223,12 +224,14 @@ open class DefFuncId: Serializable {
     @Schema(description = "路径")
     var path: String? = null
         get() {
-            return  if (DictInfoTools.pathCode(code!!)) {
+            return  if (!code.isNullOrEmpty()&&DictInfoTools.pathCode(code!!)) {
                 code
             } else if (firstName == "基本信息"&&code == "pic"){
                 code
-            } else {
+            } else if (!code.isNullOrEmpty()) {
                 "infos.$code"
+            } else {
+                null
             }
 //            return if ( code == "roomLocalFuncTypeID"||code == "roomLocalFuncTypeName"||code == "rFID"||
 //                code == "partAutoFireExtinguishArea"||code == "autoFireExtinguishSystem"||code == "maxPermitArea"){

+ 83 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/tool/DictInfoTools.kt

@@ -0,0 +1,83 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.tool
+
+object DictInfoTools {
+
+    fun pathCode (code: String):Boolean{
+        return when (code) {
+            "id" -> true
+            "name" -> true
+            "localId" -> true
+            "localName" -> true
+            "qRCodePic" -> true
+            "defaultQRCode" -> true
+            "rFID" -> true
+            "cADID" -> true
+            "bimId" -> true
+            "bimTypeId" -> true
+            "bimLocation" -> true
+            "bimFamilyName" -> true
+            "bimFamilySymbol" -> true
+            "equipSerial" -> true
+            "modelId" -> true
+            "note" -> true
+            "introduction" -> true
+            "businessFloorNum" -> true
+            "officeFloorNum" -> true
+            "shaftSequenceId" -> true
+            "outline" -> true
+            "buildQRCode" -> true
+            "bimIdPre" -> true
+            "floorSequenceId" -> true
+            "permanentPeopleNum" -> true
+            "floorIdentity" -> true
+            "depth" -> true
+            "width" -> true
+            "buildArea" -> true
+            "netArea" -> true
+            "height" -> true
+            "intro" -> true
+            "ratedCoolingP" -> true
+            "ratedHeatingP" -> true
+            "acType" -> true
+            "zoneOrientation" -> true
+            "roomFuncType" -> true
+            "roomSerial" -> true
+            "projRoomFuncType" -> true
+            "ratedLightP" -> true
+            "zoneType" -> true
+            "tenantType" -> true
+            "tenant" -> true
+            "elecCap" -> true
+            "pollutionDegree" -> true
+            else -> {
+                false
+            }
+        }
+    }
+}

+ 9 - 9
datacenter/src/main/resources/application-dev.yml

@@ -34,8 +34,8 @@ spring:
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
-    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
-#    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
 #    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
@@ -47,13 +47,13 @@ spring:
       max-file-size:                   500MB        # 限制单个文件的最大值
 
     #配置rabbitMq 服务器
-  rabbitmq:
-    host: 192.168.64.15
-    port: 9936
-    username: admin
-    password: brzj123456
-    #虚拟host 可以不设置,使用 server 默认 host
-    virtual-host: /test
+#  rabbitmq:
+#    host: 192.168.64.15
+#    port: 9936
+#    username: admin
+#    password: brzj123456
+#    #虚拟host 可以不设置,使用 server 默认 host
+#    virtual-host: /test
 
 #  rabbitmq:
 #    host: 39.102.43.179

+ 9 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/ObjectToFromController.kt

@@ -163,15 +163,21 @@ class ObjectToFromController {
     fun equipSync(@RequestParam projectId: String): SBaseResponse {
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
-            val equipList = equipmentService.select(SFilter.eq("projectId", projectId)).exec()
+            val equipList = equipmentService.select(SFilter.eq("projectId", projectId)).order( " lastUpdate desc").exec()
             for (equip in equipList) {
                 val createObj =
                     EquipApi.createObj(dictProject!!.groupCode!!, projectId, EquipUtil.equipTools(projectId, equip))
-                if (createObj!!.result == "success") {
+                if (createObj!=null&&createObj!!.result == "success") {
+                    val updateObj =
+                        EquipApi.updateObj(dictProject!!.groupCode!!, projectId, EquipUtil.equipTools(projectId, equip))
+                    if (updateObj!=null&&updateObj.result == "success") {
+                        logger.debug("设备更成功:${equip.toJson()}")
+                    }
+                }else{
                     val updateObj =
                         EquipApi.updateObj(dictProject!!.groupCode!!, projectId, EquipUtil.equipTools(projectId, equip))
                     if (updateObj!=null&&updateObj.result == "success") {
-                        logger.debug("设备更新失败:${equip.toJson()}")
+                        logger.debug("设备更成功:${equip.toJson()}")
                     }
                 }
                 if (!equip.buildingId.isNullOrEmpty()) {

+ 29 - 4
datasyn/src/main/kotlin/com/persagy/server/syn/task/ScheduledConfig.kt

@@ -1,11 +1,36 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
 package com.persagy.server.syn.task
 
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.context.annotation.Configuration
+import org.springframework.scheduling.annotation.SchedulingConfigurer
+import org.springframework.scheduling.config.ScheduledTaskRegistrar
 import java.util.concurrent.Executors
 
-
 /**
  * 定时任务并行执行
  */

+ 21 - 10
datasyn/src/main/resources/logback-spring.xml

@@ -32,25 +32,36 @@
         </encoder>
     </appender>
 
+    <!-- 定义cn.sagacloud包的日志级别 -->
+    <logger name="com.persagy" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <!-- 定义com.persagy包的日志级别 -->
+    <logger name="com.persagy" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
 <!--    &lt;!&ndash; 定义cn.sagacloud包的日志级别 &ndash;&gt;-->
-<!--    <logger name="com.persagy" level="DEBUG" additivity="false">-->
+<!--    <logger name="com.persagy" level="ERROR" additivity="false">-->
 <!--        <appender-ref ref="STDOUT"/>-->
 <!--    </logger>-->
 
 <!--    &lt;!&ndash; 定义com.persagy包的日志级别 &ndash;&gt;-->
-<!--    <logger name="com.persagy" level="DEBUG" additivity="false">-->
+<!--    <logger name="com.persagy" level="ERROR" additivity="false">-->
 <!--        <appender-ref ref="STDOUT"/>-->
 <!--    </logger>-->
 
-    <!-- 定义cn.sagacloud包的日志级别 -->
-    <logger name="com.persagy" level="ERROR" additivity="false">
-        <appender-ref ref="STDOUT"/>
-    </logger>
 
-    <!-- 定义com.persagy包的日志级别 -->
-    <logger name="com.persagy" level="ERROR" additivity="false">
-        <appender-ref ref="STDOUT"/>
-    </logger>
+<!--    &lt;!&ndash; 定义cn.sagacloud包的日志级别 &ndash;&gt;-->
+<!--    <logger name="com.persagy" level="ERROR" additivity="false">-->
+<!--        <appender-ref ref="STDOUT"/>-->
+<!--    </logger>-->
+
+<!--    &lt;!&ndash; 定义com.persagy包的日志级别 &ndash;&gt;-->
+<!--    <logger name="com.persagy" level="ERROR" additivity="false">-->
+<!--        <appender-ref ref="STDOUT"/>-->
+<!--    </logger>-->
 
     <!-- 定义日志级别 -->
     <root level="ERROR">