From 8d5c10ad84f3e0b3599549c113d7c527a5ef28bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 14 Oct 2025 15:33:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=8E=B7=E5=8F=96=E5=8F=8A=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuBizNuCustomerServerController.java | 8 +- .../entity/NuBizNuCustomerElderTag.java | 106 +++++++++ .../entity/NuBizNuCustomerServer.java | 104 +++++---- .../entity/NuBizNuCustomerServerInstant.java | 127 +++++++++++ .../mapper/NuBizNuCustomerElderTagMapper.java | 16 ++ .../NuBizNuCustomerServerInstantMapper.java | 13 ++ .../xml/NuBizNuCustomerElderTagMapper.xml | 24 ++ .../NuBizNuCustomerServerInstantMapper.xml | 5 + .../INuBizNuCustomerElderTagService.java | 16 ++ .../INuBizNuCustomerServerInstantService.java | 14 ++ .../INuBizNuCustomerServerService.java | 4 +- .../NuBizNuCustomerElderTagServiceImpl.java | 23 ++ ...BizNuCustomerServerInstantServiceImpl.java | 18 ++ .../NuBizNuCustomerServerServiceImpl.java | 214 ++++++++++++++++-- .../entity/NuConfigServiceDirective.java | 33 ++- .../xml/NuConfigServiceDirectiveMapper.xml | 77 +++---- .../NuConfigServiceCategoryServiceImpl.java | 33 ++- .../nu/modules/eldertag/entity/ElderTag.java | 7 + 18 files changed, 730 insertions(+), 112 deletions(-) create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerElderTag.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerElderTagMapper.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerInstantMapper.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerElderTagService.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerInstantService.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerElderTagServiceImpl.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerInstantServiceImpl.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java index 8e005eca..4f326964 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java @@ -37,8 +37,8 @@ public class NuBizNuCustomerServerController extends JeecgController>> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) { - List> pageList = nuBizNuCustomerServerService.getNclist(nuBizNuCustomerServer); + public Result> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) { + Map pageList = nuBizNuCustomerServerService.getNclist(nuBizNuCustomerServer); return Result.OK(pageList); } @@ -110,8 +110,8 @@ public class NuBizNuCustomerServerController extends JeecgController addBatch(@RequestBody List serverList) { - nuBizNuCustomerServerService.addBatch(serverList); + public Result addBatch(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) { + nuBizNuCustomerServerService.addBatch(nuBizNuCustomerServer); return Result.OK("操作成功"); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerElderTag.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerElderTag.java new file mode 100644 index 00000000..d9c86f95 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerElderTag.java @@ -0,0 +1,106 @@ +package com.nu.modules.NuBizNuCustomerServer.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +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.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Description: 护理单元客户配置长者标签 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +@Data +@TableName("nu_biz_nu_customer_elder_tag") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_biz_nu_customer_elder_tag对象", description="护理单元客户配置长者标签") +public class NuBizNuCustomerElderTag implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**护理单元id*/ + @Excel(name = "护理单元id", width = 15) + @ApiModelProperty(value = "护理单元id") + private String nuId; + /**护理单元名称*/ + @Excel(name = "护理单元名称", width = 15) + @ApiModelProperty(value = "护理单元名称") + private String nuName; + /**客户id*/ + @Excel(name = "客户id", width = 15) + @ApiModelProperty(value = "客户id") + private String customerId; + /**客户姓名*/ + @Excel(name = "客户姓名", width = 15) + @ApiModelProperty(value = "客户姓名") + private String customerName; + /**长者标签ID*/ + @Excel(name = "长者标签ID", width = 15) + @ApiModelProperty(value = "长者标签ID") + private String tagId; + /**长者标签名称*/ + @Excel(name = "长者标签名称", width = 15) + @ApiModelProperty(value = "长者标签名称") + private String tagName; + /**长者标签类型*/ + @Excel(name = "长者标签类型", width = 15) + @ApiModelProperty(value = "长者标签类型") + private String tagType; + /**图标*/ + @Excel(name = "图标", width = 15) + @ApiModelProperty(value = "图标") + private java.lang.String pic; + /**图标*/ + @Excel(name = "图标", width = 15) + @ApiModelProperty(value = "图标") + @TableField(exist = false) + private java.lang.String netPic; + /**焦点图标*/ + @Excel(name = "焦点图标", width = 15) + @ApiModelProperty(value = "焦点图标") + private java.lang.String picFocus; + /**图标*/ + @Excel(name = "图标", width = 15) + @ApiModelProperty(value = "图标") + @TableField(exist = false) + private java.lang.String netPicFocus; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**选中状态*/ + @TableField(exist = false) + private String izSelected; +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java index 444b9624..b8865f87 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java @@ -4,10 +4,9 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -30,7 +29,7 @@ import lombok.experimental.Accessors; @TableName("nu_biz_nu_customer_server") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_customer_server_care对象", description="护理单元客户配置服务指令") +@ApiModel(value="nu_biz_nu_customer_server对象", description="护理单元客户配置服务指令") public class NuBizNuCustomerServer implements Serializable { private static final long serialVersionUID = 1L; @@ -42,68 +41,78 @@ public class NuBizNuCustomerServer implements Serializable { @Excel(name = "护理单元id", width = 15) @ApiModelProperty(value = "护理单元id") private java.lang.String nuId; + /**护理单元名称*/ + @Excel(name = "护理单元名称", width = 15) + @ApiModelProperty(value = "护理单元名称") + private java.lang.String nuName; /**客户id*/ @Excel(name = "客户id", width = 15) @ApiModelProperty(value = "客户id") private java.lang.String customerId; + /**客户姓名*/ + @Excel(name = "客户姓名", width = 15) + @ApiModelProperty(value = "客户姓名") + private java.lang.String customerName; /**服务类别id*/ @Excel(name = "服务类别id", width = 15) @ApiModelProperty(value = "服务类别id") private java.lang.String categoryId; + /**服务类别名称*/ + @Excel(name = "服务类别名称", width = 15) + @ApiModelProperty(value = "服务类别名称") + private java.lang.String categoryName; /**服务类型id*/ @Excel(name = "服务类型id", width = 15) @ApiModelProperty(value = "服务类型id") private java.lang.String typeId; + /**服务类型名称*/ + @Excel(name = "服务类型名称", width = 15) + @ApiModelProperty(value = "服务类型名称") + private java.lang.String typeName; /**服务指令id*/ @Excel(name = "服务指令id", width = 15) @ApiModelProperty(value = "服务指令id") private java.lang.String directiveId; - /**护理单元名称*/ - @Excel(name = "护理单元名称", width = 15) - @ApiModelProperty(value = "护理单元名称") - private java.lang.String nuName; - /**客户姓名*/ - @Excel(name = "客户姓名", width = 15) - @ApiModelProperty(value = "客户姓名") - private java.lang.String customerName; - /**服务类别名称*/ - @Excel(name = "服务类别名称", width = 15) - @ApiModelProperty(value = "服务类别名称") - private java.lang.String categoryName; - /**服务类型名称*/ - @Excel(name = "服务类型名称", width = 15) - @ApiModelProperty(value = "服务类型名称") - private java.lang.String typeName; - /**服务指令名称*/ - @Excel(name = "服务指令名称", width = 15) + /**服务指令名称*/ + @Excel(name = "服务指令名称", width = 15) @ApiModelProperty(value = "服务指令名称") private java.lang.String directiveName; - /**定位*/ - @Excel(name = "定位", width = 15) - @ApiModelProperty(value = "定位") - private java.lang.String positioning; - /**服务标签名称*/ - @Excel(name = "服务标签名称", width = 15) - @ApiModelProperty(value = "服务标签名称") - private java.lang.String tagName; - /**体型标签名称*/ - @Excel(name = "体型标签名称", width = 15) - @ApiModelProperty(value = "体型标签名称") - private java.lang.String bodyTagName; - /**情绪标签名称*/ - @Excel(name = "情绪标签名称", width = 15) - @ApiModelProperty(value = "情绪标签名称") - private java.lang.String emotionTagName; + /**周期类型ID*/ + @Excel(name = "周期类型ID", width = 15) + @ApiModelProperty(value = "周期类型ID") + private java.lang.String cycleTypeId; /**周期类型*/ @Excel(name = "周期类型", width = 15) @ApiModelProperty(value = "周期类型") private java.lang.String cycleType; + /**周期值*/ + @Excel(name = "周期值", width = 15) + @ApiModelProperty(value = "周期值") + private java.lang.String cycleValue; + /**即时指令图标*/ + @ApiModelProperty(value = "即时指令图标") + private java.lang.String immediateFile; + /**即时指令焦点图标*/ + @ApiModelProperty(value = "即时指令图标") + private java.lang.String immediateFileFocus; + /**服务指令图片大图*/ + @ApiModelProperty(value = "服务指令图片大图") + private java.lang.String previewFile; + /**服务指令图片小图*/ + @ApiModelProperty(value = "服务指令图片小图") + private java.lang.String previewFileSmall; + /**定位*/ + @Excel(name = "定位", width = 15) + @ApiModelProperty(value = "定位") + private java.lang.String positioning; /**纵向定位*/ @Excel(name = "纵向定位", width = 15) @ApiModelProperty(value = "纵向定位") private java.lang.String positioningLong; - - + /**PAD端无线循环使用*/ + @Excel(name = "PAD端无线循环使用", width = 15) + @ApiModelProperty(value = "PAD端无线循环使用") + private java.lang.String tagName; /**开始时间*/ @ApiModelProperty(value = "开始时间") private java.lang.String startTime; @@ -129,4 +138,17 @@ public class NuBizNuCustomerServer implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + /**是否是服务指令包 0否 1是*/ + @ApiModelProperty(value = "是否是服务指令包") + private java.lang.String izPackage; + + /**服务指令列表**/ + @TableField(exist = false) + private List serverList; + /**即时服务指令列表**/ + @TableField(exist = false) + private List instantList; + /**长者标签列表**/ + @TableField(exist = false) + private List tagList; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java new file mode 100644 index 00000000..33b6b220 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java @@ -0,0 +1,127 @@ +package com.nu.modules.NuBizNuCustomerServer.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +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.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: yangjun + * @Date: 2025-03-31 + * @Version: V1.0 + */ +@Data +@TableName("nu_biz_nu_customer_server_instant") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_biz_nu_customer_server_instant对象", description="护理单元客户配置服务指令即时指令") +public class NuBizNuCustomerServerInstant implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**护理单元id*/ + @Excel(name = "护理单元id", width = 15) + @ApiModelProperty(value = "护理单元id") + private String nuId; + /**护理单元名称*/ + @Excel(name = "护理单元名称", width = 15) + @ApiModelProperty(value = "护理单元名称") + private String nuName; + /**客户id*/ + @Excel(name = "客户id", width = 15) + @ApiModelProperty(value = "客户id") + private String customerId; + /**客户姓名*/ + @Excel(name = "客户姓名", width = 15) + @ApiModelProperty(value = "客户姓名") + private String customerName; + /**服务类别id*/ + @Excel(name = "服务类别id", width = 15) + @ApiModelProperty(value = "服务类别id") + private String categoryId; + /**服务类别名称*/ + @Excel(name = "服务类别名称", width = 15) + @ApiModelProperty(value = "服务类别名称") + private String categoryName; + /**服务类型id*/ + @Excel(name = "服务类型id", width = 15) + @ApiModelProperty(value = "服务类型id") + private String typeId; + /**服务类型名称*/ + @Excel(name = "服务类型名称", width = 15) + @ApiModelProperty(value = "服务类型名称") + private String typeName; + /**服务指令id*/ + @Excel(name = "服务指令id", width = 15) + @ApiModelProperty(value = "服务指令id") + private String directiveId; + /**服务指令名称*/ + @Excel(name = "服务指令名称", width = 15) + @ApiModelProperty(value = "服务指令名称") + private String directiveName; + /**即时指令图标*/ + @ApiModelProperty(value = "即时指令图标") + private java.lang.String immediateFile; + /**即时指令焦点图标*/ + @ApiModelProperty(value = "即时指令图标") + private java.lang.String immediateFileFocus; + /**服务指令图片大图*/ + @ApiModelProperty(value = "服务指令图片大图") + private java.lang.String previewFile; + /**服务指令图片小图*/ + @ApiModelProperty(value = "服务指令图片小图") + private java.lang.String previewFileSmall; + /**即时指令图标*/ + @ApiModelProperty(value = "即时指令图标") + @TableField(exist = false) + private java.lang.String netImmediateFile; + /**即时指令焦点图标*/ + @ApiModelProperty(value = "即时指令图标") + @TableField(exist = false) + private java.lang.String netImmediateFileFocus; + /**服务指令图片大图*/ + @ApiModelProperty(value = "服务指令图片大图") + @TableField(exist = false) + private java.lang.String netPreviewFile; + /**服务指令图片小图*/ + @ApiModelProperty(value = "服务指令图片小图") + @TableField(exist = false) + private java.lang.String netPreviewFileSmall; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**是否是服务指令包 0否 1是*/ + @ApiModelProperty(value = "是否是服务指令包") + private java.lang.String izPackage; +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerElderTagMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerElderTagMapper.java new file mode 100644 index 00000000..10230514 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerElderTagMapper.java @@ -0,0 +1,16 @@ +package com.nu.modules.NuBizNuCustomerServer.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; + +import java.util.List; + +/** + * @Description: 护理单元客户配置长者标签 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +public interface NuBizNuCustomerElderTagMapper extends BaseMapper { + List getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag); +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerInstantMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerInstantMapper.java new file mode 100644 index 00000000..f6edf3e6 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerInstantMapper.java @@ -0,0 +1,13 @@ +package com.nu.modules.NuBizNuCustomerServer.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +public interface NuBizNuCustomerServerInstantMapper extends BaseMapper { +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml new file mode 100644 index 00000000..503f154c --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml new file mode 100644 index 00000000..5850773f --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerElderTagService.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerElderTagService.java new file mode 100644 index 00000000..f9fc3dec --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerElderTagService.java @@ -0,0 +1,16 @@ +package com.nu.modules.NuBizNuCustomerServer.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; + +import java.util.List; + +/** + * @Description: 护理单元客户配置长者标签 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +public interface INuBizNuCustomerElderTagService extends IService { + List getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag); +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerInstantService.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerInstantService.java new file mode 100644 index 00000000..9f753ad8 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerInstantService.java @@ -0,0 +1,14 @@ +package com.nu.modules.NuBizNuCustomerServer.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +public interface INuBizNuCustomerServerInstantService extends IService { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java index 2388ce94..0d0d227e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java @@ -14,11 +14,11 @@ import java.util.Map; */ public interface INuBizNuCustomerServerService extends IService { - List> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer); + Map getNclist(NuBizNuCustomerServer nuBizNuCustomerServer); NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer); NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer); - void addBatch(List serverList); + void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerElderTagServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerElderTagServiceImpl.java new file mode 100644 index 00000000..be977dfb --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerElderTagServiceImpl.java @@ -0,0 +1,23 @@ +package com.nu.modules.NuBizNuCustomerServer.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; +import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerElderTagMapper; +import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService; +import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +@Service +public class NuBizNuCustomerElderTagServiceImpl extends ServiceImpl implements INuBizNuCustomerElderTagService { + public List getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag){ + return baseMapper.getElderTags(nuBizNuCustomerElderTag); + } +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerInstantServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerInstantServiceImpl.java new file mode 100644 index 00000000..f4241e2b --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerInstantServiceImpl.java @@ -0,0 +1,18 @@ +package com.nu.modules.NuBizNuCustomerServer.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; +import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerInstantMapper; +import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService; +import org.springframework.stereotype.Service; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +@Service +public class NuBizNuCustomerServerInstantServiceImpl extends ServiceImpl implements INuBizNuCustomerServerInstantService { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java index 2eb801b3..3832d0b8 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java @@ -1,9 +1,14 @@ package com.nu.modules.NuBizNuCustomerServer.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer; +import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerMapper; +import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService; +import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService; import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerService; import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; @@ -11,6 +16,7 @@ import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService; +import com.nu.modules.sysconfig.ISysConfigApi; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,10 +39,17 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) { - + public Map getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) { + Map resMap = new HashMap<>(); + //服务指令计划 QueryWrapper nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()),"nu_id",nuBizNuCustomerServer.getNuId()); nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()),"customer_id",nuBizNuCustomerServer.getCustomerId()); @@ -50,25 +63,142 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("nuId",nuBizNuCustomerServer.getNuId()); + map.put("customerId",nuBizNuCustomerServer.getCustomerId()); map.put("directiveId",par.getId()); map.put("directiveName",par.getDirectiveName()); - map.put("categoryName",par.getCategoryName()); + map.put("typeId",par.getTypeId()); map.put("typeName",par.getTypeName()); + map.put("categoryId",par.getCategoryId()); + map.put("categoryName",par.getCategoryName()); map.put("tagName",par.getTagName()); map.put("startTime",par.getStartTime()); map.put("endTime",par.getEndTime()); + map.put("cycleTypeId",par.getCycleType()); map.put("cycleType",par.getCycleType()); + map.put("cycleValue",par.getCycleValue()); map.put("positioningLong",par.getPositioningLong()); map.put("positioning",par.getPositioning()); - map.put("nuId",nuBizNuCustomerServer.getNuId()); - map.put("customerId",nuBizNuCustomerServer.getCustomerId()); + map.put("izPackage",par.getIzPackage()); + if(nuBizNuCustomerServer.getImmediateFile()!=null){ + String immediateFile = getImageNetUrl(nuBizNuCustomerServer.getImmediateFile()); + map.put("immediateFile",nuBizNuCustomerServer.getImmediateFile()); + map.put("netImmediateFile",immediateFile); + }else{ + map.put("immediateFile",""); + map.put("netImmediateFile",""); + } + if(nuBizNuCustomerServer.getImmediateFileFocus()!=null){ + String immediateFileFocus = getImageNetUrl(nuBizNuCustomerServer.getImmediateFileFocus()); + map.put("immediateFileFocus",nuBizNuCustomerServer.getImmediateFileFocus()); + map.put("netImmediateFileFocus",immediateFileFocus); + }else{ + map.put("immediateFileFocus",""); + map.put("netImmediateFileFocus",""); + } + if(nuBizNuCustomerServer.getPreviewFile()!=null){ + String previewFile = getImageNetUrl(nuBizNuCustomerServer.getPreviewFile()); + map.put("previewFile",nuBizNuCustomerServer.getPreviewFile()); + map.put("netPreviewFile",previewFile); + }else{ + map.put("previewFile",""); + map.put("netPreviewFile",""); + } + if(nuBizNuCustomerServer.getPreviewFileSmall()!=null){ + String previewFileSmall = getImageNetUrl(nuBizNuCustomerServer.getPreviewFileSmall()); + map.put("previewFileSmall",nuBizNuCustomerServer.getPreviewFileSmall()); + map.put("netPreviewFileSmall",previewFileSmall); + }else{ + map.put("previewFileSmall",""); + map.put("netPreviewFileSmall",""); + } childrenList.add(map); } } posMap.put("children",childrenList); allList.add(posMap); } - return allList; + resMap.put("serviceList",allList);//服务指令计划 + //即时指令 + QueryWrapper instantQueryWrapper = new QueryWrapper<>(); + instantQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()),"nu_id",nuBizNuCustomerServer.getNuId()); + instantQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()),"customer_id",nuBizNuCustomerServer.getCustomerId()); + List instantList = nuBizNuCustomerServerInstantService.list(instantQueryWrapper); + for(NuBizNuCustomerServerInstant pari : instantList){ + if(pari.getImmediateFile()!=null){ + String immediateFile = getImageNetUrl(pari.getImmediateFile()); + pari.setNetImmediateFile(immediateFile); + }else{ + pari.setImmediateFile(""); + pari.setNetImmediateFile(""); + } + if(pari.getImmediateFileFocus()!=null){ + String immediateFileFocus = getImageNetUrl(pari.getImmediateFileFocus()); + pari.setNetImmediateFileFocus(immediateFileFocus); + }else{ + pari.setImmediateFileFocus(""); + pari.setNetImmediateFileFocus(""); + } + if(pari.getPreviewFile()!=null){ + String previewFile = getImageNetUrl(pari.getPreviewFile()); + pari.setNetPreviewFile(previewFile); + }else{ + pari.setPreviewFile(""); + pari.setNetPreviewFile(""); + } + if(pari.getPreviewFileSmall()!=null){ + String previewFileSmall = getImageNetUrl(pari.getPreviewFileSmall()); + pari.setNetPreviewFileSmall(previewFileSmall); + }else{ + pari.setPreviewFileSmall(""); + pari.setNetPreviewFileSmall(""); + } + } + resMap.put("instantList",instantList); + NuBizNuCustomerElderTag elderTag = new NuBizNuCustomerElderTag(); + //体型标签 + elderTag.setNuId(nuBizNuCustomerServer.getNuId()); + elderTag.setCustomerId(nuBizNuCustomerServer.getCustomerId()); + elderTag.setTagType("tx"); + List bodyTagList = nuBizNuCustomerElderTagService.getElderTags(elderTag); + for(NuBizNuCustomerElderTag bt : bodyTagList){ + if(bt.getPic()!=null){ + String pic = getImageNetUrl(bt.getPic()); + bt.setNetPic(pic); + }else{ + bt.setPic(""); + bt.setNetPic(""); + } + if(bt.getPicFocus()!=null){ + String picFocus = getImageNetUrl(bt.getPicFocus()); + bt.setNetPicFocus(picFocus); + }else{ + bt.setPicFocus(""); + bt.setNetPicFocus(""); + } + } + resMap.put("bodyTagList",bodyTagList); + //情绪标签 + elderTag.setTagType("qx"); + List emotionTagList = nuBizNuCustomerElderTagService.getElderTags(elderTag); + for(NuBizNuCustomerElderTag et : emotionTagList){ + if(et.getPic()!=null){ + String pic = getImageNetUrl(et.getPic()); + et.setNetPic(pic); + }else{ + et.setPic(""); + et.setNetPic(""); + } + if(et.getPicFocus()!=null){ + String picFocus = getImageNetUrl(et.getPicFocus()); + et.setNetPicFocus(picFocus); + }else{ + et.setPicFocus(""); + et.setNetPicFocus(""); + } + } + resMap.put("emotionTagList",emotionTagList); + return resMap; } @@ -100,20 +230,72 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl serverList) { + public void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer) { + //保存服务指令计划 + String nuId = nuBizNuCustomerServer.getNuId(); + String customerId = nuBizNuCustomerServer.getCustomerId(); + QueryWrapper nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); + nuBizNuCustomerServerQueryWrapper.eq("nu_id",nuId); + nuBizNuCustomerServerQueryWrapper.eq("customer_id",customerId); + baseMapper.delete(nuBizNuCustomerServerQueryWrapper); + List serverList = nuBizNuCustomerServer.getServerList(); if(serverList.size()>0){ - NuBizNuCustomerServer nuBizNuCustomerServer = serverList.get(0); - String nuId = nuBizNuCustomerServer.getNuId(); - String customerId = nuBizNuCustomerServer.getCustomerId(); - - QueryWrapper nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); - nuBizNuCustomerServerQueryWrapper.eq("nu_id",nuId); - nuBizNuCustomerServerQueryWrapper.eq("customer_id",customerId); - baseMapper.delete(nuBizNuCustomerServerQueryWrapper); - for(NuBizNuCustomerServer par : serverList){ + par.setNuName(nuBizNuCustomerServer.getNuName()); + par.setCustomerName(nuBizNuCustomerServer.getCustomerName()); baseMapper.insert(par); } } + QueryWrapper instantQueryWrapper = new QueryWrapper<>(); + instantQueryWrapper.eq("nu_id",nuId); + instantQueryWrapper.eq("customer_id",customerId); + nuBizNuCustomerServerInstantService.remove(instantQueryWrapper); + List instantList = nuBizNuCustomerServer.getInstantList(); + if(instantList.size()>0){ + for(NuBizNuCustomerServerInstant pari : instantList){ + pari.setNuName(nuBizNuCustomerServer.getNuName()); + pari.setCustomerName(nuBizNuCustomerServer.getCustomerName()); + nuBizNuCustomerServerInstantService.save(pari); + } + } + + QueryWrapper tagQueryWrapper = new QueryWrapper<>(); + instantQueryWrapper.eq("nu_id",nuId); + instantQueryWrapper.eq("customer_id",customerId); + nuBizNuCustomerElderTagService.remove(tagQueryWrapper); + List tagList = nuBizNuCustomerServer.getTagList(); + if(tagList.size()>0){ + for(NuBizNuCustomerElderTag tg : tagList){ + tg.setNuName(nuBizNuCustomerServer.getNuName()); + tg.setCustomerName(nuBizNuCustomerServer.getCustomerName()); + nuBizNuCustomerElderTagService.save(tg); + } + } + + } + + /** + * 获取管理平台静态资源路径 + * @return + */ + private String getOpeMediaAddress(){ + JSONObject json = sysConfigApi.getByKey("ope_media_address"); + if(json!=null){ + String configValue = json.getString("configValue"); + if(!configValue.endsWith("/")){ + configValue += "/"; + } + return configValue; + } + return ""; + } + + private String getImageNetUrl(String imageUrl){ + String netUrl = ""; + String configValue = getOpeMediaAddress(); + if(!configValue.equals("")){ + netUrl = configValue + imageUrl; + } + return netUrl; } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java index 86280bba..dbffd064 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java @@ -35,22 +35,32 @@ public class NuConfigServiceDirective implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private java.lang.String id; + /**服务指令名称*/ + @Excel(name = "服务指令名称", width = 15) + @ApiModelProperty(value = "服务指令名称") + private java.lang.String directiveName; /**服务类别id*/ @Excel(name = "服务类别id", width = 15) @ApiModelProperty(value = "服务类别id") private java.lang.String categoryId; + /**服务类别*/ + @Excel(name = "服务类别", width = 15) + @ApiModelProperty(value = "服务类别") + @TableField(exist = false) + private java.lang.String categoryName; /**服务类型id*/ @Excel(name = "服务类型id", width = 15) @ApiModelProperty(value = "服务类型id") private java.lang.String typeId; + /**服务类型*/ + @Excel(name = "服务类型", width = 15) + @ApiModelProperty(value = "服务类型") + @TableField(exist = false) + private java.lang.String typeName; /**指令标签id*/ @Excel(name = "指令标签id", width = 15) @ApiModelProperty(value = "指令标签id") private java.lang.String instructionTagId; - /**服务指令名称*/ - @Excel(name = "服务指令名称", width = 15) - @ApiModelProperty(value = "服务指令名称") - private java.lang.String directiveName; /**收费价格*/ @Excel(name = "收费价格", width = 15) @ApiModelProperty(value = "收费价格") @@ -75,6 +85,11 @@ public class NuConfigServiceDirective implements Serializable { @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") private java.lang.String cycleType; + /**周期类型 1日常护理 2周期护理 3即时护理*/ + @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) + @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") + @TableField(exist = false) + private java.lang.String cycleTypeName; /**排序*/ @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") @@ -133,6 +148,16 @@ public class NuConfigServiceDirective implements Serializable { */ @ApiModelProperty(value = "即时指令图标") private java.lang.String immediateFileFocus; + /** + * 服务指令图片大图 + */ + @ApiModelProperty(value = "服务指令图片大图") + private java.lang.String previewFile; + /** + * 服务指令图片小图 + */ + @ApiModelProperty(value = "服务指令图片小图") + private java.lang.String previewFileSmall; //体型标签 @TableField(exist = false) private String bodyTagName; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml index 28e40ce4..efc4442e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml @@ -3,47 +3,42 @@ diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java index 239aa9be..231d493a 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java @@ -80,19 +80,44 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl