From 956c2e3db5648787d4dfb8e71b780869a0a86710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 22 Mar 2023 21:41:49 +0800 Subject: [PATCH 1/3] =?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 | 16 +- .../ota/controller/OtaBaSjListController.java | 13 ++ .../ota/service/IOtaBaCxListService.java | 7 + .../ota/service/IOtaBaSjListService.java | 7 + .../service/impl/OtaBaCxListServiceImpl.java | 137 +++++++++++------ .../service/impl/OtaBaSjListServiceImpl.java | 141 ++++++++++++------ 6 files changed, 232 insertions(+), 89 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 b9956d7ec..e1f702cca 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 @@ -2,6 +2,7 @@ package com.jero.modules.ota.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; @@ -167,4 +168,17 @@ public class OtaBaCxListController extends JeroController record(@RequestBody Map map) { + otaBaCxListService.record(map); + 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 5e256a3c2..78cc3b348 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 @@ -2,6 +2,7 @@ package com.jero.modules.ota.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; @@ -167,4 +168,16 @@ public class OtaBaSjListController extends JeroController record(@RequestBody Map map) { + otaBaSjListService.record(map); + 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 c76057203..c38e75d3f 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 @@ -3,6 +3,7 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxList; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 车型及功能备案列表 @@ -58,4 +59,10 @@ public interface IOtaBaCxListService extends IService { * @return */ List queryList(); + + /** + * 备案维护 + * + */ + void record(Map map); } 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 9644621c9..c9404e16c 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 @@ -3,6 +3,7 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaSjList; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 升级备案-升级活动备案列表 @@ -58,4 +59,10 @@ public interface IOtaBaSjListService extends IService { * @return */ List queryList(); + + /** + * 备案维护 + * + */ + void record(Map map); } 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 7a5ced897..9697359f9 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 @@ -1,29 +1,43 @@ package com.jero.modules.ota.service.impl; +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.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.IOtaBaCxListService; +import com.jero.modules.ota.service.IOtaBaCxLsjlService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.List; import java.util.Date; +import java.util.Map; + 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 OtaBaCxListServiceImpl extends ServiceImpl implements IOtaBaCxListService { - /** - * 保存 - * - * @param otaBaCxList - * @return - */ - @Override + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + @Autowired + private IOtaBaCxLsjlService otaBaCxLsjlService; + + /** + * 保存 + * + * @param otaBaCxList + * @return + */ + @Override public void add(OtaBaCxList otaBaCxList) { Date now = new Date(); otaBaCxList.setCreateTime(now); @@ -31,59 +45,96 @@ public class OtaBaCxListServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaCxList queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + /** + * 备案维护 + * + * @param map + */ + @Override + public void record(Map map) { + 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); + } + 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 cbbe2eef5..b761bc537 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 @@ -1,29 +1,43 @@ 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.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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; + +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; +import java.util.Map; /** * @Description: 升级备案-升级活动备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaSjListServiceImpl extends ServiceImpl implements IOtaBaSjListService { - /** - * 保存 - * - * @param otaBaSjList - * @return - */ - @Override + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + @Autowired + private IOtaBaSjLsjlService otaBaSjLsjlService; + + /** + * 保存 + * + * @param otaBaSjList + * @return + */ + @Override public void add(OtaBaSjList otaBaSjList) { Date now = new Date(); otaBaSjList.setCreateTime(now); @@ -31,59 +45,96 @@ public class OtaBaSjListServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjList queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + /** + * 备案维护 + * + * @param map + */ + @Override + public void record(Map map) { + 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); + } + 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()); + } + } } 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 2/3] =?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()); From bd6912b229f6324dd7cec9a6fcdec2748c164371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 22 Mar 2023 22:01:06 +0800 Subject: [PATCH 3/3] =?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 | 28 +++++++++--------- .../ota/controller/OtaBaSjListController.java | 29 +++++++++---------- .../ota/service/IOtaBaCxListService.java | 4 +-- .../ota/service/IOtaBaSjListService.java | 4 +-- .../service/impl/OtaBaCxListServiceImpl.java | 7 ++--- .../service/impl/OtaBaSjListServiceImpl.java | 4 --- 6 files changed, 33 insertions(+), 43 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 0ab7a921d..7070302ae 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 @@ -1,29 +1,29 @@ package com.jero.modules.ota.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -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.service.IOtaBaCxListService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaCxList; +import com.jero.modules.ota.service.IOtaBaCxListService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 车型及功能备案列表 * @Author: jero-boot * @Date: 2023-03-17 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 7c46be347..30bb4ba6b 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 @@ -1,30 +1,29 @@ package com.jero.modules.ota.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -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; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.ota.entity.OtaBaSjList; +import com.jero.modules.ota.service.IOtaBaSjListService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 升级备案-升级活动备案列表 * @Author: jero-boot * @Date: 2023-03-17 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 7a628e415..45dbe6352 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 @@ -1,9 +1,9 @@ package com.jero.modules.ota.service; -import com.jero.modules.ota.entity.OtaBaCxList; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.ota.entity.OtaBaCxList; + import java.util.List; -import java.util.Map; /** * @Description: 车型及功能备案列表 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 f150daa5b..8d99a3778 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 @@ -1,11 +1,9 @@ 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 com.jero.modules.ota.entity.OtaBaSjList; import java.util.List; -import java.util.Map; /** * @Description: 升级备案-升级活动备案列表 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 657ec57e5..ca1027c8c 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 @@ -1,5 +1,6 @@ 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; @@ -9,13 +10,9 @@ import com.jero.modules.ota.service.IOtaBaCxLsjlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.List; import java.util.Date; -import java.util.Map; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 车型及功能备案列表 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 1f89c89a0..808f867cd 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,8 +2,6 @@ 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; @@ -12,11 +10,9 @@ import com.jero.modules.ota.service.IOtaBaSjLsjlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.Map; /** * @Description: 升级备案-升级活动备案列表