From 459aa78c84cf552ebea6ef056d978c2531d71ac8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 06 三月 2026 17:14:27 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index 32e4cfb..17bb6a6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -12,6 +12,7 @@
import com.smartor.common.LSHospTokenUtil;
import com.smartor.common.LyraTokenUtil;
import com.smartor.domain.*;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.BaseOrganizationMapper;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.service.IServiceTaskService;
@@ -98,7 +99,7 @@
iServiceTaskService.updateServiceTask(serviceTask2);
//鑾峰彇鍒拌浠诲姟鎵�鏈夌殑鏈嶅姟锛屽苟浠庨槦鍒楅噷鍒犻櫎
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(serviceTask2.getTaskid());
serviceSubtaskVO.setSendstate(2L);
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
@@ -152,7 +153,7 @@
public ServiceTaskVO queryTaskByCondition(ServiceSubtask serviceSubtask) {
//瀹氫箟鎮ｈ�呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚�
List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(serviceSubtask.getTaskid());
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isEmpty(selectServiceSubtaskList) || selectServiceSubtaskList.size() == 0) {
@@ -283,7 +284,7 @@
serviceSubtask.setCreateTime(new Date());
serviceSubtask.setLeavehospitaldistrictcode(serviceTaskVO.getDistrictcode());
//鍏堟煡璇竴閬嶏紝璇askGuid鏄惁瀛樺湪
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
@@ -294,7 +295,7 @@
serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
}
Integer integer = serviceSubtask.getId().intValue();
- log.error("鎻掑叆鐨処D鏄細{}", integer);
+ log.info("鎻掑叆鐨処D鏄細{}", integer);
return integer;
}
@@ -302,21 +303,10 @@
@Override
public Map query360PatInfo(ServiceQueryInfo serviceQueryInfo) {
if (ObjectUtils.isEmpty(serviceQueryInfo)) {
- log.info("360鏌ヨ鏉′欢涓虹┖");
+ log.error("360鏌ヨ鏉′欢涓虹┖");
throw new BaseException("360鏌ヨ鏉′欢涓虹┖");
}
String token = LSHospTokenUtil.getToken(serviceQueryInfo.getXiaoXiTou().getFaSongJGID(),serviceQueryInfo.getUrl());
-// LyraTokenUtil lyraTokenUtil = null;
-// if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47255004333112711A1001")) //鏅畞
-// lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13021/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
-// if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47231022633110211A2101")) //涓尰闄�
-// lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13011/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
-//
-// try {
-// token = lyraTokenUtil.getToken();
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
//鐢ㄦ埛淇℃伅锛岄�氳繃ZuZhiJGID鍘籦se_organization涓幏鍙栨満鏋勪俊鎭�
if (StringUtils.isBlank(serviceQueryInfo.getYeWuXX().getYongHuXX().getZuZhiJGID()))
@@ -335,18 +325,20 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
serviceQueryInfo.getXiaoXiTou().setFaSongSJ(simpleDateFormat.format(new Date()));
- log.error(new Gson().toJson(serviceQueryInfo));
- log.error("serviceQueryInfo鐨勭粨鏋滀负锛歿}", serviceQueryInfo);
+ log.info("serviceQueryInfo鐨勭粨鏋滀负锛歿}", serviceQueryInfo);
ObjectMapper objectMapper = new ObjectMapper();
String result = null;
Map map = new HashMap();
try {
String jsonString = objectMapper.writeValueAsString(serviceQueryInfo);
- log.error("token鐨勫�间负锛歿}", token);
- if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47255004333112711A1001")) //鏅畞
+ log.info("token鐨勫�间负锛歿}", token);
+ if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47255004333112711A1001")) { //鏅畞
result = OkHttpExample.sendPostRequest("https://9.0.124.104:13021/mediinfo-grus-fuwuzxwg/api/esb/lyraSyncRun", jsonString, token);
- if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47231022633110211A2101")) //涓尰闄�
+ }else if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47231022633110211A2101")) { //涓尰闄�
result = OkHttpExample.sendPostRequest("https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraSyncRun", jsonString, token);
+ }else if(ObjectUtils.isNotEmpty(serviceQueryInfo.getUrl360())){
+ result = OkHttpExample.sendPostRequest(serviceQueryInfo.getUrl360(), jsonString, token);
+ }
map = objectMapper.readValue(result, Map.class);
} catch (Exception e) {
e.printStackTrace();
@@ -359,6 +351,7 @@
return map;
}
+
@Override
public Map focus(ServiceQueryFocus serviceQueryFocus) {
return null;
--
Gitblit v1.9.3