From bcb2a2945b4d59a2145bbbdda33d99ed26afe8fa Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 21 Mar 2024 13:57:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=83=BD=E9=87=8F=E5=9B=BE=E8=B0=B1=E6=8B=BC=E6=8E=A5?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxNursingLogServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java index faa7fad..acba407 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java @@ -194,19 +194,19 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { String newNursingData = wxNursingLogReq.getNursingData(); if (StringUtils.isNotBlank(newNursingData)) { JSONObject newJsonObject = JSON.parseObject(newNursingData); - String newGearData = newJsonObject.get("GearData").toString(); + String newGearData = newJsonObject.get("groupedAa").toString(); if (StringUtils.isNotBlank(newGearData)) { JSONArray newGearDataJsonArray = JSON.parseArray(newGearData); - newJsonObject.put("GearData", newGearDataJsonArray.subList(0, Math.min(maxEnergySize, newGearDataJsonArray.size()))); + newJsonObject.put("groupedAa", newGearDataJsonArray.subList(0, Math.min(maxEnergySize, newGearDataJsonArray.size()))); updateNursingLog.setNursingData(newJsonObject.toJSONString()); } } } else { String newNursingData = wxNursingLogReq.getNursingData(); JSONObject newJsonObject = JSON.parseObject(newNursingData); - String newGearData = newJsonObject.get("GearData").toString(); + String newGearData = newJsonObject.get("groupedAa").toString(); JSONObject oldNursingDataJsonObject = JSON.parseObject(oldNursingData); - String oldGearData = oldNursingDataJsonObject.get("GearData").toString(); + String oldGearData = oldNursingDataJsonObject.get("groupedAa").toString(); if (StringUtils.isBlank(newGearData)) { if (StringUtils.isBlank(oldGearData)) { // 1、两个都是空的，直接保存最新的 @@ -214,21 +214,21 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { } else { // 2、新的是空的，旧的不是空的，将旧的补充过来 JSONArray oldGearDataJsonArray = JSON.parseArray(oldGearData); - newJsonObject.put("GearData", oldGearDataJsonArray.subList(0, Math.min(maxEnergySize, oldGearDataJsonArray.size()))); + newJsonObject.put("groupedAa", oldGearDataJsonArray.subList(0, Math.min(maxEnergySize, oldGearDataJsonArray.size()))); updateNursingLog.setNursingData(newJsonObject.toJSONString()); } } else { if (StringUtils.isBlank(oldGearData)) { // 4、新的不是空的，旧的是空的，直接保存新的（判断新的是否符合规定） JSONArray newGearDataJsonArray = JSON.parseArray(newGearData); - newJsonObject.put("GearData", newGearDataJsonArray.subList(0, Math.min(maxEnergySize, newGearDataJsonArray.size()))); + newJsonObject.put("groupedAa", newGearDataJsonArray.subList(0, Math.min(maxEnergySize, newGearDataJsonArray.size()))); updateNursingLog.setNursingData(newJsonObject.toJSONString()); } else { // 3、新的不是空的，旧的不是空的，将旧的补充过来 JSONArray newGearDataJsonArray = JSON.parseArray(newGearData); JSONArray oldGearDataJsonArray = JSON.parseArray(oldGearData); oldGearDataJsonArray.addAll(newGearDataJsonArray.subList(0, Math.min(maxEnergySize - oldGearDataJsonArray.size(), newGearDataJsonArray.size()))); - newJsonObject.put("GearData", oldGearDataJsonArray); + newJsonObject.put("groupedAa", oldGearDataJsonArray); updateNursingLog.setNursingData(newJsonObject.toJSONString()); } }