yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加接口

This commit is contained in:
yangjun 2025-11-05 10:19:09 +08:00
parent afb1f58d56
commit 4e873822cd
7 changed files with 384 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java
View File

@ -1,5 +1,6 @@
package com.nu.modules.NuBizNuCustomerServer.controller;
import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerService;
import io.swagger.annotations.Api;
@ -116,4 +117,18 @@ public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCust
}
/**
* 获取指令包集合数据
*
* @param DirectivePackageDto
* @return
*/
@ApiOperation(value="获取指令包集合数据", notes="获取指令包集合数据")
@GetMapping(value = "/getNcPackagelist")
public Result<List<DirectivePackageDto>> getNcPackagelist(DirectivePackageDto DirectivePackageDto) {
List<DirectivePackageDto> pageList = nuBizNuCustomerServerService.getNcPackagelist(DirectivePackageDto);
return Result.OK(pageList);
}
}

259
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/ConfigServiceDirectiveDto.java Normal file
View File

@ -0,0 +1,259 @@
package com.nu.modules.NuBizNuCustomerServer.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 服务指令
* @Author: 张明远
* @Date: 2025-03-13
* @Version: V1.0
*/
@Data
public class ConfigServiceDirectiveDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
private String id;
/**
* 服务类别id
*/
@Dict(dicCode = "id", dictTable = "nu_config_service_category", dicText = "category_name")
private String categoryId;
/**
* 服务类型id
*/
@Dict(dicCode = "id", dictTable = "nu_config_service_type", dicText = "type_name")
private String typeId;
/**
* 分类标签
*/
@Dict(dicCode = "id", dictTable = "nu_config_service_instruction_tag", dicText = "instruction_name")
private String instructionTagId;
/**
* 服务指令名称
*/
private String directiveName;
/**
* 收费价格
*/
private java.math.BigDecimal tollPrice;
/**
* 提成价格
*/
private java.math.BigDecimal comPrice;
/**
* 是否参与医保报销 0不报销 1报销
*/
@Dict(dicCode = "med_ins_reimb")
private String izReimbursement;
/**
* 是否参与机构优惠 0不参与 1参与
*/
@Dict(dicCode = "institutional_discount")
private String izPreferential;
/**
* 收费频次 1按次收费 2按天收费
*/
@Dict(dicCode = "billing_frequency")
private String chargingFrequency;
/**
* 周期类型 1日常护理 2周期护理 3即时护理
*/
@Dict(dicCode = "period_type")
private String cycleType;
/**
* 排序
*/
private Integer sort;
/**
* 服务描述
*/
private String serviceContent;
/**
* 服务时长（分钟）
*/
private String serviceDuration;
/**
* 指令状态
*/
@Dict(dicCode = "directive_status")
private String status;
/**
* 是否启用 0启用 1未启用
*/
@Dict(dicCode = "iz_enabled")
private String izEnabled;
/**
* 是否删除
*/
private String delFlag;
/**
* 创建人
*/
private String createBy;
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date createTime;
/**
* 更新人
*/
private String updateBy;
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime;
/**
* 所属部门
*/
private String sysOrgCode;
/**
* 指令音频文件
*/
private String mp3File;
//语音文件是否变更
@TableField(exist = false)
private boolean mp3FileChanged;
/**
* 指令视频文件
*/
private String mp4File;
//视频文件是否变更
@TableField(exist = false)
private boolean mp4FileChanged;
/**
* 服务指令图片
*/
private String previewFile;
//服务指令图片是否变更
@TableField(exist = false)
private boolean previewFileChanged;
/**
* 即时指令图标
*/
private String immediateFile;
/**
* 即时指令焦点图标
*/
private String immediateFileFocus;
/**
* 指令音频文件md5
*/
private String mp3FileMd5;
/**
* 指令视频文件md5
*/
private String mp4FileMd5;
/**
* 服务指令图片大图md5
*/
private String previewFileMd5;
/**
* 服务指令图片小图
*/
private String previewFileSmall;
/**
* 服务指令图片小图md5
*/
private String previewFileSmallMd5;
/**
* 即时指令图标md5
*/
private String immediateFileMd5;
/**
* 即时指令图标md5
*/
private String immediateFileFocusMd5;
//即时指令图标是否变更
@TableField(exist = false)
private boolean immediateFileChanged;
//即时指令焦点图标是否变更
@TableField(exist = false)
private boolean immediateFileFocusChanged;
//合并单元格用：类别合并的行数
@TableField(exist = false)
private Integer categoryRowSpan;
//合并单元格用：类型合并的行数
@TableField(exist = false)
private Integer typeRowSpan;
//合并单元格用：分类标签合并的行数
@TableField(exist = false)
private Integer instructionRowSpan;
//体型标签id,id,id
@TableField(exist = false)
private String bodyTags;
//情绪标签id,id,id
@TableField(exist = false)
private String emotionTags;
//体型标签字符串
@TableField(exist = false)
private String bodyTagsName;
//情绪标签字符串
@TableField(exist = false)
private String emotionTagsName;
//分类标签中文名称
@TableField(exist = false)
private String instructionName;
//服务类别中文名称
@TableField(exist = false)
private String categoryName;
//服务类型中文名称
@TableField(exist = false)
private String typeName;
//周期类型中文名称
@TableField(exist = false)
private String cycleTypeName;
//媒体资源存储路径名
@TableField(exist = false)
private String mediaFileSavePath;
//体型标签json字符串（前台封装好的 有id、label）
@TableField(exist = false)
private String bodyTagsObj;
//情绪标签json字符串（前台封装好的 有id、label）
@TableField(exist = false)
private String emotionTagsObj;
//护理分类名称
@TableField(exist = false)
private String instructionTagName;
@TableField(exist = false)
private String syncIds;
@TableField(exist = false)
private String excludeIds;//需要排除的ids
@TableField(exist = false)
private String filterIzEnabled;
@TableField(exist = false)
private String directiveId;
@TableField(exist = false)
private boolean izAbnormal;//查询服务时长、收费价格、提成价格 都等于 0的数据
@TableField(exist = false)
private String compareOrgCode;//对比的机构编码
@TableField(exist = false)
private boolean ownExist;//本平台是否存在该指令
@TableField(exist = false)
private boolean targetExist;//目标平台是否存在该指令
private String packageId;//指令包id
}

61
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java Normal file
View File

@ -0,0 +1,61 @@
package com.nu.modules.NuBizNuCustomerServer.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/**
* @Description: 服务指令包
* @Author: 张明远
* @Date: 2025-03-24
* @Version: V1.0
*/
@Data
public class DirectivePackageDto implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
private String id;
/**服务指令包名称*/
private String packageName;
/**服务指令包总时长*/
private Long totalDuration;
/**备注*/
private String description;
/**排序*/
private Integer sort;
/**是否启用 0启用 1未启用*/
@Dict(dicCode = "iz_enabled")
private String izEnabled;
/**是否删除 0未删除 1删除*/
@TableLogic
private String delFlag;
/**创建人*/
@Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime;
// 开始时间
private String startTimeStr;
// 结束时间
private String endTimeStr;
// 服务标签
private String instructionTagId;
// 服务指令集合
private List<ConfigServiceDirectiveDto> directivesList;
}

6
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java
View File

@ -2,6 +2,8 @@ package com.nu.modules.NuBizNuCustomerServer.mapper;
import java.util.List;
import com.nu.modules.NuBizNuCustomerServer.entity.ConfigServiceDirectiveDto;
import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -15,4 +17,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface NuBizNuCustomerServerMapper extends BaseMapper<NuBizNuCustomerServer> {
List<NuBizNuCustomerServer> getGroupPositioning(NuBizNuCustomerServer nuBizNuCustomerServer);
List<DirectivePackageDto> getNcPackagelist(@Param("params") DirectivePackageDto directivePackageDto);
List<ConfigServiceDirectiveDto> getNcDirectiveList(@Param("params") ConfigServiceDirectiveDto configServiceDirectiveDto);
}

20
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
View File

@ -5,4 +5,24 @@
<select id="getGroupPositioning" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer">
</select>
<select id="getNcPackagelist" resultType="com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto">
select * from nu_directive_package where del_flag = '0' and iz_enabled = '0'
</select>
<select id="getNcDirectiveList" resultType="com.nu.modules.NuBizNuCustomerServer.entity.ConfigServiceDirectiveDto">
select a.package_id,b.*,
c.category_name AS category_name,
d.type_name AS type_name,
e.instruction_name AS instruction_name,
f.item_text AS cycle_type_name
from nu_package_directive a
left join nu_config_service_directive b on a.directive_id = b.id
left join nu_config_service_category c on b.category_id = c.id
left join nu_config_service_type d on b.type_id = d.id
left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id
left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = b.cycle_type
</select>
</mapper>

3
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java
View File

@ -1,5 +1,6 @@
package com.nu.modules.NuBizNuCustomerServer.service;
import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer;
import com.baomidou.mybatisplus.extension.service.IService;
@ -21,4 +22,6 @@ public interface INuBizNuCustomerServerService extends IService<NuBizNuCustomerS
NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer);
List<DirectivePackageDto> getNcPackagelist(DirectivePackageDto directivePackageDto);
}

23
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
View File

@ -3,9 +3,7 @@ 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.entity.*;
import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerMapper;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService;
@ -317,6 +315,25 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
}
@Override
public List<DirectivePackageDto> getNcPackagelist(DirectivePackageDto directivePackageDto) {
List<DirectivePackageDto> list = baseMapper.getNcPackagelist(directivePackageDto);
List<ConfigServiceDirectiveDto> directiveList = baseMapper.getNcDirectiveList(new ConfigServiceDirectiveDto());
for(DirectivePackageDto et : list){
List<ConfigServiceDirectiveDto> directivesList = new ArrayList<>();
for(ConfigServiceDirectiveDto etd : directiveList){
if(etd.getPackageId().equals(et.getId())){
directivesList.add(etd);
}
}
et.setDirectivesList(directivesList);
}
return list;
}
/**
* 获取管理平台静态资源路径
* @return