Explorar el Código

********************WX***********************
添加微服务和数据中台通讯方式

zhangweixin hace 4 años
padre
commit
66b48216bb

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

@@ -213,6 +213,11 @@ open class Equipment : BaseInfo() {
     @Column(name = "note")
     var note: Int? = null
 
+    /** 备注 */
+    @Schema(description = "客户端id")
+    @Column(name = "app_id")
+    var appId: String? = null
+
     /** 方案id */
     @Schema(description = "方案id")
 //    @Column(name = "scheme_id")

+ 4 - 4
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/task/ScanSchemeInfo.kt

@@ -73,7 +73,7 @@ class ScanSchemeInfo : RBaseInfo()  {
     /** 是否找到 */
     @Schema(description = "是否找到")
     @Column(name = "is_find")
-    var isFind: Boolean? = null
+    var find: Boolean? = null
 
     /** 操作 */
     @Schema(description = "操作")
@@ -83,17 +83,17 @@ class ScanSchemeInfo : RBaseInfo()  {
     /** 强制 */
     @Schema(description = "强制")
     @Column(name = "is_compulsory")
-    var isCompulsory: Boolean? = null
+    var compulsory: Boolean? = null
 
     /** 可选 */
     @Schema(description = "可选")
     @Column(name = "is_optional")
-    var isOptional: Boolean? = null
+    var optional: Boolean? = null
 
     /** 忽略 */
     @Schema(description = "忽略")
     @Column(name = "is_ignored")
-    var isIgnored: Boolean? = null
+    var ignored: Boolean? = null
 
     /** 项目id */
     @Schema(description = "项目id",required = true)

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/Opt.kt

@@ -60,10 +60,10 @@ object Opt {
         get() = SPageContext.getHeader("projectId")
     /** 数据来源 */
     val coming: String?
-        get() = SPageContext.getHeader("coming")
+        get() = SPageContext.getHeader("appId")
     /** 账号信息 */
     val account: String?
-        get() = SPageContext.getHeader("account")
+        get() = SPageContext.getHeader("userId")
 
     /**  使用字典信息点全局定义 ****************************************************************************/
     /** 楼层平面图 */

+ 3 - 0
datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt

@@ -82,6 +82,9 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
         if (equip.classCode.isNullOrEmpty()) {
             return false
         }
+        if (!Opt.coming.isNullOrEmpty()) {
+            equip.appId = Opt.coming
+        }
         if(equip.classCode!!.length<6){
             val entity = defClassService.select(
                     SFilter.eq("projectId", equip.projectId!!),

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

@@ -45,10 +45,8 @@ import com.persagy.server.services.rel.REq2SpService
 import com.persagy.server.utils.IdUtils
 import com.persagy.service.SBaseService
 import com.persagy.service.models.enums.SResponseType
-import com.persagy.service.models.requests.SCreateRequest
 import com.persagy.service.models.responses.SBaseResponse
 import com.persagy.service.utils.SSpringContextUtil
-import com.vividsolutions.jts.geom.GeometryFactory
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service

+ 1 - 1
scanbuilding/src/main/kotlin/com/persagy/server/mappers/StatisticsCountMapper.kt

@@ -158,7 +158,7 @@ interface StatisticsCountMapper {
     /**
      * 统计设备任务下的部件类型以及数量
      */
-    @Select("SELECT class_code as code,(SELECT name FROM dict.def_class WHERE code = class_code and project_id = #{projectId})  ) as name, COUNT(class_code) FROM scantask.equip_scan_task WHERE task_parent_id = #{id} AND parent_id = #{equipId} GROUP BY class_code")
+    @Select("SELECT class_code as code,(SELECT name FROM dict.def_class WHERE code = class_code and project_id = #{projectId}) as name, COUNT(class_code) FROM scantask.equip_scan_task WHERE task_parent_id = #{id} AND parent_id = #{equipId} GROUP BY class_code")
     fun categoryStatistics(projectId:String,id: String,equipId: String): ArrayList<CategoryStatistics>
 
     /**