chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

备品件类别新增

Browse Source
This commit is contained in:
jiangxh
2026-05-15 15:43:40 +08:00
parent 44c6527a84
commit f4d2ef21c8
14 changed files with 801 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

219
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/controller/MesXslSparePartsCategoryController.java Normal file
View File

@@ -0,0 +1,219 @@
package org.jeecg.modules.xslmes.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory;
import org.jeecg.modules.xslmes.service.IMesXslSparePartsCategoryService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
/**
* MES 备品件类别
*/
@Tag(name = "MES备品件类别")
@RestController
@RequestMapping("/xslmes/mesXslSparePartsCategory")
@Slf4j
public class MesXslSparePartsCategoryController extends JeecgController<MesXslSparePartsCategory, IMesXslSparePartsCategoryService> {
@Autowired
private IMesXslSparePartsCategoryService mesXslSparePartsCategoryService;
@Operation(summary = "MES备品件类别-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslSparePartsCategory>> queryPageList(
MesXslSparePartsCategory model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesXslSparePartsCategory> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
Page<MesXslSparePartsCategory> page = new Page<>(pageNo, pageSize);
IPage<MesXslSparePartsCategory> pageList = mesXslSparePartsCategoryService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES备品件类别-添加")
@Operation(summary = "MES备品件类别-添加")
@RequiresPermissions("mes:mes_xsl_spare_parts_category:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesXslSparePartsCategory model) {
//update-begin---author:jiangxh ---date:20260515 for：【MES】备品件类别保存前校验：类别名称唯一、描述 trim-----------
String err = validateForSave(model, null);
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260515 for：【MES】备品件类别保存前校验：类别名称唯一、描述 trim-----------
mesXslSparePartsCategoryService.save(model);
return Result.OK("添加成功！");
}
@AutoLog(value = "MES备品件类别-编辑")
@Operation(summary = "MES备品件类别-编辑")
@RequiresPermissions("mes:mes_xsl_spare_parts_category:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesXslSparePartsCategory model) {
//update-begin---author:jiangxh ---date:20260515 for：【MES】备品件类别保存前校验：类别名称唯一、描述 trim-----------
String err = validateForSave(model, model.getId());
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260515 for：【MES】备品件类别保存前校验：类别名称唯一、描述 trim-----------
mesXslSparePartsCategoryService.updateById(model);
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES备品件类别-删除")
@Operation(summary = "MES备品件类别-通过id删除")
@RequiresPermissions("mes:mes_xsl_spare_parts_category:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
mesXslSparePartsCategoryService.removeById(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES备品件类别-批量删除")
@Operation(summary = "MES备品件类别-批量删除")
@RequiresPermissions("mes:mes_xsl_spare_parts_category:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
mesXslSparePartsCategoryService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@Operation(summary = "MES备品件类别-通过id查询")
@GetMapping(value = "/queryById")
public Result<MesXslSparePartsCategory> queryById(@RequestParam(name = "id", required = true) String id) {
MesXslSparePartsCategory entity = mesXslSparePartsCategoryService.getById(id);
if (entity == null) {
return Result.error("未找到对应数据");
}
return Result.OK(entity);
}
@Operation(summary = "校验备品件类别名称是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
@GetMapping(value = "/checkCategoryName")
public Result<String> checkCategoryName(
@RequestParam(name = "categoryName", required = true) String categoryName,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(categoryName) || categoryName.trim().isEmpty()) {
return Result.OK("该值可用！");
}
MesXslSparePartsCategory ctx = new MesXslSparePartsCategory();
if (mesXslSparePartsCategoryService.isCategoryNameDuplicated(categoryName.trim(), dataId, ctx)) {
return Result.error("类别名称不能重复");
}
return Result.OK("该值可用！");
}
@RequiresPermissions("mes:mes_xsl_spare_parts_category:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesXslSparePartsCategory model) {
return super.exportXls(request, model, MesXslSparePartsCategory.class, "MES备品件类别");
}
@RequiresPermissions("mes:mes_xsl_spare_parts_category:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
//update-begin---author:jiangxh ---date:20260515 for：【MES】备品件类别导入：类别名称唯一、文件内去重-----------
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> ent : fileMap.entrySet()) {
MultipartFile file = ent.getValue();
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<MesXslSparePartsCategory> list =
ExcelImportUtil.importExcel(file.getInputStream(), MesXslSparePartsCategory.class, params);
if (list == null) {
list = List.of();
}
Set<String> namesInFile = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
MesXslSparePartsCategory row = list.get(i);
int rowNo = i + 1;
if (row == null) {
return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
}
String name = row.getCategoryName();
if (name != null) {
name = name.trim();
}
if (oConvertUtils.isEmpty(name)) {
return Result.error("文件导入失败：第 " + rowNo + " 条类别名称不能为空");
}
row.setCategoryName(name);
if (!namesInFile.add(name)) {
return Result.error("文件导入失败：类别名称【" + name + "】在导入文件中重复");
}
if (mesXslSparePartsCategoryService.isCategoryNameDuplicated(name, null, row)) {
return Result.error("文件导入失败：第 " + rowNo + " 条类别名称【" + name + "】不能重复（同租户未删除数据中已存在）");
}
if (row.getCategoryDescription() != null) {
row.setCategoryDescription(row.getCategoryDescription().trim());
}
}
long start = System.currentTimeMillis();
mesXslSparePartsCategoryService.saveBatch(list);
log.info("备品件类别Excel导入完成，耗时{}ms，行数={}", System.currentTimeMillis() - start, list.size());
return Result.ok("文件导入成功！数据行数：" + list.size());
} catch (Exception e) {
String msg = e.getMessage();
log.error(msg, e);
if (msg != null && msg.indexOf("Duplicate entry") >= 0) {
return Result.error("文件导入失败: 存在重复数据（类别名称不能重复）");
}
return Result.error("文件导入失败:" + e.getMessage());
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
log.error(e.getMessage(), e);
}
}
}
//update-end---author:jiangxh ---date:20260515 for：【MES】备品件类别导入：类别名称唯一、文件内去重-----------
return Result.error("文件导入失败！");
}
//update-begin---author:jiangxh ---date:20260515 for：【MES】备品件类别保存前校验-----------
private String validateForSave(MesXslSparePartsCategory model, String excludeId) {
if (oConvertUtils.isEmpty(model.getCategoryName()) || model.getCategoryName().trim().isEmpty()) {
return "类别名称不能为空";
}
String name = model.getCategoryName().trim();
model.setCategoryName(name);
if (mesXslSparePartsCategoryService.isCategoryNameDuplicated(name, excludeId, model)) {
return "类别名称不能重复";
}
if (model.getCategoryDescription() != null) {
model.setCategoryDescription(model.getCategoryDescription().trim());
}
return null;
}
//update-end---author:jiangxh ---date:20260515 for：【MES】备品件类别保存前校验-----------
}

50
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslSparePartsCategory.java Normal file
View File

@@ -0,0 +1,50 @@
package org.jeecg.modules.xslmes.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
/**
* MES 备品件类别（表 mes_xsl_spare_parts_category）
*/
@Data
@TableName("mes_xsl_spare_parts_category")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES备品件类别")
public class MesXslSparePartsCategory implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "类别名称", width = 24)
@Schema(description = "类别名称（同租户未删除数据中唯一）")
private String categoryName;
@Excel(name = "描述", width = 36)
@Schema(description = "描述")
private String categoryDescription;
private Integer tenantId;
private String sysOrgCode;
private String createBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private String updateBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
private Integer delFlag;
}

6
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/mapper/MesXslSparePartsCategoryMapper.java Normal file
View File

@@ -0,0 +1,6 @@
package org.jeecg.modules.xslmes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory;
public interface MesXslSparePartsCategoryMapper extends BaseMapper<MesXslSparePartsCategory> {}

2
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/package-info.java
View File

@@ -1,5 +1,5 @@
/**
* MES XSL 业务模块（Maven 工程名：jeecg-module-xslmes）。
* 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）等。
* 包含：客户管理（{@link org.jeecg.modules.xslmes.entity.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）、设备类型（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentType}）、设备部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart}）、设备小部位（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart}）、备品件类别（{@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory}）等。
*/
package org.jeecg.modules.xslmes;

16
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslSparePartsCategoryService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.jeecg.modules.xslmes.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory;
public interface IMesXslSparePartsCategoryService extends IService<MesXslSparePartsCategory> {
/**
* 备品件类别名称是否已被占用（仅统计未删除：del_flag 为 0 或 null）。租户与 MybatisInterceptor 注入逻辑一致。
*
* @param categoryName 类别名称（已 trim 后传入）
* @param excludeId 编辑时排除自身主键，新增传 null
* @param context 当前提交的实体（可取 tenantId；可为 null）
*/
boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslSparePartsCategory context);
}

63
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslSparePartsCategoryServiceImpl.java Normal file
View File

@@ -0,0 +1,63 @@
package org.jeecg.modules.xslmes.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.TokenUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory;
import org.jeecg.modules.xslmes.mapper.MesXslSparePartsCategoryMapper;
import org.jeecg.modules.xslmes.service.IMesXslSparePartsCategoryService;
import org.springframework.stereotype.Service;
@Service
public class MesXslSparePartsCategoryServiceImpl extends ServiceImpl<MesXslSparePartsCategoryMapper, MesXslSparePartsCategory>
implements IMesXslSparePartsCategoryService {
//update-begin---author:jiangxh ---date:20260515 for：【MES】备品件类别名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
@Override
public boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslSparePartsCategory context) {
if (oConvertUtils.isEmpty(categoryName)) {
return false;
}
Integer tenantId = resolveTenantId(context);
LambdaQueryWrapper<MesXslSparePartsCategory> w = new LambdaQueryWrapper<>();
w.eq(MesXslSparePartsCategory::getCategoryName, categoryName.trim());
w.and(
q ->
q.eq(MesXslSparePartsCategory::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesXslSparePartsCategory::getDelFlag));
if (oConvertUtils.isNotEmpty(excludeId)) {
w.ne(MesXslSparePartsCategory::getId, excludeId);
}
if (tenantId != null) {
w.eq(MesXslSparePartsCategory::getTenantId, tenantId);
}
return this.count(w) > 0;
}
private static Integer resolveTenantId(MesXslSparePartsCategory context) {
if (context != null && context.getTenantId() != null) {
return context.getTenantId();
}
String ts = TenantContext.getTenant();
if (oConvertUtils.isEmpty(ts)) {
try {
ts = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
} catch (Exception ignored) {
}
}
if (oConvertUtils.isEmpty(ts)) {
return null;
}
try {
return Integer.parseInt(ts.trim());
} catch (NumberFormatException e) {
return null;
}
}
//update-end---author:jiangxh ---date:20260515 for：【MES】备品件类别名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
}