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

新增MES厂家信息模块，包括数据库表、权限设置、服务层、控制器及前端组件，支持厂家类别、有效状态的字典管理及名称唯一性校验。

Browse Source
This commit is contained in:
jiangxh
2026-05-15 17:19:42 +08:00
parent cfd7ca0a7e
commit f2ca204147
14 changed files with 916 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,249 @@
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.MesXslManufacturer;
import org.jeecg.modules.xslmes.service.IMesXslManufacturerService;
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/mesXslManufacturer")
@Slf4j
public class MesXslManufacturerController extends JeecgController<MesXslManufacturer, IMesXslManufacturerService> {
private static final Set<String> MANUFACTURER_CATEGORIES = Set.of("mold", "capsule", "equipment");
private static final Set<String> VALID_STATUS = Set.of("0", "1");
@Autowired
private IMesXslManufacturerService mesXslManufacturerService;
@Operation(summary = "MES厂家信息-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslManufacturer>> queryPageList(
MesXslManufacturer model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesXslManufacturer> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
Page<MesXslManufacturer> page = new Page<>(pageNo, pageSize);
IPage<MesXslManufacturer> pageList = mesXslManufacturerService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES厂家信息-添加")
@Operation(summary = "MES厂家信息-添加")
@RequiresPermissions("mes:mes_xsl_manufacturer:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesXslManufacturer model) {
//update-begin---author:jiangxh ---date:20260515 for：【MES】厂家信息保存前校验：类别字典值、名称唯一、有效状态-----------
String err = validateForSave(model, null);
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260515 for：【MES】厂家信息保存前校验：类别字典值、名称唯一、有效状态-----------
mesXslManufacturerService.save(model);
return Result.OK("添加成功！");
}
@AutoLog(value = "MES厂家信息-编辑")
@Operation(summary = "MES厂家信息-编辑")
@RequiresPermissions("mes:mes_xsl_manufacturer:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesXslManufacturer model) {
//update-begin---author:jiangxh ---date:20260515 for：【MES】厂家信息保存前校验：类别字典值、名称唯一、有效状态-----------
String err = validateForSave(model, model.getId());
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260515 for：【MES】厂家信息保存前校验：类别字典值、名称唯一、有效状态-----------
mesXslManufacturerService.updateById(model);
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES厂家信息-删除")
@Operation(summary = "MES厂家信息-通过id删除")
@RequiresPermissions("mes:mes_xsl_manufacturer:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
mesXslManufacturerService.removeById(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES厂家信息-批量删除")
@Operation(summary = "MES厂家信息-批量删除")
@RequiresPermissions("mes:mes_xsl_manufacturer:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
mesXslManufacturerService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@Operation(summary = "MES厂家信息-通过id查询")
@GetMapping(value = "/queryById")
public Result<MesXslManufacturer> queryById(@RequestParam(name = "id", required = true) String id) {
MesXslManufacturer entity = mesXslManufacturerService.getById(id);
if (entity == null) {
return Result.error("未找到对应数据");
}
return Result.OK(entity);
}
@Operation(summary = "校验厂家名称是否重复（同租户未删除数据；dataId 为编辑时当前主键）")
@GetMapping(value = "/checkManufacturerName")
public Result<String> checkManufacturerName(
@RequestParam(name = "manufacturerName", required = true) String manufacturerName,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(manufacturerName) || manufacturerName.trim().isEmpty()) {
return Result.OK("该值可用！");
}
MesXslManufacturer ctx = new MesXslManufacturer();
if (mesXslManufacturerService.isManufacturerNameDuplicated(manufacturerName.trim(), dataId, ctx)) {
return Result.error("厂家名称不能重复");
}
return Result.OK("该值可用！");
}
@RequiresPermissions("mes:mes_xsl_manufacturer:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesXslManufacturer model) {
return super.exportXls(request, model, MesXslManufacturer.class, "MES厂家信息");
}
@RequiresPermissions("mes:mes_xsl_manufacturer: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<MesXslManufacturer> list =
ExcelImportUtil.importExcel(file.getInputStream(), MesXslManufacturer.class, params);
if (list == null) {
list = List.of();
}
Set<String> namesInFile = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
MesXslManufacturer row = list.get(i);
int rowNo = i + 1;
if (row == null) {
return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
}
String name = row.getManufacturerName();
if (name != null) {
name = name.trim();
}
if (oConvertUtils.isEmpty(name)) {
return Result.error("文件导入失败：第 " + rowNo + " 条厂家名称不能为空");
}
row.setManufacturerName(name);
if (!namesInFile.add(name)) {
return Result.error("文件导入失败：厂家名称【" + name + "】在导入文件中重复");
}
String cat = row.getManufacturerCategory();
if (oConvertUtils.isEmpty(cat) || !MANUFACTURER_CATEGORIES.contains(cat.trim())) {
return Result.error("文件导入失败：第 " + rowNo + " 条厂家类别无效（须为模具厂家/胶囊厂家/设备厂家对应字典值）");
}
row.setManufacturerCategory(cat.trim());
String vs = row.getValidStatus();
if (oConvertUtils.isEmpty(vs)) {
row.setValidStatus("0");
} else {
vs = vs.trim();
if (!VALID_STATUS.contains(vs)) {
return Result.error("文件导入失败：第 " + rowNo + " 条是否有效无效（须为有效或无效对应字典值）");
}
row.setValidStatus(vs);
}
if (mesXslManufacturerService.isManufacturerNameDuplicated(name, null, row)) {
return Result.error("文件导入失败：第 " + rowNo + " 条厂家名称【" + name + "】不能重复（同租户未删除数据中已存在）");
}
}
long start = System.currentTimeMillis();
mesXslManufacturerService.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(MesXslManufacturer model, String excludeId) {
if (oConvertUtils.isEmpty(model.getManufacturerCategory()) || model.getManufacturerCategory().trim().isEmpty()) {
return "厂家类别不能为空";
}
String cat = model.getManufacturerCategory().trim();
if (!MANUFACTURER_CATEGORIES.contains(cat)) {
return "厂家类别无效";
}
model.setManufacturerCategory(cat);
if (oConvertUtils.isEmpty(model.getManufacturerName()) || model.getManufacturerName().trim().isEmpty()) {
return "厂家名称不能为空";
}
String name = model.getManufacturerName().trim();
model.setManufacturerName(name);
if (mesXslManufacturerService.isManufacturerNameDuplicated(name, excludeId, model)) {
return "厂家名称不能重复";
}
String vs = model.getValidStatus();
if (oConvertUtils.isEmpty(vs)) {
model.setValidStatus("0");
} else {
vs = vs.trim();
if (!VALID_STATUS.contains(vs)) {
return "是否有效取值无效";
}
model.setValidStatus(vs);
}
return null;
}
//update-end---author:jiangxh ---date:20260515 for：【MES】厂家信息保存前校验-----------
}

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

@@ -0,0 +1,57 @@
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.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
/**
* MES 厂家信息（表 mes_xsl_manufacturer）
*/
@Data
@TableName("mes_xsl_manufacturer")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES厂家信息")
public class MesXslManufacturer implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "厂家类别", width = 16, dicCode = "xslmes_manufacturer_category")
@Dict(dicCode = "xslmes_manufacturer_category")
@Schema(description = "厂家类别（字典 xslmes_manufacturer_category）")
private String manufacturerCategory;
@Excel(name = "厂家名称", width = 28)
@Schema(description = "厂家名称（同租户未删除数据中唯一）")
private String manufacturerName;
@Excel(name = "是否有效", width = 12, dicCode = "xslmes_manufacturer_valid")
@Dict(dicCode = "xslmes_manufacturer_valid")
@Schema(description = "是否有效（字典 xslmes_manufacturer_valid：0有效1无效）")
private String validStatus;
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;
}

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

@@ -0,0 +1,9 @@
package org.jeecg.modules.xslmes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.xslmes.entity.MesXslManufacturer;
/**
* MES 厂家信息
*/
public interface MesXslManufacturerMapper extends BaseMapper<MesXslManufacturer> {}

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.MesXslSparePartsCategory}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）等。
* 包含：客户管理（{@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}）、备品件信息（{@link org.jeecg.modules.xslmes.entity.MesXslSparePart}）、厂家信息（{@link org.jeecg.modules.xslmes.entity.MesXslManufacturer}）等。
*/
package org.jeecg.modules.xslmes;

16
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslManufacturerService.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.MesXslManufacturer;
public interface IMesXslManufacturerService extends IService<MesXslManufacturer> {
/**
* 厂家名称是否已被占用（仅统计未删除：del_flag 为 0 或 null）。租户与拦截器注入逻辑一致。
*
* @param manufacturerName 厂家名称（已 trim 后传入）
* @param excludeId 编辑时排除自身主键，新增传 null
* @param context 当前提交的实体（可取 tenantId；可为 null）
*/
boolean isManufacturerNameDuplicated(String manufacturerName, String excludeId, MesXslManufacturer context);
}

63
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslManufacturerServiceImpl.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.MesXslManufacturer;
import org.jeecg.modules.xslmes.mapper.MesXslManufacturerMapper;
import org.jeecg.modules.xslmes.service.IMesXslManufacturerService;
import org.springframework.stereotype.Service;
@Service
public class MesXslManufacturerServiceImpl extends ServiceImpl<MesXslManufacturerMapper, MesXslManufacturer>
implements IMesXslManufacturerService {
//update-begin---author:jiangxh ---date:20260515 for：【MES】厂家名称同租户不可重复；仅统计未删除（del_flag=0 或 null）-----------
@Override
public boolean isManufacturerNameDuplicated(String manufacturerName, String excludeId, MesXslManufacturer context) {
if (oConvertUtils.isEmpty(manufacturerName)) {
return false;
}
Integer tenantId = resolveTenantId(context);
LambdaQueryWrapper<MesXslManufacturer> w = new LambdaQueryWrapper<>();
w.eq(MesXslManufacturer::getManufacturerName, manufacturerName.trim());
w.and(
q ->
q.eq(MesXslManufacturer::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesXslManufacturer::getDelFlag));
if (oConvertUtils.isNotEmpty(excludeId)) {
w.ne(MesXslManufacturer::getId, excludeId);
}
if (tenantId != null) {
w.eq(MesXslManufacturer::getTenantId, tenantId);
}
return this.count(w) > 0;
}
private static Integer resolveTenantId(MesXslManufacturer 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）-----------
}