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 ac38769..3f7aa6b 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 @@ -120,6 +120,10 @@ public class DirectiveAsyncMQDto implements Serializable { * 即时指令图标 */ private String immediateFile; + /** + * 即时指令焦点图标 + */ + private String immediateFileFocus; /** * 指令音频文件md5 */ @@ -140,7 +144,10 @@ public class DirectiveAsyncMQDto implements Serializable { * 即时指令图标md5 */ private java.lang.String immediateFileMd5; - + /** + * 即时指令焦点图标md5 + */ + private java.lang.String immediateFileFocusMd5; //分类标签中文名称 private String instructionName; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java index 2b50ced..cd163e7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java @@ -224,6 +224,11 @@ public class ConfigServiceDirective implements Serializable { */ @ApiModelProperty(value = "即时指令图标md5") private java.lang.String immediateFileMd5; + /** + * 即时指令焦点图标md5 + */ + @ApiModelProperty(value = "即时指令焦点图标md5") + private java.lang.String immediateFileFocusMd5; //服务指令图片是否变更 @TableField(exist = false) @@ -233,10 +238,20 @@ public class ConfigServiceDirective implements Serializable { */ @ApiModelProperty(value = "即时指令图标") private java.lang.String immediateFile; + /** + * 即时指令焦点图标 + */ + @ApiModelProperty(value = "即时指令焦点图标") + private java.lang.String immediateFileFocus; + //即时指令图标是否变更 @TableField(exist = false) private boolean immediateFileChanged; + //即时指令焦点图标是否变更 + @TableField(exist = false) + private boolean immediateFileFocusChanged; + //合并单元格用:类别合并的行数 @TableField(exist = false) private Integer categoryRowSpan; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index ea8aad5..bf50345 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -31,10 +31,12 @@ + + @@ -76,10 +78,12 @@ c.mp4_file, c.preview_file, c.immediate_file, + c.immediate_file_focus, c.mp3_file_md5, c.mp4_file_md5, c.preview_file_md5, c.immediate_file_md5, + c.immediate_file_focus_md5, bodytag.id as bodyTagId, bodytag.tag_name as bodyTagName, emotag.id as emotionTagId, @@ -177,6 +181,7 @@ m.preview_file, m.preview_file_small, m.immediate_file, + m.immediate_file_focus, m.mp3_file, m.mp4_file, m.sys_org_code, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index bf73193..69fc4b9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -445,11 +445,13 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl