|
@@ -3,6 +3,7 @@ package com.example.opc_da.service.impl;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.example.opc_common.entity.DataModel;
|
|
|
import com.example.opc_common.entity.Item;
|
|
|
+import com.example.opc_common.entity.ItemGroup;
|
|
|
import com.example.opc_common.enums.ResultEnum;
|
|
|
import com.example.opc_common.util.Blank;
|
|
|
import com.example.opc_common.util.MathUtil;
|
|
@@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
@Service
|
|
|
@Transactional
|
|
@@ -64,14 +66,14 @@ public class DataModelServiceImpl implements DataModelService {
|
|
|
|
|
|
@Override
|
|
|
public Result delDataModelById(Integer id) {
|
|
|
- List<Item> itemList = dataModelDao.getItemByDaModel(id);
|
|
|
- if (Blank.isNotEmpty(itemList)) {
|
|
|
+ List<Map<String, Object>> mapList = dataModelDao.getItemGroupByDm(id);
|
|
|
+ if (Blank.isNotEmpty(mapList)) {
|
|
|
String message = "此数据模型已被配置在【";
|
|
|
- for (int i = 0; i < itemList.size(); i++) {
|
|
|
+ for (int i = 0; i < mapList.size(); i++) {
|
|
|
if (i != 0) {
|
|
|
message += ",";
|
|
|
}
|
|
|
- message += "组"+itemList.get(i).getItemGroupName() + "的标签" + itemList.get(i).getItemName();
|
|
|
+ message += "组" + mapList.get(i).get("item_group_name") + "-" + mapList.get(i).get("count") + "个标签";
|
|
|
}
|
|
|
message += "】中,无法直接删除";
|
|
|
return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), message);
|