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); 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); 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); /** * 保存产线数据 */ 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;
