lipenghui 4 meses atrás
pai
commit
2e4e1aca3d

+ 1 - 0
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -36,4 +36,5 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_STORAGE_AREA_NOT_EXISTS = new ErrorCode(131, "PMS 库区不存在");
     ErrorCode IOT_SHELVES_NOT_EXISTS = new ErrorCode(132, "PMS 货架不存在");
     ErrorCode IOT_CARGO_LOCATION_NOT_EXISTS = new ErrorCode(133, "PMS 货位不存在");
+    ErrorCode IOT_INSPECT_ITEM_NOT_EXISTS = new ErrorCode(134, "巡检项不存在");
 }

+ 94 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/IotInspectItemController.java

@@ -0,0 +1,94 @@
+package cn.iocoder.yudao.module.pms.controller.admin.inspect;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.vo.IotInspectItemPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.vo.IotInspectItemRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.vo.IotInspectItemSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectItemDO;
+import cn.iocoder.yudao.module.pms.service.inspect.IotInspectItemService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+
+@Tag(name = "管理后台 - 巡检项")
+@RestController
+@RequestMapping("/rq/iot-inspect-item")
+@Validated
+public class IotInspectItemController {
+
+    @Resource
+    private IotInspectItemService iotInspectItemService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建巡检项")
+    @PreAuthorize("@ss.hasPermission('rq:iot-inspect-item:create')")
+    public CommonResult<Long> createIotInspectItem(@Valid @RequestBody IotInspectItemSaveReqVO createReqVO) {
+        return success(iotInspectItemService.createIotInspectItem(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新巡检项")
+    @PreAuthorize("@ss.hasPermission('rq:iot-inspect-item:update')")
+    public CommonResult<Boolean> updateIotInspectItem(@Valid @RequestBody IotInspectItemSaveReqVO updateReqVO) {
+        iotInspectItemService.updateIotInspectItem(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除巡检项")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-inspect-item:delete')")
+    public CommonResult<Boolean> deleteIotInspectItem(@RequestParam("id") Long id) {
+        iotInspectItemService.deleteIotInspectItem(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得巡检项")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-inspect-item:query')")
+    public CommonResult<IotInspectItemRespVO> getIotInspectItem(@RequestParam("id") Long id) {
+        IotInspectItemDO iotInspectItem = iotInspectItemService.getIotInspectItem(id);
+        return success(BeanUtils.toBean(iotInspectItem, IotInspectItemRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得巡检项分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-inspect-item:query')")
+    public CommonResult<PageResult<IotInspectItemRespVO>> getIotInspectItemPage(@Valid IotInspectItemPageReqVO pageReqVO) {
+        PageResult<IotInspectItemDO> pageResult = iotInspectItemService.getIotInspectItemPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotInspectItemRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出巡检项 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-inspect-item:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotInspectItemExcel(@Valid IotInspectItemPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotInspectItemDO> list = iotInspectItemService.getIotInspectItemPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "巡检项.xls", "数据", IotInspectItemRespVO.class,
+                        BeanUtils.toBean(list, IotInspectItemRespVO.class));
+    }
+
+}

+ 55 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/vo/IotInspectItemPageReqVO.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.controller.admin.inspect.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 IotInspectItemPageReqVO extends PageParam {
+
+    @Schema(description = "巡检项")
+    private String item;
+
+    @Schema(description = "巡检标准")
+    private String standard;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门id", example = "5369")
+    private Long deptId;
+    /**
+     * 设备分类id
+     */
+    private Long deviceClassify;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 设备分类名称
+     */
+    private String deviceClassifyName;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+}

+ 61 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/vo/IotInspectItemRespVO.java

@@ -0,0 +1,61 @@
+package cn.iocoder.yudao.module.pms.controller.admin.inspect.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 IotInspectItemRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2246")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "巡检项", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("巡检项")
+    private String item;
+
+    @Schema(description = "巡检标准", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("巡检标准")
+    private String standard;
+
+    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("排序")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门id", example = "5369")
+    @ExcelProperty("部门id")
+    private Long deptId;
+    /**
+     * 设备分类id
+     */
+    private Long deviceClassify;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 设备分类名称
+     */
+    private String deviceClassifyName;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+}

+ 52 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/vo/IotInspectItemSaveReqVO.java

@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.pms.controller.admin.inspect.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 IotInspectItemSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2246")
+    private Long id;
+
+    @Schema(description = "巡检项", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "巡检项不能为空")
+    private String item;
+
+    @Schema(description = "巡检标准", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "巡检标准不能为空")
+    private String standard;
+
+    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "部门id", example = "5369")
+    private Long deptId;
+
+    /**
+     * 设备分类id
+     */
+    private Long deviceClassify;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 设备分类名称
+     */
+    private String deviceClassifyName;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+}

+ 70 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/inspect/IotInspectItemDO.java

@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.inspect;
+
+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_inspect_item")
+@KeySequence("rq_iot_inspect_item_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotInspectItemDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 巡检项
+     */
+    private String item;
+    /**
+     * 巡检标准
+     */
+    private String standard;
+    /**
+     * 排序
+     */
+    private Integer sort;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 设备分类id
+     */
+    private Long deviceClassify;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 设备分类名称
+     */
+    private String deviceClassifyName;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+}

+ 1 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/IotDeviceMapper.java

@@ -44,6 +44,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .eqIfPresent(IotDeviceDO::getRemainAmount, reqVO.getRemainAmount())
                 .eqIfPresent(IotDeviceDO::getInfoId, reqVO.getInfoId())
                 .eqIfPresent(IotDeviceDO::getInfoType, reqVO.getInfoType())
+                .eqIfPresent(IotDeviceDO::getAssetClass, reqVO.getAssetClass())
                 .likeIfPresent(IotDeviceDO::getInfoName, reqVO.getInfoName())
                 .eqIfPresent(IotDeviceDO::getInfoRemark, reqVO.getInfoRemark())
                 .eqIfPresent(IotDeviceDO::getInfoUrl, reqVO.getInfoUrl())

+ 29 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectItemMapper.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.inspect;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.vo.IotInspectItemPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectItemDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 巡检项 Mapper
+ *
+ * @author 李鹏辉
+ */
+@Mapper
+public interface IotInspectItemMapper extends BaseMapperX<IotInspectItemDO> {
+
+    default PageResult<IotInspectItemDO> selectPage(IotInspectItemPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectItemDO>()
+                .eqIfPresent(IotInspectItemDO::getItem, reqVO.getItem())
+                .eqIfPresent(IotInspectItemDO::getStandard, reqVO.getStandard())
+                .eqIfPresent(IotInspectItemDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotInspectItemDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(IotInspectItemDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(IotInspectItemDO::getDeptId, reqVO.getDeptId())
+                .orderByDesc(IotInspectItemDO::getId));
+    }
+
+}

+ 56 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectItemService.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.pms.service.inspect;
+
+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.inspect.vo.IotInspectItemPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.vo.IotInspectItemSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectItemDO;
+
+/**
+ * 巡检项 Service 接口
+ *
+ * @author 李鹏辉
+ */
+public interface IotInspectItemService {
+
+    /**
+     * 创建巡检项
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotInspectItem(@Valid IotInspectItemSaveReqVO createReqVO);
+
+    /**
+     * 更新巡检项
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotInspectItem(@Valid IotInspectItemSaveReqVO updateReqVO);
+
+    /**
+     * 删除巡检项
+     *
+     * @param id 编号
+     */
+    void deleteIotInspectItem(Long id);
+
+    /**
+     * 获得巡检项
+     *
+     * @param id 编号
+     * @return 巡检项
+     */
+    IotInspectItemDO getIotInspectItem(Long id);
+
+    /**
+     * 获得巡检项分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 巡检项分页
+     */
+    PageResult<IotInspectItemDO> getIotInspectItemPage(IotInspectItemPageReqVO pageReqVO);
+
+}

+ 83 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectItemServiceImpl.java

@@ -0,0 +1,83 @@
+package cn.iocoder.yudao.module.pms.service.inspect;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.vo.IotInspectItemPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.vo.IotInspectItemSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectItemDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectItemMapper;
+import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_INSPECT_ITEM_NOT_EXISTS;
+
+/**
+ * 巡检项 Service 实现类
+ *
+ * @author 李鹏辉
+ */
+@Service
+@Validated
+public class IotInspectItemServiceImpl implements IotInspectItemService {
+
+    @Resource
+    private IotInspectItemMapper iotInspectItemMapper;
+    @Autowired
+    private IotProductClassifyService iotProductClassifyService;
+
+    @Override
+    public Long createIotInspectItem(IotInspectItemSaveReqVO createReqVO) {
+        // 插入
+        IotInspectItemDO iotInspectItem = BeanUtils.toBean(createReqVO, IotInspectItemDO.class);
+        iotInspectItem.setDeleted(false);
+        IotProductClassifyDO iotProductClassify = iotProductClassifyService.getIotProductClassify(iotInspectItem.getDeviceClassify());
+        if (Objects.nonNull(iotProductClassify)) {
+            iotInspectItem.setDeviceClassifyName(iotProductClassify.getName());
+        }
+        iotInspectItemMapper.insert(iotInspectItem);
+        // 返回
+        return iotInspectItem.getId();
+    }
+
+    @Override
+    public void updateIotInspectItem(IotInspectItemSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotInspectItemExists(updateReqVO.getId());
+        // 更新
+        IotInspectItemDO updateObj = BeanUtils.toBean(updateReqVO, IotInspectItemDO.class);
+        iotInspectItemMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotInspectItem(Long id) {
+        // 校验存在
+        validateIotInspectItemExists(id);
+        // 删除
+        iotInspectItemMapper.deleteById(id);
+    }
+
+    private void validateIotInspectItemExists(Long id) {
+        if (iotInspectItemMapper.selectById(id) == null) {
+            throw exception(IOT_INSPECT_ITEM_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotInspectItemDO getIotInspectItem(Long id) {
+        return iotInspectItemMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotInspectItemDO> getIotInspectItemPage(IotInspectItemPageReqVO pageReqVO) {
+        return iotInspectItemMapper.selectPage(pageReqVO);
+    }
+
+}