diff --git a/src/main/java/com/ynxbd/common/TestA.java b/src/main/java/com/ynxbd/common/TestA.java index e5b1472..8ea9b57 100644 --- a/src/main/java/com/ynxbd/common/TestA.java +++ b/src/main/java/com/ynxbd/common/TestA.java @@ -1,5 +1,7 @@ package com.ynxbd.common; +import cn.hutool.Hutool; +import cn.hutool.core.util.PhoneUtil; import com.ynxbd.common.bean.Doctor; import com.ynxbd.common.bean.Patient; import com.ynxbd.common.bean.enums.MerchantEnum; @@ -32,16 +34,16 @@ public class TestA { // System.out.println(cacheSign); // } -// public static void main(String[] args) { -// String KEY = "795b207e12572839976d9310bdde32be"; -// String PARTNER_ID = "100000317"; -// -// String timestamp = System.currentTimeMillis() + ""; -// String str = PARTNER_ID + timestamp; -// String cacheSign = HMACHelper.sha256(str, KEY); -// System.out.println(timestamp); -// System.out.println(cacheSign); -// } + public static void main(String[] args) { + String KEY = "3431de05cbf9d0ffdbc064a352835981"; + String PARTNER_ID = "100000637"; + + String timestamp = System.currentTimeMillis() + ""; + String str = PARTNER_ID + timestamp; + String cacheSign = HMACHelper.sha256(str, KEY); + System.out.println(timestamp); + System.out.println(cacheSign); + } // public static void main(String[] args) { @@ -62,10 +64,6 @@ public class TestA { // } - public static void main(String[] args) { - List patients = new PatientDao().selectListByPatientId("1"); - System.out.println(patients); - } // public static void main(String[] args) { // System.out.println(AesWxHelper.encode("524404")); diff --git a/src/main/java/com/ynxbd/common/action/AIGuidanceAction.java b/src/main/java/com/ynxbd/common/action/AIGuidanceAction.java index 7aca564..61321af 100644 --- a/src/main/java/com/ynxbd/common/action/AIGuidanceAction.java +++ b/src/main/java/com/ynxbd/common/action/AIGuidanceAction.java @@ -32,7 +32,7 @@ public class AIGuidanceAction extends BaseAction { */ @Action("getAllHospInfo") public Result getAllHospInfo() { - if (!AIGuidanceConfig.isVerifySign(request)) { + if (!AIGuidanceConfig.IS_DEV && !AIGuidanceConfig.isVerifySign(request)) { return Result.error(ResultEnum.SIGN_ERROR); // 签名异常 } @@ -50,7 +50,7 @@ public class AIGuidanceAction extends BaseAction { */ @Action("getHospDetail") public Result getHospDetail(String hosId) { - if (!AIGuidanceConfig.isVerifySign(request)) { + if (!AIGuidanceConfig.IS_DEV && !AIGuidanceConfig.isVerifySign(request)) { return Result.error(ResultEnum.SIGN_ERROR); // 签名异常 } return new AIGuidanceService().getHospDetail(hosId); @@ -61,7 +61,7 @@ public class AIGuidanceAction extends BaseAction { */ @Action("getDeptList") public Result getDeptList(String hosId, String branchId) { - if (!AIGuidanceConfig.isVerifySign(request)) { + if (!AIGuidanceConfig.IS_DEV && !AIGuidanceConfig.isVerifySign(request)) { return Result.error(ResultEnum.SIGN_ERROR); // 签名异常 } return new AIGuidanceService().getDeptList(hosId, branchId); @@ -72,7 +72,7 @@ public class AIGuidanceAction extends BaseAction { */ @Action("getDoctorList") public Result getDoctorList(String hosId, String branchId, String deptId) { - if (!AIGuidanceConfig.isVerifySign(request)) { + if (!AIGuidanceConfig.IS_DEV && !AIGuidanceConfig.isVerifySign(request)) { return Result.error(ResultEnum.SIGN_ERROR); // 签名异常 } return new AIGuidanceService().getDoctorList(hosId, branchId, deptId); diff --git a/src/main/java/com/ynxbd/common/result/Result.java b/src/main/java/com/ynxbd/common/result/Result.java index 73ed323..5c8100d 100644 --- a/src/main/java/com/ynxbd/common/result/Result.java +++ b/src/main/java/com/ynxbd/common/result/Result.java @@ -143,7 +143,7 @@ public class Result extends BaseResult { if (e != null && e.getClass() == ServiceException.class) { ServiceException serviceException = (ServiceException) e; - if (serviceException.getMessage() != null) { + if (serviceException.isLog() && serviceException.getMessage() != null) { message = serviceException.getMessage(); log.error(e.getMessage()); } @@ -190,18 +190,18 @@ public class Result extends BaseResult { this.date = DateHelper.getCurDateTime(); } - public String toDataStr(){ + public String toDataStr() { if (data == null) return null; return data.toString(); } public T dataToBean(Class clazz) { - if(this.data == null) return null; + if (this.data == null) return null; return JsonHelper.parseObject(JsonHelper.toJsonString(this.data), clazz); } public List dataToList(Class clazz) { - if(this.data == null) return new ArrayList<>(); + if (this.data == null) return new ArrayList<>(); return JsonHelper.parseArray(JsonHelper.toJsonString(this.data), clazz); } diff --git a/src/main/java/com/ynxbd/common/result/ServiceException.java b/src/main/java/com/ynxbd/common/result/ServiceException.java index 42a22a4..65776b9 100644 --- a/src/main/java/com/ynxbd/common/result/ServiceException.java +++ b/src/main/java/com/ynxbd/common/result/ServiceException.java @@ -8,7 +8,8 @@ import lombok.Getter; */ @Getter public class ServiceException extends Exception { - final private ResultEnum resultEnum; + private final ResultEnum resultEnum; + private boolean isLog = true; public ServiceException(ResultEnum resultEnum) { super(resultEnum.message); @@ -24,4 +25,10 @@ public class ServiceException extends Exception { super(message); this.resultEnum = null; } + + public ServiceException(String message, boolean isLog) { + super(message); + this.resultEnum = null; + this.isLog = isLog; + } } diff --git a/src/main/java/com/ynxbd/common/service/AIGuidanceService.java b/src/main/java/com/ynxbd/common/service/AIGuidanceService.java index 70ff91e..f23aa0d 100644 --- a/src/main/java/com/ynxbd/common/service/AIGuidanceService.java +++ b/src/main/java/com/ynxbd/common/service/AIGuidanceService.java @@ -7,6 +7,7 @@ import com.ynxbd.common.bean.ai.AIDoctor; import com.ynxbd.common.dao.RegisterDao; import com.ynxbd.common.dao.his.HisRegisterDao; import com.ynxbd.common.helper.common.DateHelper; +import com.ynxbd.common.helper.common.JsonHelper; import com.ynxbd.common.helper.common.URLHelper; import com.ynxbd.common.result.Result; import com.ynxbd.common.result.ResultEnum; @@ -75,6 +76,7 @@ public class AIGuidanceService { List dataList = new ArrayList<>(); if (!hosId.equals(AIGuidanceConfig.HOS_ID)) { // 医院id校验 + log.warn("[智能导诊]科室列表查询-hosId不匹配"); return Result.success(ResultEnum.AI_SUCCESS, dataList); } @@ -157,6 +159,7 @@ public class AIGuidanceService { } if (!hosId.equals(AIGuidanceConfig.HOS_ID)) { // 医院id校验 + log.warn("[智能导诊]医生列表查询-hosId不匹配"); return Result.success(ResultEnum.AI_SUCCESS, new ArrayList<>()); } diff --git a/src/main/java/com/ynxbd/common/service/MedicalService.java b/src/main/java/com/ynxbd/common/service/MedicalService.java index 63e9135..56f9870 100644 --- a/src/main/java/com/ynxbd/common/service/MedicalService.java +++ b/src/main/java/com/ynxbd/common/service/MedicalService.java @@ -113,7 +113,7 @@ public class MedicalService { payAuthNo = userInfo.getPayAuthNo(); } - // 测试报告内容[2] + // [验收]测试报告内容[2] log.info("{}[HIS医保上传明细] req={patientId:\"{}\", treatNum:\"{}\", totalFee:\"{}\", cardNo:\"{}\", recipeJson:\"{}\"}", merchantEnum.NAME, patientId, treatNum, totalFee, cardNo, recipeJson); JsonResult result = HisMedDao.rxMedUploadDetails(merchantEnum, payAuthNo, cardNo, openid, patientId, treatNum, recipeJson, totalFee, ybAttrib, ybBZCode, ybBZName); return hisMedPlaceOrder(merchantEnum, payAuthNo, result); diff --git a/src/main/java/com/ynxbd/wx/config/AIGuidanceConfig.java b/src/main/java/com/ynxbd/wx/config/AIGuidanceConfig.java index cf5c88e..7895691 100644 --- a/src/main/java/com/ynxbd/wx/config/AIGuidanceConfig.java +++ b/src/main/java/com/ynxbd/wx/config/AIGuidanceConfig.java @@ -17,6 +17,8 @@ public class AIGuidanceConfig { } public final static boolean IS_ENABLE; + // 是否为测试环境 + public final static boolean IS_DEV; // 是否为分时段挂号 public final static boolean IS_SPLIT_TIME_REG; //配置文件读取项 @@ -33,9 +35,11 @@ public class AIGuidanceConfig { static { ProperHelper config = new ProperHelper().read("ai-guidance.properties"); IS_ENABLE = config.getBoolean("ai.is_enable", false); - IS_SPLIT_TIME_REG = config.getBoolean("ai.is_split_time_reg", true); config.setIsEnable(IS_ENABLE); + IS_DEV = config.getBoolean("ai.is_dev", false); + IS_SPLIT_TIME_REG = config.getBoolean("ai.is_split_time_reg", true); + PARTNER_ID = config.getString("ai.partner_id"); KEY = config.getString("ai.key"); HOS_ID = config.getString("ai.hos_id"); diff --git a/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java b/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java index 638e86e..627cc4c 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/WxMedHelper.java @@ -35,12 +35,12 @@ public class WxMedHelper { * @param qrCode 授权 */ public static MedicalUserInfo getUserInfo(String openid, String qrCode, String cardNo, String realName) throws ServiceException { - log.info("[医保]获取用户信息 openid={}, qrCode={}", openid, qrCode); + log.info("[医保]获取用户信息 openid={}, realName={}, qrCode={}", openid, realName, qrCode); MedicalUserInfo info = WxFactory.Medical.Common().getUserInfo(WxMedConfig.PARTNER_URL, openid, qrCode); if (info == null || !info.isSuccess()) { String message = info == null ? "" : info.getMessage(); - log.info("[医保授权]失败 {}", message); - throw new ServiceException("[医保授权]失败:" + message); + log.error("[医保授权]失败 openid={}, realName={}, message={}", openid, realName, message); + throw new ServiceException("[医保授权]失败:" + message, false); } if (cardNo != null) { diff --git a/src/main/resources/ai-guidance.properties b/src/main/resources/ai-guidance.properties index bd76db1..f8a3e40 100644 --- a/src/main/resources/ai-guidance.properties +++ b/src/main/resources/ai-guidance.properties @@ -1,5 +1,8 @@ # \u667A\u80FD\u5BFC\u8BCA\uFF08\u9700\u5546\u6237\u52A0https\u767D\u540D\u5355\uFF09 ai.is_enable=true +# \u662F\u5426\u4E3A\u6D4B\u8BD5\u73AF\u5883 +ai.is_dev=true + # \u662F\u5426\u662F\u5206\u65F6\u6BB5\u6302\u53F7(\u9ED8\u8BA4true) ai.is_split_time_reg=false # \u5408\u4F5C\u65B9id