diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultCategoryTypeController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultCategoryTypeController.java new file mode 100644 index 0000000..cd33055 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultCategoryTypeController.java @@ -0,0 +1,105 @@ +package org.dromara.platform.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.platform.domain.vo.FaultCategoryTypeVo; +import org.dromara.platform.domain.bo.FaultCategoryTypeBo; +import org.dromara.platform.service.IFaultCategoryTypeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 故障大类-类别 + * + * @author gejunhao + * @date 2025-04-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/categoryType") +public class FaultCategoryTypeController extends BaseController { + + private final IFaultCategoryTypeService faultCategoryTypeService; + + /** + * 查询故障大类-类别列表 + */ + @SaCheckPermission("platform:categoryType:list") + @GetMapping("/list") + public TableDataInfo list(FaultCategoryTypeBo bo, PageQuery pageQuery) { + return faultCategoryTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出故障大类-类别列表 + */ + @SaCheckPermission("platform:categoryType:export") + @Log(title = "故障大类-类别", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(FaultCategoryTypeBo bo, HttpServletResponse response) { + List list = faultCategoryTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "故障大类-类别", FaultCategoryTypeVo.class, response); + } + + /** + * 获取故障大类-类别详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("platform:categoryType:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(faultCategoryTypeService.queryById(id)); + } + + /** + * 新增故障大类-类别 + */ + @SaCheckPermission("platform:categoryType:add") + @Log(title = "故障大类-类别", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody FaultCategoryTypeBo bo) { + return toAjax(faultCategoryTypeService.insertByBo(bo)); + } + + /** + * 修改故障大类-类别 + */ + @SaCheckPermission("platform:categoryType:edit") + @Log(title = "故障大类-类别", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody FaultCategoryTypeBo bo) { + return toAjax(faultCategoryTypeService.updateByBo(bo)); + } + + /** + * 删除故障大类-类别 + * + * @param ids 主键串 + */ + @SaCheckPermission("platform:categoryType:remove") + @Log(title = "故障大类-类别", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(faultCategoryTypeService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java index 30cdae7..ab565dd 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/ContractInfo.java @@ -72,16 +72,19 @@ public class ContractInfo extends TenantEntity { /** * 签订日期 */ + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") private Date signDate; /** * 开始时间 */ + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") private Date startDate; /** * 结束时间 */ + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") private Date endDate; /** diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/FaultCategoryType.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/FaultCategoryType.java new file mode 100644 index 0000000..4c85f30 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/FaultCategoryType.java @@ -0,0 +1,47 @@ +package org.dromara.platform.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 故障大类-类别对象 fault_category_type + * + * @author gejunhao + * @date 2025-04-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("fault_category_type") +public class FaultCategoryType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @TableId(value = "id") + private String id; + + /** + * 故障类别名称 + */ + private String typeName; + + /** + * 当前状态 + */ + private Long status; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java index d80515f..9ebc108 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ContractInfoBo.java @@ -43,13 +43,13 @@ public class ContractInfoBo extends BaseEntity { /** * 所有者ID */ - @NotBlank(message = "所有者ID不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "所有者ID不能为空", groups = { AddGroup.class, EditGroup.class }) private String ownerId; /** * 所有者名称 */ - @NotBlank(message = "所有者名称不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "所有者名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String ownerName; /** @@ -79,18 +79,21 @@ public class ContractInfoBo extends BaseEntity { /** * 签订日期 */ + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") @NotNull(message = "签订日期不能为空", groups = { AddGroup.class, EditGroup.class }) private Date signDate; /** * 开始时间 */ + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date startDate; /** * 结束时间 */ + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date endDate; @@ -127,19 +130,19 @@ public class ContractInfoBo extends BaseEntity { /** * 合同备注 */ - @NotBlank(message = "合同备注不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "合同备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; /** * 附件 */ - @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class }) private String attachment; /** * 当前状态 */ - @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class }) private Long status; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/FaultCategoryTypeBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/FaultCategoryTypeBo.java new file mode 100644 index 0000000..2689252 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/FaultCategoryTypeBo.java @@ -0,0 +1,42 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.FaultCategoryType; +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.*; + +/** + * 故障大类-类别业务对象 fault_category_type + * + * @author gejunhao + * @date 2025-04-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = FaultCategoryType.class, reverseConvertGenerate = false) +public class FaultCategoryTypeBo extends BaseEntity { + + /** + * 唯一标识符 + */ + @NotBlank(message = "唯一标识符不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 故障类别名称 + */ + @NotBlank(message = "故障类别名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String typeName; + + /** + * 当前状态 + */ + @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/FaultCategoryTypeVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/FaultCategoryTypeVo.java new file mode 100644 index 0000000..d7b8772 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/FaultCategoryTypeVo.java @@ -0,0 +1,50 @@ +package org.dromara.platform.domain.vo; + +import org.dromara.platform.domain.FaultCategoryType; +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; + + + +/** + * 故障大类-类别视图对象 fault_category_type + * + * @author gejunhao + * @date 2025-04-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = FaultCategoryType.class) +public class FaultCategoryTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @ExcelProperty(value = "唯一标识符") + private String id; + + /** + * 故障类别名称 + */ + @ExcelProperty(value = "故障类别名称") + private String typeName; + + /** + * 当前状态 + */ + @ExcelProperty(value = "当前状态") + private Long status; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/FaultCategoryTypeMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/FaultCategoryTypeMapper.java new file mode 100644 index 0000000..aab1cda --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/FaultCategoryTypeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.platform.mapper; + +import org.dromara.platform.domain.FaultCategoryType; +import org.dromara.platform.domain.vo.FaultCategoryTypeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 故障大类-类别Mapper接口 + * + * @author gejunhao + * @date 2025-04-07 + */ +public interface FaultCategoryTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IFaultCategoryTypeService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IFaultCategoryTypeService.java new file mode 100644 index 0000000..c23c9a9 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IFaultCategoryTypeService.java @@ -0,0 +1,68 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.vo.FaultCategoryTypeVo; +import org.dromara.platform.domain.bo.FaultCategoryTypeBo; +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 gejunhao + * @date 2025-04-07 + */ +public interface IFaultCategoryTypeService { + + /** + * 查询故障大类-类别 + * + * @param id 主键 + * @return 故障大类-类别 + */ + FaultCategoryTypeVo queryById(String id); + + /** + * 分页查询故障大类-类别列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 故障大类-类别分页列表 + */ + TableDataInfo queryPageList(FaultCategoryTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的故障大类-类别列表 + * + * @param bo 查询条件 + * @return 故障大类-类别列表 + */ + List queryList(FaultCategoryTypeBo bo); + + /** + * 新增故障大类-类别 + * + * @param bo 故障大类-类别 + * @return 是否新增成功 + */ + Boolean insertByBo(FaultCategoryTypeBo bo); + + /** + * 修改故障大类-类别 + * + * @param bo 故障大类-类别 + * @return 是否修改成功 + */ + Boolean updateByBo(FaultCategoryTypeBo bo); + + /** + * 校验并批量删除故障大类-类别信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/FaultCategoryTypeServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/FaultCategoryTypeServiceImpl.java new file mode 100644 index 0000000..378b923 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/FaultCategoryTypeServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.platform.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.platform.domain.bo.FaultCategoryTypeBo; +import org.dromara.platform.domain.vo.FaultCategoryTypeVo; +import org.dromara.platform.domain.FaultCategoryType; +import org.dromara.platform.mapper.FaultCategoryTypeMapper; +import org.dromara.platform.service.IFaultCategoryTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 故障大类-类别Service业务层处理 + * + * @author gejunhao + * @date 2025-04-07 + */ +@RequiredArgsConstructor +@Service +public class FaultCategoryTypeServiceImpl implements IFaultCategoryTypeService { + + private final FaultCategoryTypeMapper baseMapper; + + /** + * 查询故障大类-类别 + * + * @param id 主键 + * @return 故障大类-类别 + */ + @Override + public FaultCategoryTypeVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询故障大类-类别列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 故障大类-类别分页列表 + */ + @Override + public TableDataInfo queryPageList(FaultCategoryTypeBo 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(FaultCategoryTypeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(FaultCategoryTypeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getTypeName()), FaultCategoryType::getTypeName, bo.getTypeName()); + lqw.eq(bo.getStatus() != null, FaultCategoryType::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增故障大类-类别 + * + * @param bo 故障大类-类别 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(FaultCategoryTypeBo bo) { + FaultCategoryType add = MapstructUtils.convert(bo, FaultCategoryType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改故障大类-类别 + * + * @param bo 故障大类-类别 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(FaultCategoryTypeBo bo) { + FaultCategoryType update = MapstructUtils.convert(bo, FaultCategoryType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(FaultCategoryType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除故障大类-类别信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}