jiangs/transitPlatForm
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
tangw 2026-03-31 19:30:47 +08:00
commit d933ac4197
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/websocket/WebSocketMsgServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.transitPlatForm.common.core.redis.RedisCache;
import com.transitPlatForm.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.websocket.Session;
import java.util.ArrayList;
@ -15,6 +16,7 @@ import java.util.concurrent.TimeUnit;
* WebSocket消息处理业务实现类
*/
@Service
@Slf4j
public class WebSocketMsgServiceImpl implements WebSocketMsgService {
@Override
@ -251,7 +253,8 @@ public class WebSocketMsgServiceImpl implements WebSocketMsgService {
}
// 4. 新增：解析并添加多IP列表
this.addIpList(dataStrMap,senderId);
System.out.println("setClientInfo成功：用户属性更新完成，senderId=" + senderId);
//System.out.println("setClientInfo成功：用户属性更新完成，senderId=" + senderId);
log.info("setClientInfo成功：用户属性更新完成，senderId={}", senderId);
}
/**
* 解析客户端传递的多IP列表，并同步更新IP→userId索引

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java
View File

@ -554,7 +554,9 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
String UserId = ChatWebSocketServer.getUserIdByIp(ip);
if (UserId == null || "".equals(UserId)) {
String webid = getLocalid();
log.info("webid:{}",webid);
UserId = ChatWebSocketServer.getUsersByWebId(webid);
log.info("UserId:{}",UserId);
if (UserId != null && !"".equals(UserId)) {
return new Result("0", "客户端插件正常");
}

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
View File

@ -150,7 +150,7 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
if (statusSample.equals("30")) return new Result("-1", "该标本已经送检！");
if (statusSample.equals("10")) return new Result("-1","该条码还没有打印，不允许送出！");
if (Integer.parseInt(statusSample) > 30)
return new Result("-1", barcode+"标本已经签收或者上机，不能再进行送检操作！");
return new Result("-1", barcode+"标本已经签收或者上机或者已审核或者作废，不能再进行送检操作！");
regTransitSample.setDstHospCode(dstHospCode);
regTransitSample.setDstHospName(dstHospName);
regTransitSample.setSendPackTime(commonUtil.getCurrentTime()); //

4
pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml
View File

@ -7,9 +7,7 @@
<![CDATA[select *,CONVERT(VARCHAR(20), OrderTime, 23) as OrderDate from reg_apply where OrderTime >= #{begdate} and OrderTime <= #{enddate} ]]>
<if test="patId != null and patId != ''"> and PatId = #{patId}</if>
<if test="brxm != null and brxm != ''">and PatName like '%'+#{brxm}+'%'</if>
<if test="status == 1">and Status in ('10','20','30','40')</if>
<if test="status == 2">and Status in ('50','60')</if>
<if test="status == 3">and Status in ('70','80')</if>
<if test="status != null ">and Status = #{status}</if>
<if test="SrcHospCode != null and SrcHospCode != ''">and SrcHospCode = #{SrcHospCode}</if>
order by OrderTime desc
</select>