Merge branch 'master' of http://1.94.244.160:3000/shuzhihua/pms-iot

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/thingmodel/ThingModelCommonDO.java

@@ -1,9 +1,14 @@
 package cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.model.ThingModelEvent;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.model.ThingModelProperty;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.model.ThingModelService;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 
 /**
@@ -42,17 +47,21 @@ public class ThingModelCommonDO extends BaseDO {
      * 功能类型（1 - 属性，2 - 服务，3 - 事件）
      */
     private Integer type;
+
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private ThingModelProperty property;
+
     /**
-     * 属性（存储 ThingModelProperty 的 JSON 数据）
-     */
-    private String property;
-    /**
-     * 事件（存储 ThingModelEvent 的 JSON 数据）
+     * 事件
      */
-    private String event;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private ThingModelEvent event;
+
     /**
-     * 服务（存储服务的 JSON 数据）
+     * 服务
      */
-    private String service;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private ThingModelService service;
+
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/devicecert/QhseDeviceCertController.java

@@ -104,6 +104,20 @@ public class QhseDeviceCertController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<QhseDeviceCertDO> list = qhseDeviceCertService.getQhseDeviceCertPage(pageReqVO).getList();
+        List<DeptRespDTO> deptList = deptApi.getDeptList();
+        list.forEach(e ->{
+            if(Objects.nonNull(e)&&Objects.nonNull(e.getDeptId())){
+                deptList.stream().filter(dept -> dept.getId().equals(e.getDeptId())).forEach(dept -> {
+                    e.setDeptName(dept.getName());
+                });
+                if ("three".equals(e.getCertType())) {
+                    e.setCertType("三类检测证书");
+                }
+                if ("four".equals(e.getCertType())) {
+                    e.setCertType("四类检测证书");
+                }
+            }
+        });
         // 导出 Excel
         ExcelUtils.write(response, "QHSE应检设备证书.xls", "数据", QhseDeviceCertRespVO.class,
                         BeanUtils.toBean(list, QhseDeviceCertRespVO.class));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/devicecert/vo/QhseDeviceCertRespVO.java

@@ -17,22 +17,27 @@ public class QhseDeviceCertRespVO {
     private Long id;
 
     @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9166")
-    @ExcelProperty("设备id")
+//    @ExcelProperty("设备id")
     private Long deviceId;
 
     @Schema(description = "部门id", example = "20873")
-    @ExcelProperty("部门id")
+//    @ExcelProperty("部门id")
     private Long deptId;
 
+    @Schema(description = "设备编码", example = "芋艿")
+    @ExcelProperty("设备编码")
+    private String deviceCode;
+
     @Schema(description = "设备名称", example = "芋艿")
     @ExcelProperty("设备名称")
     private String deviceName;
 
-    @Schema(description = "证书编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("证书编号")
+    @Schema(description = "序列号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("序列号")
     private String certNo;
 
     @Schema(description = "证书类别")
+    @ExcelProperty("证书类别")
     private String certType;
 
     @Schema(description = "检测单位", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -67,6 +72,4 @@ public class QhseDeviceCertRespVO {
     @Schema(description = "过期")
     private Boolean expired;
 
-    @Schema(description = "设备编码")
-    private String deviceCode;
 }