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

服务指令-工单去掉net字段

This commit is contained in:
曹磊 2026-01-21 10:06:39 +08:00
parent c56f8fcb22
commit 1dcb83514d
4 changed files with 47 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java
View File

@ -66,19 +66,19 @@ public class DirectiveOrder implements Serializable {
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图-网络地址*/
private String netPreviewFile;
// private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图-网络地址*/
private String netPreviewFileSmall;
// private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
// private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
// private String netMp4File;
/**服务时长（分钟）*/
private String serviceDuration;
/**服务描述*/

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderSub.java
View File

@ -73,19 +73,19 @@ public class DirectiveOrderSub implements Serializable {
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图-网络地址*/
private String netPreviewFile;
// private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图-网络地址*/
private String netPreviewFileSmall;
// private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
// private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
// private String netMp4File;
/**服务时长（分钟）*/
private String serviceDuration;
/**服务描述*/

40
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
View File

@ -22,13 +22,13 @@
<result column="cycle_type" property="cycleType"/>
<result column="cycle_value" property="cycleValue"/>
<result column="preview_file" property="previewFile"/>
<result column="net_preview_file" property="netPreviewFile"/>
<!-- <result column="net_preview_file" property="netPreviewFile"/>-->
<result column="preview_file_small" property="previewFileSmall"/>
<result column="net_preview_file_small" property="netPreviewFileSmall"/>
<!-- <result column="net_preview_file_small" property="netPreviewFileSmall"/>-->
<result column="mp3_file" property="mp3File"/>
<result column="net_mp3_file" property="netMp3File"/>
<!-- <result column="net_mp3_file" property="netMp3File"/>-->
<result column="mp4_file" property="mp4File"/>
<result column="net_mp4_file" property="netMp4File"/>
<!-- <result column="net_mp4_file" property="netMp4File"/>-->
<result column="service_duration" property="serviceDuration"/>
<result column="service_content" property="serviceContent"/>
<result column="package_id" property="packageId"/>
@ -80,13 +80,13 @@
<result column="sub_cycle_type" property="cycleType"/>
<result column="sub_cycle_value" property="cycleValue"/>
<result column="sub_preview_file" property="previewFile"/>
<result column="sub_net_preview_file" property="netPreviewFile"/>
<!-- <result column="sub_net_preview_file" property="netPreviewFile"/>-->
<result column="sub_preview_file_small" property="previewFileSmall"/>
<result column="sub_net_preview_file_small" property="netPreviewFileSmall"/>
<!-- <result column="sub_net_preview_file_small" property="netPreviewFileSmall"/>-->
<result column="sub_mp3_file" property="mp3File"/>
<result column="sub_net_mp3_file" property="netMp3File"/>
<!-- <result column="sub_net_mp3_file" property="netMp3File"/>-->
<result column="sub_mp4_file" property="mp4File"/>
<result column="sub_net_mp4_file" property="netMp4File"/>
<!-- <result column="sub_net_mp4_file" property="netMp4File"/>-->
<result column="sub_service_duration" property="serviceDuration"/>
<result column="sub_service_content" property="serviceContent"/>
<result column="sub_toll_price" property="tollPrice"/>
@ -151,13 +151,13 @@
a.cycle_type as cycleType,
a.cycle_value as cycleValue,
a.preview_file as previewFile,
a.net_preview_file as netPeviewFile,
-- a.net_preview_file as netPeviewFile,
a.preview_file_small as previewFileSmall,
a.net_preview_file_small as netPreviewFileSmall,
-- a.net_preview_file_small as netPreviewFileSmall,
a.mp3_file as mp3File,
a.net_mp3_file as netMp3File,
-- a.net_mp3_file as netMp3File,
a.mp4_file as mp4File,
a.net_mp4_file as netMp4File,
-- a.net_mp4_file as netMp4File,
a.service_duration as serviceDuration,
a.service_content as serviceContent,
a.package_id as packageId,
@ -310,13 +310,13 @@
o.cycle_type,
o.cycle_value,
o.preview_file,
o.net_preview_file,
-- o.net_preview_file,
o.preview_file_small,
o.net_preview_file_small,
-- o.net_preview_file_small,
o.mp3_file,
o.net_mp3_file,
-- o.net_mp3_file,
o.mp4_file,
o.net_mp4_file,
-- o.net_mp4_file,
o.service_duration,
o.service_content,
o.iz_package,
@ -365,13 +365,13 @@
s.cycle_type as sub_cycle_type,
s.cycle_value as sub_cycle_value,
s.preview_file as sub_preview_file,
s.net_preview_file as sub_net_preview_file,
-- s.net_preview_file as sub_net_preview_file,
s.preview_file_small as sub_preview_file_small,
s.net_preview_file_small as sub_net_preview_file_small,
-- s.net_preview_file_small as sub_net_preview_file_small,
s.mp3_file as sub_mp3_file,
s.net_mp3_file as sub_net_mp3_file,
-- s.net_mp3_file as sub_net_mp3_file,
s.mp4_file as sub_mp4_file,
s.net_mp4_file as sub_net_mp4_file,
-- s.net_mp4_file as sub_net_mp4_file,
s.service_duration as sub_service_duration,
s.service_content as sub_service_content,
s.toll_price as sub_toll_price,

115
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java
View File

@ -12,7 +12,6 @@ import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
import com.nu.modules.sysconfig.ISysConfigApi;
import com.nu.websocket.SdWebsocket;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
@ -44,12 +43,9 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
@Autowired
ISendOrderRuleSubService sendOrderRuleSubService;
@Autowired
private ISysConfigApi sysConfigApi;
@Autowired
private ISysBaseAPI sysBaseAPI;
SendOrderRule sendOrderRule;
List<SendOrderRuleSub> ruleSubList;
private String serverNetUrl;
@Autowired
private SdWebsocket sdWebsocket;
@ -160,7 +156,6 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
Date endTime = c.getTime();
orders.setEndTime(endTime);
getNetImages(orders);
String orderNo = getOrderNo(orders.getOrderType());
orders.setOrderNo(orderNo);
orders.setOptType("1");
@ -181,7 +176,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
message.put("data", orders);//业务数据
String messageJson = message.toJSONString();
//发送给单个用户
// sdWebsocket.sendMessage(orders.getEmployeeId(), messageJson);
sdWebsocket.sendMessage(orders.getEmployeeId(), messageJson);
log.info("【ws消息推送】发送给用户 {}: {}", orders.getEmployeeId(), messageJson);
} catch (Exception e) {
log.error("ws发送消息失败", e);
@ -828,7 +823,6 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
employeeName = getEmployeeName(employeeId);
}
getNetImages(orders);
String orderNo = getOrderNo(orderType);
orders.setOrderNo(orderNo);
orders.setOrderType(orderType);
@ -845,7 +839,6 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
if(packageSubList!=null){
for(int i=0;i<packageSubList.size();i++){
DirectiveOrderSub ordersSub = packageSubList.get(i);
getSubNetImages(ordersSub);
ordersSub.setOrderNo(getOrderSubNo(orderNo));
ordersSub.setOrderType(orderType);
ordersSub.setMainId(orders.getId());
@ -873,97 +866,27 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
}
}
//todo
//发送websocket消息
try {
// 发送数据
JSONObject message = new JSONObject();
message.put("type", "directiveOrder");//消息类型
message.put("timestamp", System.currentTimeMillis());
message.put("from", "system");//发送者
message.put("to", orders.getEmployeeId());//接收用户
message.put("data", orders);//业务数据
String messageJson = message.toJSONString();
//发送给单个用户
sdWebsocket.sendMessage(orders.getEmployeeId(), messageJson);
log.info("【ws消息推送】发送给用户 {}: {}", orders.getEmployeeId(), messageJson);
} catch (Exception e) {
log.error("ws发送消息失败", e);
}
return map;
}
private DirectiveOrder getNetImages(DirectiveOrder par) {
if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
String previewFile = getImageNetUrl(par.getPreviewFile());
par.setNetPreviewFile(previewFile);
} else {
par.setPreviewFile("");
par.setNetPreviewFile("");
}
if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) {
String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
par.setNetPreviewFileSmall(previewFileSmall);
} else {
par.setPreviewFileSmall("");
par.setNetPreviewFileSmall("");
}
if (par.getMp3File() != null && !par.getMp3File().equals("")) {
String netMp3File = getImageNetUrl(par.getMp3File());
par.setNetMp3File(netMp3File);
} else {
par.setMp3File("");
par.setNetMp3File("");
}
if (par.getMp4File() != null && !par.getMp4File().equals("")) {
String netMp4File = getImageNetUrl(par.getMp4File());
par.setNetMp4File(netMp4File);
} else {
par.setMp4File("");
par.setNetMp4File("");
}
return par;
}
private DirectiveOrderSub getSubNetImages(DirectiveOrderSub par) {
if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
String previewFile = getImageNetUrl(par.getPreviewFile());
par.setNetPreviewFile(previewFile);
} else {
par.setPreviewFile("");
par.setNetPreviewFile("");
}
if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) {
String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
par.setNetPreviewFileSmall(previewFileSmall);
} else {
par.setPreviewFileSmall("");
par.setNetPreviewFileSmall("");
}
if (par.getMp3File() != null && !par.getMp3File().equals("")) {
String netMp3File = getImageNetUrl(par.getMp3File());
par.setNetMp3File(netMp3File);
} else {
par.setMp3File("");
par.setNetMp3File("");
}
if (par.getMp4File() != null && !par.getMp4File().equals("")) {
String netMp4File = getImageNetUrl(par.getMp4File());
par.setNetMp4File(netMp4File);
} else {
par.setMp4File("");
par.setNetMp4File("");
}
return par;
}
/**
* 获取管理平台静态资源路径
*
* @return
*/
private void getOpeMediaAddress() {
if (serverNetUrl == null || serverNetUrl.equals("")) {
JSONObject json = sysConfigApi.getByKey("ope_media_address");
if (json != null) {
String configValue = json.getString("configValue");
if (!configValue.endsWith("/")) {
configValue += "/";
}
serverNetUrl = configValue;
}
}
}
private String getImageNetUrl(String imageUrl) {
getOpeMediaAddress();
return serverNetUrl + imageUrl;
}
/**
* 获取员工姓名
* @param employeeId