浏览代码

编码分类及执行时间

lipenghui 3 天之前
父节点
当前提交
e9551ff12c

+ 111 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/yfclass/IotYfClassifyController.java

@@ -0,0 +1,111 @@
+package cn.iocoder.yudao.module.pms.controller.admin.yfclass;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotProductClassifyListReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotProductClassifyRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotProductClassifySimpleRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo.IotYfClassifyPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo.IotYfClassifyRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo.IotYfClassifySaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.yfclass.IotYfClassifyDO;
+import cn.iocoder.yudao.module.pms.service.yfclass.IotYfClassifyService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+
+@Tag(name = "管理后台 - 油服设备分类")
+@RestController
+@RequestMapping("/rq/iot-yf-classify")
+@Validated
+public class IotYfClassifyController {
+
+    @Resource
+    private IotYfClassifyService iotYfClassifyService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建油服设备分类")
+    @PreAuthorize("@ss.hasPermission('rq:iot-yf-classify:create')")
+    public CommonResult<Long> createIotYfClassify(@Valid @RequestBody IotYfClassifySaveReqVO createReqVO) {
+        return success(iotYfClassifyService.createIotYfClassify(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新油服设备分类")
+    @PreAuthorize("@ss.hasPermission('rq:iot-yf-classify:update')")
+    public CommonResult<Boolean> updateIotYfClassify(@Valid @RequestBody IotYfClassifySaveReqVO updateReqVO) {
+        iotYfClassifyService.updateIotYfClassify(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除油服设备分类")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-yf-classify:delete')")
+    public CommonResult<Boolean> deleteIotYfClassify(@RequestParam("id") Long id) {
+        iotYfClassifyService.deleteIotYfClassify(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得油服设备分类")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-yf-classify:query')")
+    public CommonResult<IotYfClassifyRespVO> getIotYfClassify(@RequestParam("id") Long id) {
+        IotYfClassifyDO iotYfClassify = iotYfClassifyService.getIotYfClassify(id);
+        return success(BeanUtils.toBean(iotYfClassify, IotYfClassifyRespVO.class));
+    }
+
+
+    @GetMapping("/list")
+    @Operation(summary = "获取产品分类列表")
+    @PreAuthorize("@ss.hasPermission('iot:product-classify:query')")
+    public CommonResult<List<IotYfClassifyRespVO>> getIotProductClassifyList(IotProductClassifyListReqVO reqVO) {
+        List<IotYfClassifyDO> list = iotYfClassifyService.getYfClassifyList(reqVO);
+        return success(BeanUtils.toBean(list, IotYfClassifyRespVO.class));
+    }
+
+    @GetMapping(value = {"/list-all-simple", "/simple-list"})
+    @Operation(summary = "获取产品分类精简信息列表", description = "只包含被开启的产品分类,主要用于前端的下拉选项")
+    public CommonResult<List<IotProductClassifySimpleRespVO>> getSimpleIotProductClassifyList() {
+        List<IotYfClassifyDO> list = iotYfClassifyService.getYfClassifyList(
+                new IotProductClassifyListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
+        return success(BeanUtils.toBean(list, IotProductClassifySimpleRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出油服设备分类 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-yf-classify:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotYfClassifyExcel(@Valid IotYfClassifyPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotYfClassifyDO> list = iotYfClassifyService.getIotYfClassifyPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "油服设备分类.xls", "数据", IotYfClassifyRespVO.class,
+                        BeanUtils.toBean(list, IotYfClassifyRespVO.class));
+    }
+
+}

+ 40 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/yfclass/vo/IotYfClassifyPageReqVO.java

@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 油服设备分类分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotYfClassifyPageReqVO extends PageParam {
+
+    @Schema(description = "父分类id", example = "31774")
+    private Long parentId;
+
+    @Schema(description = "分类名称", example = "王五")
+    private String name;
+
+    @Schema(description = "分类编码")
+    private String code;
+
+    @Schema(description = "分类排序")
+    private Integer sort;
+
+    @Schema(description = "开启状态", example = "2")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注扩展字段", example = "随便")
+    private String remark;
+
+}

+ 47 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/yfclass/vo/IotYfClassifyRespVO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 油服设备分类 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotYfClassifyRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9419")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "父分类id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31774")
+    @ExcelProperty("父分类id")
+    private Long parentId;
+
+    @Schema(description = "分类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @ExcelProperty("分类名称")
+    private String name;
+
+    @Schema(description = "分类编码")
+    @ExcelProperty("分类编码")
+    private String code;
+
+    @Schema(description = "分类排序")
+    @ExcelProperty("分类排序")
+    private Integer sort;
+
+    @Schema(description = "开启状态", example = "2")
+    @ExcelProperty("开启状态")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注扩展字段", example = "随便")
+    @ExcelProperty("备注扩展字段")
+    private String remark;
+
+}

+ 35 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/yfclass/vo/IotYfClassifySaveReqVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 油服设备分类新增/修改 Request VO")
+@Data
+public class IotYfClassifySaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9419")
+    private Long id;
+
+    @Schema(description = "父分类id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31774")
+    @NotNull(message = "父分类id不能为空")
+    private Long parentId;
+
+    @Schema(description = "分类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @NotEmpty(message = "分类名称不能为空")
+    private String name;
+
+    @Schema(description = "分类编码")
+    private String code;
+
+    @Schema(description = "分类排序")
+    private Integer sort;
+
+    @Schema(description = "开启状态", example = "2")
+    private Integer status;
+
+    @Schema(description = "备注扩展字段", example = "随便")
+    private String remark;
+
+}

+ 55 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/yfclass/IotYfClassifyDO.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.yfclass;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 油服设备分类 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_iot_yf_classify")
+@KeySequence("rq_iot_yf_classify_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotYfClassifyDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 父分类id
+     */
+    private Long parentId;
+    /**
+     * 分类名称
+     */
+    private String name;
+    /**
+     * 分类编码
+     */
+    private String code;
+    /**
+     * 分类排序
+     */
+    private Integer sort;
+    /**
+     * 开启状态
+     */
+    private Integer status;
+    /**
+     * 备注扩展字段
+     */
+    private String remark;
+
+}

+ 39 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/yfclass/IotYfClassifyMapper.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.yfclass;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotProductClassifyListReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo.IotYfClassifyPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.yfclass.IotYfClassifyDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 油服设备分类 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotYfClassifyMapper extends BaseMapperX<IotYfClassifyDO> {
+
+    default PageResult<IotYfClassifyDO> selectPage(IotYfClassifyPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotYfClassifyDO>()
+                .eqIfPresent(IotYfClassifyDO::getParentId, reqVO.getParentId())
+                .likeIfPresent(IotYfClassifyDO::getName, reqVO.getName())
+                .eqIfPresent(IotYfClassifyDO::getCode, reqVO.getCode())
+                .eqIfPresent(IotYfClassifyDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotYfClassifyDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(IotYfClassifyDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(IotYfClassifyDO::getRemark, reqVO.getRemark())
+                .orderByDesc(IotYfClassifyDO::getId));
+    }
+
+    default List<IotYfClassifyDO> selectList(IotProductClassifyListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotYfClassifyDO>()
+                .likeIfPresent(IotYfClassifyDO::getName, reqVO.getName())
+                .eqIfPresent(IotYfClassifyDO::getStatus, reqVO.getStatus()));
+    }
+}

+ 1 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -256,6 +256,7 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         if ("out".equals(updateObj.getType())) {
             updateObj.setStatus("oa");
         }
+        updateObj.setExecuteDate(LocalDateTime.now());
         iotMaintainMapper.updateById(updateObj);
         //删除工单bom及物料
         iotMaintainBomMapper.delete("maintain_id", String.valueOf(updateObj.getId()));

+ 65 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/yfclass/IotYfClassifyService.java

@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.pms.service.yfclass;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotProductClassifyListReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo.IotYfClassifyPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo.IotYfClassifySaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.yfclass.IotYfClassifyDO;
+
+/**
+ * 油服设备分类 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface IotYfClassifyService {
+    List<IotYfClassifyDO> getYfClassifyList(IotProductClassifyListReqVO reqVO);
+    /**
+     * 获得产品分类信息数组
+     *
+     * @param ids 产品分类编号数组
+     * @return 产品分类信息数组
+     */
+    List<IotYfClassifyDO> getYfClassifyList(Collection<Long> ids);
+    /**
+     * 创建油服设备分类
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotYfClassify(@Valid IotYfClassifySaveReqVO createReqVO);
+
+    /**
+     * 更新油服设备分类
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotYfClassify(@Valid IotYfClassifySaveReqVO updateReqVO);
+
+    /**
+     * 删除油服设备分类
+     *
+     * @param id 编号
+     */
+    void deleteIotYfClassify(Long id);
+
+    /**
+     * 获得油服设备分类
+     *
+     * @param id 编号
+     * @return 油服设备分类
+     */
+    IotYfClassifyDO getIotYfClassify(Long id);
+
+    /**
+     * 获得油服设备分类分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 油服设备分类分页
+     */
+    PageResult<IotYfClassifyDO> getIotYfClassifyPage(IotYfClassifyPageReqVO pageReqVO);
+
+}

+ 93 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/yfclass/IotYfClassifyServiceImpl.java

@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.pms.service.yfclass;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotProductClassifyListReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo.IotYfClassifyPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.yfclass.vo.IotYfClassifySaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.yfclass.IotYfClassifyDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.yfclass.IotYfClassifyMapper;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/**
+ * 油服设备分类 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class IotYfClassifyServiceImpl implements IotYfClassifyService {
+
+    @Resource
+    private IotYfClassifyMapper iotYfClassifyMapper;
+
+    @Override
+    public List<IotYfClassifyDO> getYfClassifyList(Collection<Long> ids) {
+        if (CollUtil.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
+        return iotYfClassifyMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public List<IotYfClassifyDO> getYfClassifyList(IotProductClassifyListReqVO reqVO) {
+        List<IotYfClassifyDO> list = iotYfClassifyMapper.selectList(reqVO);
+        list.sort(Comparator.comparing(IotYfClassifyDO::getSort));
+        return list;
+    }
+
+    @Override
+    public Long createIotYfClassify(IotYfClassifySaveReqVO createReqVO) {
+        // 插入
+        IotYfClassifyDO iotYfClassify = BeanUtils.toBean(createReqVO, IotYfClassifyDO.class);
+        iotYfClassifyMapper.insert(iotYfClassify);
+        // 返回
+        return iotYfClassify.getId();
+    }
+
+    @Override
+    public void updateIotYfClassify(IotYfClassifySaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotYfClassifyExists(updateReqVO.getId());
+        // 更新
+        IotYfClassifyDO updateObj = BeanUtils.toBean(updateReqVO, IotYfClassifyDO.class);
+        iotYfClassifyMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotYfClassify(Long id) {
+        // 校验存在
+        validateIotYfClassifyExists(id);
+        // 删除
+        iotYfClassifyMapper.deleteById(id);
+    }
+
+    private void validateIotYfClassifyExists(Long id) {
+        if (iotYfClassifyMapper.selectById(id) == null) {
+            throw exception(new ErrorCode(1000, "编码分类不存在"));
+        }
+    }
+
+    @Override
+    public IotYfClassifyDO getIotYfClassify(Long id) {
+        return iotYfClassifyMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotYfClassifyDO> getIotYfClassifyPage(IotYfClassifyPageReqVO pageReqVO) {
+        return iotYfClassifyMapper.selectPage(pageReqVO);
+    }
+
+}