Browse Source

***********************WX*****************************
关系调整

张维新 4 years ago
parent
commit
bc467fec47

+ 18 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/ObjectFromToControllers.kt

@@ -133,13 +133,14 @@ class ObjectFromToControllers {
      */
     @Operation(summary = "项目信息-数据中台存储到数据中心,根据 id 同步 ", description = "")
     @PostMapping(value = ["/project-syn-id"])
-    fun projectId(@RequestParam projectId: String): SBaseResponse {
+    fun projectId(@RequestParam projectId: String,sign: Boolean = false): SBaseResponse {
         return try {
             /** 集团数据 */
             DClassDefService.groupQuerys()
             /** 项目数据 */
             DClassDefService.dictProject()
-            val dictProject = dictProjectService.select(SFilter.eq("id",projectId)).entity()
+            if (!sign){
+                val dictProject = dictProjectService.select(SFilter.eq("id",projectId)).entity()
                 val projectQueryList = ProjectApi.projectQuery(dictProject!!.groupCode!!,projectId!!)
                 if (projectQueryList.size > 0) {
                     for (projectQuery in projectQueryList) {
@@ -149,6 +150,21 @@ class ObjectFromToControllers {
                         projectService.replace(projectDataConversion)
                     }
                 }
+            } else {
+                val dictProjectList = dictProjectService.selectAll().exec()
+                for (dictProject in dictProjectList) {
+                    val projectQueryList = ProjectApi.projectQuery(dictProject!!.groupCode!!,projectId!!)
+                    if (projectQueryList.size > 0) {
+                        for (projectQuery in projectQueryList) {
+                            logger.debug("项目1:  ${projectQuery.toJson()} ")
+                            val projectDataConversion = ProjectUtil.projectDataConversions(dictProject!!.groupCode!!, projectQuery)
+                            logger.debug("项目:  ${projectDataConversion.toJson()} ")
+                            projectService.replace(projectDataConversion)
+                        }
+                    }
+                }
+            }
+
             SBaseResponse(SResponseType.success)
         } catch (e: Exception) {
             e.printStackTrace()

+ 6 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdFloor.kt

@@ -29,7 +29,9 @@ package com.persagy.server.syn.services.jms
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
+import com.persagy.server.datacenter.models.entities.objects.Building
 import com.persagy.server.datacenter.models.entities.objects.Floor
+import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi
@@ -53,7 +55,8 @@ class RwdFloor {
     var syncRwdMessageService = SObjectService(SMybatisDao(SyncRwdDatacenterMessage::class.java))
     /** 项目所属的集团 */
     private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
-
+    /** 建筑服务 */
+    private val buildingService = SObjectService(SMybatisDao(Building::class.java))
     /**
      * 楼层
      *
@@ -78,7 +81,7 @@ class RwdFloor {
                             val hashMap = floorInBuildingList[0]
                             floorDataConversions.buildingId =  hashMap["objFrom"].toString()
                         }
-                        floorService.insert(floorDataConversions)
+                        floorService.replace(floorDataConversions)
                         message.state = 0
                     } else {
                         message.state = 2
@@ -102,7 +105,7 @@ class RwdFloor {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        floorService.update(floorDataConversions)
+                        floorService.replace(floorDataConversions)
                         message.state = 0
                     } else {
                         message.state = 2