diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java index cd717d2..f545199 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java @@ -258,8 +258,11 @@ public class AnYanClientExecutor implements AnYanClient { return token; } - @Override - public AuthResult publicNetworkTokenNoCache() { + /** + * @description: 旧版公网获取token实现(SM4 + AnYanResult 包裹解密),保留备份 + * @author PengJ + */ + public AuthResult publicNetworkTokenNoCacheBAK() { JSONObject param = new JSONObject(); String password = anYanProperties.getPublicPassWrod(); String userName = anYanProperties.getPublicUserNmae(); @@ -289,6 +292,47 @@ public class AnYanClientExecutor implements AnYanClient { return null; } + /** + * @description: 公网获取token(密码模式,调用方式与 getAuthTokenByPassword 保持一致) + * 表单提交 + 公网 host + QUERY_AUTH_TOKEN,仅 RSA 加密密码,不写 Redis(缓存由调用方负责) + * @author PengJ + */ + @Override + public AuthResult publicNetworkTokenNoCache() { + String username = anYanProperties.getPublicUserNmae(); + String password = anYanProperties.getPublicPassWrod(); + try { + // 仅 RSA 加密密码,与 getAuthTokenByPassword 保持一致 + String encryptPassword = StringUtils.encryptByPublicKey(publicKey, password); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.MULTIPART_FORM_DATA); + MultiValueMap formData = new LinkedMultiValueMap<>(); + formData.add("grant_type", "password"); + formData.add("username", username); + formData.add("password", encryptPassword); + formData.add("client_id", anYanProperties.getClientId()); + formData.add("client_secret", anYanProperties.getClientSecret()); + ResponseEntity authResult = RestTemplateUtil.postExchangeForGetTokenByPassword(AnYanApiEnum.QUERY_AUTH_TOKEN, formData, headers, AuthResult.class); + if (HttpStatus.OK.equals(authResult.getStatusCode()) + && ObjectUtils.isNotEmpty(authResult.getBody())) { + return authResult.getBody(); + } else { + log.error("------安眼系统获取公网token失败{}------", authResult.getBody()); + ExceptionAssertsUtil.fail("------安眼系统获取公网token失败------" + authResult.getBody()); + return null; + } + } catch (HttpClientErrorException e) { + log.error("------安眼系统获取公网token失败{}------", e.getMessage()); + String replace = Objects.requireNonNull(e.getMessage()).replace("401 Unauthorized: ", ""); + replace = replace.replace("\"", ""); + AuthResult bean = JSONUtil.toBean(replace, AuthResult.class); + ExceptionAssertsUtil.fail(bean.getMessage()); + } catch (Exception e) { + ExceptionAssertsUtil.fail(e.getMessage()); + } + return null; + } + /** * @description: 根据token获取用户信息 * @author PengJ diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java index eca2526..dfd004a 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java @@ -1,5 +1,6 @@ package com.renkang.anyan.config; +import com.alibaba.fastjson.JSON; import com.renkang.anyan.enums.AnYanApiEnum; import com.renkang.anyan.model.vo.AnYanResult; import lombok.extern.slf4j.Slf4j; @@ -81,7 +82,15 @@ public class RestTemplateUtil { public static ResponseEntity postExchangeForGetToken(AnYanApiEnum api, Object requestBody, Class responseType) { String url = getProperties().getPublicHost() + api.getMethodPath() + api.getMethodParam(); HttpEntity requestEntity = new HttpEntity<>(requestBody); - return getRestTemplate().exchange(url, api.getHttpMethod(), requestEntity, responseType); + // 打印请求入参,便于排查 + String bodyJson = JSON.toJSONString(requestBody); + log.info("安眼获取token请求入参: url={}, body={}", url, bodyJson); + // 打印等价 curl(application/json),便于本地手动调试 + log.info("安眼获取token等价curl: curl -X POST '{}' -H 'Content-Type: application/json' -d '{}'", url, bodyJson); + ResponseEntity response = getRestTemplate().exchange(url, api.getHttpMethod(), requestEntity, responseType); + // 打印返回信息(状态码 + 响应体) + log.info("安眼获取token返回信息: statusCode={}, body={}", response.getStatusCode(), JSON.toJSONString(response.getBody())); + return response; } /** diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/mapper/LargeScreenDataMapper.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/mapper/LargeScreenDataMapper.java index 07ac081..bd923e9 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/mapper/LargeScreenDataMapper.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/mapper/LargeScreenDataMapper.java @@ -44,4 +44,13 @@ public interface LargeScreenDataMapper extends MPJBaseMapper { */ List> selectEmployeeNumsByPhones(@Param("phones") List phones); + /** + * 查询 EMP_CARE_EMP 表中 FIRST_AIDER_INFO 是否包含指定工号 + * + * @param workNo 工号 + * @return 命中记录数,大于 0 表示该工号是急救人员 + */ + @Select("SELECT COUNT(1) FROM AYGC_YWK.EMP_CARE_EMP WHERE DEL_FLAG = '0' AND FIRST_AIDER_INFO LIKE CONCAT('%', #{workNo}, '%')") + int countFirstAiderByWorkNo(@Param("workNo") String workNo); + } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java index 8be886b..b8e1e81 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java @@ -936,9 +936,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl 0; - return true; + return baseMapper.countFirstAiderByWorkNo(workNo) > 0; } @Override diff --git a/jeecg-boot-base-core/pom.xml b/jeecg-boot-base-core/pom.xml index 34c243c..19dc40b 100644 --- a/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot-base-core/pom.xml @@ -43,6 +43,14 @@ true + + yixiong-tech + yixiong-tech Repository + https://maven.ops.yixiong-tech.com/repository/public/ + + false + + @@ -367,6 +375,31 @@ + + + + ptr.xjyt.iosp.starter + iosp-starter-log + 2.0.9.RELEASE + + + + com.hongyousoft + kafka-appender + 0.0.4 + + + + org.apache.skywalking + apm-toolkit-logback-1.x + 9.3.0 + + + + org.apache.kafka + kafka-clients + 2.4.0 + diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java index 33c1c7e..203acdf 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java @@ -48,7 +48,7 @@ public class SysMessageController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = sysMessageService.page(page, queryWrapper); diff --git a/pom.xml b/pom.xml index cd274bc..9500825 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ dt-releases jeecg Repository - https://maven.icdat.cn/repository/releases/ + https://maven.ops.yixiong-tech.com/repository/releases/ false @@ -151,7 +151,7 @@ dt-snapshots jeecg-snapshots Repository - https://maven.icdat.cn/repository/shapshots/ + https://maven.ops.yixiong-tech.com/repository/shapshots/ false