From 20a19c23dcd9b80a3c23a5dd52d2f048cbb68ec7 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 7 Jan 2026 09:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=AF=E5=85=A5=E4=BD=8F=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F=E5=B1=9E=E6=80=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=EF=BC=9A=E5=BF=85=E9=A1=BB=E6=98=AF=E6=8A=A4=E7=90=86?= =?UTF-8?q?=E5=8D=95=E5=85=83=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/baseinfo/api/INuBaseInfoApi.java | 2 +- .../service/impl/NuBaseInfoServiceImpl.java | 33 ++++++++++--------- .../com/nu/modules/common/NuCommonApi.java | 2 +- .../nu/modules/wechat/elder/api/ElderApi.java | 4 +-- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/baseinfo/api/INuBaseInfoApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/baseinfo/api/INuBaseInfoApi.java index 545a1b6..30f83cc 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/baseinfo/api/INuBaseInfoApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/baseinfo/api/INuBaseInfoApi.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; public interface INuBaseInfoApi { - NuBaseInfoEntity queryInfoByNuId(String orgCode, String nuId); + NuBaseInfoEntity queryInfoByNuId(String orgCode, String nuId, String areaType); List queryByOpenId(String openId); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java index 398f65e..0af417d 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -35,10 +35,11 @@ public class NuBaseInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq("nu_id", nuId); + qw.eq("area_flag",areaType);//区域属性 qw.eq("del_flag", "0"); NuBaseInfo nuBaseInfo = baseMapper.selectOne(qw); if (nuBaseInfo == null) { @@ -59,19 +60,19 @@ public class NuBaseInfoServiceImpl extends ServiceImpl queryByOpenId(String openId) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("open_id",openId); + qw.eq("open_id", openId); List list = baseMapper.selectList(qw); - return BeanUtil.copyToList(list,NuBaseInfoEntity.class); + return BeanUtil.copyToList(list, NuBaseInfoEntity.class); } @Override public NuBaseInfoEntity queryByElderIdNum(String idCard) { - NuBaseInfo resource = baseMapper.queryByElderIdNum(idCard); + NuBaseInfo resource = baseMapper.queryByElderIdNum(idCard); NuBaseInfoEntity result = new NuBaseInfoEntity(); - if(resource == null){ + if (resource == null) { return null; - }else{ - BeanUtils.copyProperties(resource,result); + } else { + BeanUtils.copyProperties(resource, result); return result; } } @@ -81,21 +82,21 @@ public class NuBaseInfoServiceImpl extends ServiceImpl> getNuListByOrgCode(String orgCode) { List list = baseMapper.selectList(new QueryWrapper<>()); List> mapList = new ArrayList<>(); - List wlsbList =baseMapper.selectWlsbList(); - for(NuBaseInfo info:list){ + List wlsbList = baseMapper.selectWlsbList(); + for (NuBaseInfo info : list) { String sxtStr = "";//摄像头集合 String dbStr = "";//电表集合 String sbStr = "";//水表集合 String wsdjStr = "";//温湿度计集合 - for(NuBaseInfo wlsb:wlsbList){ - if(info.getNuId().equals(wlsb.getNuId())){ - if("1".equals(wlsb.getDeviceType())){ + for (NuBaseInfo wlsb : wlsbList) { + if (info.getNuId().equals(wlsb.getNuId())) { + if ("1".equals(wlsb.getDeviceType())) { sxtStr = sxtStr + wlsb.getDeviceSn() + ","; - }else if ("2".equals(wlsb.getDeviceType())){ + } else if ("2".equals(wlsb.getDeviceType())) { dbStr = dbStr + wlsb.getDeviceSn() + ","; - }else if ("3".equals(wlsb.getDeviceType())){ + } else if ("3".equals(wlsb.getDeviceType())) { sbStr = sbStr + wlsb.getDeviceSn() + ","; - }else if ("4".equals(wlsb.getDeviceType())){ + } else if ("4".equals(wlsb.getDeviceType())) { wsdjStr = wsdjStr + wlsb.getDeviceSn() + ","; } @@ -107,7 +108,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl 0) wsdjStr = wsdjStr.substring(0, wsdjStr.length() - 1); Map map = Map.of( "nuId", info.getNuId(), - "nuType", dictUtils.translateDictValue("nu_type",info.getAreaFlag()), + "nuType", dictUtils.translateDictValue("nu_type", info.getAreaFlag()), "status", info.getStatus(), "sxtList", sxtStr, "dbList", dbStr, diff --git a/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java b/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java index c9159aa..ff3f7e5 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java @@ -88,7 +88,7 @@ public class NuCommonApi { * @param code 数据字典编码 * @return */ - @GetMapping("/queryAreaNameById") + @GetMapping("/queryDictItemByCode") public Result queryDictItemByCode(@RequestParam("code") String code) { return Result.ok(); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java index 7ef17aa..261c9b1 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java @@ -195,7 +195,7 @@ public class ElderApi { DynamicDataSourceContextHolder.push(orgCode); JSONObject orgInfo = null; try { - orgInfo = sysBaseAPI.getOrgInfo(orgCode,"payable_amount"); + orgInfo = sysBaseAPI.getOrgInfo(orgCode, "payable_amount"); } finally { DynamicDataSourceContextHolder.clear(); } @@ -205,7 +205,7 @@ public class ElderApi { return Result.ok(null); } - NuBaseInfoEntity baseInfo = nuBaseInfoApi.queryInfoByNuId(orgCode, nuId); + NuBaseInfoEntity baseInfo = nuBaseInfoApi.queryInfoByNuId(orgCode, nuId, "1"); if (baseInfo == null) { return Result.ok(null); }