From 99f276f2c9ef41a17ec1a2e44f21d5afe2ae400f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 23 Mar 2023 23:47:39 +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=E4=BF=AE=E6=94=B9=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 | 12 ++++++++---- .../ota/controller/OtaBaSjListController.java | 12 ++++++++---- .../ota/service/IOtaBaCxListService.java | 2 +- .../ota/service/IOtaBaSjListService.java | 2 +- .../service/impl/OtaBaCxListServiceImpl.java | 16 +++++++++------- .../service/impl/OtaBaSjListServiceImpl.java | 18 +++++++++++------- 6 files changed, 38 insertions(+), 24 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 7070302ae..8ba1c6df6 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 @@ -174,10 +174,14 @@ public class OtaBaCxListController extends JeroController batchRecord(@RequestBody List recordList) { - otaBaCxListService.batchRecord(recordList); + @ApiOperation(value = "车型及功能备案列表-备案维护", notes = "车型及功能备案列表-备案维护") + @PostMapping(value = "/batchRecord") + public Result batchRecord(@RequestParam(name = "ids", required = true) String ids, + @RequestParam(name = "bazt", required = true) String bazt, + @RequestParam(name = "batjsj", required = true) String batjsj, + @RequestParam(name = "bz", required = true) String bz, + @RequestParam(name = "cut") String cut) { + otaBaCxListService.batchRecord(ids, bazt, batjsj, bz, cut); 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 30bb4ba6b..b46297dca 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 @@ -173,10 +173,14 @@ public class OtaBaSjListController extends JeroController batchRecord(@RequestBody List recordList) { - otaBaSjListService.batchRecord(recordList); + @ApiOperation(value = "升级备案-备案维护", notes = "升级备案-备案维护") + @PostMapping(value = "/batchRecord") + public Result batchRecord(@RequestParam(name = "ids", required = true) String ids, + @RequestParam(name = "bazt", required = true) String bazt, + @RequestParam(name = "batjsj", required = true) String batjsj, + @RequestParam(name = "bz", required = true) String bz, + @RequestParam(name = "cut") String cut) { + otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut); 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 45dbe6352..4ada7932b 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 batchRecord(List recordList); + void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); } 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 8d99a3778..d0b34c3ca 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 @@ -64,5 +64,5 @@ public interface IOtaBaSjListService extends IService { * 备案维护 * */ - void batchRecord(List recordList); + void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); } 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 ca1027c8c..ec6a70bad 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 @@ -7,6 +7,7 @@ import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.IOtaBaCxListService; import com.jero.modules.ota.service.IOtaBaCxLsjlService; +import com.jero.modules.system.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -102,19 +103,20 @@ public class OtaBaCxListServiceImpl extends ServiceImpl recordList) { + public void batchRecord(String ids, String bazt, String batjsj, String bz, String cut) { try { - if (null != recordList && recordList.size() > 0) { - for (OtaBaCxList obc : recordList) { - String id = obc.getId(); + if (StringUtils.isNotEmpty(ids)) { + String[] idList = ids.split(","); + for (String id : idList) { OtaBaCxList otaBaCxList = this.queryById(id); - otaBaCxList.setBatjsj(obc.getBatjsj()); - otaBaCxList.setBz(obc.getBz()); + otaBaCxList.setBazt(bazt); + otaBaCxList.setBatjsj(sdf.parse(batjsj)); + otaBaCxList.setBz(bz); this.saveOrUpdate(otaBaCxList); //添加历史记录数据 OtaBaCxLsjl lsjl = new OtaBaCxLsjl(); lsjl.setOtaId(id); - lsjl.setSjzt(obc.getBz()); + lsjl.setSjzt(bazt); otaBaCxLsjlService.add(lsjl); } } 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 808f867cd..879f67e95 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,11 +2,14 @@ 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; import com.jero.modules.ota.mapper.OtaBaSjListMapper; import com.jero.modules.ota.service.IOtaBaSjListService; import com.jero.modules.ota.service.IOtaBaSjLsjlService; +import com.jero.modules.system.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -102,19 +105,20 @@ public class OtaBaSjListServiceImpl extends ServiceImpl recordList) { + public void batchRecord(String ids, String bazt, String batjsj, String bz, String cut) { try { - if (null != recordList && recordList.size() > 0) { - for (OtaBaSjList obs : recordList) { - String id = obs.getId(); + if (StringUtils.isNotEmpty(ids)) { + String[] idList = ids.split(","); + for (String id : idList) { OtaBaSjList otaBaSjList = this.queryById(id); - otaBaSjList.setBatjsj(obs.getBatjsj()); - otaBaSjList.setBz(obs.getBz()); + otaBaSjList.setBazt(bazt); + otaBaSjList.setBatjsj(sdf.parse(batjsj)); + otaBaSjList.setBz(bz); this.saveOrUpdate(otaBaSjList); //添加历史记录数据 OtaBaSjLsjl lsjl = new OtaBaSjLsjl(); lsjl.setOtaId(id); - lsjl.setSjzt(obs.getBz()); + lsjl.setSjzt(bazt); otaBaSjLsjlService.add(lsjl); } }