From e98e114ff8765ca1ffbd6dda167e35d18b72f5d4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 16:34:07 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index 8985b97..95d8391 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -2,10 +2,12 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
@@ -20,8 +22,6 @@
import com.vincent.rsf.server.manager.service.MatnrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.entity.Fields;
-import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -100,6 +100,17 @@
@Override
public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
+ IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, pageParam.buildWrapper(true));
+ /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
+ List<Map<String, Object>> mapList = reulst.getRecords();
+ if (!mapList.isEmpty()) {
+ mapList.forEach(map -> {
+ if (!Objects.isNull(map.get("fieldsIndex"))) {
+ FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
+ }
+ });
+ }
+
PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
List<Matnr> records = page.getRecords();
for (Matnr record : records) {
@@ -110,6 +121,19 @@
}
page.setRecords(records);
return page;
+ }
+
+ @Override
+ public Matnr selectMatnrById(Long id) {
+ Matnr matnr = this.baseMapper.selectById(id);
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("褰撳墠鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ if (!Objects.isNull(matnr.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(matnr.getFieldsIndex());
+ matnr.setExtendFields(fields);
+ }
+ return matnr;
}
/**
@@ -123,8 +147,6 @@
Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
if (Objects.isNull(matnr1.getCode())) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
- System.out.println("=========>");
- System.out.println(ruleCode);
matnr1.setCode(ruleCode);
}
/**
@@ -135,9 +157,9 @@
FieldsUtils.saveFields(matnr, uuid16);
matnr1.setFieldsIndex(uuid16);
}
- if (!this.save(matnr1)) {
+ if (!this.saveOrUpdate(matnr1)) {
return R.error("Save Fail");
}
- return R.ok("淇濆瓨鎴愬姛!!");
+ return R.ok(matnr1);
}
}
--
Gitblit v1.9.1