点检及保养项目新增

This commit is contained in:
2026-05-19 15:20:51 +08:00
parent d57cb6cb8c
commit 9fe1da209d
15 changed files with 1566 additions and 1 deletions

View File

@@ -0,0 +1,301 @@
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.util.Arrays;
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.MesXslEquipmentPart;
import org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart;
import org.jeecg.modules.xslmes.entity.MesXslEquipmentType;
import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
import org.jeecg.modules.xslmes.service.IMesXslEquipmentCategoryService;
import org.jeecg.modules.xslmes.service.IMesXslEquipmentPartService;
import org.jeecg.modules.xslmes.service.IMesXslEquipmentSubPartService;
import org.jeecg.modules.xslmes.service.IMesXslEquipmentTypeService;
import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
/**
* MES 点检及保养项目
*/
@Tag(name = "MES点检及保养项目")
@RestController
@RequestMapping("/xslmes/mesXslInspectMaintainItem")
@Slf4j
public class MesXslInspectMaintainItemController
extends JeecgController<MesXslInspectMaintainItem, IMesXslInspectMaintainItemService> {
private static final Set<String> ITEM_CATEGORY = Set.of("inspect", "maintain");
private static final Set<String> ITEM_TYPE = Set.of("mechanical", "electrical");
private static final Set<String> INSPECT_METHOD = Set.of("visual", "sight", "hearing");
@Autowired
private IMesXslInspectMaintainItemService mesXslInspectMaintainItemService;
@Autowired
private IMesXslEquipmentCategoryService mesXslEquipmentCategoryService;
@Autowired
private IMesXslEquipmentTypeService mesXslEquipmentTypeService;
@Autowired
private IMesXslEquipmentPartService mesXslEquipmentPartService;
@Autowired
private IMesXslEquipmentSubPartService mesXslEquipmentSubPartService;
@Operation(summary = "MES点检及保养项目-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<MesXslInspectMaintainItem>> queryPageList(
MesXslInspectMaintainItem model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<MesXslInspectMaintainItem> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<MesXslInspectMaintainItem> page = new Page<>(pageNo, pageSize);
IPage<MesXslInspectMaintainItem> pageList = mesXslInspectMaintainItemService.page(page, queryWrapper);
return Result.OK(pageList);
}
@AutoLog(value = "MES点检及保养项目-添加")
@Operation(summary = "MES点检及保养项目-添加")
@RequiresPermissions("mes:mes_xsl_inspect_maintain_item:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesXslInspectMaintainItem model) {
//update-begin---author:jiangxh ---date:20260519 for【MES】点检及保养项目保存前校验-----------
String err = validateForSave(model, null);
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260519 for【MES】点检及保养项目保存前校验-----------
mesXslInspectMaintainItemService.save(model);
return Result.OK("添加成功!");
}
@AutoLog(value = "MES点检及保养项目-编辑")
@Operation(summary = "MES点检及保养项目-编辑")
@RequiresPermissions("mes:mes_xsl_inspect_maintain_item:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesXslInspectMaintainItem model) {
//update-begin---author:jiangxh ---date:20260519 for【MES】点检及保养项目保存前校验-----------
String err = validateForSave(model, model.getId());
if (err != null) {
return Result.error(err);
}
//update-end---author:jiangxh ---date:20260519 for【MES】点检及保养项目保存前校验-----------
mesXslInspectMaintainItemService.updateById(model);
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES点检及保养项目-删除")
@Operation(summary = "MES点检及保养项目-通过id删除")
@RequiresPermissions("mes:mes_xsl_inspect_maintain_item:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
mesXslInspectMaintainItemService.removeById(id);
return Result.OK("删除成功!");
}
@AutoLog(value = "MES点检及保养项目-批量删除")
@Operation(summary = "MES点检及保养项目-批量删除")
@RequiresPermissions("mes:mes_xsl_inspect_maintain_item:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
mesXslInspectMaintainItemService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@Operation(summary = "MES点检及保养项目-通过id查询")
@GetMapping(value = "/queryById")
public Result<MesXslInspectMaintainItem> queryById(@RequestParam(name = "id", required = true) String id) {
MesXslInspectMaintainItem entity = mesXslInspectMaintainItemService.getById(id);
if (entity == null) {
return Result.error("未找到对应数据");
}
return Result.OK(entity);
}
@Operation(summary = "校验项目名称是否重复同租户未删除数据dataId 为编辑时当前主键)")
@GetMapping(value = "/checkItemName")
public Result<String> checkItemName(
@RequestParam(name = "itemName", required = true) String itemName,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(itemName) || itemName.trim().isEmpty()) {
return Result.OK("该值可用!");
}
MesXslInspectMaintainItem ctx = new MesXslInspectMaintainItem();
if (mesXslInspectMaintainItemService.isItemNameDuplicated(itemName.trim(), dataId, ctx)) {
return Result.error("项目名称不能重复");
}
return Result.OK("该值可用!");
}
@Operation(summary = "校验项目编号是否重复同租户未删除数据dataId 为编辑时当前主键)")
@GetMapping(value = "/checkItemCode")
public Result<String> checkItemCode(
@RequestParam(name = "itemCode", required = true) String itemCode,
@RequestParam(name = "dataId", required = false) String dataId) {
if (oConvertUtils.isEmpty(itemCode) || itemCode.trim().isEmpty()) {
return Result.OK("该值可用!");
}
MesXslInspectMaintainItem ctx = new MesXslInspectMaintainItem();
if (mesXslInspectMaintainItemService.isItemCodeDuplicated(itemCode.trim(), dataId, ctx)) {
return Result.error("项目编号不能重复");
}
return Result.OK("该值可用!");
}
@RequiresPermissions("mes:mes_xsl_inspect_maintain_item:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesXslInspectMaintainItem model) {
return super.exportXls(request, model, MesXslInspectMaintainItem.class, "MES点检及保养项目");
}
@RequiresPermissions("mes:mes_xsl_inspect_maintain_item:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesXslInspectMaintainItem.class);
}
//update-begin---author:jiangxh ---date:20260519 for【MES】点检及保养项目保存校验唯一性、设备关联、字典-----------
private String validateForSave(MesXslInspectMaintainItem model, String excludeId) {
if (model == null) {
return "参数不能为空";
}
String itemName = model.getItemName();
if (itemName != null) {
itemName = itemName.trim();
}
if (oConvertUtils.isEmpty(itemName)) {
return "项目名称不能为空";
}
model.setItemName(itemName);
String itemCode = model.getItemCode();
if (itemCode != null) {
itemCode = itemCode.trim();
}
if (oConvertUtils.isEmpty(itemCode)) {
return "项目编号不能为空";
}
model.setItemCode(itemCode);
if (mesXslInspectMaintainItemService.isItemNameDuplicated(itemName, excludeId, model)) {
return "项目名称不能重复";
}
if (mesXslInspectMaintainItemService.isItemCodeDuplicated(itemCode, excludeId, model)) {
return "项目编号不能重复";
}
if (oConvertUtils.isEmpty(model.getEquipmentCategoryId())) {
return "请选择设备类别";
}
if (oConvertUtils.isEmpty(model.getEquipmentTypeId())) {
return "请选择设备类型";
}
if (oConvertUtils.isEmpty(model.getEquipmentPartId())) {
return "请选择设备部位";
}
if (oConvertUtils.isEmpty(model.getEquipmentSubPartId())) {
return "请选择设备小部位";
}
MesXslEquipmentCategory cat = mesXslEquipmentCategoryService.getById(model.getEquipmentCategoryId());
if (cat == null || isDeleted(cat.getDelFlag())) {
return "设备类别不存在或已删除";
}
model.setEquipmentCategoryName(cat.getCategoryName());
MesXslEquipmentType type = mesXslEquipmentTypeService.getById(model.getEquipmentTypeId());
if (type == null || isDeleted(type.getDelFlag())) {
return "设备类型不存在或已删除";
}
if (!model.getEquipmentCategoryId().equals(type.getEquipmentCategoryId())) {
return "设备类型与所选设备类别不匹配";
}
model.setEquipmentTypeName(type.getTypeName());
MesXslEquipmentPart part = mesXslEquipmentPartService.getById(model.getEquipmentPartId());
if (part == null || isDeleted(part.getDelFlag())) {
return "设备部位不存在或已删除";
}
if (!model.getEquipmentCategoryId().equals(part.getEquipmentCategoryId())) {
return "设备部位与所选设备类别不匹配";
}
model.setEquipmentPartName(part.getPartName());
MesXslEquipmentSubPart sub = mesXslEquipmentSubPartService.getById(model.getEquipmentSubPartId());
if (sub == null || isDeleted(sub.getDelFlag())) {
return "设备小部位不存在或已删除";
}
if (!model.getEquipmentCategoryId().equals(sub.getEquipmentCategoryId())) {
return "设备小部位与所选设备类别不匹配";
}
if (!model.getEquipmentPartId().equals(sub.getEquipmentPartId())) {
return "设备小部位与所选设备部位不匹配";
}
model.setEquipmentSubPartName(sub.getSubPartName());
String itemCategory = model.getItemCategory();
if (itemCategory != null) {
itemCategory = itemCategory.trim();
}
if (oConvertUtils.isEmpty(itemCategory) || !ITEM_CATEGORY.contains(itemCategory)) {
return "项目类别无效,请选择点检或保养";
}
model.setItemCategory(itemCategory);
String itemType = model.getItemType();
if (itemType != null) {
itemType = itemType.trim();
}
if (oConvertUtils.isEmpty(itemType) || !ITEM_TYPE.contains(itemType)) {
return "项目类型无效,请选择机械类或电气类";
}
model.setItemType(itemType);
String inspectMethod = model.getInspectMethod();
if (inspectMethod != null) {
inspectMethod = inspectMethod.trim();
}
if (oConvertUtils.isEmpty(inspectMethod) || !INSPECT_METHOD.contains(inspectMethod)) {
return "点检方式无效,请选择视觉、目测或听觉";
}
model.setInspectMethod(inspectMethod);
if (model.getJudgmentCriteria() != null) {
model.setJudgmentCriteria(model.getJudgmentCriteria().trim());
}
if (oConvertUtils.isEmpty(model.getJudgmentCriteria())) {
return "判断基准不能为空";
}
if (model.getMaintainCycleDays() != null && model.getMaintainCycleDays() < 0) {
return "保养周期(天)不能为负数";
}
return null;
}
private static boolean isDeleted(Integer delFlag) {
return delFlag != null && delFlag.equals(CommonConstant.DEL_FLAG_1);
}
//update-end---author:jiangxh ---date:20260519 for【MES】点检及保养项目保存校验唯一性、设备关联、字典-----------
}

View File

@@ -0,0 +1,102 @@
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_inspect_maintain_item
*/
@Data
@TableName("mes_xsl_inspect_maintain_item")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES点检及保养项目")
public class MesXslInspectMaintainItem implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String id;
@Excel(name = "项目名称", width = 22)
@Schema(description = "项目名称(同租户未删除数据中唯一)")
private String itemName;
@Excel(name = "项目编号", width = 18)
@Schema(description = "项目编号(同租户未删除数据中唯一)")
private String itemCode;
@Schema(description = "设备类别主键 mes_xsl_equipment_category.id")
private String equipmentCategoryId;
@Excel(name = "设备类别", width = 20)
@Schema(description = "设备类别名称冗余")
private String equipmentCategoryName;
@Schema(description = "设备类型主键 mes_xsl_equipment_type.id")
private String equipmentTypeId;
@Excel(name = "设备类型", width = 20)
@Schema(description = "设备类型名称冗余")
private String equipmentTypeName;
@Schema(description = "设备部位主键 mes_xsl_equipment_part.id")
private String equipmentPartId;
@Excel(name = "设备部位", width = 20)
@Schema(description = "设备部位名称冗余")
private String equipmentPartName;
@Schema(description = "设备小部位主键 mes_xsl_equipment_sub_part.id")
private String equipmentSubPartId;
@Excel(name = "设备小部位", width = 20)
@Schema(description = "设备小部位名称冗余")
private String equipmentSubPartName;
@Excel(name = "项目类别", width = 12, dicCode = "xslmes_im_item_category")
@Dict(dicCode = "xslmes_im_item_category")
@Schema(description = "项目类别字典xslmes_im_item_categoryinspect点检/maintain保养")
private String itemCategory;
@Excel(name = "项目类型", width = 12, dicCode = "xslmes_im_item_type")
@Dict(dicCode = "xslmes_im_item_type")
@Schema(description = "项目类型字典xslmes_im_item_typemechanical机械类/electrical电气类")
private String itemType;
@Excel(name = "点检方式", width = 12, dicCode = "xslmes_im_inspect_method")
@Dict(dicCode = "xslmes_im_inspect_method")
@Schema(description = "点检方式字典xslmes_im_inspect_methodvisual视觉/sight目测/hearing听觉")
private String inspectMethod;
@Excel(name = "判断基准", width = 28)
@Schema(description = "判断基准")
private String judgmentCriteria;
@Excel(name = "保养周期(天)", width = 14)
@Schema(description = "保养周期(天)")
private Integer maintainCycleDays;
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;
}

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.MesXslInspectMaintainItem;
/**
* MES 点检及保养项目
*/
public interface MesXslInspectMaintainItemMapper extends BaseMapper<MesXslInspectMaintainItem> {}

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.MesXslEquipmentLedger})、设备部位({@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})、停机主类型({@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType})、停机类型({@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType})等。
* 包含:客户管理({@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.MesXslEquipmentLedger})、设备部位({@link org.jeecg.modules.xslmes.entity.MesXslEquipmentPart})、设备小部位({@link org.jeecg.modules.xslmes.entity.MesXslEquipmentSubPart})、点检及保养项目({@link org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem})、备品件类别({@link org.jeecg.modules.xslmes.entity.MesXslSparePartsCategory})、备品件信息({@link org.jeecg.modules.xslmes.entity.MesXslSparePart})、厂家信息({@link org.jeecg.modules.xslmes.entity.MesXslManufacturer})、停机主类型({@link org.jeecg.modules.xslmes.entity.MesXslDowntimeMainType})、停机类型({@link org.jeecg.modules.xslmes.entity.MesXslDowntimeType})等。
*/
package org.jeecg.modules.xslmes;

View File

@@ -0,0 +1,14 @@
package org.jeecg.modules.xslmes.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.xslmes.entity.MesXslInspectMaintainItem;
/**
* MES 点检及保养项目
*/
public interface IMesXslInspectMaintainItemService extends IService<MesXslInspectMaintainItem> {
boolean isItemNameDuplicated(String itemName, String excludeId, MesXslInspectMaintainItem context);
boolean isItemCodeDuplicated(String itemCode, String excludeId, MesXslInspectMaintainItem context);
}

View File

@@ -0,0 +1,78 @@
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.MesXslInspectMaintainItem;
import org.jeecg.modules.xslmes.mapper.MesXslInspectMaintainItemMapper;
import org.jeecg.modules.xslmes.service.IMesXslInspectMaintainItemService;
import org.springframework.stereotype.Service;
@Service
public class MesXslInspectMaintainItemServiceImpl
extends ServiceImpl<MesXslInspectMaintainItemMapper, MesXslInspectMaintainItem>
implements IMesXslInspectMaintainItemService {
//update-begin---author:jiangxh ---date:20260519 for【MES】点检及保养项目项目名称/编号同租户不可重复-----------
@Override
public boolean isItemNameDuplicated(String itemName, String excludeId, MesXslInspectMaintainItem context) {
return isFieldDuplicated(MesXslInspectMaintainItem::getItemName, itemName, excludeId, context);
}
@Override
public boolean isItemCodeDuplicated(String itemCode, String excludeId, MesXslInspectMaintainItem context) {
return isFieldDuplicated(MesXslInspectMaintainItem::getItemCode, itemCode, excludeId, context);
}
private boolean isFieldDuplicated(
com.baomidou.mybatisplus.core.toolkit.support.SFunction<MesXslInspectMaintainItem, String> column,
String value,
String excludeId,
MesXslInspectMaintainItem context) {
if (oConvertUtils.isEmpty(value)) {
return false;
}
Integer tenantId = resolveTenantId(context);
LambdaQueryWrapper<MesXslInspectMaintainItem> w = new LambdaQueryWrapper<>();
w.eq(column, value.trim());
w.and(
q ->
q.eq(MesXslInspectMaintainItem::getDelFlag, CommonConstant.DEL_FLAG_0)
.or()
.isNull(MesXslInspectMaintainItem::getDelFlag));
if (oConvertUtils.isNotEmpty(excludeId)) {
w.ne(MesXslInspectMaintainItem::getId, excludeId);
}
if (tenantId != null) {
w.eq(MesXslInspectMaintainItem::getTenantId, tenantId);
}
return this.count(w) > 0;
}
private static Integer resolveTenantId(MesXslInspectMaintainItem 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) {
// ignore
}
}
if (oConvertUtils.isEmpty(ts)) {
return null;
}
try {
return Integer.parseInt(ts);
} catch (NumberFormatException e) {
return null;
}
}
//update-end---author:jiangxh ---date:20260519 for【MES】点检及保养项目项目名称/编号同租户不可重复-----------
}