From a0d14af1f357fd159b7154d211f7e1b4d8ad377e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 26 Mar 2023 17:17:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaSjSjxtbhController.java | 18 +++ .../ota/service/IOtaBaSjSjxtbhService.java | 2 + .../impl/OtaBaSjSjxtbhServiceImpl.java | 140 +++++++++++------- 3 files changed, 106 insertions(+), 54 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java index 9bff89950..b1c0a0d5f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java @@ -143,6 +143,24 @@ public class OtaBaSjSjxtbhController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + JSONObject json = otaBaSjSjxtbhService.queryByOtaId(otaId, otaIdT); + if (json == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(json); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java index 025659468..8814bb255 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java @@ -57,4 +57,6 @@ public interface IOtaBaSjSjxtbhService extends IService { * @return */ List queryList(); + + JSONObject queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 002c5ddb7..4cbfc0f6c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -1,102 +1,134 @@ package com.jero.modules.ota.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaSjSjxtbh; import com.jero.modules.ota.mapper.OtaBaSjSjxtbhMapper; import com.jero.modules.ota.service.IOtaBaSjSjxtbhService; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 升级备案-本次升级的系统名称与参数变化 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl implements IOtaBaSjSjxtbhService { - /** - * 保存 - */ - @Override + /** + * 保存 + */ + @Override public void add(JSONObject json) { - Date now = new Date(); - String otaId = (String) json.get("otaId"); - List newList = new ArrayList<>(); - if (StringUtils.isNotEmpty(otaId)) { - JSONArray list = json.getJSONArray("list"); - for (Object obj : list) { - OtaBaSjSjxtbh bh = JSONObject.parseObject(obj.toString(),OtaBaSjSjxtbh.class); - bh.setOtaId(otaId); - bh.setCreateTime(now); - bh.setUpdateTime(now); - newList.add(bh); - } - } - saveOrUpdateBatch(newList); + Date now = new Date(); + String otaId = (String) json.get("otaId"); + List newList = new ArrayList<>(); + if (StringUtils.isNotEmpty(otaId)) { + deleteByOtaId(otaId); + JSONArray list = json.getJSONArray("list"); + for (Object obj : list) { + OtaBaSjSjxtbh bh = JSONObject.parseObject(obj.toString(), OtaBaSjSjxtbh.class); + bh.setOtaId(otaId); + bh.setCreateTime(now); + bh.setUpdateTime(now); + newList.add(bh); + } + } + saveOrUpdateBatch(newList); } - /** - * 更新 - * - * @param otaBaSjSjxtbh - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjSjxtbh + * @return + */ + @Override public void editById(OtaBaSjSjxtbh otaBaSjSjxtbh) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjxtbh.setUpdateTime(now); - saveOrUpdate(otaBaSjSjxtbh); + saveOrUpdate(otaBaSjSjxtbh); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjxtbh queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public JSONObject queryByOtaId(String otaId, String otaIdT) { + List res = this.getByOtaId(otaId); + if (ObjectUtil.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + JSONObject json = new JSONObject(); + json.put("list", res); + return json; + } + + private List getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjxtbh::getOtaId, otaId); + return this.list(queryWrapper); + } + + public void deleteByOtaId(String otaId) { + List list = this.getByOtaId(otaId); + List ids = new ArrayList<>(); + for (OtaBaSjSjxtbh bh : list) { + ids.add(bh.getId()); + } + this.deleteByIds(ids); + } }