Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotDeviceRespVO.java

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/plan/IotInspectPlanController.java

@@ -11,7 +11,10 @@ import cn.iocoder.yudao.module.pms.controller.admin.inspect.plan.vo.IotInspectPl
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.plan.vo.IotInspectPlanSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectPlanService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserUpdateStatusReqVO;
+import com.xingyuv.captcha.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,8 +26,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -38,6 +42,8 @@ public class IotInspectPlanController {
 
     @Resource
     private IotInspectPlanService iotInspectPlanService;
+    @Resource
+    private AdminUserApi adminUserApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建巡检计划")
@@ -79,7 +85,18 @@ public class IotInspectPlanController {
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-plan:query')")
     public CommonResult<PageResult<IotInspectPlanRespVO>> getIotInspectPlanPage(@Valid IotInspectPlanPageReqVO pageReqVO) {
         PageResult<IotInspectPlanDO> pageResult = iotInspectPlanService.getIotInspectPlanPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IotInspectPlanRespVO.class));
+        List<IotInspectPlanRespVO> collect = pageResult.getList().stream().map(e -> {
+            IotInspectPlanRespVO iotInspectPlanRespVO = new IotInspectPlanRespVO();
+            BeanUtils.copyProperties(e, iotInspectPlanRespVO);
+            if (StringUtils.isNotBlank(e.getCreator())) {
+                AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(e.getCreator()));
+                if (Objects.nonNull(user)) {
+                    iotInspectPlanRespVO.setCreateName(user.getNickname());
+                }
+            }
+            return iotInspectPlanRespVO;
+        }).collect(Collectors.toList());
+        return success(new PageResult<>(collect, pageResult.getTotal()));
     }
 
     @GetMapping("/export-excel")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/plan/vo/IotInspectPlanRespVO.java

@@ -63,4 +63,6 @@ public class IotInspectPlanRespVO {
     private String beginCreateTime;
 
     private List<String> charges;
+
+    private String createName;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/IotMaintainController.java

@@ -21,14 +21,13 @@ import cn.iocoder.yudao.module.pms.service.failure.IotFailureReportService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainBomService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainService;
 import cn.iocoder.yudao.module.pms.service.maintain.material.IotMaintainMaterialService;
-import cn.iocoder.yudao.module.pms.util.IotDeviceConvert;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.service.product.SupplierService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import com.xingyuv.captcha.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -126,9 +125,18 @@ public class IotMaintainController {
         List<IotMaintainRespVO> collect = pageResult.getList().stream().map(e -> {
             IotMaintainRespVO iotMaintainRespVO = new IotMaintainRespVO();
             BeanUtils.copyProperties(e, iotMaintainRespVO);
-            DeptRespDTO dept = deptApi.getDept(e.getDeptId());
-            if (Objects.nonNull(dept)) {
-                iotMaintainRespVO.setDeptName(dept.getName());
+            if (Objects.nonNull(e.getDeptId())) {
+                DeptRespDTO dept = deptApi.getDept(e.getDeptId());
+                if (Objects.nonNull(dept)) {
+                    iotMaintainRespVO.setDeptName(dept.getName());
+                }
+            }
+
+            if (StringUtils.isNotBlank(e.getCreator())) {
+                AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(e.getCreator()));
+                if (Objects.nonNull(user)) {
+                    iotMaintainRespVO.setCreateName(user.getNickname());
+                }
             }
             return iotMaintainRespVO;
         }).collect(Collectors.toList());

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/vo/IotMaintainRespVO.java

@@ -1,18 +1,15 @@
 package cn.iocoder.yudao.module.pms.controller.admin.maintain.vo;
 
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainBomDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.material.IotMaintainMaterialDO;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
-import com.alibaba.excel.annotation.*;
-
-import javax.validation.constraints.NotEmpty;
-
 @Schema(description = "管理后台 - 维修工单 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -128,4 +125,6 @@ public class IotMaintainRespVO {
     private String supplierName;
 
     private String deptName;
+
+    private String createName;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotDeviceRespVO.java

@@ -204,4 +204,7 @@ public class IotDeviceRespVO {
 
     @Schema(description = "模板中涉及多个累计运行公里数的属性集合")
     private List<IotDeviceRunLogRespVO> mileageAccumulatedAttrs;
+
+    @Schema(description = "启用日期")
+    private String enableDate;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotDeviceSaveReqVO.java

@@ -111,4 +111,7 @@ public class IotDeviceSaveReqVO {
 
     @Schema(description = "车辆id")
     private Long carId;
+
+    @Schema(description = "启用日期")
+    private LocalDateTime enableDate;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/IotDeviceDO.java

@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -163,4 +162,6 @@ public class IotDeviceDO extends BaseDO {
     private Double lat;
     private String location;
     private String chargeName;
+
+    private LocalDateTime enableDate;
 }

yudao-server/src/main/resources/application-prod.yaml

@@ -56,7 +56,10 @@ spring:
           url: jdbc:mysql://172.21.20.20:3306/yanfan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: ruiqi
           password: .N_Mdq!BR1W4
-
+        yanfan:
+          url: jdbc:mysql://172.21.20.20:3306/yanfan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: ruiqi
+          password: .N_Mdq!BR1W4
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
     host: localhost # 地址
@@ -251,7 +254,8 @@ iot:
     # 清除会话(设置为false,断开连接，重连后使用原来的会话 保留订阅的主题，能接收离线期间的消息)
     clearSession: true
 
-
+yanfan:
+  url: http://172.21.10.65
 # 插件配置
 pf4j:
   pluginsDir: ${user.home}/plugins # 插件目录