diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/DayMessage.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/DayMessage.java index 996e2c6..860ba14 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/DayMessage.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/DayMessage.java @@ -1,5 +1,7 @@ package com.czlis.interfaceCommon.pojo.inter; +import cn.hutool.json.JSONUtil; +import com.czlis.interfaceCommon.service.LisInterfaceType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,11 +9,15 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class DayMessage { +public class DayMessage implements LisInterfaceType { private String ip; private String userid; private String msgid; private String msg; private String yljg; + @Override + public String serializationJson() { + return JSONUtil.toJsonStr(this); + } } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/GetReqInterface.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/GetReqInterface.java index 06bc458..e202d28 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/GetReqInterface.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/GetReqInterface.java @@ -1,5 +1,7 @@ package com.czlis.interfaceCommon.pojo.inter; +import cn.hutool.json.JSONUtil; +import com.czlis.interfaceCommon.service.LisInterfaceType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,7 +9,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class GetReqInterface { +public class GetReqInterface implements LisInterfaceType { private String yljg; private String brdh; private String brly; @@ -18,4 +20,9 @@ public class GetReqInterface { private String bz1; private String sqh; private String ip; + + @Override + public String serializationJson() { + return JSONUtil.toJsonStr(this); + } } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetDict.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetDict.java index 40ea33e..fb15110 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetDict.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetDict.java @@ -1,5 +1,7 @@ package com.czlis.interfaceCommon.pojo.inter; +import cn.hutool.json.JSONUtil; +import com.czlis.interfaceCommon.service.LisInterfaceType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,10 +9,14 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class SetDict { +public class SetDict implements LisInterfaceType { private String ip; private String userid; private String zdlb; private String yljg; + @Override + public String serializationJson() { + return JSONUtil.toJsonStr(this); + } } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReport.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReport.java index 3ab8940..2ea74a4 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReport.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReport.java @@ -1,5 +1,7 @@ package com.czlis.interfaceCommon.pojo.inter; +import cn.hutool.json.JSONUtil; +import com.czlis.interfaceCommon.service.LisInterfaceType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,7 +9,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class SetReport { +public class SetReport implements LisInterfaceType { private String ip; private String userid; private String yq; @@ -15,4 +17,8 @@ public class SetReport { private String ybh; private String status; + @Override + public String serializationJson() { + return JSONUtil.toJsonStr(this); + } } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReqStatus.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReqStatus.java index 6280a0e..acdbff6 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReqStatus.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/inter/SetReqStatus.java @@ -1,5 +1,7 @@ package com.czlis.interfaceCommon.pojo.inter; +import cn.hutool.json.JSONUtil; +import com.czlis.interfaceCommon.service.LisInterfaceType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,10 +9,14 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class SetReqStatus { +public class SetReqStatus implements LisInterfaceType { private String ip; private String userid; private String sqh; private String status; + @Override + public String serializationJson() { + return JSONUtil.toJsonStr(this); + } } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/LisInterfaceType.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/LisInterfaceType.java new file mode 100644 index 0000000..126abaf --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/service/LisInterfaceType.java @@ -0,0 +1,6 @@ +package com.czlis.interfaceCommon.service; + +public interface LisInterfaceType { + + public String serializationJson(); +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java index 58bbc37..15e4d7e 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java @@ -12,6 +12,7 @@ import com.czlis.common.enums.BusinessType; import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants; import com.czlis.common.core.domain.Result; import com.czlis.interfaceCommon.mapper.LisInterfaceMapper; +import com.czlis.interfaceCommon.service.LisInterfaceType; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -32,13 +33,15 @@ public class LisInterfaceUtil { /** * 接口调用 * @param type - * @param inValue + * @param * @return */ @Log(title = "接口调用",businessType = BusinessType.INTERFACE_INVOKE) - public Result invokeLisInterface(String type, String inValue) { + public Result invokeLisInterface(String type, LisInterfaceType lisInterfaceType) { String interfaceType = commonUtil.getComOptValue("HISOPT","SP_INTER"); log.info("开始调用{}接口,入参:{}",type,interfaceType); + String inValue = lisInterfaceType.serializationJson(); + log.info("接口入参:{}",inValue); switch (interfaceType){ case "2": //存储过程 return invokeSP(type, inValue); diff --git a/lis-quartz/src/main/java/com/czlis/quartz/task/LisTask.java b/lis-quartz/src/main/java/com/czlis/quartz/task/LisTask.java index 08bedfc..4e84d29 100644 --- a/lis-quartz/src/main/java/com/czlis/quartz/task/LisTask.java +++ b/lis-quartz/src/main/java/com/czlis/quartz/task/LisTask.java @@ -32,8 +32,7 @@ public class LisTask { setDict.setIp(""); setDict.setUserid("admin"); setDict.setYljg("1"); - String jsonStr = JSONUtil.toJsonStr(setDict); - return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, jsonStr); + return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, setDict); } /** @@ -46,8 +45,7 @@ public class LisTask { setDict.setIp(""); setDict.setUserid("admin"); setDict.setYljg("1"); - String jsonStr = JSONUtil.toJsonStr(setDict); - return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, jsonStr); + return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, setDict); } /** @@ -60,8 +58,7 @@ public class LisTask { setDict.setIp(""); setDict.setUserid("admin"); setDict.setYljg("1"); - String jsonStr = JSONUtil.toJsonStr(setDict); - return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, jsonStr); + return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, setDict); } /** @@ -74,7 +71,6 @@ public class LisTask { setDict.setIp(""); setDict.setUserid("admin"); setDict.setYljg("1"); - String jsonStr = JSONUtil.toJsonStr(setDict); - return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, jsonStr); + return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, setDict); } } diff --git a/lis-interfaceCommon/src/main/resources/jasperreports_extension.properties b/lis-system/src/main/resources/static/jasperreports_extension.properties similarity index 100% rename from lis-interfaceCommon/src/main/resources/jasperreports_extension.properties rename to lis-system/src/main/resources/static/jasperreports_extension.properties diff --git a/lis-interfaceCommon/src/main/resources/stsong/fonts.xml b/lis-system/src/main/resources/static/stsong/fonts.xml similarity index 100% rename from lis-interfaceCommon/src/main/resources/stsong/fonts.xml rename to lis-system/src/main/resources/static/stsong/fonts.xml diff --git a/lis-interfaceCommon/src/main/resources/stsong/stsong.ttf b/lis-system/src/main/resources/static/stsong/stsong.ttf similarity index 100% rename from lis-interfaceCommon/src/main/resources/stsong/stsong.ttf rename to lis-system/src/main/resources/static/stsong/stsong.ttf diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 8be1bff..91bb875 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -56,8 +56,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { getReqInterface.setEtime(""); getReqInterface.setEtime(""); getReqInterface.setYljg(""); - String jsonStr = JSONUtil.toJsonStr(getReqInterface); - lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.GETREQINTERFACE, jsonStr); + lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.GETREQINTERFACE, getReqInterface); labReqmainOne = commonUtil.getLabReqmainOne(sqh); } if(labReqmainOne == null) return new Result("-1","没有获取到申请单信息!"); @@ -76,8 +75,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { setReqStatus.setSqh(sqh); setReqStatus.setUserid(userId.toString()); setReqStatus.setStatus(SampleStatusConstants.SIGNFOR); - String jsonStr = JSONUtil.toJsonStr(setReqStatus); - Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETREQSTATUS, jsonStr); + Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETREQSTATUS, setReqStatus); if(!result.getCode().equals("0")) return result; //4.获取病人信息 diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java index 21abd54..90a2eb8 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java @@ -50,8 +50,7 @@ public class MZCXServiceImpl implements MZCXService { getReqInterface.setDept(""); getReqInterface.setUserid(SecurityUtils.getLoginUser().getUsername()); getReqInterface.setIp(IpUtils.getIpAddr()); - String jsonStr = JSONUtil.toJsonStr(getReqInterface); - Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.GETREQINTERFACE, jsonStr); + Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.GETREQINTERFACE, getReqInterface); Map map = new HashMap<>(); map.put("brdh", brdh); map.put("st", stime); @@ -69,8 +68,7 @@ public class MZCXServiceImpl implements MZCXService { dayMessage.setMsg(""); dayMessage.setIp(IpUtils.getIpAddr()); dayMessage.setUserid(SecurityUtils.getLoginUser().getUsername()); - String jsonStr = JSONUtil.toJsonStr(dayMessage); - Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, jsonStr); + Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, dayMessage); if (result != null && result.getData() != null) { try { JSONObject json = JSONUtil.parseFromXml(result.getData().toString());