Browse Source

**************************************万达adm**********************************************
首次提交

zhangweixin 4 years ago
parent
commit
edc4b3db32

+ 0 - 71
datacenter/src/main/kotlin/com/persagy/server/controllers/TestController.kt

@@ -1,71 +0,0 @@
-/*
- * *********************************************************************************************************************
- *
- *          !!
- *        .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.controllers
-
-import com.persagy.server.Opt
-import com.persagy.server.jms.TopicSender
-import io.swagger.v3.oas.annotations.Operation
-import io.swagger.v3.oas.annotations.tags.Tag
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-
-/**
- * 测试消息
- *
- * @author wx  <zhangweixin@sagacloud.com>
- * @date  2020/10/27 19:35
- */
-@Tag(name = "0000、测试消息")
-@RestController
-@RequestMapping("/tests")
-class TestController {
-    companion object {
-        // 日志
-        private val logger = LoggerFactory.getLogger(TestController::class.java)
-    } // Companion object
-
-    @Autowired
-    lateinit var topicSender: TopicSender
-
-    /**
-     * 创建设备
-     *
-     * @param   request         设备对象
-     * @return                  创建结果信息
-     */
-    @Operation(summary = "测试消息", description = "")
-    @PostMapping(value = ["/test"])
-    fun create() {
-        logger.debug("projectId =${Opt.projectId}")
-        topicSender.sendMessage()
-    } // Function create()
-
-}

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

@@ -76,8 +76,8 @@ open class ManualRelationCalcService {
             SSpringContextUtil.getBean(RabbitMqService::class.java) as RabbitMqService
         }
     } // Companion object
-    /** 资产服务 */
-    private val relPropertyService = SObjectService(SMybatisDao(RelProperty::class.java))
+//    /** 资产服务 */
+//    private val relPropertyService = SObjectService(SMybatisDao(RelProperty::class.java))
     /** 资产所在的空间 *******************************************************/
     private val rPeInSpBaseService = SObjectService(SMybatisDao(RPe2Sp::class.java))
     /** 设备服务于竖井 */
@@ -415,7 +415,7 @@ open class ManualRelationCalcService {
                     /** 暂无数据 */
                     val manualRelationCalcResponse = ManualRelationCalcResponse()
                     manualRelationCalcResponse.result = SResponseType.success
-                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
                     return manualRelationCalcResponse
                 }
             }
@@ -423,7 +423,7 @@ open class ManualRelationCalcService {
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -489,7 +489,7 @@ open class ManualRelationCalcService {
                     /** 暂无数据 */
                     val manualRelationCalcResponse = ManualRelationCalcResponse()
                     manualRelationCalcResponse.result = SResponseType.success
-                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
                     return manualRelationCalcResponse
                 }
             }
@@ -498,7 +498,7 @@ open class ManualRelationCalcService {
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
 
     }  // Fun
@@ -563,20 +563,20 @@ open class ManualRelationCalcService {
                     /** 暂无数据 */
                     val manualRelationCalcResponse = ManualRelationCalcResponse()
                     manualRelationCalcResponse.result = SResponseType.success
-                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
                     return manualRelationCalcResponse
                 }
             }
             /** 暂无数据 */
             val manualRelationCalcResponse = ManualRelationCalcResponse()
             manualRelationCalcResponse.result = SResponseType.success
-            manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//            manualRelationCalcResponse.content = ArrayList<RelProperty>()
             return manualRelationCalcResponse
         }
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -639,7 +639,7 @@ open class ManualRelationCalcService {
                     /** 暂无数据 */
                     val manualRelationCalcResponse = ManualRelationCalcResponse()
                     manualRelationCalcResponse.result = SResponseType.success
-                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
                     return manualRelationCalcResponse
                 }
             }
@@ -647,7 +647,7 @@ open class ManualRelationCalcService {
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -715,19 +715,19 @@ open class ManualRelationCalcService {
                 /** 暂无数据 */
                 val manualRelationCalcResponse = ManualRelationCalcResponse()
                 manualRelationCalcResponse.result = SResponseType.success
-                manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                manualRelationCalcResponse.content = ArrayList<RelProperty>()
                 return manualRelationCalcResponse
             }
             /** 暂无数据 */
             val manualRelationCalcResponse = ManualRelationCalcResponse()
             manualRelationCalcResponse.result = SResponseType.success
-            manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//            manualRelationCalcResponse.content = ArrayList<RelProperty>()
             return manualRelationCalcResponse
         }
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -793,13 +793,13 @@ open class ManualRelationCalcService {
             /** 暂无数据 */
             val manualRelationCalcResponse = ManualRelationCalcResponse()
             manualRelationCalcResponse.result = SResponseType.success
-            manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//            manualRelationCalcResponse.content = ArrayList<RelProperty>()
             return manualRelationCalcResponse
         }
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -861,7 +861,7 @@ open class ManualRelationCalcService {
                     /** 暂无数据 */
                     val manualRelationCalcResponse = ManualRelationCalcResponse()
                     manualRelationCalcResponse.result = SResponseType.success
-                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
                     return manualRelationCalcResponse
                 }
             }
@@ -869,7 +869,7 @@ open class ManualRelationCalcService {
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     }
 
@@ -1339,14 +1339,14 @@ open class ManualRelationCalcService {
                 /** 暂无数据 */
                 val manualRelationCalcResponse = ManualRelationCalcResponse()
                 manualRelationCalcResponse.result = SResponseType.success
-                manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                manualRelationCalcResponse.content = ArrayList<RelProperty>()
                 return manualRelationCalcResponse
             }
         }
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -1653,14 +1653,14 @@ open class ManualRelationCalcService {
                 /** 暂无数据 */
                 val manualRelationCalcResponse = ManualRelationCalcResponse()
                 manualRelationCalcResponse.result = SResponseType.success
-                manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                manualRelationCalcResponse.content = ArrayList<RelProperty>()
                 return manualRelationCalcResponse
             }
         }
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -2353,14 +2353,14 @@ open class ManualRelationCalcService {
                 /** 暂无数据 */
                 val manualRelationCalcResponse = ManualRelationCalcResponse()
                 manualRelationCalcResponse.result = SResponseType.success
-                manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                manualRelationCalcResponse.content = ArrayList<RelProperty>()
                 return manualRelationCalcResponse
             }
         }
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun hvac()
 
@@ -2864,14 +2864,14 @@ open class ManualRelationCalcService {
                 /** 暂无数据 */
                 val manualRelationCalcResponse = ManualRelationCalcResponse()
                 manualRelationCalcResponse.result = SResponseType.success
-                manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                manualRelationCalcResponse.content = ArrayList<RelProperty>()
                 return manualRelationCalcResponse
             }
         }
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -3079,14 +3079,14 @@ open class ManualRelationCalcService {
                 /** 暂无数据 */
                 val manualRelationCalcResponse = ManualRelationCalcResponse()
                 manualRelationCalcResponse.result = SResponseType.success
-                manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                manualRelationCalcResponse.content = ArrayList<RelProperty>()
                 return manualRelationCalcResponse
             }
         }
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
 
     } // Fun
@@ -3217,7 +3217,7 @@ open class ManualRelationCalcService {
                 /** 暂无数据 */
                 val manualRelationCalcResponse = ManualRelationCalcResponse()
                 manualRelationCalcResponse.result = SResponseType.success
-                manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                manualRelationCalcResponse.content = ArrayList<RelProperty>()
                 return manualRelationCalcResponse
             }
         }
@@ -3225,7 +3225,7 @@ open class ManualRelationCalcService {
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -3294,7 +3294,7 @@ open class ManualRelationCalcService {
                     /** 暂无数据 */
                     val manualRelationCalcResponse = ManualRelationCalcResponse()
                     manualRelationCalcResponse.result = SResponseType.success
-                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
                     return manualRelationCalcResponse
                 }
             }
@@ -3302,7 +3302,7 @@ open class ManualRelationCalcService {
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 
@@ -3372,7 +3372,7 @@ open class ManualRelationCalcService {
                     /** 暂无数据 */
                     val manualRelationCalcResponse = ManualRelationCalcResponse()
                     manualRelationCalcResponse.result = SResponseType.success
-                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//                    manualRelationCalcResponse.content = ArrayList<RelProperty>()
                     return manualRelationCalcResponse
                 }
             }
@@ -3380,7 +3380,7 @@ open class ManualRelationCalcService {
         /** 暂无数据 */
         val manualRelationCalcResponse = ManualRelationCalcResponse()
         manualRelationCalcResponse.result = SResponseType.success
-        manualRelationCalcResponse.content = ArrayList<RelProperty>()
+//        manualRelationCalcResponse.content = ArrayList<RelProperty>()
         return manualRelationCalcResponse
     } // Fun
 

+ 2 - 1
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/RelationCalcService.kt

@@ -29,14 +29,15 @@ package com.persagy.server.services.relation_calc
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
+import com.persagy.server.datacenter.datacenter.models.entities.rel.RSp2Sp
 import com.persagy.server.datacenter.models.entities.graphtype.MPoint
 import com.persagy.server.datacenter.models.entities.graphtype.RelationTypeProject
+import com.persagy.server.datacenter.services.base.RService
 import com.persagy.server.jms.RabbitMqService
 import com.persagy.server.mappers.IRelationCalcMapper
 import com.persagy.server.models.`object`.TwicePoint
 import com.persagy.server.models.service.BaseDataService
 import com.persagy.server.services.assistant.RUpDateEquipAndSapceService
-import com.persagy.server.services.base.RService
 import com.persagy.server.services.objects.EquipmentService
 import com.persagy.server.services.objects.FloorService
 import com.persagy.server.services.objects.ZoneSpaceBaseService

+ 1 - 2
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/tools/ManualRelationTools.kt

@@ -27,7 +27,6 @@
 package com.persagy.server.datacenter.services.relation_calc.tools
 
 import com.persagy.mybatis.SMybatisDao
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelProperty
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelShaft
 import com.persagy.server.datacenter.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.server.datacenter.models.entities.rel.RPe2Sp
@@ -95,7 +94,7 @@ class ManualRelationTools {
 
 
     /** 资产服务 */
-    private val relPropertyService = SObjectService(SMybatisDao(RelProperty::class.java))
+//    private val relPropertyService = SObjectService(SMybatisDao(RelProperty::class.java))
     /** 竖井 */
     private val relShaftService = SObjectService(SMybatisDao(RelShaft::class.java))
     /** 空间 */

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/controllers/relation_calc/CalcSpecialController.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.controllers.relation_calc
+package com.persagy.server.datacenter.wanda.controllers.relation
 
 import com.persagy.server.services.relation_calc.CalcSpecialService
 import com.persagy.service.SPageContext

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

@@ -24,11 +24,10 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.controllers.relation_calc
+package com.persagy.server.datacenter.wanda.controllers.relation
 
 import com.persagy.server.services.relation_calc.RelationCalcService
 import com.persagy.service.SPageContext
-import com.persagy.service.models.enums.SResponseType
 import com.persagy.service.models.responses.SBaseResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag

+ 0 - 5
datacenter/src/main/resources/application-dev.yml

@@ -33,11 +33,6 @@ spring:
     name:                               datacenter
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
-#    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
-<<<<<<< HEAD
-=======
-#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
->>>>>>> 4f9446037d0c154f4028be83daa67ceef061bcfe
     url:                                jdbc:postgresql://192.168.64.15:5432/datacenterwanda
     username:                           postgres
 #    password:                           persagy_2020qwe!@#

+ 1 - 8
datacenter/src/main/resources/logback-spring.xml

@@ -38,20 +38,13 @@
     </appender>
 
     <!-- 定义cn.sagacloud包的日志级别 -->
-<<<<<<< HEAD
     <logger name="com.persagy" level="DEBUG" additivity="false">
-=======
-    <logger name="com.persagy" level="debug" additivity="false">
->>>>>>> 4f9446037d0c154f4028be83daa67ceef061bcfe
         <appender-ref ref="STDOUT"/>
     </logger>
 
     <!-- 定义com.persagy包的日志级别 -->
-<<<<<<< HEAD
+
     <logger name="com.persagy" level="DEBUG" additivity="false">
-=======
-    <logger name="com.persagy.server.datacenter" level="debug" additivity="false">
->>>>>>> 4f9446037d0c154f4028be83daa67ceef061bcfe
         <appender-ref ref="STDOUT"/>
     </logger>