From ab2cd229d181b2f5ce67ae8322a5ab75190caf62 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 16:34:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?67132=20=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=EF=BC=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=94=B9=E4=B8=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E3=80=82=E3=80=8166907=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/warn/service/LawsWarnService.java | 9 +++++++++ .../java/com/jero/modules/wkflow/enums/FlowTypeEnum.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index de4f64d82..a00dc52ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -93,6 +93,15 @@ public class LawsWarnService { private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService; public IPage getInfoPage(Map parameter) { + //处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期) + String flag = String.valueOf(parameter.get("flag")); + if(StringUtils.equals(flag,"0")){ + parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime")); + } else if(StringUtils.equals(flag,"1")){ + parameter.put("implement_time",parameter.get("WarnTime")); + } + parameter.remove("WarnTime"); + String cut = (String) parameter.get("cut");//中英文切换标识 List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //查询的字段 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java index 8a0c19dfc..3e03084eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java @@ -15,7 +15,7 @@ public enum FlowTypeEnum { YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性确认","Verify conformance confirmation"), FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc","法规意见收集","Collection of Legislative Comments"), FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory and technical assessment"), - QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单确认","Regulation list confirmation"), + QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单发布","Release of regulatory list"), CERTIFICATION_LC("21","认证流程","CERTIFICATION_LC","认证流程","certification_lc","Pre-Homo流程","Pre-Homo flow"), ; From 7b9e65394cf349cee3e6f8077252cb8fef7c8a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 16:37:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88-=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=A4=AA=E5=AE=BD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/dealtWith.vue | 12 ++++++++++++ .../components/designCompliance.vue | 3 +++ 2 files changed, 15 insertions(+) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index cf7ab0361..ab9143c9f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -284,6 +284,12 @@ if (row.taskId.length > 30) { row.taskId = '' } + let designDueDate = '' + if (row.taskDefinitionKey == 'zrrqr' || row.taskDefinitionKey == 'dezrrqr') { + designDueDate = 'endTime' + } else { + designDueDate = 'designDueDate' + } query = { router: row.router, taskIds: row.taskId, @@ -354,6 +360,12 @@ if (row.taskId.length > 30) { row.taskId = '' } + let verifyDueDate = '' + if (row.taskDefinitionKey == 'zrrqr' || row.taskDefinitionKey == 'dezrrqr') { + verifyDueDate = 'endTime' + } else { + verifyDueDate = 'verifyDueDate' + } query = { router: row.router, taskIds: row.taskId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index c8e92936e..0d7de755b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -266,6 +266,9 @@ getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => { if (res.success) { this.queryProject = res.result[0] || {} + if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr'){ + this.queryProject.endTime = this.queryData.endTime + } this.loading = false this.isDisplay = true } else { From 6269ecb78e4e6c64af90f4a0f797ac7aba4f945b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 17:08:24 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaSjGgnrfsController.java | 20 +++ .../controller/OtaBaSjGnxtwhController.java | 170 ++++++++++++++++++ .../ota/controller/OtaBaSjJssjController.java | 170 ++++++++++++++++++ .../controller/OtaBaSjJssjyyController.java | 170 ++++++++++++++++++ .../controller/OtaBaSjQtsjxxController.java | 16 ++ .../modules/ota/entity/OtaBaSjGnxtwh.java | 74 ++++++++ .../jero/modules/ota/entity/OtaBaSjJssj.java | 94 ++++++++++ .../modules/ota/entity/OtaBaSjJssjyy.java | 84 +++++++++ .../ota/mapper/OtaBaSjGnxtwhMapper.java | 17 ++ .../modules/ota/mapper/OtaBaSjJssjMapper.java | 17 ++ .../ota/mapper/OtaBaSjJssjyyMapper.java | 17 ++ .../ota/mapper/xml/OtaBaSjGnxtwhMapper.xml | 14 ++ .../ota/mapper/xml/OtaBaSjJssjMapper.xml | 18 ++ .../ota/mapper/xml/OtaBaSjJssjyyMapper.xml | 16 ++ .../ota/service/IOtaBaSjGgnrfsService.java | 2 + .../ota/service/IOtaBaSjGnxtwhService.java | 61 +++++++ .../ota/service/IOtaBaSjJssjService.java | 61 +++++++ .../ota/service/IOtaBaSjJssjyyService.java | 61 +++++++ .../ota/service/IOtaBaSjQtsjxxService.java | 3 + .../impl/OtaBaSjGgnrfsServiceImpl.java | 143 ++++++++++----- .../impl/OtaBaSjGnxtwhServiceImpl.java | 89 +++++++++ .../service/impl/OtaBaSjJssjServiceImpl.java | 89 +++++++++ .../impl/OtaBaSjJssjyyServiceImpl.java | 89 +++++++++ .../impl/OtaBaSjQtsjxxServiceImpl.java | 140 ++++++++++----- .../impl/OtaBaSjSjfzbhServiceImpl.java | 41 ++--- .../impl/OtaBaSjSjxtbhServiceImpl.java | 40 +++-- .../modules/ota/utils/ComparisonUtil.java | 8 +- 27 files changed, 1592 insertions(+), 132 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjJssjController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjJssjyyController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGnxtwh.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssj.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssjyy.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjGnxtwhMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjJssjMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjJssjyyMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjGnxtwhMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjJssjMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjJssjyyMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjyyService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjyyServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java index 21a61d3a7..550736260 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java @@ -7,6 +7,7 @@ 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.OtaBaSjGgnrfs; +import com.jero.modules.ota.entity.OtaBaSjSjyxpg; import com.jero.modules.ota.service.IOtaBaSjGgnrfsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -144,6 +145,25 @@ public class OtaBaSjGgnrfsController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + OtaBaSjGgnrfs otaBaSjGgnrfs = otaBaSjGgnrfsService.queryByOtaId(otaId, otaIdT); + if (otaBaSjGgnrfs == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjGgnrfs); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java new file mode 100644 index 000000000..3cb58f24e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java @@ -0,0 +1,170 @@ +package com.jero.modules.ota.controller; + +import java.util.Arrays; +import java.util.List; +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.OtaBaSjGnxtwh; +import com.jero.modules.ota.service.IOtaBaSjGnxtwhService; +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.system.base.controller.JeroController; +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; + + + /** + * @Description: 车型备案-功能系统维护 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Api(tags="车型备案-功能系统维护") +@RestController +@RequestMapping("/ota/otaBaSjGnxtwh") +@Slf4j +public class OtaBaSjGnxtwhController extends JeroController { + @Autowired + private IOtaBaSjGnxtwhService otaBaSjGnxtwhService; + + /** + * 分页列表查询 + * + * @param otaBaSjGnxtwh + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-分页列表查询") + @ApiOperation(value="车型备案-功能系统维护-分页列表查询", notes="车型备案-功能系统维护-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaSjGnxtwh otaBaSjGnxtwh, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaSjGnxtwhService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-列表查询") + @ApiOperation(value="车型备案-功能系统维护-列表查询", notes="车型备案-功能系统维护-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = otaBaSjGnxtwhService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param otaBaSjGnxtwh + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-添加") + @ApiOperation(value="车型备案-功能系统维护-添加", notes="车型备案-功能系统维护-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { + otaBaSjGnxtwhService.add(otaBaSjGnxtwh); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaSjGnxtwh + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-编辑") + @ApiOperation(value="车型备案-功能系统维护-编辑", notes="车型备案-功能系统维护-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { + otaBaSjGnxtwhService.editById(otaBaSjGnxtwh); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-通过id删除") + @ApiOperation(value="车型备案-功能系统维护-通过id删除", notes="车型备案-功能系统维护-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + otaBaSjGnxtwhService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-批量删除") + @ApiOperation(value="车型备案-功能系统维护-批量删除", notes="车型备案-功能系统维护-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.otaBaSjGnxtwhService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-通过id查询") + @ApiOperation(value="车型备案-功能系统维护-通过id查询", notes="车型备案-功能系统维护-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + OtaBaSjGnxtwh otaBaSjGnxtwh = otaBaSjGnxtwhService.queryById(id); + if(otaBaSjGnxtwh==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjGnxtwh); + } + + /** + * 导出excel + * + * @param request + * @param otaBaSjGnxtwh + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OtaBaSjGnxtwh otaBaSjGnxtwh) { + return super.exportXls(request, otaBaSjGnxtwh, OtaBaSjGnxtwh.class, "车型备案-功能系统维护"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OtaBaSjGnxtwh.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjJssjController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjJssjController.java new file mode 100644 index 000000000..85d2b1985 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjJssjController.java @@ -0,0 +1,170 @@ +package com.jero.modules.ota.controller; + +import java.util.Arrays; +import java.util.List; +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.OtaBaSjJssj; +import com.jero.modules.ota.service.IOtaBaSjJssjService; +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.system.base.controller.JeroController; +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; + + + /** + * @Description: 升级备案-结束升级 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Api(tags="升级备案-结束升级") +@RestController +@RequestMapping("/ota/otaBaSjJssj") +@Slf4j +public class OtaBaSjJssjController extends JeroController { + @Autowired + private IOtaBaSjJssjService otaBaSjJssjService; + + /** + * 分页列表查询 + * + * @param otaBaSjJssj + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "升级备案-结束升级-分页列表查询") + @ApiOperation(value="升级备案-结束升级-分页列表查询", notes="升级备案-结束升级-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaSjJssj otaBaSjJssj, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjJssj, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaSjJssjService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "升级备案-结束升级-列表查询") + @ApiOperation(value="升级备案-结束升级-列表查询", notes="升级备案-结束升级-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = otaBaSjJssjService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param otaBaSjJssj + * @return + */ + @AutoLog(value = "升级备案-结束升级-添加") + @ApiOperation(value="升级备案-结束升级-添加", notes="升级备案-结束升级-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaSjJssj otaBaSjJssj) { + otaBaSjJssjService.add(otaBaSjJssj); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaSjJssj + * @return + */ + @AutoLog(value = "升级备案-结束升级-编辑") + @ApiOperation(value="升级备案-结束升级-编辑", notes="升级备案-结束升级-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaSjJssj otaBaSjJssj) { + otaBaSjJssjService.editById(otaBaSjJssj); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "升级备案-结束升级-通过id删除") + @ApiOperation(value="升级备案-结束升级-通过id删除", notes="升级备案-结束升级-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + otaBaSjJssjService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "升级备案-结束升级-批量删除") + @ApiOperation(value="升级备案-结束升级-批量删除", notes="升级备案-结束升级-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.otaBaSjJssjService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "升级备案-结束升级-通过id查询") + @ApiOperation(value="升级备案-结束升级-通过id查询", notes="升级备案-结束升级-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + OtaBaSjJssj otaBaSjJssj = otaBaSjJssjService.queryById(id); + if(otaBaSjJssj==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjJssj); + } + + /** + * 导出excel + * + * @param request + * @param otaBaSjJssj + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OtaBaSjJssj otaBaSjJssj) { + return super.exportXls(request, otaBaSjJssj, OtaBaSjJssj.class, "升级备案-结束升级"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OtaBaSjJssj.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjJssjyyController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjJssjyyController.java new file mode 100644 index 000000000..d2b57a464 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjJssjyyController.java @@ -0,0 +1,170 @@ +package com.jero.modules.ota.controller; + +import java.util.Arrays; +import java.util.List; +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.OtaBaSjJssjyy; +import com.jero.modules.ota.service.IOtaBaSjJssjyyService; +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.system.base.controller.JeroController; +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; + + + /** + * @Description: 升级备案-结束升级原因 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Api(tags="升级备案-结束升级原因") +@RestController +@RequestMapping("/ota/otaBaSjJssjyy") +@Slf4j +public class OtaBaSjJssjyyController extends JeroController { + @Autowired + private IOtaBaSjJssjyyService otaBaSjJssjyyService; + + /** + * 分页列表查询 + * + * @param otaBaSjJssjyy + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "升级备案-结束升级原因-分页列表查询") + @ApiOperation(value="升级备案-结束升级原因-分页列表查询", notes="升级备案-结束升级原因-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaSjJssjyy otaBaSjJssjyy, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjJssjyy, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaSjJssjyyService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "升级备案-结束升级原因-列表查询") + @ApiOperation(value="升级备案-结束升级原因-列表查询", notes="升级备案-结束升级原因-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = otaBaSjJssjyyService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param otaBaSjJssjyy + * @return + */ + @AutoLog(value = "升级备案-结束升级原因-添加") + @ApiOperation(value="升级备案-结束升级原因-添加", notes="升级备案-结束升级原因-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaSjJssjyy otaBaSjJssjyy) { + otaBaSjJssjyyService.add(otaBaSjJssjyy); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaSjJssjyy + * @return + */ + @AutoLog(value = "升级备案-结束升级原因-编辑") + @ApiOperation(value="升级备案-结束升级原因-编辑", notes="升级备案-结束升级原因-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaSjJssjyy otaBaSjJssjyy) { + otaBaSjJssjyyService.editById(otaBaSjJssjyy); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "升级备案-结束升级原因-通过id删除") + @ApiOperation(value="升级备案-结束升级原因-通过id删除", notes="升级备案-结束升级原因-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + otaBaSjJssjyyService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "升级备案-结束升级原因-批量删除") + @ApiOperation(value="升级备案-结束升级原因-批量删除", notes="升级备案-结束升级原因-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.otaBaSjJssjyyService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "升级备案-结束升级原因-通过id查询") + @ApiOperation(value="升级备案-结束升级原因-通过id查询", notes="升级备案-结束升级原因-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + OtaBaSjJssjyy otaBaSjJssjyy = otaBaSjJssjyyService.queryById(id); + if(otaBaSjJssjyy==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjJssjyy); + } + + /** + * 导出excel + * + * @param request + * @param otaBaSjJssjyy + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OtaBaSjJssjyy otaBaSjJssjyy) { + return super.exportXls(request, otaBaSjJssjyy, OtaBaSjJssjyy.class, "升级备案-结束升级原因"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OtaBaSjJssjyy.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjQtsjxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjQtsjxxController.java index fdd6c83bc..39674b31f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjQtsjxxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjQtsjxxController.java @@ -6,6 +6,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.OtaBaCxQt; import com.jero.modules.ota.entity.OtaBaSjQtsjxx; import com.jero.modules.ota.service.IOtaBaSjQtsjxxService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -144,6 +145,21 @@ public class OtaBaSjQtsjxxController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + OtaBaSjQtsjxx otaBaSjQtsjxx = otaBaSjQtsjxxService.queryByOtaId(otaId, otaIdT); + if (otaBaSjQtsjxx == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjQtsjxx); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGnxtwh.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGnxtwh.java new file mode 100644 index 000000000..8032f15f9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGnxtwh.java @@ -0,0 +1,74 @@ +package com.jero.modules.ota.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 车型备案-功能系统维护 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Data +@TableName("ota_ba_sj_gnxtwh") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ota_ba_sj_gnxtwh对象", description="车型备案-功能系统维护") +public class OtaBaSjGnxtwh implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**功能系统*/ + @Excel(name = "功能系统", width = 15) + @ApiModelProperty(value = "功能系统") + private String gnxt; + + /**对应控制器*/ + @Excel(name = "对应控制器", width = 15) + @ApiModelProperty(value = "对应控制器") + private String dykzq; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssj.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssj.java new file mode 100644 index 000000000..02d89dabc --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssj.java @@ -0,0 +1,94 @@ +package com.jero.modules.ota.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 升级备案-结束升级 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Data +@TableName("ota_ba_sj_jssj") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ota_ba_sj_jssj对象", description="升级备案-结束升级") +public class OtaBaSjJssj implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**otaId*/ + @Excel(name = "otaId", width = 15) + @ApiModelProperty(value = "otaId") + private String otaid; + + /**实施的升级是否和备案一致*/ + @Excel(name = "实施的升级是否和备案一致", width = 15) + @ApiModelProperty(value = "实施的升级是否和备案一致") + private Integer sfyz; + + /**完成升级的车辆数*/ + @Excel(name = "完成升级的车辆数", width = 15) + @ApiModelProperty(value = "完成升级的车辆数") + private String wccls; + + /**VIN码清单*/ + @Excel(name = "VIN码清单", width = 15) + @ApiModelProperty(value = "VIN码清单") + private String csv; + + /**故障处置措施和应急响应实施记录*/ + @Excel(name = "故障处置措施和应急响应实施记录", width = 15) + @ApiModelProperty(value = "故障处置措施和应急响应实施记录") + private String ssjl; + + /**故障处置措施和应急响应实施记录附件*/ + @Excel(name = "故障处置措施和应急响应实施记录附件", width = 15) + @ApiModelProperty(value = "故障处置措施和应急响应实施记录附件") + private String ssjlfj; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssjyy.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssjyy.java new file mode 100644 index 000000000..9fd7c1ecd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssjyy.java @@ -0,0 +1,84 @@ +package com.jero.modules.ota.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 升级备案-结束升级原因 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Data +@TableName("ota_ba_sj_jssjyy") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ota_ba_sj_jssjyy对象", description="升级备案-结束升级原因") +public class OtaBaSjJssjyy implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**otaId*/ + @Excel(name = "otaId", width = 15) + @ApiModelProperty(value = "otaId") + private String otaid; + + /**未完成原因*/ + @Excel(name = "未完成原因", width = 15) + @ApiModelProperty(value = "未完成原因") + private String wwcyy; + + /**未完成数量*/ + @Excel(name = "未完成数量", width = 15) + @ApiModelProperty(value = "未完成数量") + private String wwcsl; + + /**未完成附件*/ + @Excel(name = "未完成附件", width = 15) + @ApiModelProperty(value = "未完成附件") + private String wwcfj; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjGnxtwhMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjGnxtwhMapper.java new file mode 100644 index 000000000..cbfa98858 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjGnxtwhMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.ota.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.ota.entity.OtaBaSjGnxtwh; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 车型备案-功能系统维护 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +public interface OtaBaSjGnxtwhMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjJssjMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjJssjMapper.java new file mode 100644 index 000000000..7d5b7441f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjJssjMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.ota.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.ota.entity.OtaBaSjJssj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 升级备案-结束升级 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +public interface OtaBaSjJssjMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjJssjyyMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjJssjyyMapper.java new file mode 100644 index 000000000..20d015c49 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjJssjyyMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.ota.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.ota.entity.OtaBaSjJssjyy; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 升级备案-结束升级原因 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +public interface OtaBaSjJssjyyMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjGnxtwhMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjGnxtwhMapper.xml new file mode 100644 index 000000000..a4262c5e3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjGnxtwhMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjJssjMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjJssjMapper.xml new file mode 100644 index 000000000..2edf94b85 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjJssjMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjJssjyyMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjJssjyyMapper.xml new file mode 100644 index 000000000..cca6d5f69 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjJssjyyMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java index 39c9b1429..d88eddf86 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGgnrfsService.java @@ -58,4 +58,6 @@ public interface IOtaBaSjGgnrfsService extends IService { * @return */ List queryList(); + + OtaBaSjGgnrfs queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java new file mode 100644 index 000000000..f96073061 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java @@ -0,0 +1,61 @@ +package com.jero.modules.ota.service; + +import com.jero.modules.ota.entity.OtaBaSjGnxtwh; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 车型备案-功能系统维护 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +public interface IOtaBaSjGnxtwhService extends IService { + + /** + * 保存 + * + * @param otaBaSjGnxtwh + * @return + */ + void add(OtaBaSjGnxtwh otaBaSjGnxtwh); + + /** + * 更新 + * + * @param otaBaSjGnxtwh + * @return + */ + void editById(OtaBaSjGnxtwh otaBaSjGnxtwh); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OtaBaSjGnxtwh queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjService.java new file mode 100644 index 000000000..47d54b889 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjService.java @@ -0,0 +1,61 @@ +package com.jero.modules.ota.service; + +import com.jero.modules.ota.entity.OtaBaSjJssj; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 升级备案-结束升级 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +public interface IOtaBaSjJssjService extends IService { + + /** + * 保存 + * + * @param otaBaSjJssj + * @return + */ + void add(OtaBaSjJssj otaBaSjJssj); + + /** + * 更新 + * + * @param otaBaSjJssj + * @return + */ + void editById(OtaBaSjJssj otaBaSjJssj); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OtaBaSjJssj queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjyyService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjyyService.java new file mode 100644 index 000000000..d5b73f790 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjyyService.java @@ -0,0 +1,61 @@ +package com.jero.modules.ota.service; + +import com.jero.modules.ota.entity.OtaBaSjJssjyy; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 升级备案-结束升级原因 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +public interface IOtaBaSjJssjyyService extends IService { + + /** + * 保存 + * + * @param otaBaSjJssjyy + * @return + */ + void add(OtaBaSjJssjyy otaBaSjJssjyy); + + /** + * 更新 + * + * @param otaBaSjJssjyy + * @return + */ + void editById(OtaBaSjJssjyy otaBaSjJssjyy); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OtaBaSjJssjyy queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjQtsjxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjQtsjxxService.java index b66a382c6..b446c94f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjQtsjxxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjQtsjxxService.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service; +import com.jero.modules.ota.entity.OtaBaCxQt; import com.jero.modules.ota.entity.OtaBaSjQtsjxx; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +59,6 @@ public interface IOtaBaSjQtsjxxService extends IService { * @return */ List queryList(); + + OtaBaSjQtsjxx queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java index e9dee99b4..450dc1296 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java @@ -1,89 +1,140 @@ package com.jero.modules.ota.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.AttachmentEO; +import com.jero.modules.ota.entity.OtaBaCxAqcs; +import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.jero.modules.ota.entity.OtaBaSjGgnrfs; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjGgnrfsMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaSjGgnrfsService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + 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 OtaBaSjGgnrfsServiceImpl extends ServiceImpl implements IOtaBaSjGgnrfsService { - /** - * 保存 - * - * @param otaBaSjGgnrfs - * @return - */ - @Override + + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + @Autowired + private ISysDictService sysDictService; + + /** + * 保存 + * + * @param otaBaSjGgnrfs + * @return + */ + @Override public void add(OtaBaSjGgnrfs otaBaSjGgnrfs) { Date now = new Date(); - otaBaSjGgnrfs.setCreateTime(now); - otaBaSjGgnrfs.setUpdateTime(now); - save(otaBaSjGgnrfs); + if (null != otaBaSjGgnrfs) { + OtaBaSjGgnrfs otaBaSjGgnrfsOld = this.getByOtaId(otaBaSjGgnrfs.getOtaId()); + if (null != otaBaSjGgnrfsOld) { + otaBaSjGgnrfs.setId(otaBaSjGgnrfsOld.getId()); + } else { + otaBaSjGgnrfs.setCreateTime(now); + } + otaBaSjGgnrfs.setUpdateTime(now); + saveOrUpdate(otaBaSjGgnrfs); + ComparisonUtil cu = new ComparisonUtil(); + if (ObjectUtils.isEmpty(otaBaSjGgnrfsOld)) { + otaBaSjGgnrfsOld = new OtaBaSjGgnrfs(); + } + List reList = cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), OtaModuleEnum.SJ_YHGZNRFS, otaBaSjGgnrfsOld, otaBaSjGgnrfs, sysDictService); + otaBaCxTxjlService.saveBatch(reList); + } } - /** - * 更新 - * - * @param otaBaSjGgnrfs - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjGgnrfs + * @return + */ + @Override public void editById(OtaBaSjGgnrfs otaBaSjGgnrfs) { - Date now = new Date(); + Date now = new Date(); otaBaSjGgnrfs.setUpdateTime(now); - saveOrUpdate(otaBaSjGgnrfs); + saveOrUpdate(otaBaSjGgnrfs); } - /** - * 通过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 OtaBaSjGgnrfs queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public OtaBaSjGgnrfs queryByOtaId(String otaId, String otaIdT) { + OtaBaSjGgnrfs res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + private OtaBaSjGgnrfs getByOtaId(String otaId) { + if (org.apache.commons.lang3.StringUtils.isEmpty(otaId)) { + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjGgnrfs::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java new file mode 100644 index 000000000..416da171e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.ota.service.impl; + +import com.jero.modules.ota.entity.OtaBaSjGnxtwh; +import com.jero.modules.ota.mapper.OtaBaSjGnxtwhMapper; +import com.jero.modules.ota.service.IOtaBaSjGnxtwhService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 车型备案-功能系统维护 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Service +public class OtaBaSjGnxtwhServiceImpl extends ServiceImpl implements IOtaBaSjGnxtwhService { + + /** + * 保存 + * + * @param otaBaSjGnxtwh + * @return + */ + @Override + public void add(OtaBaSjGnxtwh otaBaSjGnxtwh) { + Date now = new Date(); + otaBaSjGnxtwh.setCreateTime(now); + otaBaSjGnxtwh.setUpdateTime(now); + save(otaBaSjGnxtwh); + } + + /** + * 更新 + * + * @param otaBaSjGnxtwh + * @return + */ + @Override + public void editById(OtaBaSjGnxtwh otaBaSjGnxtwh) { + Date now = new Date(); + otaBaSjGnxtwh.setUpdateTime(now); + saveOrUpdate(otaBaSjGnxtwh); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OtaBaSjGnxtwh queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java new file mode 100644 index 000000000..a1ca06560 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.ota.service.impl; + +import com.jero.modules.ota.entity.OtaBaSjJssj; +import com.jero.modules.ota.mapper.OtaBaSjJssjMapper; +import com.jero.modules.ota.service.IOtaBaSjJssjService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 升级备案-结束升级 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Service +public class OtaBaSjJssjServiceImpl extends ServiceImpl implements IOtaBaSjJssjService { + + /** + * 保存 + * + * @param otaBaSjJssj + * @return + */ + @Override + public void add(OtaBaSjJssj otaBaSjJssj) { + Date now = new Date(); + otaBaSjJssj.setCreateTime(now); + otaBaSjJssj.setUpdateTime(now); + save(otaBaSjJssj); + } + + /** + * 更新 + * + * @param otaBaSjJssj + * @return + */ + @Override + public void editById(OtaBaSjJssj otaBaSjJssj) { + Date now = new Date(); + otaBaSjJssj.setUpdateTime(now); + saveOrUpdate(otaBaSjJssj); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OtaBaSjJssj queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjyyServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjyyServiceImpl.java new file mode 100644 index 000000000..269273d3a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjyyServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.ota.service.impl; + +import com.jero.modules.ota.entity.OtaBaSjJssjyy; +import com.jero.modules.ota.mapper.OtaBaSjJssjyyMapper; +import com.jero.modules.ota.service.IOtaBaSjJssjyyService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 升级备案-结束升级原因 + * @Author: jero-boot + * @Date: 2023-03-28 + * @Version: V1.0 + */ +@Service +public class OtaBaSjJssjyyServiceImpl extends ServiceImpl implements IOtaBaSjJssjyyService { + + /** + * 保存 + * + * @param otaBaSjJssjyy + * @return + */ + @Override + public void add(OtaBaSjJssjyy otaBaSjJssjyy) { + Date now = new Date(); + otaBaSjJssjyy.setCreateTime(now); + otaBaSjJssjyy.setUpdateTime(now); + save(otaBaSjJssjyy); + } + + /** + * 更新 + * + * @param otaBaSjJssjyy + * @return + */ + @Override + public void editById(OtaBaSjJssjyy otaBaSjJssjyy) { + Date now = new Date(); + otaBaSjJssjyy.setUpdateTime(now); + saveOrUpdate(otaBaSjJssjyy); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OtaBaSjJssjyy queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjQtsjxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjQtsjxxServiceImpl.java index 1953eb03e..f37ab2a1f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjQtsjxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjQtsjxxServiceImpl.java @@ -1,89 +1,137 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.OtaBaCxQt; +import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.jero.modules.ota.entity.OtaBaSjQtsjxx; +import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.mapper.OtaBaSjQtsjxxMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaSjQtsjxxService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + 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 OtaBaSjQtsjxxServiceImpl extends ServiceImpl implements IOtaBaSjQtsjxxService { - /** - * 保存 - * - * @param otaBaSjQtsjxx - * @return - */ - @Override + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + @Autowired + private ISysDictService sysDictService; + + /** + * 保存 + * + * @param otaBaSjQtsjxx + * @return + */ + @Override public void add(OtaBaSjQtsjxx otaBaSjQtsjxx) { Date now = new Date(); - otaBaSjQtsjxx.setCreateTime(now); - otaBaSjQtsjxx.setUpdateTime(now); - save(otaBaSjQtsjxx); + if (null != otaBaSjQtsjxx) { + OtaBaSjQtsjxx otaBaSjQtsjxxOld = this.getByOtaId(otaBaSjQtsjxx.getOtaId()); + if (null != otaBaSjQtsjxxOld) { + otaBaSjQtsjxx.setId(otaBaSjQtsjxxOld.getId()); + } else { + otaBaSjQtsjxx.setCreateTime(now); + } + otaBaSjQtsjxx.setUpdateTime(now); + saveOrUpdate(otaBaSjQtsjxx); + ComparisonUtil cu = new ComparisonUtil(); + if (ObjectUtils.isEmpty(otaBaSjQtsjxxOld)) { + otaBaSjQtsjxxOld = new OtaBaSjQtsjxx(); + } + List reList = cu.comparisonRecord(otaBaSjQtsjxx.getOtaId(), OtaModuleEnum.CX_QT, otaBaSjQtsjxxOld, otaBaSjQtsjxx, sysDictService); + otaBaCxTxjlService.saveBatch(reList); + } } - /** - * 更新 - * - * @param otaBaSjQtsjxx - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjQtsjxx + * @return + */ + @Override public void editById(OtaBaSjQtsjxx otaBaSjQtsjxx) { - Date now = new Date(); + Date now = new Date(); otaBaSjQtsjxx.setUpdateTime(now); - saveOrUpdate(otaBaSjQtsjxx); + saveOrUpdate(otaBaSjQtsjxx); } - /** - * 通过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 OtaBaSjQtsjxx queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public OtaBaSjQtsjxx queryByOtaId(String otaId, String otaIdT) { + OtaBaSjQtsjxx res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + public OtaBaSjQtsjxx getByOtaId(String otaId) { + if (org.apache.commons.lang3.StringUtils.isEmpty(otaId)) { + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjQtsjxx::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java index 0e5a5d2c7..6f78465c2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java @@ -47,7 +47,6 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl objMap = (HashMap) obj; - OtaBaSjSjfzbh otaBaSjSjfzbh = new OtaBaSjSjfzbh(); - Field[] fields = OtaBaSjSjfzbh.class.getDeclaredFields(); - for (Field field : fields) { - if (field.getName().equals("createTime") || field.getName().equals("updateTime")) { - continue; - } - Object bjObj = objMap.get(field.getName()); - if (null != bjObj) { - try { - field.setAccessible(true); - field.set(otaBaSjSjfzbh, bjObj.toString()); - } catch (IllegalAccessException e) { - e.printStackTrace(); + if (null != list) { + for (Object obj : list) { + Map objMap = (HashMap) obj; + OtaBaSjSjfzbh otaBaSjSjfzbh = new OtaBaSjSjfzbh(); + Field[] fields = OtaBaSjSjfzbh.class.getDeclaredFields(); + for (Field field : fields) { + if (field.getName().equals("createTime") || field.getName().equals("updateTime")) { + continue; + } + Object bjObj = objMap.get(field.getName()); + if (null != bjObj) { + try { + field.setAccessible(true); + field.set(otaBaSjSjfzbh, bjObj.toString()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } } } + otaBaSjSjfzbh.setOtaId(otaId); + otaBaSjSjfzbh.setCreateTime(now); + otaBaSjSjfzbh.setUpdateTime(now); + newList.add(otaBaSjSjfzbh); } - otaBaSjSjfzbh.setOtaId(otaId); - otaBaSjSjfzbh.setCreateTime(now); - otaBaSjSjfzbh.setUpdateTime(now); - newList.add(otaBaSjSjfzbh); } if (ObjectUtils.isEmpty(oldList)) { oldList = new ArrayList<>(); 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 f32a78641..95b1ce711 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 @@ -53,28 +53,30 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl objMap = (HashMap) obj; - OtaBaSjSjxtbh otaBaSjSjxtbh = new OtaBaSjSjxtbh(); - Field[] fields = OtaBaSjSjxtbh.class.getDeclaredFields(); - for (Field field : fields) { - if (field.getName().equals("createTime") || field.getName().equals("updateTime")) { - continue; - } - Object bjObj = objMap.get(field.getName()); - if (null != bjObj) { - try { - field.setAccessible(true); - field.set(otaBaSjSjxtbh, bjObj.toString()); - } catch (IllegalAccessException e) { - e.printStackTrace(); + if (null != list) { + for (Object obj : list) { + Map objMap = (HashMap) obj; + OtaBaSjSjxtbh otaBaSjSjxtbh = new OtaBaSjSjxtbh(); + Field[] fields = OtaBaSjSjxtbh.class.getDeclaredFields(); + for (Field field : fields) { + if (field.getName().equals("createTime") || field.getName().equals("updateTime")) { + continue; + } + Object bjObj = objMap.get(field.getName()); + if (null != bjObj) { + try { + field.setAccessible(true); + field.set(otaBaSjSjxtbh, bjObj.toString()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } } } + otaBaSjSjxtbh.setOtaId(otaId); + otaBaSjSjxtbh.setCreateTime(now); + otaBaSjSjxtbh.setUpdateTime(now); + newList.add(otaBaSjSjxtbh); } - otaBaSjSjxtbh.setOtaId(otaId); - otaBaSjSjxtbh.setCreateTime(now); - otaBaSjSjxtbh.setUpdateTime(now); - newList.add(otaBaSjSjxtbh); } if (ObjectUtils.isEmpty(oldList)) { oldList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index f50ccfbed..aece5fd23 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -5,6 +5,7 @@ import com.jero.modules.ota.enums.OtaModuleEnum; import com.jero.modules.ota.enums.OtaTitleEnum; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; import java.util.ArrayList; @@ -56,7 +57,12 @@ public class ComparisonUtil { if (ObjectUtils.isEmpty(id)) { Field tableField = newObj.getClass().getDeclaredField(tableTitle); tableField.setAccessible(true); - String content = "新增了一条'" + tableField.get(newObj).toString() + "'"; + String tableFieldStr = "空"; + Object tableFieldObj = tableField.get(newObj); + if (ObjectUtils.isNotEmpty(tableFieldStr)) { + tableFieldStr = tableFieldObj.toString(); + } + String content = "新增了一条'" + tableFieldStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); Field[] fields = newObj.getClass().getDeclaredFields(); for (Field field : fields) { From 6eae40585fd9bb9d319410ea0151e3186352e467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 17:13:15 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/SelectedBy/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue index 13c9683ae..e81326a50 100644 --- a/jero-web/src/components/SelectedBy/index.vue +++ b/jero-web/src/components/SelectedBy/index.vue @@ -128,7 +128,11 @@ }, getUserAndDepart() { getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => { - this.gData = res || [] + if (res) { + this.gData = res.filter(ele => ele.flag === 'DEPART') + } else { + this.gData = [] + } this.visibleTree = true }) }, From 4b935fb42e6a15c18dbd9ece97e3f52fcd8ae7c0 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 17:14:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/auxiliaryupgradehavechanged.vue | 18 +++++++++++++++--- .../informationaboutotherupgradetasks.vue | 2 +- .../thetargetvehicleofthisupgrade.vue | 2 +- .../components/upgradehavechanged.vue | 16 ++++++++++++++-- .../components/upgradetargetmodel.vue | 17 ++++++++++++++++- .../components/usernotification.vue | 8 ++++++-- 6 files changed, 53 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 874f7835b..7ba9967a4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -64,7 +64,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('next')}}
@@ -219,12 +219,24 @@ export default { otaId='' } getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ - this.dataSource =res.result.list == null ? {} : res.result.list + this.dataSource =res.result.list == null ? [{}] : res.result.list this.fileList = res.result.fj }) }, save(){ - postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + let objIsEmpty= ()=>{ + for (let key in this.dataSource[0]){ + return false + } + return true + } + let list=[] + if(this.dataSource.length==1 && objIsEmpty()){ + list=null + }else{ + list=this.dataSource + } + postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:list,fj:this.fileList}).then(res=>{ if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) this.getData() diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index e6ed49fe3..6a2a843c1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -97,7 +97,7 @@ export default { if(otaId==null){ otaId='' } - getAction('/ota/otaBaSjQtsjxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{ + getAction('/ota/otaBaSjQtsjxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ this.queryParam= res.result ==null ? {} :res.result } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 0b3f3fd80..2215482c4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -24,7 +24,7 @@ v-model="formInline.zsl" :title='formInline.zsl' :max-length="50" - :placeholder="$t('PleaseSelect')"> + :placeholder="$t('pleaseEnter')"> diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 9f4830c36..7359cc864 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -285,11 +285,23 @@ export default { otaId='' } getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ - this.dataSource =res.result.list == null ? {} : res.result.list + this.dataSource =res.result.list == null ? [{}] : res.result.list }) }, save(){ - postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + let objIsEmpty= ()=>{ + for (let key in this.dataSource[0]){ + return false + } + return true + } + let list=[] + if(this.dataSource.length==1 && objIsEmpty()){ + list=null + }else{ + list=this.dataSource + } + postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list: list }).then(res=>{ if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) this.getData() diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index fa99ca385..80899ab2f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -198,13 +198,28 @@ import ImportFile from '@/components/ImportFileData/index' getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ if(res.result==null){ - this.form=res.result + this.form={} this.form.cxmb=undefined this.form.bapc=undefined this.form.dllx1=undefined this.form.dllx2=undefined + this.form.qymc='安徽江淮汽车集团股份有限公司' }else{ this.form=res.result + if(res.result.dllx1==null){ + this.form.dllx1=undefined + + } + if(res.result.dllx2==null){ + this.form.dllx2=undefined + } + if(res.result.cxmb==null){ + this.form.cxmb=undefined + } + if(res.result.bapc==null){ + this.form.bapc=undefined + } + this.$forceUpdate() } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 3295454ca..d4f042877 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -178,7 +178,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('last')}} {{$t('next')}}
@@ -243,6 +243,7 @@ export default { }) }, getData(){ + let otaIdT=localStorage.getItem('otaIdT') if(otaIdT==null){ otaIdT='' @@ -251,9 +252,12 @@ export default { if(otaId==null){ otaId='' } - getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{ + getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ if(res.code == 200){ + this.formInline= res.result ==null ? {} :res.result + this.formInline.id=res.result.id + this.$forceUpdate() } }) }, From 058a196aaa1056be31b7202eeaf9b2f13ade7273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 28 Mar 2023 17:16:55 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java index 3cb58f24e..e6b310329 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java @@ -54,6 +54,7 @@ public class OtaBaSjGnxtwhController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.orderByDesc("create_time"); IPage pageList = otaBaSjGnxtwhService.page(page, queryWrapper); return Result.OK(pageList); }