From a2b3bd88142a83bb33e5ebaf3c92c03e462af685 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 10 Jun 2025 09:03:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E6=97=A0=E6=B3=95=E5=A4=84=E7=90=86=E8=B7=A8=E5=9F=9F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202=E3=80=81=E6=9C=BA=E6=9E=84=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8A=A0=E7=9B=9F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OrgApplyInfoApiEntity.java | 6 ++-- .../orgapplyinfo/entity/OrgApplyInfo.java | 12 ++++--- .../service/impl/OrgApplyInfoServiceImpl.java | 9 +++++- .../java/com/nu/modules/proxy/ProxyApi.java | 31 +++++++++++++++++++ .../orgapplyinfo/api/OrgApplyInfoApi.java | 3 +- .../org/jeecg/config/shiro/ShiroConfig.java | 2 ++ 6 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/proxy/ProxyApi.java diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java index a83f7b2..c4f8d00 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java @@ -82,8 +82,10 @@ public class OrgApplyInfoApiEntity implements Serializable { private String comLegalPerson; /**机构地址*/ private String orgAddress; - /**机构位置坐标格式：经度,纬度*/ - private String orgCoordinate; + /**机构位置坐标：经度*/ + private String orgCoordinateLo; + /**机构位置坐标：纬度*/ + private String orgCoordinateLa; /**机构负责人*/ private String orgLeader; /**机构负责人电话*/ diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java index f7a3c8b..b59822f 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java @@ -153,10 +153,14 @@ public class OrgApplyInfo implements Serializable { @Excel(name = "机构地址", width = 15) @ApiModelProperty(value = "机构地址") private java.lang.String orgAddress; - /**机构位置坐标格式：经度,纬度*/ - @Excel(name = "机构位置坐标格式：经度,纬度", width = 15) - @ApiModelProperty(value = "机构位置坐标格式：经度,纬度") - private java.lang.String orgCoordinate; + /**机构位置坐标：经度*/ + @Excel(name = "机构位置坐标：经度", width = 15) + @ApiModelProperty(value = "机构位置坐标：经度") + private String orgCoordinateLo; + /**机构位置坐标：纬度*/ + @Excel(name = "机构位置坐标：纬度", width = 15) + @ApiModelProperty(value = "机构位置坐标：纬度") + private String orgCoordinateLa; /**机构负责人*/ @Excel(name = "机构负责人", width = 15) @ApiModelProperty(value = "机构负责人") diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java index acc2266..6949172 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 机构加盟申请信息表 @@ -48,7 +49,13 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl list = baseMapper.selectList(qw); List result = Lists.newArrayList(); - BeanUtil.copyProperties(list,result); + result = list.stream() + .map(item -> { + OrgApplyInfoApiEntity entity = new OrgApplyInfoApiEntity(); + BeanUtils.copyProperties(item, entity); + return entity; + }) + .collect(Collectors.toList()); return result; } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/proxy/ProxyApi.java b/nursing-unit-api/src/main/java/com/nu/modules/proxy/ProxyApi.java new file mode 100644 index 0000000..69e0e85 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/proxy/ProxyApi.java @@ -0,0 +1,31 @@ +package com.nu.modules.proxy; + +import org.springframework.http.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; +import org.springframework.beans.factory.annotation.Autowired; + +@RestController +@RequestMapping("/api/proxy") +public class ProxyApi { + + @Autowired + private RestTemplate restTemplate; + + @GetMapping("/get") + public ResponseEntity proxyGet(@RequestParam String url, + @RequestHeader(required = false) HttpHeaders headers) { + HttpEntity entity = new HttpEntity<>(headers); + ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, entity, String.class); + return ResponseEntity.ok(response.getBody()); + } + + @PostMapping("/post") + public ResponseEntity proxyPost(@RequestParam String url, + @RequestBody(required = false) String body, + @RequestHeader(required = false) HttpHeaders headers) { + HttpEntity entity = new HttpEntity<>(body, headers); + ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, entity, String.class); + return ResponseEntity.ok(response.getBody()); + } +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java index 0a130ef..dfb460f 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java @@ -24,7 +24,8 @@ public class OrgApplyInfoApi { @PostMapping("/save") public Result save(@RequestBody OrgApplyInfoApiEntity orgApplyInfoApiEntity) { if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId())) { - return Result.ok(orgApplyInfoApi.updateById(orgApplyInfoApiEntity)); + orgApplyInfoApi.updateById(orgApplyInfoApiEntity); + return Result.ok("保存成功！"); } else { return Result.ok(orgApplyInfoApi.insert(orgApplyInfoApiEntity)); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 754cead..3b5c843 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -120,6 +120,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/api/pad/versionUpdate", "anon");//pad端版本检测接口 filterChainDefinitionMap.put("/nuIpadApi/versionManage/versionUpdate", "anon");//pad端版本检测接口 filterChainDefinitionMap.put("/api/ocr/**", "anon");//阿里云证件识别 + filterChainDefinitionMap.put("/ws/ssh/**", "anon");//SSH测试 + filterChainDefinitionMap.put("/api/proxy/**", "anon");//代理请求 //update-begin--Author:scott Date:20221116 for：排除静态资源后缀 filterChainDefinitionMap.put("/", "anon");