From 1f9f5596657af4af7e4e7da735358a0f00d64bbc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 09:17:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java | 14 +++++-
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java | 28 ++++++++++++++
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java | 16 ++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml | 2
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml | 24 -----------
5 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
index e521e73..15f4ce0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
@@ -19,12 +19,15 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
import java.util.List;
/**
@@ -55,6 +58,19 @@
@ApiModelProperty(value = "计划周期具体值，数组对象[1,2,3]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<String> planCycleValue;
+
+ @ApiModelProperty(value = "维护状态（0未维修1已维修）")
+ private Integer maintainStatus;
+
+ @ApiModelProperty(value = "最后维修时间")
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date lastMaintainTime;
+
/**
* 区域编码
*/
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
index 11d9b1f..62d0c4b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
@@ -37,27 +37,6 @@
b.create_time as device_create_time
</sql>
- <sql id="maintainStatusCalculation">
- CASE
- WHEN (
- SELECT COUNT(1)
- FROM ja_fw_device_maintain_record r
- WHERE r.device_id = a.device_id
- AND r.is_deleted = 0
- AND r.maintain_time IS NOT NULL
- AND (
- (a.plan_cycle_type = '1' AND FIND_IN_SET(DATE_FORMAT(r.maintain_time, '%m月%d号'), REPLACE(REPLACE(REPLACE(a.plan_cycle_value, '[', ''), ']', ''), '"', '')) > 0)
- OR (a.plan_cycle_type = '2' AND FIND_IN_SET(DATE_FORMAT(r.maintain_time, '%d号'), REPLACE(REPLACE(REPLACE(a.plan_cycle_value, '[', ''), ']', ''), '"', '')) > 0)
- OR (a.plan_cycle_type = '3' AND FIND_IN_SET(ELT(DAYOFWEEK(r.maintain_time), '星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'), REPLACE(REPLACE(REPLACE(a.plan_cycle_value, '[', ''), ']', ''), '"', '')) > 0)
- )
- ) > 0 THEN '已维护'
- ELSE '未维护'
- END AS maintain_status,
- (SELECT MAX(r.maintain_time) FROM ja_fw_device_maintain_record r WHERE r.device_id = a.device_id AND r.is_deleted = 0) AS last_maintain_time
-
- </sql>
-
-
<select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
select
<include refid="deviceFields"/>,a.*
@@ -75,8 +54,7 @@
<select id="selectFwDeviceMaintainPlanPage" resultMap="fwDeviceMaintainPlanResultMap">
select
- <include refid="deviceFields"/>,a.*,
- <include refid="maintainStatusCalculation"/>
+ <include refid="deviceFields"/>,a.*
from
ja_fw_device_maintain_plan a
left join ja_fw_device b on (a.device_id = b.id)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
index f4fbb3f..30b7795 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
@@ -16,8 +16,10 @@
*/
package org.sxkj.fw.device.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import org.sxkj.system.cache.SysCache;
import java.io.Serializable;
@@ -118,11 +120,17 @@
@ApiModelProperty("入库时间")
private Date createTime;
- @ApiModelProperty(value = "维修状态")
- private String maintainStatus;
+ @ApiModelProperty(value = "维护状态（0未维修1已维修）")
+ private Integer maintainStatus;
@ApiModelProperty(value = "最后维修时间")
- private String lastMaintainTime;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date lastMaintainTime;
@ApiModelProperty(value = "所属部门名称")
public String getBelongDeptName() {
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml
index ce8967f..6b87fb6 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataEvaluationMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.sxkj.gd.orderdata.mapper.GdDataEvaluationMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="gdDataEvaluationResultMap" type="org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity">
+ <resultMap id="gdDataEvaluationResultMap" type="org.sxkj.gd.orderdata.vo.GdDataEvaluationVO">
<result column="id" property="id"/>
<result column="title" property="title"/>
<result column="data_name" property="dataName"/>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
index 1c7cc2b..ad34315 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
@@ -16,8 +16,12 @@
*/
package org.sxkj.gd.orderdata.vo;
+import io.swagger.annotations.ApiModelProperty;
import org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity;
import org.springblade.core.tool.node.INode;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.sxkj.system.cache.SysCache;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -32,4 +36,28 @@
public class GdDataEvaluationVO extends GdDataEvaluationEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "提出部门名称")
+ public String getProposeDeptName() {
+ if (StringUtil.isBlank(getProposeDeptId())) {
+ return null;
+ }
+ Long deptId = Func.toLong(getProposeDeptId());
+ if (deptId == null || deptId <= 0) {
+ return null;
+ }
+ return SysCache.getDeptName(deptId);
+ }
+
+ @ApiModelProperty(value = "数据提供部门名称")
+ public String getDataProvideDeptName() {
+ if (StringUtil.isBlank(getDataProvideDeptId())) {
+ return null;
+ }
+ Long deptId = Func.toLong(getDataProvideDeptId());
+ if (deptId == null || deptId <= 0) {
+ return null;
+ }
+ return SysCache.getDeptName(deptId);
+ }
+
}
--
Gitblit v1.9.3