From cb3ee0a2600d0270cac237939b5170a11c6cc931 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 3 Mar 2026 10:57:35 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=B1=9E=E6=80=A7=EF=BC=88?=
=?UTF-8?q?=E5=AE=9A=E6=97=B6=E3=80=81=E8=AE=A1=E6=97=B6=EF=BC=89=202?=
=?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=AF=A6=E6=83=85?=
=?UTF-8?q?/=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91=E5=B0=86=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E6=8C=87=E4=BB=A4=E5=9B=BE=E6=A0=87=E3=80=81=E7=84=A6?=
=?UTF-8?q?=E7=82=B9=E6=8C=87=E4=BB=A4=E5=9B=BE=E6=A0=87=E6=8C=AA=E5=88=B0?=
=?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=8F=8F=E8=BF=B0=E5=89=8D?=
=?UTF-8?q?=203=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E9=A1=B5=E5=9B=9E=E6=98=BE=E6=9C=8D=E5=8A=A1=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7=EF=BC=9B=E8=AF=A6=E6=83=85=E3=80=81=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=9C=8D=E5=8A=A1=E5=B1=9E=E6=80=A7=204?=
=?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E5=AD=98=E5=82=A8=205?=
=?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=BA=93=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/nu/dto/DirectiveAsyncMQDto.java | 7 ++
.../com/nu/dto/DirectiveOpeLogInfoMQDto.java | 111 ++++++++++++++----
.../java/com/nu/entity/DirectiveEntity.java | 4 +
.../ConfigServiceDirectiveController.java | 3 +
.../entity/ConfigServiceDirective.java | 21 ++--
.../xml/ConfigServiceDirectiveMapper.xml | 2 +
6 files changed, 116 insertions(+), 32 deletions(-)
diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
index ec341d2f..27a0afea 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
@@ -1,6 +1,9 @@
package com.nu.dto;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
@@ -56,6 +59,10 @@ public class DirectiveAsyncMQDto implements Serializable {
* 指令类型 1日常护理 2周期护理 3即时护理
*/
private String cycleType;
+ /**
+ * 服务属性 ds定时 js计时
+ */
+ private String serviceAttribute;
/**
* 排序
*/
diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java
index c1e3f032..7b0e70c7 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java
@@ -1,8 +1,17 @@
package com.nu.dto;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -11,59 +20,111 @@ import java.util.Date;
/**
* @Description: 服务指令操作日志详情表
* @Author: jeecg-boot
- * @Date: 2025-12-22
+ * @Date: 2025-12-22
* @Version: V1.0
*/
@Data
public class DirectiveOpeLogInfoMQDto implements Serializable {
private static final long serialVersionUID = 1L;
- /**id*/
+ /**
+ * id
+ */
private String id;
- /**nu_config_directive_ope_log_main.id*/
+ /**
+ * nu_config_directive_ope_log_main.id
+ */
private String pkId;
- /**分类标签*/
+ /**
+ * 分类标签
+ */
private String instructionTagId;
- /**分类标签名称*/
+ /**
+ * 分类标签名称
+ */
private String instructionTagName;
- /**服务类别id*/
+ /**
+ * 服务类别id
+ */
private String categoryId;
- /**服务类别名称*/
+ /**
+ * 服务类别名称
+ */
private String categoryName;
- /**服务类型id*/
+ /**
+ * 服务类型id
+ */
private String typeId;
- /**服务类型名称*/
+ /**
+ * 服务类型名称
+ */
private String typeName;
- /**服务指令id*/
+ /**
+ * 服务指令id
+ */
private String directiveId;
- /**服务指令名称*/
+ /**
+ * 服务指令名称
+ */
private String directiveName;
- /**收费价格*/
+ /**
+ * 收费价格
+ */
private BigDecimal tollPrice;
- /**提成价格*/
+ /**
+ * 提成价格
+ */
private BigDecimal comPrice;
- /**服务说明*/
+ /**
+ * 服务属性 ds定时 js计时
+ */
+ private java.lang.String serviceAttribute;
+ /**
+ * 服务说明
+ */
private String serviceContent;
- /**服务时长（分钟）*/
+ /**
+ * 服务时长（分钟）
+ */
private String serviceDuration;
- /**超时时长（分钟）*/
+ /**
+ * 超时时长（分钟）
+ */
private String timeoutDuration;
- /**所属部门*/
+ /**
+ * 所属部门
+ */
private String sysOrgCode;
- /**语音文件*/
+ /**
+ * 语音文件
+ */
private String mp3File;
- /**视频文件*/
+ /**
+ * 视频文件
+ */
private String mp4File;
- /**服务指令图片大图*/
+ /**
+ * 服务指令图片大图
+ */
private String previewFile;
- /**服务指令图片小图*/
+ /**
+ * 服务指令图片小图
+ */
private String previewFileSmall;
- /**即时指令图片*/
+ /**
+ * 即时指令图片
+ */
private String immediateFile;
- /**即时指令焦点图片*/
+ /**
+ * 即时指令焦点图片
+ */
private String immediateFileFocus;
- /**创建日期*/
+ /**
+ * 创建日期
+ */
private Date createTime;
- /**数据类型 1修改前 2修改后*/
+ /**
+ * 数据类型 1修改前 2修改后
+ */
private String dataType;
}
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java
index 0ef1d5f8..805bc1a6 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java
@@ -56,6 +56,10 @@ public class DirectiveEntity implements Serializable {
* 收费频次 1按次收费 2按天收费
*/
private String chargingFrequency;
+ /**
+ * 服务属性 ds定时 js计时
+ */
+ private String serviceAttribute;
/**
* 排序
*/
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java
index ec1e0343..b3801010 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java
@@ -313,6 +313,7 @@ public class ConfigServiceDirectiveController extends JeecgController
+
@@ -66,6 +67,7 @@
c.charging_frequency,
c.sort,
c.service_content,
+ c.service_attribute,
c.service_duration,
c.timeout_duration,
c.status,