From ef570e5ddd07dd068c085e6293558dfd3eac2941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 14:21:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=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 --- .../ota/controller/OtaBaCxListController.java | 31 ++++- .../ota/controller/OtaBaSjListController.java | 12 +- .../jero/modules/ota/entity/OtaBaSjList.java | 118 ++++++++++++------ .../service/impl/OtaBaCxListServiceImpl.java | 2 +- .../service/impl/OtaBaSjJssjServiceImpl.java | 35 ++++-- .../impl/OtaBaSjSjmbcxServiceImpl.java | 1 + .../impl/OtaBaSjSjxtbhServiceImpl.java | 2 +- .../modules/ota/utils/ComparisonUtil.java | 2 +- 8 files changed, 145 insertions(+), 58 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 35cba9c8e..c1ff0530c 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,6 +1,7 @@ package com.jero.modules.ota.controller; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,11 +9,13 @@ 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.extRepo.entity.ExtRepoData; 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.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -57,9 +60,33 @@ public class OtaBaCxListController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxList, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 文件名称模糊查询 + String cpdjbh = req.getParameter("cpdjbh"); + if (StringUtils.isNotBlank(cpdjbh)) { + cpdjbh = cpdjbh.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpdjbh, cpdjbh); + } + + String ggpc = req.getParameter("ggpc"); + if (StringUtils.isNotBlank(ggpc)) { + ggpc = ggpc.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getGgpc, ggpc); + } + + String cpsb = req.getParameter("cpsb"); + if (StringUtils.isNotBlank(cpsb)) { + cpsb = cpsb.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpsb, cpsb); + } + + String cpmc = req.getParameter("cpmc"); + if (StringUtils.isNotBlank(cpmc)) { + cpmc = cpmc.replace("%", "\\%"); + queryWrapper.like(OtaBaCxList::getCpmc, cpmc); + } + queryWrapper.orderByDesc(OtaBaCxList::getCreateTime); IPage pageList = otaBaCxListService.page(page, queryWrapper); return Result.OK(pageList); } 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 d6dff0bc6..344eafb8c 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,5 +1,6 @@ package com.jero.modules.ota.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -176,11 +177,12 @@ public class OtaBaSjListController extends JeroController batchRecord(@RequestParam(name = "ids", required = true) String ids, - @RequestParam(name = "bazt", required = true) String bazt, - @RequestParam(name = "batjsj", required = true) String batjsj, - @RequestParam(name = "bz", required = true) String bz, - @RequestParam(name = "cut") String cut) { + public Result batchRecord(@RequestBody JSONObject json) { + String ids = json.getString("ids"); + String bazt = json.getString("bazt"); + String batjsj = json.getString("batjsj"); + String bz = json.getString("bz"); + String cut = json.getString("cut"); otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java index 73b8695d8..dc0e38564 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java @@ -3,6 +3,7 @@ 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; @@ -21,105 +22,146 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 升级备案-升级活动备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Data @TableName("ota_ba_sj_list") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_list对象", description="升级备案-升级活动备案列表") +@ApiModel(value = "ota_ba_sj_list对象", description = "升级备案-升级活动备案列表") public class OtaBaSjList implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @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 java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @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 java.lang.String sysOrgCode; - /**otaId*/ - @Excel(name = "otaId", width = 15) + /** + * otaId + */ + @Excel(name = "otaId", width = 15) @ApiModelProperty(value = "otaId") private java.lang.String otaId; - /**产品登记编号*/ - @Excel(name = "产品登记编号", width = 15) + /** + * 产品登记编号 + */ + @Excel(name = "产品登记编号", width = 15) @ApiModelProperty(value = "产品登记编号") private java.lang.String cpdjbh; - /**公告批次*/ - @Excel(name = "公告批次", width = 15) + /** + * 公告批次 + */ + @Excel(name = "公告批次", width = 15) @ApiModelProperty(value = "公告批次") private java.lang.String ggpc; - /**产品商标*/ - @Excel(name = "产品商标", width = 15) + /** + * 产品商标 + */ + @Excel(name = "产品商标", width = 15) @ApiModelProperty(value = "产品商标") private java.lang.String cpsb; - /**产品名称*/ - @Excel(name = "产品名称", width = 15) + /** + * 产品名称 + */ + @Excel(name = "产品名称", width = 15) @ApiModelProperty(value = "产品名称") private java.lang.String cpmc; - /**产品型号*/ - @Excel(name = "产品型号", width = 15) + /** + * 产品型号 + */ + @Excel(name = "产品型号", width = 15) @ApiModelProperty(value = "产品型号") private java.lang.String cpxh; - /**备案状态*/ - @Excel(name = "备案状态", width = 15) + /** + * 备案状态 + */ + @Excel(name = "备案状态", width = 15) @ApiModelProperty(value = "备案状态") + @Dict(dicCode = "recordstatus") private java.lang.String bazt; - /**备案提交时间*/ - @Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 备案提交时间 + */ + @Excel(name = "备案提交时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "备案提交时间") private java.util.Date batjsj; - /**创建时间*/ - @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "创建时间") private java.util.Date cjsj; - /**备注*/ - @Excel(name = "备注", width = 15) + /** + * 备注 + */ + @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String bz; - /**升级驾驶附件*/ + /** + * 升级驾驶附件 + */ @Excel(name = "升级驾驶附件", width = 15) @ApiModelProperty(value = "升级驾驶附件") private java.lang.String sjjsfj; + /** + * 升级状态(0:升级中;1:升级结束) + */ + @Excel(name = "升级状态", width = 15) + @ApiModelProperty(value = "升级状态") + private java.lang.String sjzt; public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) { this.cpdjbh = otaBaSjSjmbcx.getBabh(); 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 130bdb9b5..f32cfaf19 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 @@ -9,8 +9,8 @@ import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.*; import com.jero.modules.ota.utils.ImportFileUtil; -import com.jero.modules.system.util.StringUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; 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 index 73a45b937..ea06cd006 100644 --- 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 @@ -2,19 +2,18 @@ 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.OtaBaSjJssj; -import com.jero.modules.ota.entity.OtaBaSjJssjyy; +import com.jero.modules.ota.entity.*; import com.jero.modules.ota.mapper.OtaBaSjJssjMapper; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.service.IOtaBaSjJssjService; import com.jero.modules.ota.service.IOtaBaSjJssjyyService; +import com.jero.modules.ota.service.IOtaBaSjListService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Date; @@ -32,6 +31,8 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl yyList = new ArrayList<>(); + for (OtaBaSjJssjyy yy : otaBaSjJssj.getList()) { + yy.setOtaId(otaBaSjJssj.getOtaId()); + yyList.add(yy); + } + otaBaSjJssjyyService.saveBatch(yyList); + } } /** @@ -111,9 +125,10 @@ public class OtaBaSjJssjServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjJssj::getOtaId, otaId); OtaBaSjJssj res = this.getOne(queryWrapper, false); - - List list = otaBaSjJssjyyService.queryByOtaId(otaId); - res.setList(list); + if (ObjectUtils.isNotEmpty(res)) { + List list = otaBaSjJssjyyService.queryByOtaId(otaId); + res.setList(list); + } return res; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 6891f3cbb..5686e1c91 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -78,6 +78,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl(); } ComparisonUtil cu = new ComparisonUtil(); - List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.SJKZQMC.getName(), oldList, newList, sysDictService); + List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJXTMCBH, OtaTitleEnum.XTMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); otaBaCxTxjlService.saveBatch(reList); } 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 4abaa3d70..441ad993d 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 @@ -59,7 +59,7 @@ public class ComparisonUtil { tableField.setAccessible(true); String tableFieldStr = "空"; Object tableFieldObj = tableField.get(newObj); - if (ObjectUtils.isNotEmpty(tableFieldStr)) { + if (ObjectUtils.isNotEmpty(tableFieldObj)) { tableFieldStr = tableFieldObj.toString(); } String content = "新增了一条'" + tableFieldStr + "'";