Selaa lähdekoodia

QHSE及巡检导出中英文切换

Zimo 13 tuntia sitten
vanhempi
commit
4052a65a10
28 muutettua tiedostoa jossa 1522 lisäystä ja 8 poistoa
  1. 38 4
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/IotInspectOrderController.java
  2. 98 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/IotMeasureCertController.java
  3. 54 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/IotMeasureCertPageReqVO.java
  4. 66 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/IotMeasureCertRespVO.java
  5. 52 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/IotMeasureCertSaveReqVO.java
  6. 98 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureDetectController.java
  7. 98 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureRecordController.java
  8. 1 1
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureBookSaveReqVO.java
  9. 44 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureDetectPageReqVO.java
  10. 51 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureDetectRespVO.java
  11. 45 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureDetectSaveReqVO.java
  12. 44 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureRecordPageReqVO.java
  13. 51 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureRecordRespVO.java
  14. 40 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureRecordSaveReqVO.java
  15. 77 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/cert/IotMeasureCertDO.java
  16. 60 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/measure/IotMeasureDetectDO.java
  17. 59 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/measure/IotMeasureRecordDO.java
  18. 37 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/cert/IotMeasureCertMapper.java
  19. 2 2
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/measure/IotMeasureBookMapper.java
  20. 33 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/measure/IotMeasureDetectMapper.java
  21. 33 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/measure/IotMeasureRecordMapper.java
  22. 57 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/IotMeasureCertService.java
  23. 86 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/IotMeasureCertServiceImpl.java
  24. 12 1
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureBookServiceImpl.java
  25. 57 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureDetectService.java
  26. 86 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureDetectServiceImpl.java
  27. 57 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureRecordService.java
  28. 86 0
      yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureRecordServiceImpl.java

+ 38 - 4
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/IotInspectOrderController.java

@@ -61,6 +61,7 @@ import java.io.IOException;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -312,7 +313,7 @@ public class IotInspectOrderController {
     @Operation(summary = "导出巡检工单 Excel")
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-order:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportIotInspectOrderExcel(@Valid IotInspectOrderPageReqVO pageReqVO,
+    public void exportIotInspectOrderExcel(@Valid IotInspectOrderPageReqVO pageReqVO, @RequestHeader("Lang") String lang,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<IotInspectOrderDO> list = iotInspectOrderService.getIotInspectOrderPage(pageReqVO).getList();
@@ -320,6 +321,16 @@ public class IotInspectOrderController {
         List<DeptRespDTO> deptList = deptApi.getDeptList();
         List<DictDataDO> pmsDeviceStatus = dictDataService.getDictDataListByDictType("pms_inspect_order_status");
         bean.forEach(e -> {
+            if (e.getInspectOrderTitle().contains("~~")){
+                String[] split = e.getInspectOrderTitle().split("~~");
+                if ("zh-CN".equals(lang)) {
+                    e.setInspectOrderTitle(split[0]);
+                }else if ("en".equalsIgnoreCase(lang)) {
+                    if (split[1]!=null&&StringUtils.isNotBlank(split[1])){
+                        e.setInspectOrderTitle(split[1].replaceAll(Pattern.quote("en**"), ""));
+                    }
+                }
+            }
             deptList.stream().filter(f -> f.getId().equals(e.getDeptId())).findFirst().ifPresent(f -> e.setDeptName(f.getName()));
             pmsDeviceStatus.stream().filter(f -> f.getValue().equals(e.getStatus())).findFirst().ifPresent(f -> e.setStatus(f.getLabel()));
         });
@@ -408,7 +419,7 @@ public class IotInspectOrderController {
     @Operation(summary = "导出巡检工单巡检异常点 Excel")
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-order-detail:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportReportExceptionItem(@Valid IotInspectOrderDetailPageReqVO pageReqVO,
+    public void exportReportExceptionItem(@Valid IotInspectOrderDetailPageReqVO pageReqVO,@RequestHeader("Lang") String lang,
                                           HttpServletResponse response) throws IOException {
         Set<Long> ids = new HashSet<>();
         String companyCode;
@@ -448,7 +459,18 @@ public class IotInspectOrderController {
             if (Objects.nonNull(e.getOrderId())) {
                 IotInspectOrderDO iotInspectOrder = iotInspectOrderService.getIotInspectOrder(e.getOrderId());
                 if (Objects.nonNull(iotInspectOrder)) {
-                    e.setOrderName(iotInspectOrder.getInspectOrderTitle());
+                    if (iotInspectOrder.getInspectOrderTitle().contains("~~")){
+                        String[] split = iotInspectOrder.getInspectOrderTitle().split("~~");
+                        if ("zh-CN".equals(lang)) {
+                            e.setOrderName(split[0]);
+                        }else if ("en".equalsIgnoreCase(lang)) {
+                            if (split[1]!=null&&StringUtils.isNotBlank(split[1])){
+                                e.setOrderName(split[1].replaceAll(Pattern.quote("en**"), ""));
+                            }
+                        } else {
+                            e.setOrderName(iotInspectOrder.getInspectOrderTitle());
+                        }
+                    }
                     e.setCharge(iotInspectOrder.getChargeName());
                 }
             }
@@ -480,7 +502,7 @@ public class IotInspectOrderController {
     @Operation(summary = "导出巡检工单巡检异常点 Excel")
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-order-detail:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportReport(@Valid IotInspectOrderPageReqVO pageReqVO,
+    public void exportReport(@Valid IotInspectOrderPageReqVO pageReqVO,@RequestHeader("Lang") String lang,
                                           HttpServletResponse response) throws IOException {
         Set<Long> ids;
         if (Objects.isNull(pageReqVO.getDeptId())){
@@ -495,6 +517,18 @@ public class IotInspectOrderController {
         pageReqVO.setDeptIds(ids);
         List<IotInspectOrderRespVO> bean = iotInspectOrderMapper.selectExport(pageReqVO);
         List<IotReportInspectOrderRespVO> list = BeanUtils.toBean(bean, IotReportInspectOrderRespVO.class);
+        list.forEach(e ->{
+            if (e.getInspectOrderTitle().contains("~~")){
+                String[] split = e.getInspectOrderTitle().split("~~");
+                if ("zh-CN".equals(lang)) {
+                    e.setInspectOrderTitle(split[0]);
+                }else if ("en".equalsIgnoreCase(lang)) {
+                    if (split[1]!=null&&StringUtils.isNotBlank(split[1])){
+                        e.setInspectOrderTitle(split[1].replaceAll(Pattern.quote("en**"), ""));
+                    }
+                }
+            }
+        });
         // 导出 Excel
         ExcelUtils.write(response, "巡检报表统计.xls", "数据", IotReportInspectOrderRespVO.class, list);
     }

+ 98 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/IotMeasureCertController.java

@@ -0,0 +1,98 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert;
+
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.IotMeasureCertDO;
+import cn.iocoder.yudao.module.pms.service.qhse.cert.IotMeasureCertService;
+import org.springframework.web.bind.annotation.*;
+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 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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+
+@Tag(name = "管理后台 - 计量器具-证书管理")
+@RestController
+@RequestMapping("/rq/iot-measure-cert")
+@Validated
+public class IotMeasureCertController {
+
+    @Resource
+    private IotMeasureCertService iotMeasureCertService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建计量器具-证书管理")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-cert:create')")
+    public CommonResult<Long> createIotMeasureCert(@Valid @RequestBody IotMeasureCertSaveReqVO createReqVO) {
+        return success(iotMeasureCertService.createIotMeasureCert(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新计量器具-证书管理")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-cert:update')")
+    public CommonResult<Boolean> updateIotMeasureCert(@Valid @RequestBody IotMeasureCertSaveReqVO updateReqVO) {
+        iotMeasureCertService.updateIotMeasureCert(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除计量器具-证书管理")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-cert:delete')")
+    public CommonResult<Boolean> deleteIotMeasureCert(@RequestParam("id") Long id) {
+        iotMeasureCertService.deleteIotMeasureCert(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得计量器具-证书管理")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-cert:query')")
+    public CommonResult<IotMeasureCertRespVO> getIotMeasureCert(@RequestParam("id") Long id) {
+        IotMeasureCertDO iotMeasureCert = iotMeasureCertService.getIotMeasureCert(id);
+        return success(BeanUtils.toBean(iotMeasureCert, IotMeasureCertRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得计量器具-证书管理分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-cert:query')")
+    public CommonResult<PageResult<IotMeasureCertRespVO>> getIotMeasureCertPage(@Valid IotMeasureCertPageReqVO pageReqVO) {
+        PageResult<IotMeasureCertDO> pageResult = iotMeasureCertService.getIotMeasureCertPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotMeasureCertRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出计量器具-证书管理 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-cert:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotMeasureCertExcel(@Valid IotMeasureCertPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotMeasureCertDO> list = iotMeasureCertService.getIotMeasureCertPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "计量器具-证书管理.xls", "数据", IotMeasureCertRespVO.class,
+                        BeanUtils.toBean(list, IotMeasureCertRespVO.class));
+    }
+
+}

+ 54 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/IotMeasureCertPageReqVO.java

@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo;
+
+import lombok.*;
+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 IotMeasureCertPageReqVO extends PageParam {
+
+    @Schema(description = "证书类型", example = "2")
+    private String type;
+
+    @Schema(description = "证书类别")
+    private String classify;
+
+    @Schema(description = "证书所属公司/个人")
+    private String certBelong;
+
+    @Schema(description = "证书颁发机构")
+    private String certOrg;
+
+    @Schema(description = "证书标准")
+    private String certStandard;
+
+    @Schema(description = "证书颁发时间")
+    private LocalDateTime certIssue;
+
+    @Schema(description = "证书有效期")
+    private LocalDateTime certExpire;
+
+    @Schema(description = "到期前提醒")
+    private Integer noticeBefore;
+
+    @Schema(description = "证书图片上传")
+    private String certPic;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门id", example = "29429")
+    private Long deptId;
+
+}

+ 66 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/IotMeasureCertRespVO.java

@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 计量器具-证书管理 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotMeasureCertRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9663")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "证书类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("证书类型")
+    private String type;
+
+    @Schema(description = "证书类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("证书类别")
+    private String classify;
+
+    @Schema(description = "证书所属公司/个人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("证书所属公司/个人")
+    private String certBelong;
+
+    @Schema(description = "证书颁发机构")
+    @ExcelProperty("证书颁发机构")
+    private String certOrg;
+
+    @Schema(description = "证书标准")
+    @ExcelProperty("证书标准")
+    private String certStandard;
+
+    @Schema(description = "证书颁发时间")
+    @ExcelProperty("证书颁发时间")
+    private LocalDateTime certIssue;
+
+    @Schema(description = "证书有效期")
+    @ExcelProperty("证书有效期")
+    private LocalDateTime certExpire;
+
+    @Schema(description = "到期前提醒")
+    @ExcelProperty("到期前提醒")
+    private Integer noticeBefore;
+
+    @Schema(description = "证书图片上传")
+    @ExcelProperty("证书图片上传")
+    private String certPic;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门id", example = "29429")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+}

+ 52 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/IotMeasureCertSaveReqVO.java

@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 计量器具-证书管理新增/修改 Request VO")
+@Data
+public class IotMeasureCertSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9663")
+    private Long id;
+
+    @Schema(description = "证书类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "证书类型不能为空")
+    private String type;
+
+    @Schema(description = "证书类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "证书类别不能为空")
+    private String classify;
+
+    @Schema(description = "证书所属公司/个人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "证书所属公司/个人不能为空")
+    private String certBelong;
+
+    @Schema(description = "证书颁发机构")
+    private String certOrg;
+
+    @Schema(description = "证书标准")
+    private String certStandard;
+
+    @Schema(description = "证书颁发时间")
+    private LocalDateTime certIssue;
+
+    @Schema(description = "证书有效期")
+    private LocalDateTime certExpire;
+
+    @Schema(description = "到期前提醒")
+    private Integer noticeBefore;
+
+    @Schema(description = "证书图片上传")
+    private String certPic;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "部门id", example = "29429")
+    private Long deptId;
+
+}

+ 98 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureDetectController.java

@@ -0,0 +1,98 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure;
+
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureDetectDO;
+import cn.iocoder.yudao.module.pms.service.qhse.measure.IotMeasureDetectService;
+import org.springframework.web.bind.annotation.*;
+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 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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+
+@Tag(name = "管理后台 - 计量器具-检测校准明细")
+@RestController
+@RequestMapping("/rq/iot-measure-detect")
+@Validated
+public class IotMeasureDetectController {
+
+    @Resource
+    private IotMeasureDetectService iotMeasureDetectService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建计量器具-检测校准明细")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-detect:create')")
+    public CommonResult<Long> createIotMeasureDetect(@Valid @RequestBody IotMeasureDetectSaveReqVO createReqVO) {
+        return success(iotMeasureDetectService.createIotMeasureDetect(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新计量器具-检测校准明细")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-detect:update')")
+    public CommonResult<Boolean> updateIotMeasureDetect(@Valid @RequestBody IotMeasureDetectSaveReqVO updateReqVO) {
+        iotMeasureDetectService.updateIotMeasureDetect(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除计量器具-检测校准明细")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-detect:delete')")
+    public CommonResult<Boolean> deleteIotMeasureDetect(@RequestParam("id") Long id) {
+        iotMeasureDetectService.deleteIotMeasureDetect(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得计量器具-检测校准明细")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-detect:query')")
+    public CommonResult<IotMeasureDetectRespVO> getIotMeasureDetect(@RequestParam("id") Long id) {
+        IotMeasureDetectDO iotMeasureDetect = iotMeasureDetectService.getIotMeasureDetect(id);
+        return success(BeanUtils.toBean(iotMeasureDetect, IotMeasureDetectRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得计量器具-检测校准明细分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-detect:query')")
+    public CommonResult<PageResult<IotMeasureDetectRespVO>> getIotMeasureDetectPage(@Valid IotMeasureDetectPageReqVO pageReqVO) {
+        PageResult<IotMeasureDetectDO> pageResult = iotMeasureDetectService.getIotMeasureDetectPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotMeasureDetectRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出计量器具-检测校准明细 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-detect:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotMeasureDetectExcel(@Valid IotMeasureDetectPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotMeasureDetectDO> list = iotMeasureDetectService.getIotMeasureDetectPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "计量器具-检测校准明细.xls", "数据", IotMeasureDetectRespVO.class,
+                        BeanUtils.toBean(list, IotMeasureDetectRespVO.class));
+    }
+
+}

+ 98 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureRecordController.java

@@ -0,0 +1,98 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure;
+
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureRecordPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureRecordRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureRecordSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureRecordDO;
+import cn.iocoder.yudao.module.pms.service.qhse.measure.IotMeasureRecordService;
+import org.springframework.web.bind.annotation.*;
+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 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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+
+@Tag(name = "管理后台 - 计量器具-使用记录")
+@RestController
+@RequestMapping("/rq/iot-measure-record")
+@Validated
+public class IotMeasureRecordController {
+
+    @Resource
+    private IotMeasureRecordService iotMeasureRecordService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建计量器具-使用记录")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-record:create')")
+    public CommonResult<Long> createIotMeasureRecord(@Valid @RequestBody IotMeasureRecordSaveReqVO createReqVO) {
+        return success(iotMeasureRecordService.createIotMeasureRecord(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新计量器具-使用记录")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-record:update')")
+    public CommonResult<Boolean> updateIotMeasureRecord(@Valid @RequestBody IotMeasureRecordSaveReqVO updateReqVO) {
+        iotMeasureRecordService.updateIotMeasureRecord(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除计量器具-使用记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-record:delete')")
+    public CommonResult<Boolean> deleteIotMeasureRecord(@RequestParam("id") Long id) {
+        iotMeasureRecordService.deleteIotMeasureRecord(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得计量器具-使用记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-record:query')")
+    public CommonResult<IotMeasureRecordRespVO> getIotMeasureRecord(@RequestParam("id") Long id) {
+        IotMeasureRecordDO iotMeasureRecord = iotMeasureRecordService.getIotMeasureRecord(id);
+        return success(BeanUtils.toBean(iotMeasureRecord, IotMeasureRecordRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得计量器具-使用记录分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-record:query')")
+    public CommonResult<PageResult<IotMeasureRecordRespVO>> getIotMeasureRecordPage(@Valid IotMeasureRecordPageReqVO pageReqVO) {
+        PageResult<IotMeasureRecordDO> pageResult = iotMeasureRecordService.getIotMeasureRecordPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotMeasureRecordRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出计量器具-使用记录 Excel")
+    @PreAuthorize("@ss.hasPermission('rq:iot-measure-record:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotMeasureRecordExcel(@Valid IotMeasureRecordPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotMeasureRecordDO> list = iotMeasureRecordService.getIotMeasureRecordPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "计量器具-使用记录.xls", "数据", IotMeasureRecordRespVO.class,
+                        BeanUtils.toBean(list, IotMeasureRecordRespVO.class));
+    }
+
+}

+ 1 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureBookSaveReqVO.java

@@ -16,7 +16,7 @@ public class IotMeasureBookSaveReqVO {
     private Long id;
 
     @Schema(description = "计量器具编码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "计量器具编码不能为空")
+//    @NotEmpty(message = "计量器具编码不能为空")
     private String measureCode;
 
     @Schema(description = "计量器具名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")

+ 44 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureDetectPageReqVO.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.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 IotMeasureDetectPageReqVO extends PageParam {
+
+    @Schema(description = "计量器具id", example = "29030")
+    private Long measureId;
+
+    @Schema(description = "检测/校准日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] detectDate;
+
+    @Schema(description = "检测/校准机构")
+    private String detectOrg;
+
+    @Schema(description = "检测/校准内容")
+    private String detectContent;
+
+    @Schema(description = "检测/校准有效期")
+    private LocalDateTime validityPeriod;
+
+    @Schema(description = "校准金额")
+    private Double detectAmount;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门id", example = "27536")
+    private Long deptId;
+
+}

+ 51 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureDetectRespVO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.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 IotMeasureDetectRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "4375")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "计量器具id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29030")
+    @ExcelProperty("计量器具id")
+    private Long measureId;
+
+    @Schema(description = "检测/校准日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("检测/校准日期")
+    private String detectDate;
+
+    @Schema(description = "检测/校准机构", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("检测/校准机构")
+    private String detectOrg;
+
+    @Schema(description = "检测/校准内容", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("检测/校准内容")
+    private String detectContent;
+
+    @Schema(description = "检测/校准有效期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("检测/校准有效期")
+    private LocalDateTime validityPeriod;
+
+    @Schema(description = "校准金额")
+    @ExcelProperty("校准金额")
+    private Double detectAmount;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门id", example = "27536")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+}

+ 45 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureDetectSaveReqVO.java

@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 计量器具-检测校准明细新增/修改 Request VO")
+@Data
+public class IotMeasureDetectSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "4375")
+    private Long id;
+
+    @Schema(description = "计量器具id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29030")
+    @NotNull(message = "计量器具id不能为空")
+    private Long measureId;
+
+    @Schema(description = "检测/校准日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "检测/校准日期不能为空")
+    private String detectDate;
+
+    @Schema(description = "检测/校准机构", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "检测/校准机构不能为空")
+    private String detectOrg;
+
+    @Schema(description = "检测/校准内容", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "检测/校准内容不能为空")
+    private String detectContent;
+
+    @Schema(description = "检测/校准有效期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "检测/校准有效期不能为空")
+    private LocalDateTime validityPeriod;
+
+    @Schema(description = "校准金额")
+    private Double detectAmount;
+
+    @Schema(description = "部门id", example = "27536")
+    private Long deptId;
+
+}

+ 44 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureRecordPageReqVO.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.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 IotMeasureRecordPageReqVO extends PageParam {
+
+    @Schema(description = "计量器具id", example = "12097")
+    private Long measureId;
+
+    @Schema(description = "使用日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] useDate;
+
+    @Schema(description = "使用原因", example = "不好")
+    private String useReason;
+
+    @Schema(description = "计量项目")
+    private String measureProject;
+
+    @Schema(description = "使用人")
+    private String usePerson;
+
+    @Schema(description = "使用人id", example = "21338")
+    private Long userId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门id", example = "31709")
+    private Long deptId;
+
+}

+ 51 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureRecordRespVO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.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 IotMeasureRecordRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18259")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "计量器具id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12097")
+    @ExcelProperty("计量器具id")
+    private Long measureId;
+
+    @Schema(description = "使用日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("使用日期")
+    private String useDate;
+
+    @Schema(description = "使用原因", example = "不好")
+    @ExcelProperty("使用原因")
+    private String useReason;
+
+    @Schema(description = "计量项目")
+    @ExcelProperty("计量项目")
+    private String measureProject;
+
+    @Schema(description = "使用人")
+    @ExcelProperty("使用人")
+    private String usePerson;
+
+    @Schema(description = "使用人id", example = "21338")
+    @ExcelProperty("使用人id")
+    private Long userId;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门id", example = "31709")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+}

+ 40 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureRecordSaveReqVO.java

@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 计量器具-使用记录新增/修改 Request VO")
+@Data
+public class IotMeasureRecordSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18259")
+    private Long id;
+
+    @Schema(description = "计量器具id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12097")
+    @NotNull(message = "计量器具id不能为空")
+    private Long measureId;
+
+    @Schema(description = "使用日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "使用日期不能为空")
+    private String useDate;
+
+    @Schema(description = "使用原因", example = "不好")
+    private String useReason;
+
+    @Schema(description = "计量项目")
+    private String measureProject;
+
+    @Schema(description = "使用人")
+    private String usePerson;
+
+    @Schema(description = "使用人id", example = "21338")
+    private Long userId;
+
+    @Schema(description = "部门id", example = "31709")
+    private Long deptId;
+
+}

+ 77 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/cert/IotMeasureCertDO.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+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_measure_cert")
+@KeySequence("rq_iot_measure_cert_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotMeasureCertDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 证书类型
+     */
+    private String type;
+    /**
+     * 证书类别
+     */
+    private String classify;
+    /**
+     * 证书所属公司/个人
+     */
+    private String certBelong;
+    /**
+     * 证书颁发机构
+     */
+    private String certOrg;
+    /**
+     * 证书标准
+     */
+    private String certStandard;
+    /**
+     * 证书颁发时间
+     */
+    private LocalDateTime certIssue;
+    /**
+     * 证书有效期
+     */
+    private LocalDateTime certExpire;
+    /**
+     * 到期前提醒
+     */
+    private Integer noticeBefore;
+    /**
+     * 证书图片上传
+     */
+    private String certPic;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+}

+ 60 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/measure/IotMeasureDetectDO.java

@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+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_measure_detect")
+@KeySequence("rq_iot_measure_detect_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotMeasureDetectDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 计量器具id
+     */
+    private Long measureId;
+    /**
+     * 检测/校准日期
+     */
+    private String detectDate;
+    /**
+     * 检测/校准机构
+     */
+    private String detectOrg;
+    /**
+     * 检测/校准内容
+     */
+    private String detectContent;
+    /**
+     * 检测/校准有效期
+     */
+    private LocalDateTime validityPeriod;
+    /**
+     * 校准金额
+     */
+    private Double detectAmount;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+}

+ 59 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/measure/IotMeasureRecordDO.java

@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure;
+
+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_measure_record")
+@KeySequence("rq_iot_measure_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotMeasureRecordDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 计量器具id
+     */
+    private Long measureId;
+    /**
+     * 使用日期
+     */
+    private String useDate;
+    /**
+     * 使用原因
+     */
+    private String useReason;
+    /**
+     * 计量项目
+     */
+    private String measureProject;
+    /**
+     * 使用人
+     */
+    private String usePerson;
+    /**
+     * 使用人id
+     */
+    private Long userId;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+}

+ 37 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/cert/IotMeasureCertMapper.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.qhse.cert;
+
+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.dal.dataobject.qhse.cert.IotMeasureCertDO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertPageReqVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Set;
+
+/**
+ * 计量器具-证书管理 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotMeasureCertMapper extends BaseMapperX<IotMeasureCertDO> {
+
+    default PageResult<IotMeasureCertDO> selectPage(IotMeasureCertPageReqVO reqVO, Set<Long> ids ) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotMeasureCertDO>()
+                .eqIfPresent(IotMeasureCertDO::getType, reqVO.getType())
+                .eqIfPresent(IotMeasureCertDO::getClassify, reqVO.getClassify())
+                .eqIfPresent(IotMeasureCertDO::getCertBelong, reqVO.getCertBelong())
+                .eqIfPresent(IotMeasureCertDO::getCertOrg, reqVO.getCertOrg())
+                .eqIfPresent(IotMeasureCertDO::getCertStandard, reqVO.getCertStandard())
+                .eqIfPresent(IotMeasureCertDO::getCertIssue, reqVO.getCertIssue())
+                .eqIfPresent(IotMeasureCertDO::getCertExpire, reqVO.getCertExpire())
+                .eqIfPresent(IotMeasureCertDO::getNoticeBefore, reqVO.getNoticeBefore())
+                .eqIfPresent(IotMeasureCertDO::getCertPic, reqVO.getCertPic())
+                .eqIfPresent(IotMeasureCertDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(IotMeasureCertDO::getCreateTime, reqVO.getCreateTime())
+                .inIfPresent(IotMeasureCertDO::getDeptId, ids)
+                .orderByDesc(IotMeasureCertDO::getId));
+    }
+
+}

+ 2 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/measure/IotMeasureBookMapper.java

@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotMeasureBookMapper extends BaseMapperX<IotMeasureBookDO> {
 
-    default PageResult<IotMeasureBookDO> selectPage(IotMeasureBookPageReqVO reqVO) {
+    default PageResult<IotMeasureBookDO> selectPage(IotMeasureBookPageReqVO reqVO, Set<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotMeasureBookDO>()
                 .eqIfPresent(IotMeasureBookDO::getMeasureCode, reqVO.getMeasureCode())
                 .likeIfPresent(IotMeasureBookDO::getMeasureName, reqVO.getMeasureName())
@@ -33,7 +33,7 @@ public interface IotMeasureBookMapper extends BaseMapperX<IotMeasureBookDO> {
                 .eqIfPresent(IotMeasureBookDO::getMeasurePic, reqVO.getMeasurePic())
                 .eqIfPresent(IotMeasureBookDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotMeasureBookDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(IotMeasureBookDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotMeasureBookDO::getDeptId, ids)
                 .orderByDesc(IotMeasureBookDO::getId));
     }
 

+ 33 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/measure/IotMeasureDetectMapper.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.qhse.measure;
+
+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.qhse.measure.vo.IotMeasureDetectPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureDetectDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 计量器具-检测校准明细 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotMeasureDetectMapper extends BaseMapperX<IotMeasureDetectDO> {
+
+    default PageResult<IotMeasureDetectDO> selectPage(IotMeasureDetectPageReqVO reqVO, Set<Long> ids) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotMeasureDetectDO>()
+                .eqIfPresent(IotMeasureDetectDO::getMeasureId, reqVO.getMeasureId())
+                .betweenIfPresent(IotMeasureDetectDO::getDetectDate, reqVO.getDetectDate())
+                .eqIfPresent(IotMeasureDetectDO::getDetectOrg, reqVO.getDetectOrg())
+                .eqIfPresent(IotMeasureDetectDO::getDetectContent, reqVO.getDetectContent())
+                .eqIfPresent(IotMeasureDetectDO::getValidityPeriod, reqVO.getValidityPeriod())
+                .eqIfPresent(IotMeasureDetectDO::getDetectAmount, reqVO.getDetectAmount())
+                .betweenIfPresent(IotMeasureDetectDO::getCreateTime, reqVO.getCreateTime())
+                .inIfPresent(IotMeasureDetectDO::getDeptId, ids)
+                .orderByDesc(IotMeasureDetectDO::getId));
+    }
+
+}

+ 33 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/measure/IotMeasureRecordMapper.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.qhse.measure;
+
+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.qhse.measure.vo.IotMeasureRecordPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureRecordDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 计量器具-使用记录 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotMeasureRecordMapper extends BaseMapperX<IotMeasureRecordDO> {
+
+    default PageResult<IotMeasureRecordDO> selectPage(IotMeasureRecordPageReqVO reqVO, Set<Long> ids) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotMeasureRecordDO>()
+                .eqIfPresent(IotMeasureRecordDO::getMeasureId, reqVO.getMeasureId())
+                .betweenIfPresent(IotMeasureRecordDO::getUseDate, reqVO.getUseDate())
+                .eqIfPresent(IotMeasureRecordDO::getUseReason, reqVO.getUseReason())
+                .eqIfPresent(IotMeasureRecordDO::getMeasureProject, reqVO.getMeasureProject())
+                .eqIfPresent(IotMeasureRecordDO::getUsePerson, reqVO.getUsePerson())
+                .eqIfPresent(IotMeasureRecordDO::getUserId, reqVO.getUserId())
+                .betweenIfPresent(IotMeasureRecordDO::getCreateTime, reqVO.getCreateTime())
+                .inIfPresent(IotMeasureRecordDO::getDeptId, ids)
+                .orderByDesc(IotMeasureRecordDO::getId));
+    }
+
+}

+ 57 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/IotMeasureCertService.java

@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.pms.service.qhse.cert;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.IotMeasureCertDO;
+
+import javax.validation.Valid;
+
+/**
+ * 计量器具-证书管理 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface IotMeasureCertService {
+
+    /**
+     * 创建计量器具-证书管理
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotMeasureCert(@Valid IotMeasureCertSaveReqVO createReqVO);
+
+    /**
+     * 更新计量器具-证书管理
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotMeasureCert(@Valid IotMeasureCertSaveReqVO updateReqVO);
+
+    /**
+     * 删除计量器具-证书管理
+     *
+     * @param id 编号
+     */
+    void deleteIotMeasureCert(Long id);
+
+    /**
+     * 获得计量器具-证书管理
+     *
+     * @param id 编号
+     * @return 计量器具-证书管理
+     */
+    IotMeasureCertDO getIotMeasureCert(Long id);
+
+    /**
+     * 获得计量器具-证书管理分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 计量器具-证书管理分页
+     */
+    PageResult<IotMeasureCertDO> getIotMeasureCertPage(IotMeasureCertPageReqVO pageReqVO);
+
+}

+ 86 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/IotMeasureCertServiceImpl.java

@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.pms.service.qhse.cert;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.IotMeasureCertDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.qhse.cert.IotMeasureCertMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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 javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/**
+ * 计量器具-证书管理 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class IotMeasureCertServiceImpl implements IotMeasureCertService {
+
+    @Resource
+    private IotMeasureCertMapper iotMeasureCertMapper;
+    @Autowired
+    private DeptService deptService;
+
+    @Override
+    public Long createIotMeasureCert(IotMeasureCertSaveReqVO createReqVO) {
+        // 插入
+        IotMeasureCertDO iotMeasureCert = BeanUtils.toBean(createReqVO, IotMeasureCertDO.class);
+        iotMeasureCert.setDeleted(false);
+        iotMeasureCertMapper.insert(iotMeasureCert);
+        // 返回
+        return iotMeasureCert.getId();
+    }
+
+    @Override
+    public void updateIotMeasureCert(IotMeasureCertSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotMeasureCertExists(updateReqVO.getId());
+        // 更新
+        IotMeasureCertDO updateObj = BeanUtils.toBean(updateReqVO, IotMeasureCertDO.class);
+        iotMeasureCertMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotMeasureCert(Long id) {
+        // 校验存在
+        validateIotMeasureCertExists(id);
+        // 删除
+        iotMeasureCertMapper.deleteById(id);
+    }
+
+    private void validateIotMeasureCertExists(Long id) {
+        if (iotMeasureCertMapper.selectById(id) == null) {
+            throw exception(new ErrorCode(2, "不存在"));
+        }
+    }
+
+    @Override
+    public IotMeasureCertDO getIotMeasureCert(Long id) {
+        return iotMeasureCertMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotMeasureCertDO> getIotMeasureCertPage(IotMeasureCertPageReqVO pageReqVO) {
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotMeasureCertMapper.selectPage(pageReqVO, ids);
+    }
+
+}

+ 12 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureBookServiceImpl.java

@@ -2,10 +2,14 @@ package cn.iocoder.yudao.module.pms.service.qhse.measure;
 
 import cn.hutool.core.date.DateUtil;
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.util.object.PageUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureBookPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureBookSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureBookDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.measure.IotMeasureBookMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +35,8 @@ public class IotMeasureBookServiceImpl implements IotMeasureBookService {
 
     @Resource
     private IotMeasureBookMapper iotMeasureBookMapper;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createIotMeasureBook(IotMeasureBookSaveReqVO createReqVO) {
@@ -73,7 +79,12 @@ public class IotMeasureBookServiceImpl implements IotMeasureBookService {
 
     @Override
     public PageResult<IotMeasureBookDO> getIotMeasureBookPage(IotMeasureBookPageReqVO pageReqVO) {
-        return iotMeasureBookMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotMeasureBookMapper.selectPage(pageReqVO,ids);
     }
 
 }

+ 57 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureDetectService.java

@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.pms.service.qhse.measure;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureDetectDO;
+
+import javax.validation.Valid;
+
+/**
+ * 计量器具-检测校准明细 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface IotMeasureDetectService {
+
+    /**
+     * 创建计量器具-检测校准明细
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotMeasureDetect(@Valid IotMeasureDetectSaveReqVO createReqVO);
+
+    /**
+     * 更新计量器具-检测校准明细
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotMeasureDetect(@Valid IotMeasureDetectSaveReqVO updateReqVO);
+
+    /**
+     * 删除计量器具-检测校准明细
+     *
+     * @param id 编号
+     */
+    void deleteIotMeasureDetect(Long id);
+
+    /**
+     * 获得计量器具-检测校准明细
+     *
+     * @param id 编号
+     * @return 计量器具-检测校准明细
+     */
+    IotMeasureDetectDO getIotMeasureDetect(Long id);
+
+    /**
+     * 获得计量器具-检测校准明细分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 计量器具-检测校准明细分页
+     */
+    PageResult<IotMeasureDetectDO> getIotMeasureDetectPage(IotMeasureDetectPageReqVO pageReqVO);
+
+}

+ 86 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureDetectServiceImpl.java

@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.pms.service.qhse.measure;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureDetectSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureDetectDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.qhse.measure.IotMeasureDetectMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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 javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/**
+ * 计量器具-检测校准明细 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class IotMeasureDetectServiceImpl implements IotMeasureDetectService {
+
+    @Resource
+    private IotMeasureDetectMapper iotMeasureDetectMapper;
+    @Autowired
+    private DeptService deptService;
+
+    @Override
+    public Long createIotMeasureDetect(IotMeasureDetectSaveReqVO createReqVO) {
+        // 插入
+        IotMeasureDetectDO iotMeasureDetect = BeanUtils.toBean(createReqVO, IotMeasureDetectDO.class);
+        iotMeasureDetect.setDeleted(false);
+        iotMeasureDetectMapper.insert(iotMeasureDetect);
+        // 返回
+        return iotMeasureDetect.getId();
+    }
+
+    @Override
+    public void updateIotMeasureDetect(IotMeasureDetectSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotMeasureDetectExists(updateReqVO.getId());
+        // 更新
+        IotMeasureDetectDO updateObj = BeanUtils.toBean(updateReqVO, IotMeasureDetectDO.class);
+        iotMeasureDetectMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotMeasureDetect(Long id) {
+        // 校验存在
+        validateIotMeasureDetectExists(id);
+        // 删除
+        iotMeasureDetectMapper.deleteById(id);
+    }
+
+    private void validateIotMeasureDetectExists(Long id) {
+        if (iotMeasureDetectMapper.selectById(id) == null) {
+            throw exception(new ErrorCode(1,"不存在"));
+        }
+    }
+
+    @Override
+    public IotMeasureDetectDO getIotMeasureDetect(Long id) {
+        return iotMeasureDetectMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotMeasureDetectDO> getIotMeasureDetectPage(IotMeasureDetectPageReqVO pageReqVO) {
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotMeasureDetectMapper.selectPage(pageReqVO, ids);
+    }
+
+}

+ 57 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureRecordService.java

@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.pms.service.qhse.measure;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureRecordPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureRecordSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureRecordDO;
+
+import javax.validation.Valid;
+
+/**
+ * 计量器具-使用记录 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface IotMeasureRecordService {
+
+    /**
+     * 创建计量器具-使用记录
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotMeasureRecord(@Valid IotMeasureRecordSaveReqVO createReqVO);
+
+    /**
+     * 更新计量器具-使用记录
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotMeasureRecord(@Valid IotMeasureRecordSaveReqVO updateReqVO);
+
+    /**
+     * 删除计量器具-使用记录
+     *
+     * @param id 编号
+     */
+    void deleteIotMeasureRecord(Long id);
+
+    /**
+     * 获得计量器具-使用记录
+     *
+     * @param id 编号
+     * @return 计量器具-使用记录
+     */
+    IotMeasureRecordDO getIotMeasureRecord(Long id);
+
+    /**
+     * 获得计量器具-使用记录分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 计量器具-使用记录分页
+     */
+    PageResult<IotMeasureRecordDO> getIotMeasureRecordPage(IotMeasureRecordPageReqVO pageReqVO);
+
+}

+ 86 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureRecordServiceImpl.java

@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.pms.service.qhse.measure;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureRecordPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureRecordSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureRecordDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.qhse.measure.IotMeasureRecordMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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 javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/**
+ * 计量器具-使用记录 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class IotMeasureRecordServiceImpl implements IotMeasureRecordService {
+
+    @Resource
+    private IotMeasureRecordMapper iotMeasureRecordMapper;
+    @Autowired
+    private DeptService deptService;
+
+    @Override
+    public Long createIotMeasureRecord(IotMeasureRecordSaveReqVO createReqVO) {
+        // 插入
+        IotMeasureRecordDO iotMeasureRecord = BeanUtils.toBean(createReqVO, IotMeasureRecordDO.class);
+        iotMeasureRecord.setDeleted(false);
+        iotMeasureRecordMapper.insert(iotMeasureRecord);
+        // 返回
+        return iotMeasureRecord.getId();
+    }
+
+    @Override
+    public void updateIotMeasureRecord(IotMeasureRecordSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotMeasureRecordExists(updateReqVO.getId());
+        // 更新
+        IotMeasureRecordDO updateObj = BeanUtils.toBean(updateReqVO, IotMeasureRecordDO.class);
+        iotMeasureRecordMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotMeasureRecord(Long id) {
+        // 校验存在
+        validateIotMeasureRecordExists(id);
+        // 删除
+        iotMeasureRecordMapper.deleteById(id);
+    }
+
+    private void validateIotMeasureRecordExists(Long id) {
+        if (iotMeasureRecordMapper.selectById(id) == null) {
+            throw exception(new ErrorCode(2,"不存在"));
+        }
+    }
+
+    @Override
+    public IotMeasureRecordDO getIotMeasureRecord(Long id) {
+        return iotMeasureRecordMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotMeasureRecordDO> getIotMeasureRecordPage(IotMeasureRecordPageReqVO pageReqVO) {
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotMeasureRecordMapper.selectPage(pageReqVO, ids);
+    }
+
+}