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()); } }