Explorar el Código

******************WX *********************
关系总览,添加关系同步

zhangweixin hace 4 años
padre
commit
28a659fefd

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 18 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/dao/mappers/SchemeMapper.kt


+ 0 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/dictnew/DefFuncId.kt

@@ -45,7 +45,6 @@ open class DefFuncId: Serializable {
 
     /** 全局id */
     @Schema(description = "全局id")
-    @Id
     @Column(name = "id")
     var id: String? = null
 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 13 - 4
datacenter/src/main/kotlin/com/persagy/server/mappers/CustomMapper.kt


+ 24 - 4
datacenter/src/main/kotlin/com/persagy/server/services/assistant/SchemeService.kt

@@ -201,12 +201,32 @@ open class SchemeService {
         }
     } // Fun
 
-    fun dictInfo(projectId: String, groupId: String,  code:String){
-        mapper.dictInfo(projectId,groupId,code)
+    /**
+     * 根据项目ID添加字典
+     */
+//    fun dictInfo(projectId: String, groupId: String,  code:String){
+//        mapper.dictInfo(projectId,groupId,code)
+//    } // Fun
+
+    /**
+     *  项目级字典- 获取平台字典-可以根据条件获取字典
+     */
+    fun dictInfoCommon(type: String,projectId: String, groupId: String,  code:String){
+        mapper.dictInfoCommon(type,projectId,groupId,code)
     } // Fun
 
-    fun dictInfoProperty(projectId: String, groupId: String,  code:String,propertyCode: String){
-        mapper.dictInfoProperty(projectId,groupId,code,propertyCode)
+    /**
+     * 资产项目级字典- 根据项目ID
+     */
+//    fun dictInfoProperty(projectId: String, groupId: String,  code:String,propertyCode: String){
+//        mapper.dictInfoProperty(projectId,groupId,code,propertyCode)
+//    }
+
+    /**
+     * 资产项目级字典- 平台字典
+     */
+    fun dictInfoPropertyCommon(type: String,projectId: String, groupId: String,  code:String,propertyCode: String){
+        mapper.dictInfoPropertyCommon(type,projectId,groupId,code,propertyCode)
     }
 
 } // Class SchemeService

+ 45 - 31
datacenter/src/main/kotlin/com/persagy/server/services/dict/dictnew/DictDefClassService.kt

@@ -113,7 +113,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","equipment"),
-                            SFilter.eq("projectId",projectId!!)
+                            SFilter.eq("type","common")
+//                            SFilter.eq("projectId",projectId!!)
                         ).order("code").exec()
 
                     }
@@ -124,7 +125,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 //                    pageInfo = queryBuilder.pageQuery(1, 1000)
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","component"),
-                            SFilter.eq("projectId",projectId!!)
+                            SFilter.eq("type","common")
+//                            SFilter.eq("projectId",projectId!!)
                         ).order("code").exec()
                     }
                     "system" -> {
@@ -132,7 +134,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
 //                    pageInfo = queryBuilder.pageQuery(1, 1000)
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","system"),
-                            SFilter.eq("projectId",projectId!!)
+                            SFilter.eq("type","common")
+//                            SFilter.eq("projectId",projectId!!)
                         ).exec()
                     }
                     "major" -> {
@@ -168,7 +171,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                 defClass.aliasCode = dictMajor.aliasCode
                                 val defClassList = defClassService.select(
                                     SFilter.eq("parentCode", "system"),
-                                    SFilter.eq("projectId",projectId!!),
+                                    SFilter.eq("type","common"),
+//                                    SFilter.eq("projectId",projectId!!),
                                     SFilter.eq("majorCode", defClass.code!!)
                                 ).exec()
                                 defClass.children = defClassList
@@ -180,7 +184,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                         /** 业务空间类型 */
                         dictSchemeCategoryList = defClassService.select(
                             SFilter.eq("parentCode","space"),
-                            SFilter.eq("projectId",projectId!!)
+//                            SFilter.eq("projectId",projectId!!)
+                            SFilter.eq("type","common")
                         ).exec()
                     }
                     "majorEquipment" -> {
@@ -195,7 +200,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                 defClass.aliasCode = dictMajor.aliasCode
                                 val defClassList = defClassService.select(
                                     SFilter.eq("parentCode", "equipment"),
-                                    SFilter.eq("projectId",projectId!!),
+                                    SFilter.eq("type","common"),
+//                                    SFilter.eq("projectId",projectId!!),
                                     SFilter.eq("majorCode", defClass.code!!)
                                 ).exec()
                                 defClass.children = defClassList
@@ -206,18 +212,23 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                     "equipmentAndComponent" -> {
                         /** 设备和部件 */
                         dictSchemeCategoryList = defClassService.select(
-                            SFilter.or(SFilter.eq("parentCode","component"),SFilter.eq("parentCode","equipment")), SFilter.eq("projectId",projectId!!)
+                            SFilter.or(SFilter.eq("parentCode","component")
+                                ,SFilter.eq("parentCode","equipment")),
+                            SFilter.eq("type","common")
 
                         ).exec()
                     }
                     "equipmentComponent" ->{
                         /** 设备下的部件 */
                         dictSchemeCategoryList = defClassService.select(
-                            SFilter.eq("parentCode","equipment"), SFilter.eq("projectId",projectId!!)
+                            SFilter.eq("parentCode","equipment"),
+                            SFilter.eq("type","common")
+//                            SFilter.eq("projectId",projectId!!)
                         ).exec()
                         val defClassList = defClassService.select(
                             SFilter.eq("parentCode", "component"),
-                            SFilter.eq("projectId",projectId!!)
+                            SFilter.eq("type","common")
+//                            SFilter.eq("projectId",projectId!!)
                         ).exec()
                         if (dictSchemeCategoryList.size > 0){
                             for (dictSchemeCategory in dictSchemeCategoryList){
@@ -248,11 +259,15 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                         }
                         /** 系统 */
                         val systemList = defClassService.select(
-                            SFilter.eq("parentCode", "system"), SFilter.eq("projectId",projectId!!)
+                            SFilter.eq("parentCode", "system"),
+                            SFilter.eq("type","common")
+//                            SFilter.eq("projectId",projectId!!)
                         ).exec()
                         /** 设备 */
                         val equipmentList = defClassService.select(
-                            SFilter.eq("parentCode","equipment"), SFilter.eq("projectId",projectId!!)
+                            SFilter.eq("parentCode","equipment"),
+                            SFilter.eq("type","common")
+//                            SFilter.eq("projectId",projectId!!)
                         ).exec()
                         /** 系统下的设备 */
                         for (system in systemList){
@@ -320,7 +335,6 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
             if (dictProject!=null) {
                 val dictDefFuncBuilder01 = dictDefFuncId.select(request.filters).filter(SFilter.eq("projectId", projectId),
                     SFilter.eq("classCode", request.type!!))
-
                 val dictDefFuncList01 = dictDefFuncBuilder01.table("dict.def_funcid_project").order("sort").exec()
                 logger.debug("测试 =${dictDefFuncList01.size}")
                 /** 项目定制已存在直接返回 */
@@ -329,7 +343,8 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                     val familyList = equipFamilyService.select(SFilter.eq("family", request.type!!)).exec()
                     if (familyList.size>0){
                         val equipFamily = familyList[0]
-                        schemeService.dictInfoProperty(projectId, dictProject.groupCode!!, equipFamily.equipCode!!,request.type!!)
+//                        schemeService.dictInfoProperty(projectId, dictProject.groupCode!!, equipFamily.equipCode!!,request.type!!)
+                        schemeService.dictInfoPropertyCommon("common",projectId, dictProject.groupCode!!, equipFamily.equipCode!!,request.type!!)
                         val dictDefFuncBuilder = dictDefFuncId.select(
                             SFilter.eq("projectId", projectId),
                             SFilter.eq("classCode", request.type!!)
@@ -339,9 +354,12 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                         sQueryResponse.total = dictDefFuncList.size.toLong()
                     }
                 }else if (dictDefFuncList01.size == 0) {
-                    schemeService.dictInfo(projectId, dictProject.groupCode!!, request.type!!)
+//                    schemeService.dictInfo(projectId, dictProject.groupCode!!, request.type!!)
+                    schemeService.dictInfoCommon("common",projectId,dictProject.groupCode!!,request.type!!)
                 }
-                val dictDefFuncBuilder = dictDefFuncId.select(request.filters).filter(SFilter.eq("projectId", projectId),
+                val dictDefFuncBuilder = dictDefFuncId.select(request.filters).filter(
+//                    SFilter.eq("type","common"),
+                    SFilter.eq("projectId", projectId),
                     SFilter.eq("groupCode", dictProject.groupCode!!),
                     SFilter.eq("classCode", request.type!!))
                 /** 过滤 */
@@ -497,18 +515,18 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                     "schemeZero" -> {
                         if (!request.priorityList.isNullOrEmpty() && !request.firstNameList.isNullOrEmpty()) {
                             defFuncIdProjectService.delete(SFilter.eq("projectId",projectId))
-                            customMapper.dictSchemeData(projectId,dictProject!!.groupCode!!)
+                            customMapper.dictSchemeData("common",projectId,dictProject!!.groupCode!!)
                             val defFuncIdProject = DefFuncIdProject()
                             defFuncIdProject.visible = false
                             defFuncIdProject.projectId = projectId
-                            defFuncIdProjectService.update(defFuncIdProject, arrayListOf("visible"),
+                            defFuncIdProjectService.update(defFuncIdProject, null,
                                 arrayListOf(SFilter.eq("projectId",projectId),SFilter.not(SFilter.eq("unDisabled",false))))
                             /** 一级标签 */
                             for (firstName in request.firstNameList!!) {
                                 val propertyDefProjectInfo = DefFuncIdProject()
                                 propertyDefProjectInfo.visible = true
                                 propertyDefProjectInfo.projectId = projectId
-                                defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                defFuncIdProjectService.update(propertyDefProjectInfo, null,
                                     arrayListOf(SFilter.eq("projectId",projectId),SFilter.eq("firstName",firstName)))
                             }
                             /** 匹配优先级 */
@@ -516,7 +534,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                 val propertyDefProjectInfo = DefFuncIdProject()
                                 propertyDefProjectInfo.visible = true
                                 propertyDefProjectInfo.projectId = projectId
-                                defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                defFuncIdProjectService.update(propertyDefProjectInfo, null,
                                     arrayListOf(SFilter.eq("projectId",projectId),SFilter.eq("priority",priority)))
                             }
                         }else if (!request.firstNameList.isNullOrEmpty() && request.firstNameList!!.size > 0) {
@@ -524,11 +542,11 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                 /** 清除项目下的字典信息 */
                                 defFuncIdProjectService.delete(SFilter.eq("projectId",projectId))
                                 /** 导入原始字典数据 */
-                                customMapper.dictSchemeData(projectId,dictProject!!.groupCode!!)
+                                customMapper.dictSchemeData("common",projectId,dictProject!!.groupCode!!)
                                 val propertyDefProjectInfo = DefFuncIdProject()
                                 propertyDefProjectInfo.visible = false
                                 propertyDefProjectInfo.projectId = projectId
-                                defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                defFuncIdProjectService.update(propertyDefProjectInfo, null,
                                     arrayListOf(SFilter.eq("projectId",projectId), SFilter.not(SFilter.eq("unDisabled",false))))
 
                                 /** 一级标签 */
@@ -536,7 +554,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                     val propertyDefProjectInfo = DefFuncIdProject()
                                     propertyDefProjectInfo.visible = true
                                     propertyDefProjectInfo.projectId = projectId
-                                    defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                    defFuncIdProjectService.update(propertyDefProjectInfo, null,
                                         arrayListOf(SFilter.eq("projectId",projectId),SFilter.eq("firstName",firstName)))
                                 }
                             } catch (e: Exception) {
@@ -548,11 +566,11 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                 /** 清除项目下的字典信息 */
                                 defFuncIdProjectService.delete(SFilter.eq("projectId",projectId))
                                 /** 导入原始字典数据 */
-                                customMapper.dictSchemeData(projectId,dictProject!!.groupCode!!)
+                                customMapper.dictSchemeData("common",projectId,dictProject!!.groupCode!!)
                                 val propertyDefProjectInfo = DefFuncIdProject()
                                 propertyDefProjectInfo.visible = false
                                 propertyDefProjectInfo.projectId = projectId
-                                defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                defFuncIdProjectService.update(propertyDefProjectInfo, null,
                                     arrayListOf(SFilter.eq("projectId",projectId), SFilter.not(SFilter.eq("unDisabled",false))))
 
                                 /** 匹配优先级 */
@@ -560,7 +578,7 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                                     val propertyDefProjectInfo = DefFuncIdProject()
                                     propertyDefProjectInfo.visible = true
                                     propertyDefProjectInfo.projectId = projectId
-                                    defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                                    defFuncIdProjectService.update(propertyDefProjectInfo, null,
                                         arrayListOf(SFilter.eq("projectId",projectId),SFilter.eq("priority",priority)))
                                 }
                             } catch (e: Exception) {
@@ -570,11 +588,11 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
                             /** 清除项目下的字典信息 */
                             defFuncIdProjectService.delete(SFilter.eq("projectId",projectId))
                             /** 导入原始字典数据 */
-                            customMapper.dictSchemeData(projectId,dictProject!!.groupCode!!)
+                            customMapper.dictSchemeData("common",projectId,dictProject!!.groupCode!!)
                             val propertyDefProjectInfo = DefFuncIdProject()
                             propertyDefProjectInfo.visible = false
                             propertyDefProjectInfo.projectId = projectId
-                            defFuncIdProjectService.update(propertyDefProjectInfo, arrayListOf("visible"),
+                            defFuncIdProjectService.update(propertyDefProjectInfo, null,
                                 arrayListOf(SFilter.eq("projectId",projectId), SFilter.not(SFilter.eq("unDisabled",false))))
                         }
                     }
@@ -599,8 +617,4 @@ object DictDefClassService : SObjectService<DefClass>(SMybatisDao(DefClass::clas
         }
     } // Fun setSchemeProject()
 
-
-
-
-
 } // Object DictDefClassService

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

@@ -29,26 +29,26 @@ server:
 spring:
   datasource:
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
-    url:                                jdbc:postgresql://datacenter:5432/datacenterlabsl
-#    url:                                jdbc:postgresql://datacenter:5432/datacenter
+#    url:                                jdbc:postgresql://datacenter:5432/datacenterlabsl
+    url:                                jdbc:postgresql://datacenter:5432/datacenter
     username:                           postgres
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
-  rabbitmq:
-    host: 192.168.100.108
-    port: 9936
-    username: pbsage
-    password: pbsage123
-    #虚拟host 可以不设置,使用server默认host
-    virtual-host: /adm
-
 #  rabbitmq:
-#    host: 192.168.64.15
+#    host: 192.168.100.108
 #    port: 9936
-#    username: admin
-#    password: brzj123456
+#    username: pbsage
+#    password: pbsage123
 #    #虚拟host 可以不设置,使用server默认host
-#    virtual-host: /test
+#    virtual-host: /adm
+
+  rabbitmq:
+    host: 192.168.64.15
+    port: 9936
+    username: admin
+    password: brzj123456
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /test
 
 
   servlet:

+ 0 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/dict/DictGatherControllers.kt

@@ -35,7 +35,6 @@ class DictGatherControllers {
         return DClassDefService.dictPlatformInfoGatherCode(code)
     }
 
-
     /**
      * 同步项目字典
      */

+ 13 - 4
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/RelToFromController.kt

@@ -124,19 +124,28 @@ class RelToFromController {
      */
     @Operation(summary= "设备和楼层关系-同步到中台", description = "设备所在的楼层(图类型 MechInArch 边类型 Eq2Fl ),设备服务的楼层(图类型 MechForArch 边类型 Eq2Fl), ")
     @PostMapping("/eq2fl")
-    fun eq2Fl(@RequestParam projectId: String, @RequestParam graphCode: String, @RequestParam type: String, @RequestParam isDel: Boolean = false): SBaseResponse {
+    fun eq2Fl(@RequestParam projectId: String, @RequestParam graphCode: String, @RequestParam type: String, @RequestParam isDel: Boolean = false,@RequestParam code: String?): SBaseResponse {
         try {
+            val list = ArrayList<SFilter>()
+            list.add(SFilter.eq("projectId", projectId))
+            if (!code.isNullOrEmpty()){
+                list.add(SFilter.eq("classCode", code))
+            }
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
             if (graphCode == "MechInArch") {
-                val equipmentList = equipmentService.select(SFilter.eq("projectId", projectId)).exec()
+                val equipmentList = equipmentService.select(list).exec()
                 if (equipmentList.size>0) {
                     for (equipment in equipmentList) {
-                        val toJsonObjArray =
-                                Configure.toJsonObjArray(graphCode, type, equipment.id!!, equipment.floorId!!,null)
+
                         if (isDel) {
                             val toJsonObj = Configure.toJsonObj(graphCode, type, equipment.id!!, null)
                             EquipApi.delRel(dictProject!!.groupCode!!, projectId,toJsonObj)
                         }
+                        if (equipment.floorId.isNullOrEmpty()){
+                            continue
+                        }
+                        val toJsonObjArray =
+                            Configure.toJsonObjArray(graphCode, type, equipment.id!!, equipment.floorId!!,null)
                         val createRel = EquipApi.createRel(dictProject!!.groupCode!!, projectId, toJsonObjArray)
                         if (!createRel){
                             logger.debug("设备所在楼层的关系失败:${toJsonObjArray.toJson()}")

+ 37 - 46
datasyn/src/main/kotlin/com/persagy/server/syn/services/dict/DictSchemeService.kt

@@ -57,60 +57,51 @@ object DictSchemeService : SObjectService<DefFuncIdScheme>(SMybatisDao(DefFuncId
      */
     fun setSchemeOne(): SCreateResponse<DefFuncIdScheme> {
         return try {
-            /** 读取集团 */
-            val groupList = groupService.selectAll().exec()
-            for (group in groupList) {
-                val defClassList =
-                    defClassService.select(SFilter.eq("type", "group"), SFilter.eq("groupCode", group.code!!)).exec()
-                for (defClass in defClassList) {
-                    val defFuncIdBuilder = select(
-                        SFilter.eq("groupCode", group.code!!),
-                        SFilter.eq("classCode", defClass.code!!)
-                    )
-                    val defFuncIdList = defFuncIdBuilder.table("dict.def_funcid").exec()
-
-                    for (defFuncId in defFuncIdList){
-
-                        if (defFuncId.firstName.isNullOrEmpty() || defFuncId.firstName == "基本信息" || defFuncId.firstName == "技术参数" ||
-                            defFuncId.firstName == "运行参数" || defFuncId.firstName == "报警消息") {
-                            defFuncId.visible = true
-                        } else if (defFuncId.secondName == "设备厂家" || defFuncId.secondName == "供应购买" || defFuncId.secondName == "现场安装"
-                            || defFuncId.secondName == "运行维保" || defFuncId.secondName == "照片文档") {
-                            defFuncId.visible = true
-                        } else if (defFuncId.priority == "S") {
-                            defFuncId.visible = true
-                        } else {
-                            defFuncId.visible = false
-                        }
-                        val dicConfigureEditable = ParamTools.dicConfigureEditable()
-                        val containsKey = dicConfigureEditable.containsKey(defFuncId.code!!)
-                        if (containsKey){
-                            defFuncId.editable = false
-                            defFuncId.unDisabled = false
-                            defFuncId.visible = false
-                        }
-
-                        val dicConfigure = ParamTools.dicConfigure()
-                        if (defFuncId.code!=null){
-                            val containsKey = dicConfigure.containsKey(defFuncId.code!!)
-                            if (containsKey){
-                                defFuncId.editable = true
-                                defFuncId.unDisabled = false
-                                defFuncId.visible = true
-                            }
-                        }
-
-                        defFuncId.schemeId = 1
-                        replace(defFuncId)
+
+            val defFuncIdBuilder = select(
+                SFilter.eq("type", "common")
+            )
+            val defFuncIdList = defFuncIdBuilder.table("dict.def_funcid").exec()
+            if (defFuncIdList.size>0) {
+                delete(SFilter.eq("schemeId",1))
+            }
+            for (defFuncId in defFuncIdList) {
+                if (defFuncId.firstName.isNullOrEmpty() || defFuncId.firstName == "基本信息" || defFuncId.firstName == "技术参数" ||
+                    defFuncId.firstName == "运行参数" || defFuncId.firstName == "报警消息") {
+                    defFuncId.visible = true
+                } else if (defFuncId.secondName == "设备厂家" || defFuncId.secondName == "供应购买" || defFuncId.secondName == "现场安装"
+                    || defFuncId.secondName == "运行维保" || defFuncId.secondName == "照片文档") {
+                    defFuncId.visible = true
+                } else if (defFuncId.priority == "S") {
+                    defFuncId.visible = true
+                } else {
+                    defFuncId.visible = false
+                }
+                val dicConfigureEditable = ParamTools.dicConfigureEditable()
+                val containsKey = dicConfigureEditable.containsKey(defFuncId.code!!)
+                if (containsKey){
+                    defFuncId.editable = false
+                    defFuncId.unDisabled = false
+                    defFuncId.visible = false
+                }
+
+                val dicConfigure = ParamTools.dicConfigure()
+                if (defFuncId.code!=null){
+                    val containsKey = dicConfigure.containsKey(defFuncId.code!!)
+                    if (containsKey){
+                        defFuncId.editable = true
+                        defFuncId.unDisabled = false
+                        defFuncId.visible = true
                     }
                 }
+                defFuncId.schemeId = 1
+                replace(defFuncId)
             }
             SCreateResponse(SResponseType.success)
         } catch (e: Exception) {
             e.printStackTrace()
             SCreateResponse(SResponseType.failure,e.message!!)
         }
-
     } // Fun setSchemeOne
 
     /**