浏览代码

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

张维新 4 年之前
父节点
当前提交
e2a779e767

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/RelationCalcController.kt

@@ -326,8 +326,8 @@ class RelationCalcController {
         val projectId = SPageContext.getHeader("projectId").toString()
         logger.debug("calcEq2Sp --------------  $projectId")
         Thread.sleep(2000000);
-        return SBaseResponse(SResponseType.success)
-//        return service.calcEqForSp(objectTypes,projectId)
+//        return SBaseResponse(SResponseType.success)
+        return service.calcEqForSp(objectTypes,projectId)
     }
 
     /**

+ 11 - 5
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt

@@ -1103,9 +1103,15 @@ open class RelationCalcService {
             } catch (e: Exception) {
                 e.printStackTrace()
             }
-            /** 启动计算 */
-            val result = mapper.calcEq2Sp(projectId)
+            /** 启动计算   ******************************/
+//            val result = mapper.calcEq2Sp(projectId)
+            var result = 0
             logger.debug("计算结果= ${result}")
+
+
+            /*************************上面添加数据**********************************/
+
+
             try{
 //                val r1 = mapper.deletesp(projectId)
                 val r1 = REq2SpService.delete(SFilter.eq("projectId", projectId),SFilter.eq("sign0", 3))
@@ -1118,8 +1124,7 @@ open class RelationCalcService {
 
             if(result!=null && result == 0){
                 try {
-                    /** 发送消息 */
-                    rabbitMqService.sendRel(Opt.projectId!!, "fengkou_for","20","123","456")
+
                     upDate(projectId,"fl2sp")
                     upDate(projectId,"eq2fl")
                     val entity = relationTypeProjectservice.select(SFilter.eq("projectId", projectId), SFilter.eq("relationType", "eq2sp_for"), SFilter.eq("zoneType",tables!!)).entity()
@@ -1151,7 +1156,8 @@ open class RelationCalcService {
                         }
                     }
                 }
-
+                /** 发送消息 */
+                rabbitMqService.sendRel(Opt.projectId!!, "fengkou_for","20","123","456")
                 return SBaseResponse(SResponseType.success)
             }else{
                 upDateBiaoji(projectId,"eq2fl",5)

+ 3 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/jms/MessageReceiver.kt

@@ -61,6 +61,7 @@ class MessageReceiver {
     var synchronousMessageRelService = SObjectService(SMybatisDao(SynchronousMessageRel::class.java))
     /** 缓存对象数据 - 数据中台到数据中心 */
     var syncRwdMessageService = SObjectService(SMybatisDao(SyncRwdDatacenterMessage::class.java))
+
     /** 消息处理 */
     @Autowired
     lateinit var messageProcessing: MessageProcessing
@@ -78,6 +79,8 @@ class MessageReceiver {
             val messag = SJsonUtil.fromJson(mess, SyncRwdDatacenterMessage::class.java)
             /** 消息不可以为空 */
             if (messag != null) {
+
+
                 /** 消息类型 */
                 when(messag.type){
                     Configure.RWDCREATE -> {

+ 1 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/jms/RwdSync.kt

@@ -75,6 +75,7 @@ class RwdSync {
                     rwdProject.projectType(message)
                 }
                 Configure.BUILDING -> {
+
                     /** 建筑 */
                     rwdBuilding.buildingType(message)
                 }

+ 5 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdBuilding.kt

@@ -30,6 +30,7 @@ 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.Project
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi
@@ -52,6 +53,8 @@ class RwdBuilding {
     var syncRwdMessageService = SObjectService(SMybatisDao(SyncRwdDatacenterMessage::class.java))
     /** 项目所属的集团 */
     private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
+    /** 项目所属的集团 */
+    private val projectService = SObjectService(SMybatisDao(Project::class.java))
 
     /**
      *
@@ -70,7 +73,7 @@ class RwdBuilding {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        buildingService.insert(buildingDataConversions)
+                        buildingService.replace(buildingDataConversions)
                         message.state = 0
                     } else {
                         message.state = 2
@@ -95,7 +98,7 @@ class RwdBuilding {
                             dictProject!!.groupCode!!,
                             queryIdList[0]
                         )
-                        buildingService.update(buildingDataConversions)
+                        buildingService.replace(buildingDataConversions)
                         message.state = 0
                     } else {
                         message.state = 2

+ 30 - 26
datasyn/src/main/kotlin/com/persagy/server/syn/services/jms/RwdProject.kt

@@ -73,6 +73,8 @@ class RwdProject {
                 /** 集团和项目的关系 */
                 DClassDefService.dictProject()
 
+                DClassDefService.dictProjectType(message.projectId!!)
+                DClassDefService.dictProjectInfo(message.projectId!!)
                 /** 创建 */
                 val dictProject = dictProjectService.select(SFilter.eq("id", message.projectId!!)).entity()
                 if (dictProject!=null) {
@@ -96,39 +98,41 @@ class RwdProject {
                 syncRwdMessageService.update(message, arrayListOf("state"))
             }
             Configure.RWDUPDATE -> {
-                /** 修改 */
-                val dictProject = dictProjectService.select(SFilter.eq("id", message.projectId!!)).entity()
-                if (dictProject!=null) {
-                    val queryIdList = BuildingApi.queryId(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
-                    if (queryIdList.size>0){
-                        val buildingDataConversions =  ProjectUtil.projectDataConversions(
-                            dictProject!!.groupCode!!,
-                            queryIdList[0]
-                        )
-                        projectService.update(buildingDataConversions)
-                        message.state = 0
+                val entity = projectService.select(SFilter.eq("projectId", message.projectId!!)).entity()
+                if (entity!=null){
+                    /** 修改 */
+                    val dictProject = dictProjectService.select(SFilter.eq("id", message.projectId!!)).entity()
+                    if (dictProject!=null) {
+                        val queryIdList = BuildingApi.queryId(dictProject.groupCode!!, message.projectId!!, message.targetId!!)
+                        if (queryIdList.size>0){
+                            val buildingDataConversions =  ProjectUtil.projectDataConversions(
+                                    dictProject!!.groupCode!!,
+                                    queryIdList[0]
+                            )
+                            projectService.update(buildingDataConversions)
+                            message.state = 0
+                        } else {
+                            message.state = 2
+                        }
                     } else {
                         message.state = 2
                     }
-                } else {
-                    message.state = 2
+                    /** 更改标记 */
+                    syncRwdMessageService.update(message, arrayListOf("state"))
                 }
-                /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
-
             }
             Configure.RWDDELETE -> {
                 /** 删除 */
-                val delete = projectService.delete(
-                    SFilter.eq("id", message.targetId!!)
-                )
-                if (delete) {
-                    message.state = 0
-                } else {
-                    message.state = 2
-                }
-                /** 更改标记 */
-                syncRwdMessageService.update(message, arrayListOf("state"))
+//                val delete = projectService.delete(
+//                    SFilter.eq("id", message.targetId!!)
+//                )
+//                if (delete) {
+//                    message.state = 0
+//                } else {
+//                    message.state = 2
+//                }
+//                /** 更改标记 */
+//                syncRwdMessageService.update(message, arrayListOf("state"))
             }
         }