From db523e0fdf7801cdc01f10886f2c9aec04e711bb Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 25 Feb 2021 11:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/controller/EncodeReplaceDictController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/EncodeReplaceDictController.java b/src/main/java/com/nanometer/smartlab/controller/EncodeReplaceDictController.java
index 2949efb..b23aaf7 100644
--- a/src/main/java/com/nanometer/smartlab/controller/EncodeReplaceDictController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/EncodeReplaceDictController.java
@@ -1,8 +1,11 @@
package com.nanometer.smartlab.controller;
+import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.EncodeReplaceDict;
import com.nanometer.smartlab.entity.SysUser;
import com.nanometer.smartlab.entity.enumtype.ReplaceDictType;
+import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import com.nanometer.smartlab.service.BaseMetaService;
import com.nanometer.smartlab.service.EncodeReplaceDictService;
import com.nanometer.smartlab.util.FacesUtils;
import org.apache.log4j.Logger;
@@ -23,6 +26,8 @@
@Resource
private EncodeReplaceDictService encodeReplaceDictService;
+ @Resource
+ private BaseMetaService baseMetaService;
private LazyDataModel<EncodeReplaceDict> dataModel;
@@ -99,6 +104,10 @@
FacesUtils.warn("请选择数据");
} else {
encodeReplaceDictService.deleteOne(selectOne.getId());
+ ReplaceDictType type = selectOne.getType();
+ String groupId = "encode_replace_" + type.getKey();
+ BaseMeta baseMeta = baseMetaService.getBaseMeta(groupId, selectOne.getNumber(),null);
+ baseMetaService.deleteBaseMeta(Collections.singletonList(baseMeta.getId()));
FacesUtils.info("删除成功");
}
}
@@ -113,10 +122,28 @@
encodeReplaceDictService.checkAddOne(encodeReplaceDict);
encodeReplaceDictService.addOne(encodeReplaceDict, getUser());
+ BaseMeta baseMeta = new BaseMeta();
+ baseMeta.setMetaKey(encodeReplaceDict.getNumber());
+ baseMeta.setMetaValue(encodeReplaceDict.getInfo());
+ ReplaceDictType type = encodeReplaceDict.getType();
+ String groupId = "encode_replace_" + type.getKey();
+ baseMeta.setGroupId(groupId);
+ baseMetaService.insertBaseMeta(baseMeta);
+
} else {
//更新
//校验实体
encodeReplaceDictService.checkUpdateOne(encodeReplaceDict);
+ //更新前拿出baseMeta
+ EncodeReplaceDict originData = encodeReplaceDictService.getOne(encodeReplaceDict.getId());
+ ReplaceDictType type = originData.getType();
+ String groupId = "encode_replace_" + type.getKey();
+ BaseMeta baseMeta = baseMetaService.getBaseMeta(groupId, originData.getNumber(),null);
+ baseMeta.setMetaKey(encodeReplaceDict.getNumber());
+ baseMeta.setMetaValue(encodeReplaceDict.getInfo());
+ baseMeta.setGroupId("encode_replace_" + encodeReplaceDict.getType().getKey());
+ baseMeta.setValidFlag(ValidFlag.VALID);
+ baseMetaService.updateBaseMeta(baseMeta);
encodeReplaceDictService.updateOne(encodeReplaceDict);
}
--
Gitblit v1.9.2