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-14 17:11:44 +08:00
parent 7b573cebdd
commit 965bdf44db
15 changed files with 1142 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,300 @@
package org.jeecg.modules.xslmes.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.constant.CommonConstant;
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.MesXslEquipmentCategory;
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
import org.jeecg.modules.xslmes.service.IMesXslProcessOperationService;
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/mesXslEquipmentCategory")
@Slf4j
public class MesXslEquipmentCategoryController extends JeecgController<MesXslEquipmentCategory, IMesXslEquipmentCategoryService> {
private static final Set<String> INSPECT_DISTINCT = Set.of("generic", "distinct");
private static final Set<String> MAINTAIN_DISTINCT = Set.of("maintain", "distinct");
@Autowired
private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
@Autowired
private IMesXslProcessOperationService mesXslProcessOperationService;
@Operation(summary = "MES设备类别-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslEquipmentCategory>> queryPageList(
MesXslEquipmentCategory model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesXslEquipmentCategory> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
Page<MesXslEquipmentCategory> page = new Page<>(pageNo, pageSize);
IPage<MesXslEquipmentCategory> pageList = mesXslEquipmentCategoryService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES设备类别-添加")
@Operation(summary = "MES设备类别-添加")
@RequiresPermissions("mes:mes_xsl_equipment_category:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesXslEquipmentCategory model) {
//update-begin---author:jiangxh ---date:20260514 for：【MES】设备类别：名称唯一、工序与字典校验、冗余工序名称-----------
String err = validateForSave(model, null);
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260514 for：【MES】设备类别：名称唯一、工序与字典校验、冗余工序名称-----------
mesXslEquipmentCategoryService.save(model);
return Result.OK("添加成功！");
}
@AutoLog(value = "MES设备类别-编辑")
@Operation(summary = "MES设备类别-编辑")
@RequiresPermissions("mes:mes_xsl_equipment_category:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesXslEquipmentCategory model) {
//update-begin---author:jiangxh ---date:20260514 for：【MES】设备类别：名称唯一、工序与字典校验、冗余工序名称-----------
String err = validateForSave(model, model.getId());
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260514 for：【MES】设备类别：名称唯一、工序与字典校验、冗余工序名称-----------
mesXslEquipmentCategoryService.updateById(model);
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES设备类别-删除")
@Operation(summary = "MES设备类别-通过id删除")
@RequiresPermissions("mes:mes_xsl_equipment_category:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
mesXslEquipmentCategoryService.removeById(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES设备类别-批量删除")
@Operation(summary = "MES设备类别-批量删除")
@RequiresPermissions("mes:mes_xsl_equipment_category:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
mesXslEquipmentCategoryService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@Operation(summary = "MES设备类别-通过id查询")
@GetMapping(value = "/queryById")
public Result<MesXslEquipmentCategory> queryById(@RequestParam(name = "id", required = true) String id) {
MesXslEquipmentCategory entity = mesXslEquipmentCategoryService.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("该值可用！");
}
MesXslEquipmentCategory ctx = new MesXslEquipmentCategory();
if (mesXslEquipmentCategoryService.isCategoryNameDuplicated(categoryName.trim(), dataId, ctx)) {
return Result.error("该类别名称已存在");
}
return Result.OK("该值可用！");
}
@RequiresPermissions("mes:mes_xsl_equipment_category:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesXslEquipmentCategory model) {
return super.exportXls(request, model, MesXslEquipmentCategory.class, "MES设备类别");
}
@RequiresPermissions("mes:mes_xsl_equipment_category:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
//update-begin---author:jiangxh ---date:20260514 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<MesXslEquipmentCategory> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslEquipmentCategory.class, params);
if (list == null) {
list = List.of();
}
Set<String> namesInFile = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
MesXslEquipmentCategory 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 (mesXslEquipmentCategoryService.isCategoryNameDuplicated(name, null, row)) {
return Result.error("文件导入失败：第 " + rowNo + " 条类别名称【" + name + "】已存在（未删除数据中不允许重复）");
}
String opCode = row.getImportOperationCode();
if (opCode != null) {
opCode = opCode.trim();
}
if (oConvertUtils.isEmpty(opCode)) {
return Result.error("文件导入失败：第 " + rowNo + " 条工序编码不能为空");
}
MesXslProcessOperation op = findProcessByOperationCode(opCode, row);
if (op == null) {
return Result.error("文件导入失败：第 " + rowNo + " 条工序编码【" + opCode + "】不存在或未删除数据中无匹配");
}
row.setProcessOperationId(op.getId());
row.setProcessOperationName(op.getOperationName());
row.setImportOperationCode(null);
String ins = row.getInspectDistinct();
if (ins != null) {
ins = ins.trim();
}
if (oConvertUtils.isEmpty(ins) || !INSPECT_DISTINCT.contains(ins)) {
return Result.error("文件导入失败：第 " + rowNo + " 条点检区分须为字典项值 generic 或 distinct");
}
row.setInspectDistinct(ins);
String mtn = row.getMaintainDistinct();
if (mtn != null) {
mtn = mtn.trim();
}
if (oConvertUtils.isEmpty(mtn) || !MAINTAIN_DISTINCT.contains(mtn)) {
return Result.error("文件导入失败：第 " + rowNo + " 条保养区分须为字典项值 maintain 或 distinct");
}
row.setMaintainDistinct(mtn);
}
long start = System.currentTimeMillis();
mesXslEquipmentCategoryService.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:20260514 for：【MES】设备类别导入：名称唯一、工序编码解析、字典取值校验-----------
return Result.error("文件导入失败！");
}
//update-begin---author:jiangxh ---date:20260514 for：【MES】设备类别保存前校验与工序名称回填-----------
private String validateForSave(MesXslEquipmentCategory model, String excludeId) {
if (oConvertUtils.isEmpty(model.getCategoryName()) || model.getCategoryName().trim().isEmpty()) {
return "类别名称不能为空";
}
String cn = model.getCategoryName().trim();
model.setCategoryName(cn);
if (mesXslEquipmentCategoryService.isCategoryNameDuplicated(cn, excludeId, model)) {
return "类别名称已存在";
}
if (oConvertUtils.isEmpty(model.getProcessOperationId())) {
return "请选择所属工序";
}
MesXslProcessOperation op = mesXslProcessOperationService.getById(model.getProcessOperationId());
if (op == null) {
return "所属工序不存在";
}
model.setProcessOperationName(op.getOperationName());
String ins = model.getInspectDistinct();
if (ins != null) {
ins = ins.trim();
}
if (oConvertUtils.isEmpty(ins) || !INSPECT_DISTINCT.contains(ins)) {
return "点检区分不合法（须为字典项值 generic 或 distinct）";
}
model.setInspectDistinct(ins);
String mtn = model.getMaintainDistinct();
if (mtn != null) {
mtn = mtn.trim();
}
if (oConvertUtils.isEmpty(mtn) || !MAINTAIN_DISTINCT.contains(mtn)) {
return "保养区分不合法（须为字典项值 maintain 或 distinct）";
}
model.setMaintainDistinct(mtn);
model.setImportOperationCode(null);
return null;
}
private MesXslProcessOperation findProcessByOperationCode(String operationCode, MesXslEquipmentCategory context) {
LambdaQueryWrapper<MesXslProcessOperation> w = new LambdaQueryWrapper<>();
w.eq(MesXslProcessOperation::getOperationCode, operationCode.trim());
w.and(
q ->
q.eq(MesXslProcessOperation::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesXslProcessOperation::getDelFlag));
Integer tenantId = context != null ? context.getTenantId() : null;
if (tenantId != null) {
w.eq(MesXslProcessOperation::getTenantId, tenantId);
}
List<MesXslProcessOperation> found = mesXslProcessOperationService.list(w);
if (found == null || found.isEmpty()) {
return null;
}
return found.get(0);
}
//update-end---author:jiangxh ---date:20260514 for：【MES】设备类别保存前校验与工序名称回填-----------
}

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

@@ -0,0 +1,71 @@
package org.jeecg.modules.xslmes.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
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_equipment_category）
*/
@Data
@TableName("mes_xsl_equipment_category")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES设备类别")
public class MesXslEquipmentCategory implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "类别名称", width = 22)
@Schema(description = "设备类别名称（同租户未删除数据中唯一）")
private String categoryName;
@Schema(description = "所属工序主键")
private String processOperationId;
@Excel(name = "工序名称", width = 24)
@Schema(description = "工序名称冗余，用于列表与导出展示")
private String processOperationName;
@Excel(name = "点检区分", width = 14, dicCode = "xslmes_equipment_inspect_distinct")
@Dict(dicCode = "xslmes_equipment_inspect_distinct")
@Schema(description = "点检区分（字典 xslmes_equipment_inspect_distinct）")
private String inspectDistinct;
@Excel(name = "保养区分", width = 14, dicCode = "xslmes_equipment_maintain_distinct")
@Dict(dicCode = "xslmes_equipment_maintain_distinct")
@Schema(description = "保养区分（字典 xslmes_equipment_maintain_distinct）")
private String maintainDistinct;
/** Excel 导入用：工序编码，不落库 */
@TableField(exist = false)
@Excel(name = "工序编码", width = 18)
@Schema(description = "导入用工序编码（仅导入模板）")
private String importOperationCode;
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;
}

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

@@ -0,0 +1,11 @@
package org.jeecg.modules.xslmes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory;
/**
* MES 设备类别 Mapper
*/
@Mapper
public interface MesXslEquipmentCategoryMapper extends BaseMapper<MesXslEquipmentCategory> {}

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.MesXslCustomer}）、工序管理（{@link org.jeecg.modules.xslmes.entity.MesXslProcessOperation}）、设备类别（{@link org.jeecg.modules.xslmes.entity.MesXslEquipmentCategory}）等。
*/
package org.jeecg.modules.xslmes;

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

63
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentCategoryServiceImpl.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.MesXslEquipmentCategory;
import org.jeecg.modules.xslmes.mapper.MesXslEquipmentCategoryMapper;
import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
import org.springframework.stereotype.Service;
@Service
public class MesXslEquipmentCategoryServiceImpl extends ServiceImpl<MesXslEquipmentCategoryMapper, MesXslEquipmentCategory>
implements IMesXslEquipmentCategoryService {
//update-begin---author:jiangxh ---date:20260514 for：【MES】设备类别名称同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
@Override
public boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslEquipmentCategory context) {
if (oConvertUtils.isEmpty(categoryName)) {
return false;
}
Integer tenantId = resolveTenantId(context);
LambdaQueryWrapper<MesXslEquipmentCategory> w = new LambdaQueryWrapper<>();
w.eq(MesXslEquipmentCategory::getCategoryName, categoryName.trim());
w.and(
q ->
q.eq(MesXslEquipmentCategory::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesXslEquipmentCategory::getDelFlag));
if (oConvertUtils.isNotEmpty(excludeId)) {
w.ne(MesXslEquipmentCategory::getId, excludeId);
}
if (tenantId != null) {
w.eq(MesXslEquipmentCategory::getTenantId, tenantId);
}
return this.count(w) > 0;
}
private static Integer resolveTenantId(MesXslEquipmentCategory 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:20260514 for：【MES】设备类别名称同租户唯一；仅统计未删除（del_flag=0 或 null）-----------
}