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 | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 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 a4e194d..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
@@ -8,7 +8,6 @@
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;
@@ -22,8 +21,8 @@
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.system.entity.Fields;
-import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -100,9 +99,8 @@
}
@Override
- public IPage<Map<String, Object>> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
+ 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()) {
@@ -112,16 +110,56 @@
}
});
}
- List<Matnr> matnrs = JSONArray.parseArray(JSON.toJSONString(mapList), Matnr.class);
-// PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
-// List<Matnr> records = page.getRecords();
-// for (Matnr record : records) {
-// if (!Objects.isNull(record.getFieldsIndex())) {
-// Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
-// record.setExtendFields(fields);
-// }
-// }
-// page.setRecords(records);
- return reulst;
+
+ PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
+ List<Matnr> records = page.getRecords();
+ for (Matnr record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ 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;
+ }
+
+ /**
+ * @desc 鏇存柊鎵╁睍鐗╂枡鎵╁睍瀛楁鍊�
+ * @param matnr
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R saveMatnrs(Map<String, Object> matnr) {
+ Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
+ if (Objects.isNull(matnr1.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
+ matnr1.setCode(ruleCode);
+ }
+ /**
+ * 鎵╁睍瀛楁瀛樺叆搴�
+ */
+ String uuid16 = CommonUtil.randomUUID16();
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
+ FieldsUtils.saveFields(matnr, uuid16);
+ matnr1.setFieldsIndex(uuid16);
+ }
+ if (!this.saveOrUpdate(matnr1)) {
+ return R.error("Save Fail");
+ }
+ return R.ok(matnr1);
}
}
--
Gitblit v1.9.1