|
@@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory
|
|
|
/**
|
|
|
* 字典类型
|
|
|
*
|
|
|
- * @author 张维新
|
|
|
+ * @author 张维新 <zhangweixin@sagacloud.cn>
|
|
|
*/
|
|
|
object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class.java)) {
|
|
|
|
|
@@ -60,8 +60,13 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
groupService.deleteAll()
|
|
|
for (groupQuery in groupQueryList) {
|
|
|
val group = Group()
|
|
|
- group.id = groupQuery.code
|
|
|
+ group.id = groupQuery.id
|
|
|
group.name = groupQuery.name
|
|
|
+ group.code = groupQuery.code
|
|
|
+ group.createUser = groupQuery.createUser
|
|
|
+ group.updateUser = groupQuery.updateUser
|
|
|
+ group.remark = groupQuery.remark
|
|
|
+ group.status = groupQuery.status
|
|
|
groupService.insert(group)
|
|
|
}
|
|
|
} else {
|
|
@@ -83,15 +88,20 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
if (!selectAllList.isNullOrEmpty()) {
|
|
|
for (group in selectAllList) {
|
|
|
|
|
|
- val dictProjectQueryList = DictTypeApi.dictProjectQuery(group.id!!)
|
|
|
+ val dictProjectQueryList = DictTypeApi.dictProjectQuery(group.code!!)
|
|
|
if (dictProjectQueryList.size > 0) {
|
|
|
+ dictProjectService.deleteAll()
|
|
|
logger.debug("项目结果:${dictProjectQueryList.toJson()}")
|
|
|
- dictProjectService.delete(SFilter.eq("groupId",group.id!!))
|
|
|
+// dictProjectService.delete(SFilter.eq("groupCode",group.id!!))
|
|
|
for (dictProjectQuery in dictProjectQueryList) {
|
|
|
val dictProject = DictProject()
|
|
|
dictProject.id = dictProjectQuery.id
|
|
|
dictProject.name = dictProjectQuery.name
|
|
|
- dictProject.groupId = group.id
|
|
|
+ dictProject.groupCode = dictProjectQuery.groupCode
|
|
|
+ dictProject.createUser = dictProjectQuery.createUser
|
|
|
+ dictProject.updateUser = dictProjectQuery.updateUser
|
|
|
+ dictProject.status = dictProjectQuery.status
|
|
|
+
|
|
|
dictProjectService.insert(dictProject)
|
|
|
}
|
|
|
}
|
|
@@ -259,7 +269,8 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
defFuncId.unit = dictPlatformInfo.unit
|
|
|
defFuncId.origCode = dictPlatformInfo.origCode
|
|
|
defFuncId.origDataType = dictPlatformInfo.origDataType
|
|
|
-
|
|
|
+ defFuncId.aliasCode = dictPlatformInfo.aliasCode
|
|
|
+ defFuncId.aliasName = dictPlatformInfo.aliasName
|
|
|
if (!defFuncId.name.isNullOrEmpty()){
|
|
|
/** 排序 */
|
|
|
if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
|
|
@@ -306,7 +317,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- defFuncIdService.insert(defFuncId)
|
|
|
+ defFuncIdService.replace(defFuncId)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -322,18 +333,18 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
*/
|
|
|
fun dictMajor(): SBaseResponse{
|
|
|
val sBaseResponse = SBaseResponse()
|
|
|
- val dictMajorList = DictTypeApi.dictMajor("common")
|
|
|
- dictMajorService.delete(SFilter.eq("type","common"))
|
|
|
+ val dictMajorList = DictTypeApi.dictMajor("major")
|
|
|
+ dictMajorService.delete(SFilter.eq("type","major"))
|
|
|
if (dictMajorList.size>0){
|
|
|
for (dictMajor in dictMajorList){
|
|
|
|
|
|
val dictMajor1 = DictMajor()
|
|
|
- dictMajor1.aliasCode = dictMajor.aliasCode
|
|
|
- dictMajor1.aliasName = dictMajor.aliasName
|
|
|
+ dictMajor1.aliasCode = dictMajor.code
|
|
|
+ dictMajor1.aliasName = dictMajor.label
|
|
|
dictMajor1.code = dictMajor.code
|
|
|
- dictMajor1.groupId = dictMajor.groupId
|
|
|
+ dictMajor1.groupCode = dictMajor.groupId
|
|
|
dictMajor1.id = dictMajor.id
|
|
|
- dictMajor1.name = dictMajor.name
|
|
|
+ dictMajor1.name = dictMajor.label
|
|
|
dictMajor1.note = dictMajor.note
|
|
|
dictMajor1.type = dictMajor.type
|
|
|
dictMajorService.insert(dictMajor1)
|
|
@@ -343,7 +354,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
sBaseResponse.result = SResponseType.failure
|
|
|
}
|
|
|
return sBaseResponse
|
|
|
- } // dictMajor()
|
|
|
+ } // Fun dictMajor()
|
|
|
|
|
|
/**
|
|
|
* 集团下的方案
|
|
@@ -354,7 +365,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
if (groupList.size>0){
|
|
|
|
|
|
for (group in groupList){
|
|
|
- dictSchemeService.delete(SFilter.eq("groupId",group.id!!))
|
|
|
+ dictSchemeService.delete(SFilter.eq("groupCode",group.id!!))
|
|
|
val dictGroupSchemeList = DictTypeApi.dictGroupScheme(group.id!!)
|
|
|
if (dictGroupSchemeList.size>0){
|
|
|
for (dictGroupScheme in dictGroupSchemeList){
|
|
@@ -466,16 +477,17 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
val groupList = groupService.selectAll().exec()
|
|
|
if (groupList.size>0){
|
|
|
for (group in groupList){
|
|
|
- val dictGroupList = DictTypeApi.dictGroup(group.id!!)
|
|
|
+ val dictGroupList = DictTypeApi.dictGroup(group.code!!)
|
|
|
if (dictGroupList.size>0){
|
|
|
- defClassService.delete(SFilter.eq("type","group"),SFilter.eq("groupId",group.id!!))
|
|
|
+ defClassService.delete(SFilter.eq("type","group"),SFilter.eq("groupCode",group.code!!))
|
|
|
for (dictGroup in dictGroupList){
|
|
|
val defClass = DefClass()
|
|
|
+ defClass.id = dictGroup.id
|
|
|
defClass.aliasCode = dictGroup.aliasCode
|
|
|
defClass.aliasName = dictGroup.aliasName
|
|
|
defClass.code = dictGroup.code
|
|
|
defClass.equipmentCode = dictGroup.equipmentCode
|
|
|
- defClass.groupCode = group.id
|
|
|
+ defClass.groupCode = group.code
|
|
|
defClass.majorCode = dictGroup.majorCode
|
|
|
defClass.name = dictGroup.name
|
|
|
defClass.parentCode = dictGroup.parentCode
|
|
@@ -486,9 +498,9 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- sBaseResponse.result = SResponseType.failure
|
|
|
- }else{
|
|
|
sBaseResponse.result = SResponseType.success
|
|
|
+ }else{
|
|
|
+ sBaseResponse.result = SResponseType.failure
|
|
|
}
|
|
|
return sBaseResponse
|
|
|
} // Fun
|
|
@@ -500,169 +512,181 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
val sBaseResponse = SBaseResponse()
|
|
|
val defClassList = defClassService.select(SFilter.eq("type", "group")).exec()
|
|
|
if (defClassList.size>0){
|
|
|
- for (defClass in defClassList){
|
|
|
- val dictGroupInfoList = DictTypeApi.dictGroupInfo(defClass.groupCode!!, defClass.code!!)
|
|
|
- defFuncIdService.delete(SFilter.eq("groupId",defClass.groupCode!!),SFilter.eq("classCode",defClass.code!!))
|
|
|
- if (dictGroupInfoList.size>0){
|
|
|
- for (dictGroupInfo in dictGroupInfoList){
|
|
|
- /** 开头字母大写转小写 */
|
|
|
- val str1: String = dictGroupInfo.code!!.substring(0, 1).toLowerCase() //直接bai将du字符zhi串第一个不管是数字还是字母都小写
|
|
|
- val str2: String = dictGroupInfo.code!!.substring(1, dictGroupInfo.code!!.length) //截取字符串第二个以后
|
|
|
- var str=str1+str2;
|
|
|
- val defFuncId = DefFuncId()
|
|
|
|
|
|
- if (str == "equipLocalID"){
|
|
|
- defFuncId.code = "localId"
|
|
|
- }else if (str == "equipLocalName"){
|
|
|
- defFuncId.code = "localName"
|
|
|
- }else if (str == "sysLocalID"){
|
|
|
- defFuncId.code = "localId"
|
|
|
- }else if (str == "sysLocalName"){
|
|
|
- defFuncId.code = "localName"
|
|
|
- }else if (str == "tenantLocalID"){
|
|
|
- defFuncId.code = "localId"
|
|
|
- }else if (str =="tenantLocalName"){
|
|
|
- defFuncId.code = "localName"
|
|
|
- }else if (str == "roomLocalID"){
|
|
|
- defFuncId.code = "localId"
|
|
|
- }else if (str == "roomLocalName"){
|
|
|
- defFuncId.code = "localName"
|
|
|
- }else if (str == "shaftLocalID"){
|
|
|
- defFuncId.code = "localId"
|
|
|
- }else if (str == "shaftLocalName"){
|
|
|
- defFuncId.code = "localName"
|
|
|
- }else if (str == "shaftID"){
|
|
|
- defFuncId.code = "id"
|
|
|
- }else if (str == "shaftName"){
|
|
|
- defFuncId.code = "name"
|
|
|
- }else if (str == "equipID"){
|
|
|
- defFuncId.code = "id"
|
|
|
- }else if (str == "equipName"){
|
|
|
- defFuncId.code = "name"
|
|
|
- }else if (str == "sysID"){
|
|
|
- defFuncId.code = "id"
|
|
|
- }else if (str == "sysName"){
|
|
|
- defFuncId.code = "name"
|
|
|
- }else if (str == "tenantID"){
|
|
|
- defFuncId.code = "id"
|
|
|
- }else if (str == "tenantName"){
|
|
|
- defFuncId.code = "name"
|
|
|
- }else if (str == "roomID"){
|
|
|
- defFuncId.code = "id"
|
|
|
- }else if (str == "roomName"){
|
|
|
- defFuncId.code = "name"
|
|
|
- }else if (str == "projID"){
|
|
|
- defFuncId.code = "id"
|
|
|
- }else if (str == "projName"){
|
|
|
- defFuncId.code = "name"
|
|
|
- }else if (str == "projLocalName"){
|
|
|
- defFuncId.code = "localId"
|
|
|
- }else if (str == "projLocalName"){
|
|
|
- defFuncId.code = "localName"
|
|
|
- }else if (str == "flootID"){
|
|
|
- defFuncId.code = "id"
|
|
|
- }else if (str == "flootName"){
|
|
|
- defFuncId.code = "name"
|
|
|
- }else if (str == "floorLocalName"){
|
|
|
- defFuncId.code = "localId"
|
|
|
- }else if (str == "floorLocalName"){
|
|
|
- defFuncId.code = "localName"
|
|
|
- }else if (str == "buildID"){
|
|
|
- defFuncId.code = "id"
|
|
|
- }else if (str == "buildName"){
|
|
|
- defFuncId.code = "name"
|
|
|
- }else if (str == "buildLocalID"){
|
|
|
- defFuncId.code = "localId"
|
|
|
- }else if (str == "buildLocalName"){
|
|
|
- defFuncId.code = "localName"
|
|
|
- }else{
|
|
|
- defFuncId.code = str
|
|
|
- }
|
|
|
|
|
|
-
|
|
|
- defFuncId.canSub = dictGroupInfo.canSub
|
|
|
- defFuncId.category = dictGroupInfo.category
|
|
|
- defFuncId.classCode = defClass.code
|
|
|
+ val groupList = groupService.selectAll().exec()
|
|
|
+ if (groupList.size>0){
|
|
|
+ for (group in groupList){
|
|
|
+ for (defClass in defClassList){
|
|
|
+ val dictGroupInfoList = DictTypeApi.dictGroupInfo(group.code!!, defClass.code!!)
|
|
|
+ defFuncIdService.delete(SFilter.eq("groupCode",group.code!!),SFilter.eq("classCode",defClass.code!!))
|
|
|
+ if (dictGroupInfoList.size>0){
|
|
|
+ for (dictGroupInfo in dictGroupInfoList){
|
|
|
+ /** 开头字母大写转小写 */
|
|
|
+ val str1: String = dictGroupInfo.code!!.substring(0, 1).toLowerCase() //直接bai将du字符zhi串第一个不管是数字还是字母都小写
|
|
|
+ val str2: String = dictGroupInfo.code!!.substring(1, dictGroupInfo.code!!.length) //截取字符串第二个以后
|
|
|
+ var str=str1+str2;
|
|
|
+ val defFuncId = DefFuncId()
|
|
|
+
|
|
|
+ if (str == "equipLocalID"){
|
|
|
+ defFuncId.code = "localId"
|
|
|
+ }else if (str == "equipLocalName"){
|
|
|
+ defFuncId.code = "localName"
|
|
|
+ }else if (str == "sysLocalID"){
|
|
|
+ defFuncId.code = "localId"
|
|
|
+ }else if (str == "sysLocalName"){
|
|
|
+ defFuncId.code = "localName"
|
|
|
+ }else if (str == "tenantLocalID"){
|
|
|
+ defFuncId.code = "localId"
|
|
|
+ }else if (str =="tenantLocalName"){
|
|
|
+ defFuncId.code = "localName"
|
|
|
+ }else if (str == "roomLocalID"){
|
|
|
+ defFuncId.code = "localId"
|
|
|
+ }else if (str == "roomLocalName"){
|
|
|
+ defFuncId.code = "localName"
|
|
|
+ }else if (str == "shaftLocalID"){
|
|
|
+ defFuncId.code = "localId"
|
|
|
+ }else if (str == "shaftLocalName"){
|
|
|
+ defFuncId.code = "localName"
|
|
|
+ }else if (str == "shaftID"){
|
|
|
+ defFuncId.code = "id"
|
|
|
+ }else if (str == "shaftName"){
|
|
|
+ defFuncId.code = "name"
|
|
|
+ }else if (str == "equipID"){
|
|
|
+ defFuncId.code = "id"
|
|
|
+ }else if (str == "equipName"){
|
|
|
+ defFuncId.code = "name"
|
|
|
+ }else if (str == "sysID"){
|
|
|
+ defFuncId.code = "id"
|
|
|
+ }else if (str == "sysName"){
|
|
|
+ defFuncId.code = "name"
|
|
|
+ }else if (str == "tenantID"){
|
|
|
+ defFuncId.code = "id"
|
|
|
+ }else if (str == "tenantName"){
|
|
|
+ defFuncId.code = "name"
|
|
|
+ }else if (str == "roomID"){
|
|
|
+ defFuncId.code = "id"
|
|
|
+ }else if (str == "roomName"){
|
|
|
+ defFuncId.code = "name"
|
|
|
+ }else if (str == "projID"){
|
|
|
+ defFuncId.code = "id"
|
|
|
+ }else if (str == "projName"){
|
|
|
+ defFuncId.code = "name"
|
|
|
+ }else if (str == "projLocalName"){
|
|
|
+ defFuncId.code = "localId"
|
|
|
+ }else if (str == "projLocalName"){
|
|
|
+ defFuncId.code = "localName"
|
|
|
+ }else if (str == "flootID"){
|
|
|
+ defFuncId.code = "id"
|
|
|
+ }else if (str == "flootName"){
|
|
|
+ defFuncId.code = "name"
|
|
|
+ }else if (str == "floorLocalName"){
|
|
|
+ defFuncId.code = "localId"
|
|
|
+ }else if (str == "floorLocalName"){
|
|
|
+ defFuncId.code = "localName"
|
|
|
+ }else if (str == "buildID"){
|
|
|
+ defFuncId.code = "id"
|
|
|
+ }else if (str == "buildName"){
|
|
|
+ defFuncId.code = "name"
|
|
|
+ }else if (str == "buildLocalID"){
|
|
|
+ defFuncId.code = "localId"
|
|
|
+ }else if (str == "buildLocalName"){
|
|
|
+ defFuncId.code = "localName"
|
|
|
+ }else{
|
|
|
+ defFuncId.code = str
|
|
|
+ }
|
|
|
+ defFuncId.code = dictGroupInfo.code
|
|
|
+ defFuncId.id = dictGroupInfo.id
|
|
|
+ defFuncId.canSub = dictGroupInfo.canSub
|
|
|
+ defFuncId.category = dictGroupInfo.category
|
|
|
+ defFuncId.classCode = defClass.code
|
|
|
// defFuncId.code = str
|
|
|
- defFuncId.dataSource = dictGroupInfo.dataSource
|
|
|
- defFuncId.dataType = dictGroupInfo.dataType
|
|
|
- if (!dictGroupInfo.firstTag.isNullOrEmpty()){
|
|
|
- defFuncId.firstTag = ParamTools.TwoLevelCode(dictGroupInfo.firstTag!!)
|
|
|
- }
|
|
|
- defFuncId.firstName = dictGroupInfo.firstTag
|
|
|
- defFuncId.formater = dictGroupInfo.formater
|
|
|
- defFuncId.groupCode = defClass.groupCode
|
|
|
- defFuncId.idx = dictGroupInfo.idx
|
|
|
- defFuncId.inputMode = dictGroupInfo.inputMode
|
|
|
- defFuncId.isMultiple = dictGroupInfo.isMultiple
|
|
|
- defFuncId.isRegion = dictGroupInfo.isRegion
|
|
|
- defFuncId.name = dictGroupInfo.name
|
|
|
- logger.debug("name: ${ dictGroupInfo.name} *******************************************************")
|
|
|
- defFuncId.note = dictGroupInfo.note
|
|
|
- defFuncId.priority = dictGroupInfo.priority
|
|
|
- defFuncId.projectId = if (dictGroupInfo.projectId.isNullOrEmpty()) "0" else dictGroupInfo.projectId
|
|
|
- defFuncId.readonly = dictGroupInfo.readonly
|
|
|
- if (!dictGroupInfo.secondTag.isNullOrEmpty()){
|
|
|
- defFuncId.secondTag = ParamTools.TwoLevelCode(dictGroupInfo.secondTag!!)
|
|
|
- }
|
|
|
- defFuncId.secondName = dictGroupInfo.secondTag
|
|
|
- defFuncId.subFlag = dictGroupInfo.subFlag
|
|
|
- defFuncId.type = dictGroupInfo.dataType
|
|
|
- defFuncId.unit = dictGroupInfo.unit
|
|
|
-
|
|
|
-
|
|
|
- if (!defFuncId.name.isNullOrEmpty()){
|
|
|
- /** 排序 */
|
|
|
- if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
|
|
|
- defFuncId.sort = 1
|
|
|
- }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"){
|
|
|
- defFuncId.sort = 2
|
|
|
- }else if (defFuncId.name!! == "设备二维码图片"){
|
|
|
- defFuncId.sort = 3
|
|
|
- }else if (defFuncId.name!! == "设计图纸中编码"){
|
|
|
- defFuncId.sort = 4
|
|
|
- }else if (defFuncId.name!! == "设备ID"){
|
|
|
- defFuncId.sort = 101
|
|
|
- }else if (defFuncId.name!! == "设备名称"){
|
|
|
- defFuncId.sort = 102
|
|
|
- }else if (defFuncId.name!! == "BIM模型中编码"){
|
|
|
- defFuncId.sort = 103
|
|
|
- }else if (defFuncId.name!! == "BIM模型中坐标"){
|
|
|
- defFuncId.sort = 104
|
|
|
- }else if (defFuncId.firstName != null&& defFuncId.firstName == "台账参数"){
|
|
|
- defFuncId.sort = 10
|
|
|
- }else if(defFuncId.firstName != null&& defFuncId.firstName == "通讯参数"){
|
|
|
- defFuncId.sort = 20
|
|
|
- }else {
|
|
|
- defFuncId.sort = 60
|
|
|
+ defFuncId.dataSource = dictGroupInfo.dataSource
|
|
|
+ defFuncId.dataType = dictGroupInfo.dataType
|
|
|
+ if (!dictGroupInfo.firstTag.isNullOrEmpty()){
|
|
|
+ defFuncId.firstTag = ParamTools.TwoLevelCode(dictGroupInfo.firstTag!!)
|
|
|
+ }
|
|
|
+ defFuncId.firstName = dictGroupInfo.firstTag
|
|
|
+ defFuncId.formater = dictGroupInfo.formater
|
|
|
+ defFuncId.groupCode = group.code
|
|
|
+ defFuncId.idx = dictGroupInfo.idx
|
|
|
+ defFuncId.inputMode = dictGroupInfo.inputMode
|
|
|
+ defFuncId.isMultiple = dictGroupInfo.isMultiple
|
|
|
+ defFuncId.isRegion = dictGroupInfo.isRegion
|
|
|
+ defFuncId.name = dictGroupInfo.name
|
|
|
+ logger.debug("name: ${ dictGroupInfo.name} *******************************************************")
|
|
|
+ defFuncId.note = dictGroupInfo.note
|
|
|
+ defFuncId.priority = dictGroupInfo.priority
|
|
|
+ defFuncId.projectId = if (dictGroupInfo.projectId.isNullOrEmpty()) "0" else dictGroupInfo.projectId
|
|
|
+ defFuncId.readonly = dictGroupInfo.readonly
|
|
|
+ if (!dictGroupInfo.secondTag.isNullOrEmpty()){
|
|
|
+ defFuncId.secondTag = ParamTools.TwoLevelCode(dictGroupInfo.secondTag!!)
|
|
|
+ }
|
|
|
+ defFuncId.secondName = dictGroupInfo.secondTag
|
|
|
+ defFuncId.subFlag = dictGroupInfo.subFlag
|
|
|
+ defFuncId.type = dictGroupInfo.dataType
|
|
|
+ defFuncId.unit = dictGroupInfo.unit
|
|
|
+ defFuncId.origCode = dictGroupInfo.origCode
|
|
|
+ defFuncId.origDataType = dictGroupInfo.origDataType
|
|
|
+ defFuncId.aliasCode = dictGroupInfo.aliasCode
|
|
|
+ defFuncId.aliasName = dictGroupInfo.aliasName
|
|
|
+
|
|
|
+ if (!defFuncId.name.isNullOrEmpty()){
|
|
|
+ /** 排序 */
|
|
|
+ if (defFuncId.name!! == "设备本地编码"||defFuncId.name!! == "楼层本地编码"){
|
|
|
+ defFuncId.sort = 1
|
|
|
+ }else if (defFuncId.name!! == "设备本地名称"|| defFuncId.name!! == "楼层本地名称"){
|
|
|
+ defFuncId.sort = 2
|
|
|
+ }else if (defFuncId.name!! == "设备二维码图片"){
|
|
|
+ defFuncId.sort = 3
|
|
|
+ }else if (defFuncId.name!! == "设计图纸中编码"){
|
|
|
+ defFuncId.sort = 4
|
|
|
+ }else if (defFuncId.name!! == "设备ID"){
|
|
|
+ defFuncId.sort = 101
|
|
|
+ }else if (defFuncId.name!! == "设备名称"){
|
|
|
+ defFuncId.sort = 102
|
|
|
+ }else if (defFuncId.name!! == "BIM模型中编码"){
|
|
|
+ defFuncId.sort = 103
|
|
|
+ }else if (defFuncId.name!! == "BIM模型中坐标"){
|
|
|
+ defFuncId.sort = 104
|
|
|
+ }else if (defFuncId.firstName != null&& defFuncId.firstName == "台账参数"){
|
|
|
+ defFuncId.sort = 10
|
|
|
+ }else if(defFuncId.firstName != null&& defFuncId.firstName == "通讯参数"){
|
|
|
+ defFuncId.sort = 20
|
|
|
+ }else {
|
|
|
+ defFuncId.sort = 60
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ 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
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ defFuncIdService.insert(defFuncId)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- 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
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- defFuncIdService.insert(defFuncId)
|
|
|
}
|
|
|
}
|
|
|
+ sBaseResponse.result = SResponseType.success
|
|
|
+ }else{
|
|
|
+ sBaseResponse.result = SResponseType.failure
|
|
|
}
|
|
|
- sBaseResponse.result = SResponseType.failure
|
|
|
}else{
|
|
|
- sBaseResponse.result = SResponseType.success
|
|
|
+ sBaseResponse.result = SResponseType.failure
|
|
|
}
|
|
|
return sBaseResponse
|
|
|
} // Fun dictGroupInfo()
|