|
@@ -120,16 +120,18 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
defClassService.delete(SFilter.eq("type","common"))
|
|
|
for (dictPlatform in dictPlatformList){
|
|
|
val defClass = DefClass()
|
|
|
+ defClass.id = dictPlatform.id
|
|
|
defClass.aliasCode = dictPlatform.aliasCode
|
|
|
defClass.aliasName = dictPlatform.aliasName
|
|
|
defClass.code = dictPlatform.code
|
|
|
defClass.equipmentCode = dictPlatform.equipmentCode
|
|
|
- defClass.groupId = if (dictPlatform.groupId.isNullOrEmpty()) "0" else dictPlatform.groupId
|
|
|
+ defClass.groupCode = if (dictPlatform.groupCode.isNullOrEmpty()) "0" else dictPlatform.groupCode
|
|
|
defClass.majorCode = dictPlatform.majorCode
|
|
|
defClass.name = dictPlatform.name
|
|
|
defClass.parentCode = dictPlatform.parentCode
|
|
|
defClass.projectId = if (dictPlatform.projectId.isNullOrEmpty()) "0" else dictPlatform.projectId
|
|
|
defClass.systemCode = dictPlatform.systemCode
|
|
|
+ defClass.objType = dictPlatform.objType
|
|
|
defClass.type = "common"
|
|
|
defClassService.replace(defClass)
|
|
|
}
|
|
@@ -150,87 +152,87 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
// defFuncIdService.delete(SFilter.eq("groupId", "0"))
|
|
|
for (defClass in defClassList){
|
|
|
val dictPlatformInfoList = DictTypeApi.dictPlatformInfo(defClass.code!!, defClass.type!!)
|
|
|
- defFuncIdService.delete(SFilter.eq("classCode", defClass.code!!),SFilter.eq("groupId", "0"))
|
|
|
+ defFuncIdService.delete(SFilter.eq("classCode", defClass.code!!),SFilter.eq("groupCode", "0"))
|
|
|
if (!dictPlatformInfoList.isNullOrEmpty()){
|
|
|
for (dictPlatformInfo in dictPlatformInfoList){
|
|
|
/** 开头字母大写转小写 */
|
|
|
- val str1: String = dictPlatformInfo.code!!.substring(0, 1).toLowerCase() //直接bai将du字符zhi串第一个不管是数字还是字母都小写
|
|
|
- val str2: String = dictPlatformInfo.code!!.substring(1, dictPlatformInfo.code!!.length) //截取字符串第二个以后
|
|
|
- var str=str1+str2
|
|
|
+// val str1: String = dictPlatformInfo.code!!.substring(0, 1).toLowerCase() //直接bai将du字符zhi串第一个不管是数字还是字母都小写
|
|
|
+// val str2: String = dictPlatformInfo.code!!.substring(1, dictPlatformInfo.code!!.length) //截取字符串第二个以后
|
|
|
+// var str=str1+str2
|
|
|
val defFuncId = DefFuncId()
|
|
|
defFuncId.canSub = dictPlatformInfo.canSub
|
|
|
defFuncId.category = dictPlatformInfo.category
|
|
|
defFuncId.classCode = defClass.code
|
|
|
- if (str == "equipLocalID"){
|
|
|
+ if (dictPlatformInfo.code == "equipLocalID"){
|
|
|
defFuncId.code = "localId"
|
|
|
- }else if (str == "equipLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "equipLocalName"){
|
|
|
defFuncId.code = "localName"
|
|
|
- }else if (str == "sysLocalID"){
|
|
|
+ }else if (dictPlatformInfo.code == "sysLocalID"){
|
|
|
defFuncId.code = "localId"
|
|
|
- }else if (str == "sysLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "sysLocalName"){
|
|
|
defFuncId.code = "localName"
|
|
|
- }else if (str == "tenantLocalID"){
|
|
|
+ }else if (dictPlatformInfo.code == "tenantLocalID"){
|
|
|
defFuncId.code = "localId"
|
|
|
- }else if (str =="tenantLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code =="tenantLocalName"){
|
|
|
defFuncId.code = "localName"
|
|
|
- }else if (str == "roomLocalID"){
|
|
|
+ }else if (dictPlatformInfo.code == "roomLocalID"){
|
|
|
defFuncId.code = "localId"
|
|
|
- }else if (str == "roomLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "roomLocalName"){
|
|
|
defFuncId.code = "localName"
|
|
|
- }else if (str == "shaftLocalID"){
|
|
|
+ }else if (dictPlatformInfo.code == "shaftLocalID"){
|
|
|
defFuncId.code = "localId"
|
|
|
- }else if (str == "shaftLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "shaftLocalName"){
|
|
|
defFuncId.code = "localName"
|
|
|
- }else if (str == "shaftID"){
|
|
|
+ }else if (dictPlatformInfo.code == "shaftID"){
|
|
|
defFuncId.code = "id"
|
|
|
- }else if (str == "shaftName"){
|
|
|
+ }else if (dictPlatformInfo.code == "shaftName"){
|
|
|
defFuncId.code = "name"
|
|
|
- }else if (str == "equipID"){
|
|
|
+ }else if (dictPlatformInfo.code == "equipID"){
|
|
|
defFuncId.code = "id"
|
|
|
- }else if (str == "equipName"){
|
|
|
+ }else if (dictPlatformInfo.code == "equipName"){
|
|
|
defFuncId.code = "name"
|
|
|
- }else if (str == "sysID"){
|
|
|
+ }else if (dictPlatformInfo.code == "sysID"){
|
|
|
defFuncId.code = "id"
|
|
|
- }else if (str == "sysName"){
|
|
|
+ }else if (dictPlatformInfo.code == "sysName"){
|
|
|
defFuncId.code = "name"
|
|
|
- }else if (str == "tenantID"){
|
|
|
+ }else if (dictPlatformInfo.code == "tenantID"){
|
|
|
defFuncId.code = "id"
|
|
|
- }else if (str == "tenantName"){
|
|
|
+ }else if (dictPlatformInfo.code == "tenantName"){
|
|
|
defFuncId.code = "name"
|
|
|
- }else if (str == "roomID"){
|
|
|
+ }else if (dictPlatformInfo.code == "roomID"){
|
|
|
defFuncId.code = "id"
|
|
|
- }else if (str == "roomName"){
|
|
|
+ }else if (dictPlatformInfo.code == "roomName"){
|
|
|
defFuncId.code = "name"
|
|
|
- }else if (str == "projID"){
|
|
|
+ }else if (dictPlatformInfo.code == "projID"){
|
|
|
defFuncId.code = "id"
|
|
|
- }else if (str == "projName"){
|
|
|
+ }else if (dictPlatformInfo.code == "projName"){
|
|
|
defFuncId.code = "name"
|
|
|
- }else if (str == "projLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "projLocalName"){
|
|
|
defFuncId.code = "localId"
|
|
|
- }else if (str == "projLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "projLocalName"){
|
|
|
defFuncId.code = "localName"
|
|
|
- }else if (str == "flootID"){
|
|
|
+ }else if (dictPlatformInfo.code == "flootID"){
|
|
|
defFuncId.code = "id"
|
|
|
- }else if (str == "flootName"){
|
|
|
+ }else if (dictPlatformInfo.code == "flootName"){
|
|
|
defFuncId.code = "name"
|
|
|
- }else if (str == "floorLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "floorLocalName"){
|
|
|
defFuncId.code = "localId"
|
|
|
- }else if (str == "floorLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "floorLocalName"){
|
|
|
defFuncId.code = "localName"
|
|
|
- }else if (str == "buildID"){
|
|
|
+ }else if (dictPlatformInfo.code == "buildID"){
|
|
|
defFuncId.code = "id"
|
|
|
- }else if (str == "buildName"){
|
|
|
+ }else if (dictPlatformInfo.code == "buildName"){
|
|
|
defFuncId.code = "name"
|
|
|
- }else if (str == "buildLocalID"){
|
|
|
+ }else if (dictPlatformInfo.code == "buildLocalID"){
|
|
|
defFuncId.code = "localId"
|
|
|
- }else if (str == "buildLocalName"){
|
|
|
+ }else if (dictPlatformInfo.code == "buildLocalName"){
|
|
|
defFuncId.code = "localName"
|
|
|
}else{
|
|
|
- defFuncId.code = str
|
|
|
+ defFuncId.code = dictPlatformInfo.code
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ defFuncId.id = dictPlatformInfo.id
|
|
|
+// defFuncId.code = dictPlatformInfo.code
|
|
|
defFuncId.dataSource = dictPlatformInfo.dataSource
|
|
|
defFuncId.dataType = dictPlatformInfo.dataType
|
|
|
defFuncId.firstName = dictPlatformInfo.firstTag
|
|
@@ -238,7 +240,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
defFuncId.firstTag = ParamTools.TwoLevelCode(dictPlatformInfo.firstTag!!)
|
|
|
}
|
|
|
defFuncId.formater = dictPlatformInfo.formater
|
|
|
- defFuncId.groupId = if (dictPlatformInfo.groupId.isNullOrEmpty()) "0" else dictPlatformInfo.groupId
|
|
|
+ defFuncId.groupCode = if (dictPlatformInfo.groupCode.isNullOrEmpty()) "0" else dictPlatformInfo.groupCode
|
|
|
defFuncId.idx = dictPlatformInfo.idx
|
|
|
defFuncId.inputMode = dictPlatformInfo.inputMode
|
|
|
defFuncId.isMultiple = dictPlatformInfo.isMultiple
|
|
@@ -255,6 +257,8 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
defFuncId.subFlag = dictPlatformInfo.subFlag
|
|
|
defFuncId.type = dictPlatformInfo.dataType
|
|
|
defFuncId.unit = dictPlatformInfo.unit
|
|
|
+ defFuncId.origCode = dictPlatformInfo.origCode
|
|
|
+ defFuncId.origDataType = dictPlatformInfo.origDataType
|
|
|
|
|
|
if (!defFuncId.name.isNullOrEmpty()){
|
|
|
/** 排序 */
|
|
@@ -471,7 +475,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
defClass.aliasName = dictGroup.aliasName
|
|
|
defClass.code = dictGroup.code
|
|
|
defClass.equipmentCode = dictGroup.equipmentCode
|
|
|
- defClass.groupId = group.id
|
|
|
+ defClass.groupCode = group.id
|
|
|
defClass.majorCode = dictGroup.majorCode
|
|
|
defClass.name = dictGroup.name
|
|
|
defClass.parentCode = dictGroup.parentCode
|
|
@@ -497,8 +501,8 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
val defClassList = defClassService.select(SFilter.eq("type", "group")).exec()
|
|
|
if (defClassList.size>0){
|
|
|
for (defClass in defClassList){
|
|
|
- val dictGroupInfoList = DictTypeApi.dictGroupInfo(defClass.groupId!!, defClass.code!!)
|
|
|
- defFuncIdService.delete(SFilter.eq("groupId",defClass.groupId!!),SFilter.eq("classCode",defClass.code!!))
|
|
|
+ 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){
|
|
|
/** 开头字母大写转小写 */
|
|
@@ -587,7 +591,7 @@ object DClassDefService : SObjectService<DClassDef>(SMybatisDao(DClassDef::class
|
|
|
}
|
|
|
defFuncId.firstName = dictGroupInfo.firstTag
|
|
|
defFuncId.formater = dictGroupInfo.formater
|
|
|
- defFuncId.groupId = defClass.groupId
|
|
|
+ defFuncId.groupCode = defClass.groupCode
|
|
|
defFuncId.idx = dictGroupInfo.idx
|
|
|
defFuncId.inputMode = dictGroupInfo.inputMode
|
|
|
defFuncId.isMultiple = dictGroupInfo.isMultiple
|