From cdbce3e10e9dfd7cdab2a2a7d7fa13597bbd40f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 22 Mar 2023 21:59:43 +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=20=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 6 +-- .../ota/controller/OtaBaSjListController.java | 7 ++-- .../ota/service/IOtaBaCxListService.java | 2 +- .../ota/service/IOtaBaSjListService.java | 4 +- .../service/impl/OtaBaCxListServiceImpl.java | 37 +++++++----------- .../service/impl/OtaBaSjListServiceImpl.java | 38 +++++++------------ 6 files changed, 38 insertions(+), 56 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index e1f702cca..0ab7a921d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -175,9 +175,9 @@ public class OtaBaCxListController extends JeroController record(@RequestBody Map map) { - otaBaCxListService.record(map); + @PutMapping(value = "/batchRecord") + public Result batchRecord(@RequestBody List recordList) { + otaBaCxListService.batchRecord(recordList); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index 78cc3b348..7c46be347 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.service.IOtaBaSjListService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -174,9 +175,9 @@ public class OtaBaSjListController extends JeroController record(@RequestBody Map map) { - otaBaSjListService.record(map); + @PutMapping(value = "/batchRecord") + public Result batchRecord(@RequestBody List recordList) { + otaBaSjListService.batchRecord(recordList); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index c38e75d3f..7a628e415 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -64,5 +64,5 @@ public interface IOtaBaCxListService extends IService { * 备案维护 * */ - void record(Map map); + void batchRecord(List recordList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index c9404e16c..f150daa5b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -2,6 +2,8 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaSjList; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.bind.annotation.RequestBody; + import java.util.List; import java.util.Map; @@ -64,5 +66,5 @@ public interface IOtaBaSjListService extends IService { * 备案维护 * */ - void record(Map map); + void batchRecord(List recordList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 9697359f9..657ec57e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -103,35 +103,24 @@ public class OtaBaCxListServiceImpl extends ServiceImpl map) { + public void batchRecord(List recordList) { try { - String id = (String) map.get("id"); - OtaBaCxList otaBaCxList = this.queryById(id); - if (null != otaBaCxList) { - String bazt = (String) map.get("bazt"); - otaBaCxList.setBazt(bazt); - Object batjsj = map.get("batjsj"); - if (null != batjsj) { - Date batjsjDate = null; - batjsjDate = sdf.parse((String) batjsj); - otaBaCxList.setBatjsj(batjsjDate); + if (null != recordList && recordList.size() > 0) { + for (OtaBaCxList obc : recordList) { + String id = obc.getId(); + OtaBaCxList otaBaCxList = this.queryById(id); + otaBaCxList.setBatjsj(obc.getBatjsj()); + otaBaCxList.setBz(obc.getBz()); + this.saveOrUpdate(otaBaCxList); + //添加历史记录数据 + OtaBaCxLsjl lsjl = new OtaBaCxLsjl(); + lsjl.setOtaId(id); + lsjl.setSjzt(obc.getBz()); + otaBaCxLsjlService.add(lsjl); } - String bz = (String) map.get("bz"); - otaBaCxList.setBz(bz); - this.saveOrUpdate(otaBaCxList); - //添加历史记录数据 - OtaBaCxLsjl lsjl = new OtaBaCxLsjl(); - lsjl.setOtaId(otaBaCxList.getId()); - lsjl.setSjzt(bazt); - otaBaCxLsjlService.add(lsjl); } - } catch (ParseException e) { - e.printStackTrace(); - throw new JeroBootException(e.getMessage()); } catch (Exception ex) { ex.printStackTrace(); throw new JeroBootException(ex.getMessage()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index b761bc537..1f89c89a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.entity.OtaBaSjLsjl; @@ -103,35 +104,24 @@ public class OtaBaSjListServiceImpl extends ServiceImpl map) { + public void batchRecord(List recordList) { try { - String id = (String) map.get("id"); - OtaBaSjList otaBaSjList = this.queryById(id); - if (null != otaBaSjList) { - String bazt = (String) map.get("bazt"); - otaBaSjList.setBazt(bazt); - Object batjsj = map.get("batjsj"); - if (null != batjsj) { - Date batjsjDate = null; - batjsjDate = sdf.parse((String) batjsj); - otaBaSjList.setBatjsj(batjsjDate); + if (null != recordList && recordList.size() > 0) { + for (OtaBaSjList obs : recordList) { + String id = obs.getId(); + OtaBaSjList otaBaSjList = this.queryById(id); + otaBaSjList.setBatjsj(obs.getBatjsj()); + otaBaSjList.setBz(obs.getBz()); + this.saveOrUpdate(otaBaSjList); + //添加历史记录数据 + OtaBaSjLsjl lsjl = new OtaBaSjLsjl(); + lsjl.setOtaId(id); + lsjl.setSjzt(obs.getBz()); + otaBaSjLsjlService.add(lsjl); } - String bz = (String) map.get("bz"); - otaBaSjList.setBz(bz); - this.saveOrUpdate(otaBaSjList); - //添加历史记录数据 - OtaBaSjLsjl lsjl = new OtaBaSjLsjl(); - lsjl.setOtaId(otaBaSjList.getId()); - lsjl.setSjzt(bazt); - otaBaSjLsjlService.add(lsjl); } - } catch (ParseException e) { - e.printStackTrace(); - throw new JeroBootException(e.getMessage()); } catch (Exception ex) { ex.printStackTrace(); throw new JeroBootException(ex.getMessage());