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 10:35:54 +08:00
parent 965bdf44db
commit 31de1a0968
17 changed files with 1107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,293 @@
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.MesXslEquipmentType;
import org.jeecg.modules.xslmes.entity.MesXslProcessOperation;
import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
import org.jeecg.modules.xslmes.service.IMesXslEquipmentTypeService;
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/mesXslEquipmentType")
@Slf4j
public class MesXslEquipmentTypeController extends JeecgController<MesXslEquipmentType, IMesXslEquipmentTypeService> {
@Autowired
private IMesXslEquipmentTypeService mesXslEquipmentTypeService;
@Autowired
private IMesXslProcessOperationService mesXslProcessOperationService;
@Autowired
private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
@Operation(summary = "MES设备类型-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslEquipmentType>> queryPageList(
MesXslEquipmentType model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesXslEquipmentType> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
Page<MesXslEquipmentType> page = new Page<>(pageNo, pageSize);
IPage<MesXslEquipmentType> pageList = mesXslEquipmentTypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES设备类型-添加")
@Operation(summary = "MES设备类型-添加")
@RequiresPermissions("mes:mes_xsl_equipment_type:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesXslEquipmentType 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】设备类型：名称唯一、工序与设备类别校验、冗余名称-----------
mesXslEquipmentTypeService.save(model);
return Result.OK("添加成功！");
}
@AutoLog(value = "MES设备类型-编辑")
@Operation(summary = "MES设备类型-编辑")
@RequiresPermissions("mes:mes_xsl_equipment_type:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesXslEquipmentType 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】设备类型：名称唯一、工序与设备类别校验、冗余名称-----------
mesXslEquipmentTypeService.updateById(model);
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES设备类型-删除")
@Operation(summary = "MES设备类型-通过id删除")
@RequiresPermissions("mes:mes_xsl_equipment_type:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
mesXslEquipmentTypeService.removeById(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES设备类型-批量删除")
@Operation(summary = "MES设备类型-批量删除")
@RequiresPermissions("mes:mes_xsl_equipment_type:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
mesXslEquipmentTypeService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@Operation(summary = "MES设备类型-通过id查询")
@GetMapping(value = "/queryById")
public Result<MesXslEquipmentType> queryById(@RequestParam(name = "id", required = true) String id) {
MesXslEquipmentType entity = mesXslEquipmentTypeService.getById(id);
if (entity == null) {
return Result.error("未找到对应数据");
}
return Result.OK(entity);
}
@Operation(summary = "校验设备类型名称是否重复（仅未删除数据；同租户，dataId 为编辑时当前主键）")
@GetMapping(value = "/checkTypeName")
public Result<String> checkTypeName(
@RequestParam(name = "typeName", required = true) String typeName,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(typeName) || typeName.trim().isEmpty()) {
return Result.OK("该值可用！");
}
MesXslEquipmentType ctx = new MesXslEquipmentType();
if (mesXslEquipmentTypeService.isTypeNameDuplicated(typeName.trim(), dataId, ctx)) {
return Result.error("该类型名称已存在");
}
return Result.OK("该值可用！");
}
@RequiresPermissions("mes:mes_xsl_equipment_type:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesXslEquipmentType model) {
return super.exportXls(request, model, MesXslEquipmentType.class, "MES设备类型");
}
@RequiresPermissions("mes:mes_xsl_equipment_type: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<MesXslEquipmentType> list = ExcelImportUtil.importExcel(file.getInputStream(), MesXslEquipmentType.class, params);
if (list == null) {
list = List.of();
}
Set<String> namesInFile = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
MesXslEquipmentType row = list.get(i);
int rowNo = i + 1;
if (row == null) {
return Result.error("文件导入失败：第 " + rowNo + " 条数据无效（空行）");
}
String tn = row.getTypeName();
if (tn != null) {
tn = tn.trim();
}
if (oConvertUtils.isEmpty(tn)) {
return Result.error("文件导入失败：第 " + rowNo + " 条类型名称不能为空");
}
row.setTypeName(tn);
if (!namesInFile.add(tn)) {
return Result.error("文件导入失败：类型名称【" + tn + "】在导入文件中重复");
}
if (mesXslEquipmentTypeService.isTypeNameDuplicated(tn, null, row)) {
return Result.error("文件导入失败：第 " + rowNo + " 条类型名称【" + tn + "】已存在（未删除数据中不允许重复）");
}
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 catName = row.getImportCategoryName();
if (catName != null) {
catName = catName.trim();
}
if (oConvertUtils.isEmpty(catName)) {
return Result.error("文件导入失败：第 " + rowNo + " 条设备类别名称不能为空");
}
MesXslEquipmentCategory cat =
mesXslEquipmentCategoryService.findOneActiveByNameAndTenant(catName, row.getTenantId());
if (cat == null) {
return Result.error("文件导入失败：第 " + rowNo + " 条设备类别名称【" + catName + "】不存在或未删除数据中无匹配");
}
row.setEquipmentCategoryId(cat.getId());
row.setEquipmentCategoryName(cat.getCategoryName());
row.setImportCategoryName(null);
}
long start = System.currentTimeMillis();
mesXslEquipmentTypeService.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(MesXslEquipmentType model, String excludeId) {
if (oConvertUtils.isEmpty(model.getTypeName()) || model.getTypeName().trim().isEmpty()) {
return "类型名称不能为空";
}
String tn = model.getTypeName().trim();
model.setTypeName(tn);
if (mesXslEquipmentTypeService.isTypeNameDuplicated(tn, excludeId, model)) {
return "类型名称已存在";
}
if (oConvertUtils.isEmpty(model.getProcessOperationId())) {
return "请选择所属工序";
}
MesXslProcessOperation op = mesXslProcessOperationService.getById(model.getProcessOperationId());
if (op == null) {
return "所属工序不存在";
}
model.setProcessOperationName(op.getOperationName());
if (oConvertUtils.isEmpty(model.getEquipmentCategoryId())) {
return "请选择所属设备类别";
}
MesXslEquipmentCategory cat = mesXslEquipmentCategoryService.getById(model.getEquipmentCategoryId());
if (cat == null) {
return "所属设备类别不存在";
}
model.setEquipmentCategoryName(cat.getCategoryName());
model.setImportOperationCode(null);
model.setImportCategoryName(null);
return null;
}
private MesXslProcessOperation findProcessByOperationCode(String operationCode, MesXslEquipmentType 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】设备类型保存前校验与工序、类别名称回填-----------
}

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

@@ -0,0 +1,73 @@
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.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
/**
* MES 设备类型（表 mes_xsl_equipment_type）
*/
@Data
@TableName("mes_xsl_equipment_type")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES设备类型")
public class MesXslEquipmentType implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "类型名称", width = 22)
@Schema(description = "设备类型名称（同租户未删除数据中唯一）")
private String typeName;
@Schema(description = "所属工序主键")
private String processOperationId;
@Excel(name = "工序名称", width = 24)
@Schema(description = "工序名称冗余展示")
private String processOperationName;
@Schema(description = "所属设备类别主键")
private String equipmentCategoryId;
@Excel(name = "类别名称", width = 22)
@Schema(description = "设备类别名称冗余展示")
private String equipmentCategoryName;
/** Excel 导入用：工序编码，不落库 */
@TableField(exist = false)
@Excel(name = "工序编码", width = 18)
@Schema(description = "导入用工序编码")
private String importOperationCode;
/** Excel 导入用：设备类别名称（与设备类别维护中名称一致），不落库 */
@TableField(exist = false)
@Excel(name = "设备类别名称", width = 22)
@Schema(description = "导入用设备类别名称")
private String importCategoryName;
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/MesXslEquipmentTypeMapper.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.MesXslEquipmentType;
/**
* MES 设备类型 Mapper
*/
@Mapper
public interface MesXslEquipmentTypeMapper extends BaseMapper<MesXslEquipmentType> {}

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

8
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslEquipmentCategoryService.java
View File

@@ -13,4 +13,12 @@ public interface IMesXslEquipmentCategoryService extends IService<MesXslEquipmen
* @param context 当前提交的实体（可取 tenantId；可为 null）
*/
boolean isCategoryNameDuplicated(String categoryName, String excludeId, MesXslEquipmentCategory context);
/**
* 按类别名称在未删除数据中查询一条（同租户；名称需 trim 后传入）。用于设备类型关联类别解析等。
*
* @param categoryName 类别名称
* @param tenantId 租户 ID，可为 null（不按租户过滤）
*/
MesXslEquipmentCategory findOneActiveByNameAndTenant(String categoryName, Integer tenantId);
}

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

21
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslEquipmentCategoryServiceImpl.java
View File

@@ -39,6 +39,27 @@ public class MesXslEquipmentCategoryServiceImpl extends ServiceImpl<MesXslEquipm
return this.count(w) > 0;
}
//update-begin---author:jiangxh ---date:20260514 for：【MES】设备类型按类别名称解析关联，提供未删除单条查询-----------
@Override
public MesXslEquipmentCategory findOneActiveByNameAndTenant(String categoryName, Integer tenantId) {
if (oConvertUtils.isEmpty(categoryName)) {
return null;
}
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 (tenantId != null) {
w.eq(MesXslEquipmentCategory::getTenantId, tenantId);
}
w.last("LIMIT 1");
return this.getOne(w, false);
}
//update-end---author:jiangxh ---date:20260514 for：【MES】设备类型按类别名称解析关联，提供未删除单条查询-----------
private static Integer resolveTenantId(MesXslEquipmentCategory context) {
if (context != null && context.getTenantId() != null) {
return context.getTenantId();

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