diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseFactoryInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseFactoryInfoController.java new file mode 100644 index 0000000..0948fc5 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdBaseFactoryInfoController.java @@ -0,0 +1,106 @@ +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.ProdBaseFactoryInfoVo; +import org.dromara.mes.domain.bo.ProdBaseFactoryInfoBo; +import org.dromara.mes.service.IProdBaseFactoryInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 工厂信息 + * 前端访问路由地址为:/mes/baseFactoryInfo + * + * @author Yinq + * @date 2024-12-31 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/baseFactoryInfo") +public class ProdBaseFactoryInfoController extends BaseController { + + private final IProdBaseFactoryInfoService prodBaseFactoryInfoService; + + /** + * 查询工厂信息列表 + */ + @SaCheckPermission("mes:baseFactoryInfo:list") + @GetMapping("/list") + public TableDataInfo list(ProdBaseFactoryInfoBo bo, PageQuery pageQuery) { + return prodBaseFactoryInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出工厂信息列表 + */ + @SaCheckPermission("mes:baseFactoryInfo:export") + @Log(title = "工厂信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdBaseFactoryInfoBo bo, HttpServletResponse response) { + List list = prodBaseFactoryInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "工厂信息", ProdBaseFactoryInfoVo.class, response); + } + + /** + * 获取工厂信息详细信息 + * + * @param factoryId 主键 + */ + @SaCheckPermission("mes:baseFactoryInfo:query") + @GetMapping("/{factoryId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long factoryId) { + return R.ok(prodBaseFactoryInfoService.queryById(factoryId)); + } + + /** + * 新增工厂信息 + */ + @SaCheckPermission("mes:baseFactoryInfo:add") + @Log(title = "工厂信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdBaseFactoryInfoBo bo) { + return toAjax(prodBaseFactoryInfoService.insertByBo(bo)); + } + + /** + * 修改工厂信息 + */ + @SaCheckPermission("mes:baseFactoryInfo:edit") + @Log(title = "工厂信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdBaseFactoryInfoBo bo) { + return toAjax(prodBaseFactoryInfoService.updateByBo(bo)); + } + + /** + * 删除工厂信息 + * + * @param factoryIds 主键串 + */ + @SaCheckPermission("mes:baseFactoryInfo:remove") + @Log(title = "工厂信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{factoryIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] factoryIds) { + return toAjax(prodBaseFactoryInfoService.deleteWithValidByIds(List.of(factoryIds), true)); + } +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseFactoryInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseFactoryInfo.java new file mode 100644 index 0000000..b8b83c3 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseFactoryInfo.java @@ -0,0 +1,61 @@ +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_base_factory_info + * + * @author Yinq + * @date 2024-12-31 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_base_factory_info") +public class ProdBaseFactoryInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "factory_id", type = IdType.AUTO) + private Long factoryId; + + /** + * 公司名称 + */ + private String companyName; + + /** + * 工厂编号 + */ + private String factoryCode; + + /** + * 工厂名称 + */ + private String factoryName; + + /** + * 时区 + */ + private String timeZone; + + /** + * 工厂状态(1启用 0停用) + */ + private String factoryStatus; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseFactoryInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseFactoryInfoBo.java new file mode 100644 index 0000000..454d7a5 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseFactoryInfoBo.java @@ -0,0 +1,64 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdBaseFactoryInfo; +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_base_factory_info + * + * @author Yinq + * @date 2024-12-31 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdBaseFactoryInfo.class, reverseConvertGenerate = false) +public class ProdBaseFactoryInfoBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long factoryId; + + /** + * 公司名称 + */ + @NotBlank(message = "公司名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String companyName; + + /** + * 工厂编号 + */ + @NotBlank(message = "工厂编号不能为空", groups = {AddGroup.class, EditGroup.class}) + private String factoryCode; + + /** + * 工厂名称 + */ + @NotBlank(message = "工厂名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String factoryName; + + /** + * 时区 + */ + @NotBlank(message = "时区不能为空", groups = {AddGroup.class, EditGroup.class}) + private String timeZone; + + /** + * 工厂状态(1启用 0停用) + */ + @NotBlank(message = "工厂状态(1启用 0停用)不能为空", groups = {AddGroup.class, EditGroup.class}) + private String factoryStatus; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseFactoryInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseFactoryInfoVo.java new file mode 100644 index 0000000..d8c45f2 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseFactoryInfoVo.java @@ -0,0 +1,105 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdBaseFactoryInfo; +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_base_factory_info + * + * @author Yinq + * @date 2024-12-31 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdBaseFactoryInfo.class) +public class ProdBaseFactoryInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @ExcelProperty(value = "主键标识") + private Long factoryId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 公司名称 + */ + @ExcelProperty(value = "公司名称") + private String companyName; + + /** + * 工厂编号 + */ + @ExcelProperty(value = "工厂编号") + private String factoryCode; + + /** + * 工厂名称 + */ + @ExcelProperty(value = "工厂名称") + private String factoryName; + + /** + * 时区 + */ + @ExcelProperty(value = "时区") + private String timeZone; + + /** + * 工厂状态(1启用 0停用) + */ + @ExcelProperty(value = "工厂状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "enable_status") + private String factoryStatus; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseFactoryInfoMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseFactoryInfoMapper.java new file mode 100644 index 0000000..7b58d77 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseFactoryInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdBaseFactoryInfo; +import org.dromara.mes.domain.vo.ProdBaseFactoryInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 工厂信息Mapper接口 + * + * @author Yinq + * @date 2024-12-31 + */ +public interface ProdBaseFactoryInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseFactoryInfoService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseFactoryInfoService.java new file mode 100644 index 0000000..4169f69 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseFactoryInfoService.java @@ -0,0 +1,69 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdBaseFactoryInfo; +import org.dromara.mes.domain.vo.ProdBaseFactoryInfoVo; +import org.dromara.mes.domain.bo.ProdBaseFactoryInfoBo; +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 2024-12-31 + */ +public interface IProdBaseFactoryInfoService { + + /** + * 查询工厂信息 + * + * @param factoryId 主键 + * @return 工厂信息 + */ + ProdBaseFactoryInfoVo queryById(Long factoryId); + + /** + * 分页查询工厂信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工厂信息分页列表 + */ + TableDataInfo queryPageList(ProdBaseFactoryInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的工厂信息列表 + * + * @param bo 查询条件 + * @return 工厂信息列表 + */ + List queryList(ProdBaseFactoryInfoBo bo); + + /** + * 新增工厂信息 + * + * @param bo 工厂信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdBaseFactoryInfoBo bo); + + /** + * 修改工厂信息 + * + * @param bo 工厂信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdBaseFactoryInfoBo 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/ProdBaseFactoryInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseFactoryInfoServiceImpl.java new file mode 100644 index 0000000..4711405 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseFactoryInfoServiceImpl.java @@ -0,0 +1,137 @@ +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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.ProdBaseFactoryInfoBo; +import org.dromara.mes.domain.vo.ProdBaseFactoryInfoVo; +import org.dromara.mes.domain.ProdBaseFactoryInfo; +import org.dromara.mes.mapper.ProdBaseFactoryInfoMapper; +import org.dromara.mes.service.IProdBaseFactoryInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 工厂信息Service业务层处理 + * + * @author Yinq + * @date 2024-12-31 + */ +@RequiredArgsConstructor +@Service +public class ProdBaseFactoryInfoServiceImpl implements IProdBaseFactoryInfoService { + + private final ProdBaseFactoryInfoMapper baseMapper; + + /** + * 查询工厂信息 + * + * @param factoryId 主键 + * @return 工厂信息 + */ + @Override + public ProdBaseFactoryInfoVo queryById(Long factoryId){ + return baseMapper.selectVoById(factoryId); + } + + /** + * 分页查询工厂信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 工厂信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ProdBaseFactoryInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的工厂信息列表 + * + * @param bo 查询条件 + * @return 工厂信息列表 + */ + @Override + public List queryList(ProdBaseFactoryInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ProdBaseFactoryInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getFactoryId() != null, ProdBaseFactoryInfo::getFactoryId, bo.getFactoryId()); + lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), ProdBaseFactoryInfo::getCompanyName, bo.getCompanyName()); + lqw.eq(StringUtils.isNotBlank(bo.getFactoryCode()), ProdBaseFactoryInfo::getFactoryCode, bo.getFactoryCode()); + lqw.like(StringUtils.isNotBlank(bo.getFactoryName()), ProdBaseFactoryInfo::getFactoryName, bo.getFactoryName()); + lqw.eq(StringUtils.isNotBlank(bo.getTimeZone()), ProdBaseFactoryInfo::getTimeZone, bo.getTimeZone()); + lqw.eq(StringUtils.isNotBlank(bo.getFactoryStatus()), ProdBaseFactoryInfo::getFactoryStatus, bo.getFactoryStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getRemark()), ProdBaseFactoryInfo::getRemark, bo.getRemark()); + lqw.orderByDesc(ProdBaseFactoryInfo::getCreateTime); + return lqw; + } + + /** + * 新增工厂信息 + * + * @param bo 工厂信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdBaseFactoryInfoBo bo) { + ProdBaseFactoryInfo add = MapstructUtils.convert(bo, ProdBaseFactoryInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + assert add != null; + bo.setFactoryId(add.getFactoryId()); + } + return flag; + } + + /** + * 修改工厂信息 + * + * @param bo 工厂信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdBaseFactoryInfoBo bo) { + ProdBaseFactoryInfo update = MapstructUtils.convert(bo, ProdBaseFactoryInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdBaseFactoryInfo 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/ProdBaseFactoryInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseFactoryInfoMapper.xml new file mode 100644 index 0000000..5b13f86 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseFactoryInfoMapper.xml @@ -0,0 +1,7 @@ + + + + +