From 9449b5f71bd0c20ed9aefd025ee87c69bcdfbd40 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期三, 18 十二月 2024 14:51:12 +0800 Subject: [PATCH] 20241218 --- src/main/java/com/example/service/xian/MeiJiHisService.java | 231 ++++++++++++++++++++++++++------------------------------- 1 files changed, 104 insertions(+), 127 deletions(-) diff --git a/src/main/java/com/example/service/xian/MeiJiService.java b/src/main/java/com/example/service/xian/MeiJiHisService.java similarity index 63% rename from src/main/java/com/example/service/xian/MeiJiService.java rename to src/main/java/com/example/service/xian/MeiJiHisService.java index ff35c05..6036418 100644 --- a/src/main/java/com/example/service/xian/MeiJiService.java +++ b/src/main/java/com/example/service/xian/MeiJiHisService.java @@ -2,17 +2,21 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSON; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.example.config.ConfigValue; import com.example.domain.TjCustomer; import com.example.dto.xian.meiji.CheXiaoMzFyDto; import com.example.dto.xian.meiji.CreateMenZhenFyDto; +import com.example.service.HisService; import com.example.service.ISysConfigService; import com.example.utils.HttpClientUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationContext; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; import java.io.FileInputStream; import java.io.IOException; @@ -28,67 +32,50 @@ * @Author: zhaowenxuan * @Date: 2024/12/17 17:17 */ -public class MeiJiService { - @Autowired - private ISysConfigService configService; - @Autowired - private RedisTemplate<String ,Object> redisTemplate; - - private static String HIS_URL = "http://oapi.pbkwyy.com/OAPI"; - - private static String CONFIG_PATH; - - private static String GRANT_TYPE = "client_credentials"; - private static String CLIENT_ID = "XFZZQEfXTZ7exhhi"; - private static String CLIENT_SECRET = "05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad"; -// private static String SCOP = ""; - +@Service("ShanXiXiAnMeiJi") +public class MeiJiHisService implements HisService { // http://oapi.pbkwyy.com/OAPI/oauth/token // grant_type:client_credentials // client_id:XFZZQEfXTZ7exhhi // client_secret:05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad +// http://oapi.pbkwyy.com/OAPI - @Value("${config.properties}") - public void setConfigPath(String configPath) { - CONFIG_PATH = configPath; - try { - FileInputStream inputStream = new FileInputStream(CONFIG_PATH); - Properties props = new Properties(); - props.load(inputStream); - String url = props.getProperty("df_his_api_url"); - String port = props.getProperty("df_his_api_port"); - GRANT_TYPE = props.getProperty("grant_type"); - CLIENT_ID= props.getProperty("client_id"); - CLIENT_SECRET = props.getProperty("client_secret"); -// SCOP = props.getProperty("scope"); - HIS_URL=url+":"+port+"/OAPI/"; - } catch (IOException throwables) { - throwables.printStackTrace(); - } + @Autowired + public MeiJiHisService(ApplicationContext applicationContext, ConfigValue configValue) { + this.applicationContext = applicationContext; + this.configValue = configValue; + HIS_URL = configValue.getConfigValue("his_api_url") + ":" + configValue.getConfigValue("his_api_port") +"/OAPI/"; } + @Autowired + private ISysConfigService configService; + + @Autowired + private RedisTemplate<Object ,Object> redisTemplate; + + private ConfigValue configValue; + private final ApplicationContext applicationContext; + + private final String HIS_URL; //鑾峰彇token private JSONObject getToken () { + String GRANT_TYPE = "client_credentials"; + String CLIENT_ID = "XFZZQEfXTZ7exhhi"; + String CLIENT_SECRET = "05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad"; + Map<String, Object> map = new HashMap<>(); - map.put("grant_type",GRANT_TYPE); - map.put("client_id",CLIENT_ID); - map.put("client_secret",CLIENT_SECRET); + map.put("grant_type", GRANT_TYPE); + map.put("client_id", CLIENT_ID); + map.put("client_secret", CLIENT_SECRET); // map.put("scope",SCOP); String post = sendPost (HIS_URL+"/oauth/token", map); if (StrUtil.isBlank(post)) return null; - JSONObject parseObj = JSONUtil.parseObj(post); -// Integer expiresIn = parseObj.getInt("expires_in"); -// if (expiresIn != null){ -// parseObj.putOpt("time",Instant.now().getEpochSecond()); -// redisTemplate.opsForHash().putAll("token:his:df",parseObj); -// redisTemplate.expire("token:his:df",expiresIn - 10, TimeUnit.SECONDS); -// } - return parseObj; + return JSONUtil.parseObj(post); } //寤烘。 - public JSON jianDang (TjCustomer customer) { + public String jianDang (TjCustomer customer) { String czy = configService.selectConfigByKey("dfhisczybm"); Map<String, Object> map = new HashMap<> (); @@ -124,24 +111,22 @@ map.put ("minZuDm",""); map.put ("minZuMc",""); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/menZhenJz/jianDang", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/menZhenJz/jianDang", map); } //楠岃瘉韬唤璇佹槸鍚﹀缓杩囨。 - public JSON getBingRenXxByShengFenZheng (TjCustomer customer) { + public String getBingRenXxByShengFenZheng (TjCustomer customer) { String czy = configService.selectConfigByKey("dfhisczybm"); Map<String, Object> map = new HashMap<> (); map.put ("caoZuoYuan",czy); map.put ("shenFenZh", customer.getCusIdcard ()); map.put ("danWeiBh",""); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/menZhenJz/getBingRenXxByShengFenZheng", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/menZhenJz/getBingRenXxByShengFenZheng", map); } //鐥呬汉鍩烘湰淇℃伅鍙樻洿 - public JSON saveBingRenXx (TjCustomer customer) { + public String saveBingRenXx (TjCustomer customer) { String czy = configService.selectConfigByKey("dfhisczybm"); Map<String, Object> map = new HashMap<> (); map.put ("jiuZhenKh", customer.getPationId ()); @@ -165,24 +150,22 @@ map.put ("jiLuLy","3"); map.put ("caoZuoYuan",czy); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/menZhenJz/saveBingRenXx", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/menZhenJz/saveBingRenXx", map); } //寰呮敹璐硅垂鐢ㄦ煡璇� - public JSON getListDaiShouFei (String bingRenId,String jiuZhenKh,String yuanQuId) { + public String getListDaiShouFei (String bingRenId, String jiuZhenKh, String yuanQuId) { Map<String, Object> map = new HashMap<> (); map.put ("bingRenId",bingRenId); map.put ("jiuZhenKh",jiuZhenKh); map.put ("yuanQuId",yuanQuId); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/shouFei/getListDaiShouFei", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/shouFei/getListDaiShouFei", map); } //鐢熸垚寰呮敹璐�/寰呴��璐� 璐圭敤 - public JSON createMenZhenFy (CreateMenZhenFyDto dto) { + public String createMenZhenFy (CreateMenZhenFyDto dto) { String czy = configService.selectConfigByKey("dfhisczybm"); Map<String, Object> map = new HashMap<> (); map.put ("bingRenId",dto.getBingRenId()); @@ -195,48 +178,44 @@ map.put ("shouTuiBz",dto.getShouTuiBz()); map.put ("feiYongMxList",dto.getFeiYongMxList()); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/shouFei/createMenZhenFy", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/shouFei/createMenZhenFy", map); } //闂ㄨ瘖鏈敹璐硅垂鐢ㄦ挙閿� - public JSON cheXiaoMzFy (CheXiaoMzFyDto dto) { + public String cheXiaoMzFy (CheXiaoMzFyDto dto) { Map<String, Object> map = new HashMap<> (); map.put ("bingRenId",dto.getBingRenId()); map.put ("jiuZhenKh",dto.getJiuZhenKh()); map.put ("feiYongIdList",dto.getFeiYongIdList()); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/shouFei/cheXiaoMzFy", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/shouFei/cheXiaoMzFy", map); } //鏀惰垂/閫�璐瑰畬鎴愰�氱煡绗笁鏂� - public JSON pushZhiFuMsg (String feiYongId,int yeWuLx ) { + public String pushZhiFuMsg (String feiYongId, int yeWuLx ) { Map<String, Object> map = new HashMap<> (); map.put ("feiYongId",feiYongId); map.put ("yeWuLx",yeWuLx); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/shouFei/pushZhiFuMsg", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/shouFei/pushZhiFuMsg", map); } //绉戝淇℃伅鏌ヨ - public JSON getKeShi (String yuanQuId,String keShiMc,int pageIndex,int pageSize ) { + public String getKeShi (String yuanQuId, String keShiMc, int pageIndex, int pageSize ) { Map<String, Object> map = new HashMap<> (); map.put ("yuanQuId",yuanQuId); map.put ("keShiMc",keShiMc); map.put ("pageIndex",pageIndex); map.put ("pageSize",pageSize); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/zhuShuJu/getKeShi", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/zhuShuJu/getKeShi", map); } //鍖荤敓淇℃伅鏌ヨ - public JSON getListYiShengZd (String yuanQuId,String keShiMc,int pageIndex,int pageSize ) { + public String getListYiShengZd (String yuanQuId, String keShiMc, int pageIndex, int pageSize ) { Map<String, Object> map = new HashMap<> (); map.put ("yuanQuId",yuanQuId); map.put ("keShiMc",keShiMc); @@ -244,41 +223,40 @@ map.put ("pageIndex",pageIndex); map.put ("pageSize",pageSize); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/zhuShuJu/getListYiShengZd", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/zhuShuJu/getListYiShengZd", map); } //鑾峰彇鏀惰垂椤圭洰鍒嗛〉 - public JSON getShouFeiXm (String queryString,String bianGengSj,int pageIndex,int pageSize ) { + public String getShouFeiXm (String queryString, String bianGengSj, int pageIndex, int pageSize ) { Map<String, Object> map = new HashMap<> (); map.put ("queryString",queryString); map.put ("bianGengSj",bianGengSj); map.put ("pageIndex",pageIndex); map.put ("pageSize",pageSize); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/zhuShuJu/getShouFeiXm", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/zhuShuJu/getShouFeiXm", map); } /** - *绉戝淇℃伅鎺ㄩ�� - * @param xingZhiSx 缁勭粐灞炴�� 绗竴浣�1聽琛ㄧず 鎸傚彿 - * 绗簩浣� 1琛ㄧず涓村簥 - * 绗笁浣� 1琛ㄧず妫�鏌� - * 绗洓浣� 1 琛ㄧず鎵嬫湳 - * 绗簲浣� 1 琛ㄧず娌荤枟 - * 绗叚浣� 1 琛ㄧず鎶ょ悊 + * 绉戝淇℃伅鎺ㄩ�� + * + * @param xingZhiSx 缁勭粐灞炴�� 绗竴浣�1聽琛ㄧず 鎸傚彿 + * 绗簩浣� 1琛ㄧず涓村簥 + * 绗笁浣� 1琛ㄧず妫�鏌� + * 绗洓浣� 1 琛ㄧず鎵嬫湳 + * 绗簲浣� 1 琛ㄧず娌荤枟 + * 绗叚浣� 1 琛ㄧず鎶ょ悊 * @param queryString 妯$硦鍖归厤杈撯紛鐮�1銆佺瀹ゅ悕绉� - * @param zuoFeiBz 浣滃簾鏍囧織锛�0 姝e父锛�1 浣滃簾 - * @param yuanQuId 闄㈠尯id - * @param keShiIds 绉戝ID闆嗗悎 - * @param ifPlus 鏄惁鏌ヨplus灞炴�� + * @param zuoFeiBz 浣滃簾鏍囧織锛�0 姝e父锛�1 浣滃簾 + * @param yuanQuId 闄㈠尯id + * @param keShiIds 绉戝ID闆嗗悎 + * @param ifPlus 鏄惁鏌ヨplus灞炴�� * @return */ - public JSON getKeShiByConditions (int xingZhiSx, String queryString, int zuoFeiBz, String yuanQuId, List<String> keShiIds, int ifPlus) { + public String getKeShiByConditions (int xingZhiSx, String queryString, int zuoFeiBz, String yuanQuId, List<String> keShiIds, int ifPlus) { Map<String, Object> map = new HashMap<> (); map.put ("xingZhiSx",xingZhiSx); map.put ("queryString",queryString); @@ -287,146 +265,145 @@ map.put ("keShiIds",keShiIds); map.put ("ifPlus",ifPlus); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/zhuShuJu/getKeShiByConditions", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/zhuShuJu/getKeShiByConditions", map); } /** * 鍙栨牱鏈瓧鍏� + * * @param queryString 鏍锋湰绫诲瀷鍚嶇О(鏍锋湰鍚嶇О/鏍锋湰绫诲瀷id) * @param pageIndex - * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� + * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� * @return */ - public JSON getYangBen (String queryString,int pageIndex,int pageSize ) { + public String getYangBen (String queryString, int pageIndex, int pageSize ) { Map<String, Object> map = new HashMap<> (); map.put ("queryString",queryString); map.put ("pageIndex",pageIndex); map.put ("pageSize",pageSize); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/zhuShuJu/getYangBen", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/zhuShuJu/getYangBen", map); } /** - * 鐥呭尯淇℃伅鎺ㄩ�� - * @param yuanQuId 闄㈠尯Id - * @param keShiId 绉戝Id + * 鐥呭尯淇℃伅鎺ㄩ�� + * + * @param yuanQuId 闄㈠尯Id + * @param keShiId 绉戝Id * @param pageIndex 褰撳墠饣� - * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� + * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� * @return */ - public JSON getListBingQuZd (String yuanQuId,String keShiId,int pageIndex,int pageSize ) { + public String getListBingQuZd (String yuanQuId, String keShiId, int pageIndex, int pageSize ) { Map<String, Object> map = new HashMap<> (); map.put ("yuanQuId",yuanQuId); map.put ("keShiId",keShiId); map.put ("pageIndex",pageIndex); map.put ("pageSize",pageSize); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/zhuShuJu/getListBingQuZd", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/zhuShuJu/getListBingQuZd", map); } /** * 鑱屸集淇℃伅 + * * @param bianGengSj 鍙樻洿鏃堕棿 - * @param pageIndex 褰撳墠饣� - * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� + * @param pageIndex 褰撳墠饣� + * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� * @return */ - public JSON getZhiGongPage (String bianGengSj,int pageIndex,int pageSize ) { + public String getZhiGongPage (String bianGengSj, int pageIndex, int pageSize ) { Map<String, Object> map = new HashMap<> (); map.put ("bianGengSj",bianGengSj); map.put ("pageIndex",pageIndex); map.put ("pageSize",pageSize); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/zhuShuJu/getZhiGongPage", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/zhuShuJu/getZhiGongPage", map); } /** * 妫�鏌ラ」鐩� + * * @param queryString * @param bianGengSj * @param pageIndex * @param pageSize * @return */ - public JSON getJianChaXm (String queryString,String bianGengSj,int pageIndex,int pageSize ) { + public String getJianChaXm (String queryString, String bianGengSj, int pageIndex, int pageSize ) { Map<String, Object> map = new HashMap<> (); map.put ("queryString",queryString); map.put ("bianGengSj",bianGengSj); map.put ("pageIndex",pageIndex); map.put ("pageSize",pageSize); //鑱屼笟缂栫爜 - String post = sendPost (HIS_URL+"/zhuShuJu/getJianChaXm", map); - return JSONUtil.parseObj(post); + return sendPost (HIS_URL+"/zhuShuJu/getJianChaXm", map); } /** * 妫�楠岄」饨帹閫� + * * @param queryCode 鏌ヨ鐮�(椤光浆缂栫爜/鎷尖境鐮� - * @param page 褰撳墠饣� - * @param size 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100 + * @param page 褰撳墠饣� + * @param size 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100 * @return */ - public JSON getJianYanXm(String queryCode,Integer page,Integer size){ + public String getJianYanXm(String queryCode, Integer page, Integer size){ HashMap<String, Object> hashMap = new HashMap<>(); hashMap.put("queryCode",queryCode); hashMap.put("page",page); hashMap.put("size",size); - String post = sendPost (HIS_URL+"/zhuShuJu/getJianYanXm", hashMap); - return JSONUtil.parse(post); + return sendPost (HIS_URL+"/zhuShuJu/getJianYanXm", hashMap); } /** * 妫�楠岄」饨敹璐规帹閫� + * * @param shouFeiXmId 鏀惰垂椤光浆id - * @param jiaGeTx 浠锋牸浣撶郴 + * @param jiaGeTx 浠锋牸浣撶郴 * @return */ - public JSON getShouFeiXmJg(String shouFeiXmId,String jiaGeTx){ + public String getShouFeiXmJg(String shouFeiXmId, String jiaGeTx){ HashMap<String, Object> hashMap = new HashMap<>(); hashMap.put("shouFeiXmId",shouFeiXmId); hashMap.put("jiaGeTx",jiaGeTx); - String post = sendPost (HIS_URL+"/zhuShuJu/getShouFeiXmJg", hashMap); - return JSONUtil.parse(post); + return sendPost (HIS_URL+"/zhuShuJu/getShouFeiXmJg", hashMap); } /** * 妫�楠屽鍣� + * * @param queryString 瀹瑰櫒鍚嶇О(瀹瑰櫒鍚嶇О/杈撯紛鐮�1) - * @param pageIndex 褰撳墠饣� - * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� + * @param pageIndex 褰撳墠饣� + * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� * @return */ - public JSON getRongQi(String queryString,Integer pageIndex,Integer pageSize){ + public String getRongQi(String queryString, Integer pageIndex, Integer pageSize){ HashMap<String, Object> hashMap = new HashMap<>(); hashMap.put("queryString",queryString); hashMap.put("pageIndex",pageIndex); hashMap.put("pageSize",pageSize); - String post = sendPost (HIS_URL+"/zhuShuJu/getRongQi", hashMap); - return JSONUtil.parse(post); + return sendPost (HIS_URL+"/zhuShuJu/getRongQi", hashMap); } /** - * 妫�楠屾牱鏈� + * 妫�楠屾牱鏈� + * * @param queryString 鏍锋湰绫诲瀷鍚嶇О(鏍锋湰鍚嶇О/鏍锋湰绫诲瀷id) - * @param pageIndex 褰撳墠饣� - * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� + * @param pageIndex 褰撳墠饣� + * @param pageSize 姣忊粴鏉℃暟锛堟渶饧や笉鑳借秴杩�100锛� * @return */ - public JSON getYangBen(String queryString,Integer pageIndex,Integer pageSize){ + public String getJyYangBen(String queryString, Integer pageIndex, Integer pageSize){ HashMap<String, Object> hashMap = new HashMap<>(); hashMap.put("queryString",queryString); hashMap.put("pageIndex",pageIndex); hashMap.put("pageSize",pageSize); - String post = sendPost (HIS_URL+"/zhuShuJu/getYangBen", hashMap); - return JSONUtil.parse(post); + return sendPost (HIS_URL+"/zhuShuJu/getYangBen", hashMap); } private String sendPost(String url,Map<String, Object> hashMap){ -- Gitblit v1.8.0