|
@@ -82,6 +82,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
if (equip.classCode.isNullOrEmpty()) {
|
|
|
return false
|
|
|
}
|
|
|
+ if(equip.classCode!!.length>6){
|
|
|
+ val entity = defClassService.select(
|
|
|
+ SFilter.eq("projectId", equip.projectId!!),
|
|
|
+ SFilter.endWith("code", equip.classCode!!)
|
|
|
+ ).entity()
|
|
|
+ if (entity!=null){
|
|
|
+ equip.classCode = entity.code
|
|
|
+ } else {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/** 设备名字 */
|
|
|
if (equip.name.isNullOrEmpty()) {
|
|
|
val entity = defClassService.select(
|
|
@@ -129,6 +141,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
|
|
|
*/
|
|
|
override fun onUpdateBefore(entity: Equipment): Boolean {
|
|
|
try {
|
|
|
+
|
|
|
+ if(entity.classCode!!.length>6){
|
|
|
+ val defClass = defClassService.select(
|
|
|
+ SFilter.eq("projectId", entity.projectId!!),
|
|
|
+ SFilter.endWith("code", entity.classCode!!)
|
|
|
+ ).entity()
|
|
|
+ if (defClass!=null){
|
|
|
+ entity.classCode = defClass.code
|
|
|
+ } else {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (entity.propertyId.isNullOrEmpty()) {
|
|
|
|
|
|
// val property = PropertyService.select(SFilter.eq("equipmentId", entity.id!!)).entity()
|