diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdVulcAlarmItemsController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdVulcAlarmItemsController.java new file mode 100644 index 0000000..973a375 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdVulcAlarmItemsController.java @@ -0,0 +1,116 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.ProdVulcAlarmItemsVo; +import org.dromara.mes.domain.bo.ProdVulcAlarmItemsBo; +import org.dromara.mes.service.IProdVulcAlarmItemsService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 报警项目信息 + * 前端访问路由地址为:/mes/vulcAlarmItems + * + * @author Yinq + * @date 2025-07-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/vulcAlarmItems") +public class ProdVulcAlarmItemsController extends BaseController { + + private final IProdVulcAlarmItemsService prodVulcAlarmItemsService; + + /** + * 查询报警项目信息列表 + */ + @SaCheckPermission("mes:vulcAlarmItems:list") + @GetMapping("/list") + public TableDataInfo list(ProdVulcAlarmItemsBo bo, PageQuery pageQuery) { + return prodVulcAlarmItemsService.queryPageList(bo, pageQuery); + } + + /** + * 导出报警项目信息列表 + */ + @SaCheckPermission("mes:vulcAlarmItems:export") + @Log(title = "报警项目信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdVulcAlarmItemsBo bo, HttpServletResponse response) { + List list = prodVulcAlarmItemsService.queryList(bo); + ExcelUtil.exportExcel(list, "报警项目信息", ProdVulcAlarmItemsVo.class, response); + } + + /** + * 获取报警项目信息详细信息 + * + * @param alarmItemsId 主键 + */ + @SaCheckPermission("mes:vulcAlarmItems:query") + @GetMapping("/{alarmItemsId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long alarmItemsId) { + return R.ok(prodVulcAlarmItemsService.queryById(alarmItemsId)); + } + + /** + * 新增报警项目信息 + */ + @SaCheckPermission("mes:vulcAlarmItems:add") + @Log(title = "报警项目信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdVulcAlarmItemsBo bo) { + return toAjax(prodVulcAlarmItemsService.insertByBo(bo)); + } + + /** + * 修改报警项目信息 + */ + @SaCheckPermission("mes:vulcAlarmItems:edit") + @Log(title = "报警项目信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdVulcAlarmItemsBo bo) { + return toAjax(prodVulcAlarmItemsService.updateByBo(bo)); + } + + /** + * 删除报警项目信息 + * + * @param alarmItemsIds 主键串 + */ + @SaCheckPermission("mes:vulcAlarmItems:remove") + @Log(title = "报警项目信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{alarmItemsIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] alarmItemsIds) { + return toAjax(prodVulcAlarmItemsService.deleteWithValidByIds(List.of(alarmItemsIds), true)); + } + + + /** + * 下拉框查询报警项目信息列表 + */ + @GetMapping("/getProdVulcAlarmItemsList") + public R> getProdVulcAlarmItemsList(ProdVulcAlarmItemsBo bo) { + List list = prodVulcAlarmItemsService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdVulcAlarmStandardController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdVulcAlarmStandardController.java new file mode 100644 index 0000000..55309c6 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdVulcAlarmStandardController.java @@ -0,0 +1,117 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.ProdVulcAlarmStandardVo; +import org.dromara.mes.domain.bo.ProdVulcAlarmStandardBo; +import org.dromara.mes.service.IProdVulcAlarmStandardService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 报警标准信息 + * 前端访问路由地址为:/mes/vulcAlarmStandard + * + * @author Yinq + * @date 2025-07-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/vulcAlarmStandard") +public class ProdVulcAlarmStandardController extends BaseController { + + private final IProdVulcAlarmStandardService prodVulcAlarmStandardService; + + /** + * 查询报警标准信息列表 + */ + @SaCheckPermission("mes:vulcAlarmStandard:list") + @GetMapping("/list") + public TableDataInfo list(ProdVulcAlarmStandardBo bo, PageQuery pageQuery) { + return prodVulcAlarmStandardService.queryPageList(bo, pageQuery); + } + + /** + * 导出报警标准信息列表 + */ + @SaCheckPermission("mes:vulcAlarmStandard:export") + @Log(title = "报警标准信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdVulcAlarmStandardBo bo, HttpServletResponse response) { + List list = prodVulcAlarmStandardService.queryList(bo); + ExcelUtil.exportExcel(list, "报警标准信息", ProdVulcAlarmStandardVo.class, response); + } + + /** + * 获取报警标准信息详细信息 + * + * @param alarmStandardId 主键 + */ + @SaCheckPermission("mes:vulcAlarmStandard:query") + @GetMapping("/{alarmStandardId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long alarmStandardId) { + return R.ok(prodVulcAlarmStandardService.queryById(alarmStandardId)); + } + + /** + * 新增报警标准信息 + */ + @SaCheckPermission("mes:vulcAlarmStandard:add") + @Log(title = "报警标准信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdVulcAlarmStandardBo bo) { + return toAjax(prodVulcAlarmStandardService.insertByBo(bo)); + } + + /** + * 修改报警标准信息 + */ + @SaCheckPermission("mes:vulcAlarmStandard:edit") + @Log(title = "报警标准信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdVulcAlarmStandardBo bo) { + return toAjax(prodVulcAlarmStandardService.updateByBo(bo)); + } + + /** + * 删除报警标准信息 + * + * @param alarmStandardIds 主键串 + */ + @SaCheckPermission("mes:vulcAlarmStandard:remove") + @Log(title = "报警标准信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{alarmStandardIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] alarmStandardIds) { + return toAjax(prodVulcAlarmStandardService.deleteWithValidByIds(List.of(alarmStandardIds), true)); + } + + + /** + * 下拉框查询报警标准信息列表 + */ + + @GetMapping("/getProdVulcAlarmStandardList") + public R> getProdVulcAlarmStandardList(ProdVulcAlarmStandardBo bo) { + List list = prodVulcAlarmStandardService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java index 5db0f02..e3cc134 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyStepInfo.java @@ -98,4 +98,16 @@ public class ProdTechnologyStepInfo extends TenantEntity { */ @TableLogic private String delFlag; + + /** + * 工序ID + */ + @TableField(exist = false) + private Long processId; + + /** + * 工艺名称 + */ + @TableField(exist = false) + private String technologyName; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmItems.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmItems.java new file mode 100644 index 0000000..fdd9b01 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmItems.java @@ -0,0 +1,62 @@ +package org.dromara.mes.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 报警项目信息对象 prod_vulc_alarm_items + * + * @author Yinq + * @date 2025-07-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_vulc_alarm_items") +public class ProdVulcAlarmItems extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 报警项目ID + */ + @TableId(value = "alarm_items_id", type = IdType.AUTO) + private Long alarmItemsId; + + /** + * 报警项目编号 + */ + private String alarmItemsCode; + + /** + * 报警项目名称 + */ + private String alarmItemsName; + + /** + * 报警类型 + */ + private String alarmType; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmStandard.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmStandard.java new file mode 100644 index 0000000..d761896 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdVulcAlarmStandard.java @@ -0,0 +1,105 @@ +package org.dromara.mes.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 报警标准信息对象 prod_vulc_alarm_standard + * + * @author Yinq + * @date 2025-07-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_vulc_alarm_standard") +public class ProdVulcAlarmStandard extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 报警项目ID + */ + @TableId(value = "alarm_standard_id", type = IdType.AUTO) + private Long alarmStandardId; + + /** + * 报警项目ID + */ + private Long alarmItemsId; + + /** + * 工艺步序ID + */ + private Long stepId; + + /** + * 开始时间(s) + */ + private Long startTime; + + /** + * 持续时间(s) + */ + private Long durationTime; + + /** + * 标准值(Mpa/℃) + */ + private Long standardValue; + + /** + * 最大值(Mpa/℃) + */ + private Long maxValue; + + /** + * 最小值(Mpa/℃) + */ + private Long minValue; + + /** + * 控制标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + /** + * 报警项目名称 + */ + @TableField(exist = false) + private String alarmItemsName; + + /** + * 工艺名称 + */ + @TableField(exist = false) + private String technologyName; + + /** + * 工艺步序编号 + */ + @TableField(exist = false) + private String stepCode; + + /** + * 工艺步序名称 + */ + @TableField(exist = false) + private String stepName; + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java index ed1355e..4e1d7e8 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyStepInfoBo.java @@ -96,5 +96,13 @@ public class ProdTechnologyStepInfoBo extends BaseEntity { */ private BigDecimal lowerLimit; + /** + * 工序ID + */ + private Long processId; + /** + * 工艺名称 + */ + private String technologyName; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmItemsBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmItemsBo.java new file mode 100644 index 0000000..df11c36 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmItemsBo.java @@ -0,0 +1,57 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdVulcAlarmItems; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 报警项目信息业务对象 prod_vulc_alarm_items + * + * @author Yinq + * @date 2025-07-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdVulcAlarmItems.class, reverseConvertGenerate = false) +public class ProdVulcAlarmItemsBo extends BaseEntity { + + /** + * 报警项目ID + */ + private Long alarmItemsId; + + /** + * 报警项目编号 + */ + @NotBlank(message = "报警项目编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String alarmItemsCode; + + /** + * 报警项目名称 + */ + @NotBlank(message = "报警项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String alarmItemsName; + + /** + * 报警类型 + */ + @NotBlank(message = "报警类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String alarmType; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java new file mode 100644 index 0000000..adab39c --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdVulcAlarmStandardBo.java @@ -0,0 +1,94 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdVulcAlarmStandard; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 报警标准信息业务对象 prod_vulc_alarm_standard + * + * @author Yinq + * @date 2025-07-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdVulcAlarmStandard.class, reverseConvertGenerate = false) +public class ProdVulcAlarmStandardBo extends BaseEntity { + + /** + * 报警项目ID + */ + private Long alarmStandardId; + + /** + * 报警项目ID + */ + @NotNull(message = "报警项目ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long alarmItemsId; + + /** + * 工艺步序ID + */ + @NotNull(message = "工艺步序ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long stepId; + + /** + * 工艺步序编号 + */ + private String stepCode; + + /** + * 开始时间(s) + */ + private Long startTime; + + /** + * 持续时间(s) + */ + private Long durationTime; + + /** + * 标准值(Mpa/℃) + */ + private Long standardValue; + + /** + * 最大值(Mpa/℃) + */ + private Long maxValue; + + /** + * 最小值(Mpa/℃) + */ + private Long minValue; + + /** + * 控制标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 报警项目名称 + */ + private String alarmItemsName; + + /** + * 工艺名称 + */ + private String technologyName; + + /** + * 工艺步序名称 + */ + private String stepName; +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java index 18de289..7ecbf9c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java @@ -1,6 +1,7 @@ package org.dromara.mes.domain.vo; import java.math.BigDecimal; + import org.dromara.mes.domain.ProdTechnologyStepInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -11,7 +12,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -116,5 +116,14 @@ public class ProdTechnologyStepInfoVo implements Serializable { @ExcelProperty(value = "阈值下限") private BigDecimal lowerLimit; + /** + * 工序ID + */ + private Long processId; + /** + * 工艺名称 + */ + @ExcelProperty(value = "工艺名称") + private String technologyName; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmItemsVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmItemsVo.java new file mode 100644 index 0000000..664462b --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmItemsVo.java @@ -0,0 +1,70 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdVulcAlarmItems; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 报警项目信息视图对象 prod_vulc_alarm_items + * + * @author Yinq + * @date 2025-07-17 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdVulcAlarmItems.class) +public class ProdVulcAlarmItemsVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 报警项目ID + */ + @ExcelProperty(value = "报警项目ID") + private Long alarmItemsId; + + /** + * 报警项目编号 + */ + @ExcelProperty(value = "报警项目编号") + private String alarmItemsCode; + + /** + * 报警项目名称 + */ + @ExcelProperty(value = "报警项目名称") + private String alarmItemsName; + + /** + * 报警类型 + */ + @ExcelProperty(value = "报警类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "vulc_alarm_type") + private String alarmType; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmStandardVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmStandardVo.java new file mode 100644 index 0000000..c26000e --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdVulcAlarmStandardVo.java @@ -0,0 +1,113 @@ +package org.dromara.mes.domain.vo; + + +import org.dromara.mes.domain.ProdVulcAlarmStandard; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 报警标准信息视图对象 prod_vulc_alarm_standard + * + * @author Yinq + * @date 2025-07-17 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdVulcAlarmStandard.class) +public class ProdVulcAlarmStandardVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 报警项目ID + */ + @ExcelProperty(value = "报警项目ID") + private Long alarmStandardId; + + /** + * 报警项目ID + */ + @ExcelProperty(value = "报警项目ID") + private Long alarmItemsId; + + /** + * 工艺步序ID + */ + @ExcelProperty(value = "工艺步序ID") + private Long stepId; + + /** + * 工艺步序编号 + */ + @ExcelProperty(value = "工艺步序编号") + private String stepCode; + + /** + * 开始时间(s) + */ + @ExcelProperty(value = "开始时间(s)") + private Long startTime; + + /** + * 持续时间(s) + */ + @ExcelProperty(value = "持续时间(s)") + private Long durationTime; + + /** + * 标准值(Mpa/℃) + */ + @ExcelProperty(value = "标准值(Mpa/℃)") + private Long standardValue; + + /** + * 最大值(Mpa/℃) + */ + @ExcelProperty(value = "最大值(Mpa/℃)") + private Long maxValue; + + /** + * 最小值(Mpa/℃) + */ + @ExcelProperty(value = "最小值(Mpa/℃)") + private Long minValue; + + /** + * 控制标识（1是 0否） + */ + @ExcelProperty(value = "控制标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 报警项目名称 + */ + private String alarmItemsName; + + /** + * 工艺名称 + */ + private String technologyName; + + /** + * 工艺步序名称 + */ + private String stepName; +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdVulcAlarmItemsMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdVulcAlarmItemsMapper.java new file mode 100644 index 0000000..05809f6 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdVulcAlarmItemsMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdVulcAlarmItems; +import org.dromara.mes.domain.vo.ProdVulcAlarmItemsVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 报警项目信息Mapper接口 + * + * @author Yinq + * @date 2025-07-17 + */ +public interface ProdVulcAlarmItemsMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdVulcAlarmStandardMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdVulcAlarmStandardMapper.java new file mode 100644 index 0000000..7dfea37 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdVulcAlarmStandardMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdVulcAlarmStandard; +import org.dromara.mes.domain.vo.ProdVulcAlarmStandardVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 报警标准信息Mapper接口 + * + * @author Yinq + * @date 2025-07-17 + */ +public interface ProdVulcAlarmStandardMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdVulcAlarmItemsService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdVulcAlarmItemsService.java new file mode 100644 index 0000000..4fa8a7b --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdVulcAlarmItemsService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdVulcAlarmItems; +import org.dromara.mes.domain.vo.ProdVulcAlarmItemsVo; +import org.dromara.mes.domain.bo.ProdVulcAlarmItemsBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 报警项目信息Service接口 + * + * @author Yinq + * @date 2025-07-17 + */ +public interface IProdVulcAlarmItemsService { + + /** + * 查询报警项目信息 + * + * @param alarmItemsId 主键 + * @return 报警项目信息 + */ + ProdVulcAlarmItemsVo queryById(Long alarmItemsId); + + /** + * 分页查询报警项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 报警项目信息分页列表 + */ + TableDataInfo queryPageList(ProdVulcAlarmItemsBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的报警项目信息列表 + * + * @param bo 查询条件 + * @return 报警项目信息列表 + */ + List queryList(ProdVulcAlarmItemsBo bo); + + /** + * 新增报警项目信息 + * + * @param bo 报警项目信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdVulcAlarmItemsBo bo); + + /** + * 修改报警项目信息 + * + * @param bo 报警项目信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdVulcAlarmItemsBo bo); + + /** + * 校验并批量删除报警项目信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdVulcAlarmStandardService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdVulcAlarmStandardService.java new file mode 100644 index 0000000..55c2eed --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdVulcAlarmStandardService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdVulcAlarmStandard; +import org.dromara.mes.domain.vo.ProdVulcAlarmStandardVo; +import org.dromara.mes.domain.bo.ProdVulcAlarmStandardBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 报警标准信息Service接口 + * + * @author Yinq + * @date 2025-07-17 + */ +public interface IProdVulcAlarmStandardService { + + /** + * 查询报警标准信息 + * + * @param alarmStandardId 主键 + * @return 报警标准信息 + */ + ProdVulcAlarmStandardVo queryById(Long alarmStandardId); + + /** + * 分页查询报警标准信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 报警标准信息分页列表 + */ + TableDataInfo queryPageList(ProdVulcAlarmStandardBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的报警标准信息列表 + * + * @param bo 查询条件 + * @return 报警标准信息列表 + */ + List queryList(ProdVulcAlarmStandardBo bo); + + /** + * 新增报警标准信息 + * + * @param bo 报警标准信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdVulcAlarmStandardBo bo); + + /** + * 修改报警标准信息 + * + * @param bo 报警标准信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdVulcAlarmStandardBo bo); + + /** + * 校验并批量删除报警标准信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java index 5de0395..e4ea184 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyStepInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.ProdTechnologyInfo; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.ProdTechnologyStepInfoBo; import org.dromara.mes.domain.vo.ProdTechnologyStepInfoVo; @@ -73,6 +74,9 @@ public class ProdTechnologyStepInfoServiceImpl implements IProdTechnologyStepInf Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdTechnologyStepInfo.class) .selectAll(ProdTechnologyStepInfo.class) + .select(ProdTechnologyInfo::getProcessId) + .select(ProdTechnologyInfo::getTechnologyName) + .leftJoin(ProdTechnologyInfo.class, ProdTechnologyInfo::getTechnologyId, ProdTechnologyStepInfo::getTechnologyId) .eq(bo.getStepId() != null, ProdTechnologyStepInfo::getStepId, bo.getStepId()) .eq(bo.getTechnologyId() != null, ProdTechnologyStepInfo::getTechnologyId, bo.getTechnologyId()) .eq(bo.getStepCode() != null, ProdTechnologyStepInfo::getStepCode, bo.getStepCode()) @@ -84,7 +88,8 @@ public class ProdTechnologyStepInfoServiceImpl implements IProdTechnologyStepInf .eq(StringUtils.isNotBlank(bo.getDataType()), ProdTechnologyStepInfo::getDataType, bo.getDataType()) .eq(StringUtils.isNotBlank(bo.getPointAddress()), ProdTechnologyStepInfo::getPointAddress, bo.getPointAddress()) .eq(bo.getOperationType() != null, ProdTechnologyStepInfo::getOperationType, bo.getOperationType()) - .orderByDesc(ProdTechnologyStepInfo::getStepCode); + .eq(bo.getProcessId() != null, ProdTechnologyInfo::getProcessId, bo.getProcessId()) + .orderByAsc(ProdTechnologyStepInfo::getStepCode); return lqw; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmItemsServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmItemsServiceImpl.java new file mode 100644 index 0000000..866e470 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmItemsServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.mes.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.ProdVulcAlarmItemsBo; +import org.dromara.mes.domain.vo.ProdVulcAlarmItemsVo; +import org.dromara.mes.domain.ProdVulcAlarmItems; +import org.dromara.mes.mapper.ProdVulcAlarmItemsMapper; +import org.dromara.mes.service.IProdVulcAlarmItemsService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 报警项目信息Service业务层处理 + * + * @author Yinq + * @date 2025-07-17 + */ +@RequiredArgsConstructor +@Service +public class ProdVulcAlarmItemsServiceImpl implements IProdVulcAlarmItemsService { + + private final ProdVulcAlarmItemsMapper baseMapper; + + /** + * 查询报警项目信息 + * + * @param alarmItemsId 主键 + * @return 报警项目信息 + */ + @Override + public ProdVulcAlarmItemsVo queryById(Long alarmItemsId){ + return baseMapper.selectVoById(alarmItemsId); + } + + /** + * 分页查询报警项目信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 报警项目信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdVulcAlarmItemsBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的报警项目信息列表 + * + * @param bo 查询条件 + * @return 报警项目信息列表 + */ + @Override + public List queryList(ProdVulcAlarmItemsBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdVulcAlarmItemsBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdVulcAlarmItems.class) + .selectAll(ProdVulcAlarmItems.class) + .eq(bo.getAlarmItemsId() != null, ProdVulcAlarmItems::getAlarmItemsId, bo.getAlarmItemsId()) + .eq(StringUtils.isNotBlank(bo.getAlarmItemsCode()), ProdVulcAlarmItems::getAlarmItemsCode, bo.getAlarmItemsCode()) + .like(StringUtils.isNotBlank(bo.getAlarmItemsName()), ProdVulcAlarmItems::getAlarmItemsName, bo.getAlarmItemsName()) + .eq(StringUtils.isNotBlank(bo.getAlarmType()), ProdVulcAlarmItems::getAlarmType, bo.getAlarmType()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdVulcAlarmItems::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(ProdVulcAlarmItems::getCreateTime); + return lqw; + } + + /** + * 新增报警项目信息 + * + * @param bo 报警项目信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdVulcAlarmItemsBo bo) { + ProdVulcAlarmItems add = MapstructUtils.convert(bo, ProdVulcAlarmItems.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAlarmItemsId(add.getAlarmItemsId()); + } + return flag; + } + + /** + * 修改报警项目信息 + * + * @param bo 报警项目信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdVulcAlarmItemsBo bo) { + ProdVulcAlarmItems update = MapstructUtils.convert(bo, ProdVulcAlarmItems.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdVulcAlarmItems entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除报警项目信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmStandardServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmStandardServiceImpl.java new file mode 100644 index 0000000..2ff30af --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdVulcAlarmStandardServiceImpl.java @@ -0,0 +1,151 @@ +package org.dromara.mes.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.ProdTechnologyInfo; +import org.dromara.mes.domain.ProdTechnologyStepInfo; +import org.dromara.mes.domain.ProdVulcAlarmItems; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.ProdVulcAlarmStandardBo; +import org.dromara.mes.domain.vo.ProdVulcAlarmStandardVo; +import org.dromara.mes.domain.ProdVulcAlarmStandard; +import org.dromara.mes.mapper.ProdVulcAlarmStandardMapper; +import org.dromara.mes.service.IProdVulcAlarmStandardService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 报警标准信息Service业务层处理 + * + * @author Yinq + * @date 2025-07-17 + */ +@RequiredArgsConstructor +@Service +public class ProdVulcAlarmStandardServiceImpl implements IProdVulcAlarmStandardService { + + private final ProdVulcAlarmStandardMapper baseMapper; + + /** + * 查询报警标准信息 + * + * @param alarmStandardId 主键 + * @return 报警标准信息 + */ + @Override + public ProdVulcAlarmStandardVo queryById(Long alarmStandardId) { + return baseMapper.selectVoById(alarmStandardId); + } + + /** + * 分页查询报警标准信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 报警标准信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdVulcAlarmStandardBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的报警标准信息列表 + * + * @param bo 查询条件 + * @return 报警标准信息列表 + */ + @Override + public List queryList(ProdVulcAlarmStandardBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdVulcAlarmStandardBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdVulcAlarmStandard.class) + .selectAll(ProdVulcAlarmStandard.class) + .select(ProdVulcAlarmItems::getAlarmItemsName) + .select(ProdTechnologyStepInfo::getStepCode) + .select(ProdTechnologyStepInfo::getStepName) + .select(ProdTechnologyInfo::getTechnologyName) + .leftJoin(ProdVulcAlarmItems.class, ProdVulcAlarmItems::getAlarmItemsId, ProdVulcAlarmStandard::getAlarmItemsId) + .leftJoin(ProdTechnologyStepInfo.class, ProdTechnologyStepInfo::getStepId, ProdVulcAlarmStandard::getStepId) + .leftJoin(ProdTechnologyInfo.class, ProdTechnologyInfo::getTechnologyId, ProdTechnologyStepInfo::getTechnologyId) + .eq(bo.getAlarmStandardId() != null, ProdVulcAlarmStandard::getAlarmStandardId, bo.getAlarmStandardId()) + .eq(bo.getAlarmItemsId() != null, ProdVulcAlarmStandard::getAlarmItemsId, bo.getAlarmItemsId()) + .eq(bo.getStepId() != null, ProdVulcAlarmStandard::getStepId, bo.getStepId()) + .eq(StringUtils.isNotBlank(bo.getStepCode()), ProdVulcAlarmStandard::getStepCode, bo.getStepCode()) + .eq(bo.getStartTime() != null, ProdVulcAlarmStandard::getStartTime, bo.getStartTime()) + .eq(bo.getDurationTime() != null, ProdVulcAlarmStandard::getDurationTime, bo.getDurationTime()) + .eq(bo.getStandardValue() != null, ProdVulcAlarmStandard::getStandardValue, bo.getStandardValue()) + .eq(bo.getMaxValue() != null, ProdVulcAlarmStandard::getMaxValue, bo.getMaxValue()) + .eq(bo.getMinValue() != null, ProdVulcAlarmStandard::getMinValue, bo.getMinValue()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdVulcAlarmStandard::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(ProdVulcAlarmStandard::getCreateTime); + return lqw; + } + + /** + * 新增报警标准信息 + * + * @param bo 报警标准信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdVulcAlarmStandardBo bo) { + ProdVulcAlarmStandard add = MapstructUtils.convert(bo, ProdVulcAlarmStandard.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAlarmStandardId(add.getAlarmStandardId()); + } + return flag; + } + + /** + * 修改报警标准信息 + * + * @param bo 报警标准信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdVulcAlarmStandardBo bo) { + ProdVulcAlarmStandard update = MapstructUtils.convert(bo, ProdVulcAlarmStandard.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdVulcAlarmStandard entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除报警标准信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdVulcAlarmItemsMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdVulcAlarmItemsMapper.xml new file mode 100644 index 0000000..e92c6cd --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdVulcAlarmItemsMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdVulcAlarmStandardMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdVulcAlarmStandardMapper.xml new file mode 100644 index 0000000..eabe892 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdVulcAlarmStandardMapper.xml @@ -0,0 +1,7 @@ + + + + +