浏览代码

********************WX***********************
屏蔽不规范编码

zhangweixin 4 年之前
父节点
当前提交
0bde3eb54f

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/control/RelEquipmentControlRelationTwoSy.kt

@@ -43,7 +43,7 @@ open class RelEquipmentControlRelationTwoSy : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="relationship.r_eq2sy", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_ControlRelation_2'")
+    @SCascade(table="relationship.r_eq2sy", idColumn="eq_id", childIdColumn="sy_id",self = false,filter = "type = 'eq2sy_ControlRelation_2'")
     var objectInfo: ArrayList<RelGeneralSystem>? = null
 
 }

+ 144 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/objects/VShaft.kt

@@ -0,0 +1,144 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .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-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.models.entities.objects
+
+import com.persagy.server.datacenter.models.entities.assistant.PointPosition
+import com.persagy.server.datacenter.models.entities.base.BaseInfo
+import com.persagy.service.models.annotations.SCascade
+import io.swagger.v3.oas.annotations.media.Schema
+import javax.persistence.Column
+import javax.persistence.Id
+import javax.persistence.Table
+
+/**
+ * 竖井信息实体类
+ *
+ * @author  张维新
+ */
+@Schema(description = "竖井信息实体类")
+@Table(name = "v_shaft")
+class VShaft : BaseInfo() {
+
+    /** 竖井id */
+   @Schema(description = "竖井id")
+    @Id
+    @Column(name = "id")
+    var id: String? = null
+
+    /** 竖井名称 */
+   @Schema(description = "竖井名称")
+    @Column(name = "name")
+    var name: String? = null
+
+    /** 竖井本地编码 */
+   @Schema(description = "竖井本地编码")
+    @Column(name = "local_id")
+    var localId: String? = null
+
+    /** 竖井本地名称 */
+   @Schema(description = "竖井本地名称")
+    @Column(name = "local_name")
+    var localName: String? = null
+
+    /** BIM模型中编码 */
+   @Schema(description = "BIM模型中编码")
+    @Column(name = "bim_id")
+    var bimId: String? = null
+
+    /** 设计图纸中编码 */
+   @Schema(description = "设计图纸中编码")
+    @Column(name = "cad_id")
+    var cadId: String? = null
+
+    /** 二维码图片 */
+   @Schema(description = "二维码图片")
+    @Column(name = "qr_code_pic")
+    var qRCodePic: String? = null
+
+    /** 二维码内容 */
+   @Schema(description = "二维码内容")
+    @Column(name = "default_qr_code")
+    var defaultQRCode: String? = null
+
+    /** 项目id */
+   @Schema(description = "项目id")
+    @Column(name = "project_id")
+    var projectId: String? = null
+
+    /** BIM模型中坐标 */
+   @Schema(description = "BIM模型中坐标")
+    @Column(name = "bim_location")
+    var bimLocation: String? = null
+
+    /** 竖井顺序码 */
+   @Schema(description = "竖井顺序码")
+    @Column(name = "shaft_sequenceId")
+    var shaftSequenceId: Int? = null
+
+    /** 竖井顺序码 */
+    @Schema(description = "功能类型")
+    @Column(name = "shaftfunctype")
+    var shaftfunctype: String? = null
+
+
+    /** 信息点 */
+   @Schema(description = "信息点")
+    @Column(name = "infos")
+    var infos: HashMap<String, Any?>? = null
+
+    /** BIM模型中轮廓坐标 */
+   @Schema(description = "BIM模型中轮廓坐标")
+    @Column(name = "outline")
+    var outline: ArrayList<PointPosition>? = null
+
+    /** 对象类型 */
+   @Schema(description = "对象类型")
+    @Column(name = "object_type")
+    override var objectType: String? = "Shaft"
+
+    /** 级联-竖井内的设备 */
+   @Schema(description = "级联-竖井内的设备")
+    @SCascade(table="r_eq_in_sh", idColumn="shaft_id", childIdColumn="equip_id")
+    var equipmentList: ArrayList<Equipment>? = null
+
+    /** 级联-竖井内的系统 */
+   @Schema(description = "级联-竖井内的系统")
+    @SCascade(table="r_sy_in_sh", idColumn="shaft_id", childIdColumn="sys_id")
+    var systemList: ArrayList<GeneralSystem>? = null
+
+    /** 贯通关系   self = true  同样的对象查询时 id可以互相调换查询   */
+   @Schema(description = "级联-贯通关系")
+    @SCascade(table="r_sh_through_sh", idColumn="shaft_id", childIdColumn="shaft_other_id", self = true)
+    var shaftThroughList: ArrayList<VShaft>? = null
+
+    /** 竖井内的业务空间  self = true  同样的对象查询时 id可以互相调换查询   */
+   @Schema(description = "级联-竖井内的业务空间")
+    @SCascade(table="relationship.r_sh2sp", idColumn="id1", childIdColumn="id2", self = false,filter = "type = 'sh2sp'")
+    var spaceList: ArrayList<ZoneSpace>? = null
+
+
+} // Class Shaft

+ 14 - 14
datacenter/src/main/kotlin/com/persagy/server/controllers/graphtype/GraphicTypeController.kt

@@ -87,7 +87,7 @@ open class GraphicTypeController {
     @PostMapping(value = ["/query-count"])
     fun queryCount(): SQueryResponse<GraphicType> {
         return graphicTypeMapperService.queryCounts()
-    } /* Fun pageQuery() */
+    }
 
     /**
      * 下载模板
@@ -96,7 +96,7 @@ open class GraphicTypeController {
     @GetMapping(value = ["/template-downloads"])
     fun templateDownloads(@RequestBody response: HttpServletResponse) {
         RelationTypeProjectService.templateDownloads(response)
-    } // Fun templateDownloads
+    }
 
     /**
      * 导出关系
@@ -105,7 +105,7 @@ open class GraphicTypeController {
     @GetMapping(value = ["/export"])
     fun exportExcel( response: HttpServletResponse, @RequestParam projectId: String,@RequestParam relType: String,@RequestParam code: String = "对象ID", @RequestParam zoneType: String? = null) {
         RelationTypeProjectService.exportExcel(response, projectId,relType, code, zoneType)
-    } // Fun exportExcel
+    }
 
     /**
      * 导入excel
@@ -122,16 +122,16 @@ open class GraphicTypeController {
             return SBaseResponse(SResponseType.failure,"error:" + e.message)
         }
         return SBaseResponse(SResponseType.success, "")
-    } // Fun importExcel()
+    }
 
     /**
      * 下载报告
      */
     @Operation(summary="下载报告", description ="")
     @GetMapping(value = ["/report-downloads"])
-    fun reportDownloads(@RequestBody response: HttpServletResponse, @RequestParam relType: String, @RequestParam zoneType: String? = null) {
-        RelationTypeProjectService.reportDownloads(response, relType, zoneType)
-    } // Fun reportDownloads()
+    fun reportDownloads(response: HttpServletResponse,@RequestParam projectId: String, @RequestParam relType: String, @RequestParam zoneType: String? = null) {
+        RelationTypeProjectService.reportDownloads(response,projectId, relType, zoneType)
+    }
 
     /**
      * 获取源末端
@@ -140,7 +140,7 @@ open class GraphicTypeController {
     @PostMapping(value = ["/connected-block-query"])
     fun connectedBlockQuery(@RequestBody request: SQueryRequest): SQueryResponse<ConnectedBlockResponse> {
         return ConnectedBlockService.getConnectedBlock(request);
-    } // Fun connectedBlockQuery()
+    }
 
     /**
      * 覆盖源末端
@@ -149,7 +149,7 @@ open class GraphicTypeController {
     @PostMapping(value = ["/replace-connected-block-source"])
     fun replaceConnectedBlockSource(@RequestBody request: ConnectedBlockSourceRequest): SCreateResponse<ConnectedBlockSource> {
         return ConnectedBlockSourceService.replaceConnectedBlockSource(request)
-    } // Fun replaceConnectedBlockSource()
+    }
 
 
     /**
@@ -160,7 +160,7 @@ open class GraphicTypeController {
     fun relationTypeProject(@RequestBody request: SQueryRequest): SQueryResponse<RelationTypeProject> {
         val service = SObjectService(RelationTypeProject::class.java)
         return service.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
-    } // Fun replaceConnectedBlockSource()
+    }
 
 
     /**
@@ -170,7 +170,7 @@ open class GraphicTypeController {
     @GetMapping(value = ["/export/point"])
     fun exportExcelPoint(response: HttpServletResponse, @RequestParam buildingId: String,floorId: String,category: String) {
         RelationTypeProjectService.exportExcelPoint(response,buildingId,floorId,category)
-    } // Fun exportExcel
+    }
 
     /**
      * 导入excel
@@ -186,12 +186,12 @@ open class GraphicTypeController {
         }catch (e : Exception){
             return SBaseResponse(SResponseType.failure,"error:" + e.message)
         }
-    } // Fun importExcel()
+    }
 
     @Operation(summary="下载报告-点表", description="")
     @GetMapping(value = ["/downloads/point"])
     fun reportDownloadsPoint(response: HttpServletResponse, @RequestParam key: String) {
         RelationTypeProjectService.reportDownloadsPoint(response, key)
-    } // Fun reportDownloads()
+    }
 
-} // Class EquipScanTaskController
+}

+ 3 - 2
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt

@@ -31,6 +31,7 @@ import com.persagy.database.SFilter
 import com.persagy.server.datacenter.models.entities.assistant.ShaftFuncType
 import com.persagy.server.datacenter.models.entities.assistant.ShaftWithCount
 import com.persagy.server.datacenter.models.entities.objects.Shaft
+import com.persagy.server.datacenter.models.entities.objects.VShaft
 import com.persagy.server.datacenter.models.entities.objects.ZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RelationSpaceShaft
 import com.persagy.server.datacenter.models.entities.task.BuildingDic
@@ -115,9 +116,9 @@ class ShaftController {
      */
     @Operation(summary = "查询竖井信息", description = "级联查询:竖井内的设备(equipmentList)、竖井内的系统(systemList)、竖井联通关系(shaftThroughList)、竖井内的业务空间(spaceList)")
     @PostMapping(value = ["/query"])
-    fun query(@RequestBody request: SQueryRequest): SQueryResponse<Shaft> {
+    fun query(@RequestBody request: SQueryRequest): SQueryResponse<VShaft> {
         logger.debug("ShaftQuery =${request.toJson()}")
-        return ShaftService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
+        return ShaftService.vShaftService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("projectId").toString())))
     } // Function query()
 
     /**

+ 2 - 4
datacenter/src/main/kotlin/com/persagy/server/jms/TopicReceiver.kt

@@ -32,8 +32,6 @@ import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.datacenter.models.jms.SynchronousMessageRel
 import com.persagy.service.SObjectService
 import com.persagy.service.utils.SJsonUtil
-import org.springframework.amqp.rabbit.annotation.RabbitHandler
-import org.springframework.amqp.rabbit.annotation.RabbitListener
 import org.springframework.stereotype.Component
 import org.springframework.stereotype.Service
 import java.util.*
@@ -63,8 +61,8 @@ class TopicReceiver {
      *
      * @param
      */
-    @RabbitListener(queues = ["queue-center-adm"])
-    @RabbitHandler
+//    @RabbitListener(queues = ["queue-center-adm"])
+//    @RabbitHandler
     fun receiveMessage(message: String) {
         try {
             println("接收数据中心消息 , $message")

+ 3 - 4
datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelExportMapper.kt

@@ -210,10 +210,9 @@ interface IRelationExcelExportMapper {
      * @param   type            关系类型
      * @return  关系记录
      */
-    @Select("SELECT r.eq_id AS id, eq.name, eq.local_id, eq.local_name, '设备' AS object_type,\n" +
-            "       r.sy_id AS _id, sy.name AS _name, sy.local_id AS _local_id, sy.local_name AS _local_name, '系统' AS _object_type\n" +
-            "FROM relationship.r_eq2sy r JOIN equipment AS eq ON r.eq_id = eq.id JOIN general_system AS sy ON r.sy_id = sy.id\n" +
-            "WHERE r.project_id = #{projectId} AND r.type = #{type}")
+    @Select("SELECT r.eq_id AS id, eq.name, eq.local_id, eq.local_name, '设备' AS object_type,(SELECT local_name FROM building WHERE id = eq.building_id ) AS building_name," +
+            "(SELECT local_name FROM floor WHERE id = eq.floor_id) AS floor_name,r.sy_id AS _id, sy.name AS _name, sy.local_id AS _local_id, sy.local_name AS _local_name, '系统' AS _object_type " +
+            "FROM relationship.r_eq2sy r JOIN equipment AS eq ON r.eq_id = eq.id JOIN general_system AS sy ON r.sy_id = sy.id WHERE r.project_id = #{projectId} AND r.type = #{type}")
     fun eq2sy(projectId: String, type: String): List<HashMap<String, Any?>>
 
     /**

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt

@@ -145,13 +145,13 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
      * @param   relType         关系类型
      * @param   zoneType        业务空间类型
      */
-    fun reportDownloads(response: HttpServletResponse, relType: String, zoneType: String? = null) {
+    fun reportDownloads(response: HttpServletResponse, projectId: String, relType: String, zoneType: String? = null) {
         val zone = if (zoneType != null) {
             "_${zoneType}"
         } else {
             ""
         }
-        val projectId = SPageContext.getHeader("projectId")
+//        val projectId = SPageContext.getHeader("projectId")
         val file = File("/tmp/relation-$projectId-${relType}${zone}.xlsx")
         val workbook = if (file.exists()) {
             XSSFWorkbook(file)

+ 2 - 1
datacenter/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt

@@ -71,7 +71,8 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
     /** 竖井和业务空间关系 */
     var rSh2SpService = SObjectService(SMybatisDao(RSh2Sp::class.java))
 
-
+    /** 竖井视图服务 */
+    var vShaftService = SObjectService(SMybatisDao(VShaft::class.java))
     /**
      * 创建之前操作
      *

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationAddService.kt

@@ -1733,7 +1733,7 @@ class ManualRelationAddService {
             sCreateResponse.result = SResponseType.success
             sCreateResponse.message = "添加成功"
             return sCreateResponse
-        }else if (relationAddRequest.relType == "eq2eq_ControlRelation_2"||relationAddRequest.relType == "eq2sy_SensorRelationship_ss2sy"||relationAddRequest.relType == "eq2sy_ValveRelationship_vv2sy"){
+        }else if (relationAddRequest.relType == "eq2sy_ControlRelation_2"||relationAddRequest.relType == "eq2sy_SensorRelationship_ss2sy"||relationAddRequest.relType == "eq2sy_ValveRelationship_vv2sy"){
 
             if (!relationAddRequest.type.isNullOrEmpty()&&relationAddRequest.type == "cadId"){
                 /** 从对象不存在cadId编码 */
@@ -1785,14 +1785,14 @@ class ManualRelationAddService {
             }
             /** 查询空间 */
             val equipmentToList = GeneralSystemService.select(SFilter.eq("projectId", projectId), SFilter.inList(relationAddRequest.type!!, setCode.toList())).exec()
-            if (relationAddRequest.relType == "eq2eq_ControlRelation_2"){ /** 系统控制关系 */
+            if (relationAddRequest.relType == "eq2sy_ControlRelation_2"){ /** 系统控制关系 */
                 for (equipmentTo in equipmentToList) {
                     val rEq2Sy = REq2Sy()
                     rEq2Sy.id1 = equipment.id
                     rEq2Sy.projectId = projectId
                     rEq2Sy.sign = 1
                     rEq2Sy.id2 = equipmentTo.id
-                    rEq2Sy.type = "eq2eq_ControlRelation_2"
+                    rEq2Sy.type = "eq2sy_ControlRelation_2"
                     rEq2SyService.replace(rEq2Sy)
                 }
             }else if (relationAddRequest.relType == "eq2sy_SensorRelationship_ss2sy"){ /** 传感器测量系统关系 */

+ 6 - 6
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

@@ -219,7 +219,7 @@ open class ManualRelationCalcService {
                 ||manualRelationCalcRequest.relType == "eq2eq_SensorRelationship_ss2eq"||manualRelationCalcRequest.relType == "eq2eq_ValveRelationship_vv2eq"||manualRelationCalcRequest.relType =="eq2eq_ControlEquipNetwork"){
                 /** 测控类 */
                 return control(projectId,list,sQueryRequest,manualRelationCalcRequest)
-            }else if (manualRelationCalcRequest.relType == "eq2eq_ControlRelation_2"||manualRelationCalcRequest.relType == "eq2sy_SensorRelationship_ss2sy"
+            }else if (manualRelationCalcRequest.relType == "eq2sy_ControlRelation_2"||manualRelationCalcRequest.relType == "eq2sy_SensorRelationship_ss2sy"
                 ||manualRelationCalcRequest.relType == "eq2sy_ValveRelationship_vv2sy"){
                 /** 测控类 */
                 return controlSy(projectId,list,sQueryRequest,manualRelationCalcRequest)
@@ -534,7 +534,7 @@ open class ManualRelationCalcService {
                 }else if (manualRelationCalcDel.relType == "eq2eq_ValveRelationship_vv2eq"){/** 阀门限制设备关系 */
                     delete = rEq2EqService.delete(SFilter.eq("projectId", projectId!!),
                         SFilter.eq("id1", manualRelationCalcDel.fromId!!), SFilter.eq("id2", manualRelationCalcDel.toId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
-                }else if (manualRelationCalcDel.relType == "eq2eq_ControlRelation_2"){ /** 系统控制关系 */
+                }else if (manualRelationCalcDel.relType == "eq2sy_ControlRelation_2"){ /** 系统控制关系 */
                     delete = rEq2SyService.delete(SFilter.eq("projectId", projectId!!),
                         SFilter.eq("id1", manualRelationCalcDel.fromId!!), SFilter.eq("id2", manualRelationCalcDel.toId!!),SFilter.eq("type", manualRelationCalcDel.relType!!))
                 }else if (manualRelationCalcDel.relType == "eq2sy_SensorRelationship_ss2sy"){ /** 传感器测量系统关系 */
@@ -3297,7 +3297,7 @@ open class ManualRelationCalcService {
      * 测控类
      * 通信连接                 eq2eq_SensorNetwork_1
      * 设备控制关系              eq2eq_ControlRelation_1
-     * 系统控制关系              eq2eq_ControlRelation_2   ****
+     * 系统控制关系              eq2sy_ControlRelation_2   ****
      * 传感器测量设备关系            eq2eq_SensorRelationship_ss2eq
      * 传感器测量系统关系            eq2sy_SensorRelationship_ss2sy               ***
      * 传感器测量空间关系            ss2sp               ****
@@ -3511,7 +3511,7 @@ open class ManualRelationCalcService {
     /**
      * 测控类
      *  传感器测量系统关系            eq2sy_SensorRelationship_ss2sy
-     *  系统控制关系              eq2eq_ControlRelation_2
+     *  系统控制关系              eq2sy_ControlRelation_2
      *  阀门限制系统关系             eq2sy_ValveRelationship_vv2sy
      */
     fun  controlSy(projectId: String,list: ArrayList<SFilter>,sQueryRequest: SQueryRequest,manualRelationCalcRequest: ManualRelationCalcRequest): ManualRelationCalcResponse{
@@ -3532,7 +3532,7 @@ open class ManualRelationCalcService {
                 }
                 list.add(SFilter.inList("id", listId))
 
-                if (manualRelationCalcRequest.relType == "eq2eq_ControlRelation_2"){ /** 系统控制关系 */
+                if (manualRelationCalcRequest.relType == "eq2sy_ControlRelation_2"){ /** 系统控制关系 */
                 val pageQuery = relEquipmentControlRelationTwoSyService.pageQuery(sQueryRequest, list)
                 val manualRelationCalcResponse = ManualRelationCalcResponse()
                     manualRelationCalcResponse.direction = "Left"
@@ -3593,7 +3593,7 @@ open class ManualRelationCalcService {
                     listSFilter.add(SFilter.eq("projectId",projectId))
                     listSFilter.add(SFilter.inList("id",listrelZoneSpaceAirId))
 
-                    if (manualRelationCalcRequest.relType == "eq2eq_ControlRelation_2"){ /** 系统控制关系 */
+                    if (manualRelationCalcRequest.relType == "eq2sy_ControlRelation_2"){ /** 系统控制关系 */
                     val pageQuery = relEquipmentControlRelationTwoSyService.pageQuery(sQueryRequest, listSFilter)
                         val manualRelationCalcResponse = ManualRelationCalcResponse()
                         manualRelationCalcResponse.direction = "Left"

+ 7 - 7
datacenter/src/main/resources/application-test.yml

@@ -33,13 +33,13 @@ spring:
     username:                           postgres
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
-  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
 
   servlet:
     multipart:

+ 1 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTask.kt

@@ -29,7 +29,6 @@ package com.persagy.server.syn.task
 import com.persagy.server.syn.jms.MessageProcessing
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Service
 
 /**
@@ -53,7 +52,7 @@ class SchedulerTask {
     //cron表达式:每隔5秒执行一次
 //    @Scheduled(cron = "0 */5 * * * ?")
 //    @Scheduled(cron="0/30 * *  * * ? ")   //每5秒执行一次
-    @Scheduled(cron = "0 */1 * * * ?")
+//    @Scheduled(cron = "0 */1 * * * ?")
     fun scheduled() {
         logger.info("同步数据中心任务开始至中台")
         messageProcessing.syncDataCenter()

+ 1 - 2
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTaskRel.kt

@@ -29,7 +29,6 @@ package com.persagy.server.syn.task
 import com.persagy.server.syn.jms.MessageProcessing
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Service
 
 /**
@@ -53,7 +52,7 @@ class SchedulerTaskRel {
     //cron表达式:每隔5秒执行一次
 //    @Scheduled(cron = "0 */5 * * * ?")
 //    @Scheduled(cron="0/5 * *  * * ? ")   //每5秒执行一次
-    @Scheduled(cron = "0 */3 * * * ?")
+//    @Scheduled(cron = "0 */3 * * * ?")
     fun scheduled() {
         logger.info("同步数据中心任务开始至数据中台-关系数据")
         messageProcessing.syncDataCenterRel()

+ 3 - 2
datasyn/src/main/resources/application-dev.yml

@@ -5,8 +5,8 @@ spring:
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
     #    username:                           postgres
     #    password:                           123qwe!@#
-    #    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!@#
@@ -35,6 +35,7 @@ eureka:
       eviction-interval-timer-in-ms: 5000 # 清理间隔(单位毫秒,默认是60*1000)启用主动失效,
 
 saga:
+#  dataPlatform:                        http://192.168.64.7:8832
   dataPlatform:                        http://39.102.40.239:9970
   data_org:                            http://39.102.40.239:9970
   data_rwd:                            http://39.102.40.239:9970

+ 2 - 2
equip-component/src/main/resources/application-test.yml

@@ -19,8 +19,8 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://datacenter:5432/datacenter
-#    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
+#    url:                                jdbc:postgresql://datacenter:5432/datacenter
+    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://datacenter:5432/datacenterlabsl
     username:                           postgres