From e70c3d7a34ad9e9023abd9fc669bdf4e4a082a38 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 七月 2025 15:59:42 +0800
Subject: [PATCH] 增加code唯一校验，修改导入返回值
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java | 42 +++++++++++++--------
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java | 16 ++++++-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java | 2 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 59 ++++-------------------------
4 files changed, 50 insertions(+), 69 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index 754130c..e6f9f67 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -282,17 +282,8 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- String fileName = file.getOriginalFilename();
-
- Result<?> importResult = eamMaintenanceStandardService.importPointInspectionExcel(file);
-
- if (importResult.isSuccess()) {
- results.put(fileName, "鎴愬姛: " + importResult.getMessage());
- successCount++;
- } else {
- results.put(fileName, "澶辫触: " + importResult.getMessage());
- failureCount++;
- }
+ file.getOriginalFilename();
+ return eamMaintenanceStandardService.importPointInspectionExcel(file);
}
// 鏋勫缓鍝嶅簲
@@ -302,13 +293,7 @@
response.put("successCount", successCount);
response.put("failureCount", failureCount);
- if (failureCount == 0) {
- return Result.ok("鎵�鏈夌偣妫�鏂囦欢瀵煎叆鎴愬姛"+response);
- } else if (successCount == 0) {
- return Result.error("鎵�鏈夌偣妫�鏂囦欢瀵煎叆澶辫触", response);
- } else {
- return Result.error("閮ㄥ垎鐐规鏂囦欢瀵煎叆澶辫触", response);
- }
+ return Result.ok("瀵煎叆瀹屾垚" + response);
} catch (Exception e) {
log.error("鐐规瀵煎叆澶勭悊寮傚父", e);
@@ -333,17 +318,8 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- String fileName = file.getOriginalFilename();
-
- Result<?> importResult = eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND");
-
- if (importResult.isSuccess()) {
- results.put(fileName, "鎴愬姛: " + importResult.getMessage());
- successCount++;
- } else {
- results.put(fileName, "澶辫触: " + importResult.getMessage());
- failureCount++;
- }
+ file.getOriginalFilename();
+ return eamMaintenanceStandardService.importMaintenanceStandard(file, "SECOND");
}
// 鏋勫缓鏈�缁堝搷搴�
@@ -353,11 +329,7 @@
response.put("successCount", successCount);
response.put("failureCount", failureCount);
- if (failureCount > 0) {
- return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触", response);
- }
-
- return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔�"+response);
+ return Result.ok("瀵煎叆瀹屾垚"+response);
} catch (Exception e) {
log.error("瀵煎叆澶勭悊寮傚父", e);
@@ -381,17 +353,8 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
- String fileName = file.getOriginalFilename();
-
- Result<?> importResult = eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD");
-
- if (importResult.isSuccess()) {
- results.put(fileName, "鎴愬姛: " + importResult.getMessage());
- successCount++;
- } else {
- results.put(fileName, "澶辫触: " + importResult.getMessage());
- failureCount++;
- }
+ file.getOriginalFilename();
+ return eamMaintenanceStandardService.importMaintenanceStandard(file, "THIRD");
}
// 鏋勫缓鏈�缁堝搷搴�
@@ -401,11 +364,7 @@
response.put("successCount", successCount);
response.put("failureCount", failureCount);
- if (failureCount > 0) {
- return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触", response);
- }
-
- return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔�"+response);
+ return Result.ok("瀵煎叆瀹屾垚"+response);
} catch (Exception e) {
log.error("瀵煎叆澶勭悊寮傚父", e);
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java
index 9e6bd90..b137c71 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java
@@ -4,7 +4,11 @@
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.StrUtil;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.BaseFactory;
@@ -98,16 +102,22 @@
/**
* 娣诲姞
*
- * @param BaseFactory
+ * @param baseFactory
* @return
*/
@AutoLog(value = "璁惧杞﹂棿绠＄悊-娣诲姞")
@ApiOperation(value = "璁惧杞﹂棿绠＄悊-娣诲姞", notes = "璁惧杞﹂棿绠＄悊-娣诲姞")
@PostMapping(value = "/add")
- public Result<BaseFactory> add(@RequestBody BaseFactory BaseFactory) {
+ public Result<?> add(@RequestBody BaseFactory baseFactory) {
Result<BaseFactory> result = new Result<>();
try {
- BaseFactoryService.saveBaseFactoryData(BaseFactory);
+ QueryWrapper<BaseFactory> baseFactoryQueryWrapper = new QueryWrapper<>();
+ baseFactoryQueryWrapper.eq(StrUtil.isNotEmpty(baseFactory.getFactoryCode()), "factory_code", baseFactory.getFactoryCode());
+ baseFactoryQueryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0.toString());
+ if (BaseFactoryService.getOne(baseFactoryQueryWrapper) != null) {
+ return Result.error("鏈烘瀯缂栫爜宸插瓨鍦�");
+ }
+ BaseFactoryService.saveBaseFactoryData(baseFactory);
result.success("娣诲姞鎴愬姛锛�");
} catch (Exception e) {
log.error(e.getMessage(), e);
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
index 375b778..94495b8 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
@@ -32,6 +32,8 @@
*/
List<EamBaseFactoryTreeModel> searchByKeyWord(String keyWord);
+
+
/**
* 淇濆瓨浜х嚎鏁版嵁
*/
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
index 047ae84..c50d112 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
@@ -3,10 +3,12 @@
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.FillRuleConstant;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.BaseFactory;
@@ -100,32 +102,34 @@
return Collections.emptyList();
}
+
+
/**
* saveProductionData 瀵瑰簲 add 淇濆瓨鐢ㄦ埛鍦ㄩ〉闈㈡坊鍔犵殑鏂扮殑璁惧杞﹂棿绠＄悊瀵硅薄鏁版嵁
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void saveBaseFactoryData(BaseFactory BaseFactory) {
- if (BaseFactory != null) {
- if (BaseFactory.getParentId() == null|| StrUtil.isEmpty(BaseFactory.getParentId())) {
- BaseFactory.setParentId("");
- BaseFactory.setFactoryCategory("0");
+ public void saveBaseFactoryData(BaseFactory baseFactory) {
+ if (baseFactory != null) {
+ if (baseFactory.getParentId() == null|| StrUtil.isEmpty(baseFactory.getParentId())) {
+ baseFactory.setParentId("");
+ baseFactory.setFactoryCategory("0");
}
- if (BaseFactory.getFactoryCategory() == null|| StrUtil.isEmpty(BaseFactory.getFactoryCategory())) {
- BaseFactory.setFactoryCategory("1");
+ if (baseFactory.getFactoryCategory() == null|| StrUtil.isEmpty(baseFactory.getFactoryCategory())) {
+ baseFactory.setFactoryCategory("1");
}
- BaseFactory.setId(IdWorker.getIdStr(BaseFactory));
+ baseFactory.setId(IdWorker.getIdStr(baseFactory));
// 鍏堝垽鏂瀵硅薄鏈夋棤鐖剁骇ID,鏈夊垯鎰忓懗鐫�涓嶆槸鏈�楂樼骇,鍚﹀垯鎰忓懗鐫�鏄渶楂樼骇
// 鑾峰彇鐖剁骇ID
- String parentId = BaseFactory.getParentId();
+ String parentId = baseFactory.getParentId();
JSONObject formData = new JSONObject();
formData.put("parentId",parentId);
String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.WORKSHOP,formData);
- BaseFactory.setOrgCode(codeArray[0]);
+ baseFactory.setOrgCode(codeArray[0]);
String orgType = codeArray[1];
- BaseFactory.setOrgType(String.valueOf(orgType));
- BaseFactory.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
- this.save(BaseFactory);
+ baseFactory.setOrgType(String.valueOf(orgType));
+ baseFactory.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+ this.save(baseFactory);
}
}
@@ -145,9 +149,15 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean updateBaseFactoryDataById(BaseFactory BaseFactory) {
- if (BaseFactory != null) {
- this.updateById(BaseFactory);
+ public boolean updateBaseFactoryDataById(BaseFactory baseFactory) {
+ QueryWrapper<BaseFactory> baseFactoryQueryWrapper = new QueryWrapper<>();
+ baseFactoryQueryWrapper.eq(StrUtil.isNotEmpty(baseFactory.getFactoryCode()), "factory_code", baseFactory.getFactoryCode());
+ baseFactoryQueryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0.toString());
+ if (this.getOne(baseFactoryQueryWrapper) != null) {
+ throw new JeecgBootException("鏈烘瀯缂栫爜宸插瓨鍦�");
+ }
+ if (baseFactory != null) {
+ this.updateById(baseFactory);
return true;
}
return false;
--
Gitblit v1.9.3