From 90271b189e1f315b6b1e1da93f6a64d1d7327716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 20 Aug 2023 15:26:14 +0800 Subject: [PATCH] =?UTF-8?q?OTA=E5=8E=86=E5=8F=B2=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 45 +++-- .../OtaManageHistoryController.java | 171 ++++++++++++++++++ .../OtaManagePermissionController.java | 170 +++++++++++++++++ .../modules/ota/entity/OtaManageHistory.java | 74 ++++++++ .../ota/entity/OtaManagePermission.java | 74 ++++++++ .../ota/mapper/OtaManageHistoryMapper.java | 17 ++ .../ota/mapper/OtaManagePermissionMapper.java | 17 ++ .../ota/mapper/xml/OtaManageHistoryMapper.xml | 14 ++ .../mapper/xml/OtaManagePermissionMapper.xml | 14 ++ .../ota/service/IOtaManageApplyEOService.java | 6 +- .../ota/service/IOtaManageHistoryService.java | 64 +++++++ .../service/IOtaManagePermissionService.java | 61 +++++++ .../impl/OtaManageApplyEOServiceImpl.java | 64 ++++--- .../impl/OtaManageHistoryServiceImpl.java | 97 ++++++++++ .../impl/OtaManagePermissionServiceImpl.java | 89 +++++++++ 15 files changed, 935 insertions(+), 42 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageHistoryController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManagePermissionController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageHistory.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManagePermission.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageHistoryMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManagePermissionMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageHistoryMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManagePermissionMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageHistoryService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManagePermissionService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageHistoryServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManagePermissionServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index a897faba2..6165259f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -18,10 +18,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -207,29 +204,43 @@ public class OtaManageApplyEOController extends JeroController msgList = otaManageApplyEOService.submit(list, cut); - return Result.OK("提交成功！",msgList); + Map res = new HashMap<>(); + res.put("msgList",msgList); + return Result.OK("操作成功！", res); } @AutoLog(value = "批量设置") @ApiOperation(value = "批量设置", notes = "批量设置") @PostMapping(value = "/updateVdrBatch") public Result updateVdrBatch(@RequestBody JSONObject jsonObject) { - String ids = jsonObject.getString("ids"); + JSONArray array = jsonObject.getJSONArray("list"); + List list = new ArrayList<>(); + OtaManageApplyEO oma = null; + for (Object obj : array) { + oma = JSONObject.parseObject(JSONObject.toJSONString(obj), OtaManageApplyEO.class); + if (ObjectUtils.isNotEmpty(oma)) { + list.add(oma); + } + } String projectVersion = jsonObject.getString("projectVersion"); String attestationSchedule = jsonObject.getString("attestationSchedule"); String remark = jsonObject.getString("remark"); String cut = jsonObject.getString("cut"); - List msgList = otaManageApplyEOService.updateVdrBatch(ids, projectVersion, attestationSchedule, remark, cut); - return Result.OK("操作成功！", msgList); + List msgList = otaManageApplyEOService.updateVdrBatch(list, projectVersion, attestationSchedule, remark, cut); + Map res = new HashMap<>(); + res.put("msgList",msgList); + return Result.OK("操作成功！", res); } @AutoLog(value = "申请重新匹配") @ApiOperation(value = "申请重新匹配", notes = "申请重新匹配") @GetMapping(value = "/applyRematch") - public Result applyRematch(String ids,String cut) { - List msgList = otaManageApplyEOService.applyRematch(ids, cut); - return Result.OK("操作成功！", msgList); + public Result applyRematch(String ids,String projectVersion,String cut) { + List msgList = otaManageApplyEOService.applyRematch(ids,projectVersion, cut); + Map res = new HashMap<>(); + res.put("msgList",msgList); + return Result.OK("操作成功！", res); } @AutoLog(value = "确认") @@ -237,15 +248,19 @@ public class OtaManageApplyEOController extends JeroController confirm(String ids,String cut) { List msgList = otaManageApplyEOService.confirm(ids, cut); - return Result.OK("操作成功！", msgList); + Map res = new HashMap<>(); + res.put("msgList",msgList); + return Result.OK("操作成功！", res); } @AutoLog(value = "退回") @ApiOperation(value = "退回", notes = "退回") @GetMapping(value = "/reject") - public Result reject(String ids,String cut) { - List msgList = otaManageApplyEOService.reject(ids, cut); - return Result.OK("操作成功！", msgList); + public Result reject(String ids,String rejectReason,String cut) { + List msgList = otaManageApplyEOService.reject(ids, rejectReason, cut); + Map res = new HashMap<>(); + res.put("msgList",msgList); + return Result.OK("操作成功！", res); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageHistoryController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageHistoryController.java new file mode 100644 index 000000000..52c00f00a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageHistoryController.java @@ -0,0 +1,171 @@ +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.OtaManageHistory; +import com.jero.modules.ota.service.IOtaManageHistoryService; +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: OTA管理列表历史记录 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +@Api(tags="OTA管理列表历史记录") +@RestController +@RequestMapping("/ota/otaManageHistory") +@Slf4j +public class OtaManageHistoryController extends JeroController { + @Autowired + private IOtaManageHistoryService otaManageHistoryService; + + /** + * 分页列表查询 + * + * @param otaManageHistory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "OTA管理列表历史记录-分页列表查询") + @ApiOperation(value="OTA管理列表历史记录-分页列表查询", notes="OTA管理列表历史记录-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaManageHistory otaManageHistory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaManageHistory, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaManageHistoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "OTA管理列表历史记录-列表查询") + @ApiOperation(value="OTA管理列表历史记录-列表查询", notes="OTA管理列表历史记录-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = otaManageHistoryService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param otaManageHistory + * @return + */ + @AutoLog(value = "OTA管理列表历史记录-添加") + @ApiOperation(value="OTA管理列表历史记录-添加", notes="OTA管理列表历史记录-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaManageHistory otaManageHistory) { + otaManageHistoryService.add(otaManageHistory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaManageHistory + * @return + */ + @AutoLog(value = "OTA管理列表历史记录-编辑") + @ApiOperation(value="OTA管理列表历史记录-编辑", notes="OTA管理列表历史记录-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaManageHistory otaManageHistory) { + otaManageHistoryService.editById(otaManageHistory); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "OTA管理列表历史记录-通过id删除") + @ApiOperation(value="OTA管理列表历史记录-通过id删除", notes="OTA管理列表历史记录-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + otaManageHistoryService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "OTA管理列表历史记录-批量删除") + @ApiOperation(value="OTA管理列表历史记录-批量删除", notes="OTA管理列表历史记录-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.otaManageHistoryService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "OTA管理列表历史记录-通过id查询") + @ApiOperation(value="OTA管理列表历史记录-通过id查询", notes="OTA管理列表历史记录-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + OtaManageHistory otaManageHistory = otaManageHistoryService.queryById(id); + if(otaManageHistory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaManageHistory); + } + + /** + * 导出excel + * + * @param request + * @param otaManageHistory + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OtaManageHistory otaManageHistory) { + return super.exportXls(request, otaManageHistory, OtaManageHistory.class, "OTA管理列表历史记录"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OtaManageHistory.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManagePermissionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManagePermissionController.java new file mode 100644 index 000000000..a43edf15d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManagePermissionController.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.OtaManagePermission; +import com.jero.modules.ota.service.IOtaManagePermissionService; +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: OTA管理权限列表 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +@Api(tags="OTA管理权限列表") +@RestController +@RequestMapping("/ota/otaManagePermission") +@Slf4j +public class OtaManagePermissionController extends JeroController { + @Autowired + private IOtaManagePermissionService otaManagePermissionService; + + /** + * 分页列表查询 + * + * @param otaManagePermission + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "OTA管理权限列表-分页列表查询") + @ApiOperation(value="OTA管理权限列表-分页列表查询", notes="OTA管理权限列表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaManagePermission otaManagePermission, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaManagePermission, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaManagePermissionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "OTA管理权限列表-列表查询") + @ApiOperation(value="OTA管理权限列表-列表查询", notes="OTA管理权限列表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = otaManagePermissionService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param otaManagePermission + * @return + */ + @AutoLog(value = "OTA管理权限列表-添加") + @ApiOperation(value="OTA管理权限列表-添加", notes="OTA管理权限列表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaManagePermission otaManagePermission) { + otaManagePermissionService.add(otaManagePermission); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaManagePermission + * @return + */ + @AutoLog(value = "OTA管理权限列表-编辑") + @ApiOperation(value="OTA管理权限列表-编辑", notes="OTA管理权限列表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaManagePermission otaManagePermission) { + otaManagePermissionService.editById(otaManagePermission); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "OTA管理权限列表-通过id删除") + @ApiOperation(value="OTA管理权限列表-通过id删除", notes="OTA管理权限列表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + otaManagePermissionService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "OTA管理权限列表-批量删除") + @ApiOperation(value="OTA管理权限列表-批量删除", notes="OTA管理权限列表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.otaManagePermissionService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "OTA管理权限列表-通过id查询") + @ApiOperation(value="OTA管理权限列表-通过id查询", notes="OTA管理权限列表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + OtaManagePermission otaManagePermission = otaManagePermissionService.queryById(id); + if(otaManagePermission==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaManagePermission); + } + + /** + * 导出excel + * + * @param request + * @param otaManagePermission + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OtaManagePermission otaManagePermission) { + return super.exportXls(request, otaManagePermission, OtaManagePermission.class, "OTA管理权限列表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OtaManagePermission.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageHistory.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageHistory.java new file mode 100644 index 000000000..f82a06420 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageHistory.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: OTA管理列表历史记录 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +@Data +@TableName("ota_manage_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ota_manage_history对象", description="OTA管理列表历史记录") +public class OtaManageHistory 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; + + /**关联applyID*/ + @Excel(name = "关联applyID", width = 15) + @ApiModelProperty(value = "关联applyID") + private String applyId; + + /**操作记录*/ + @Excel(name = "操作记录", width = 15) + @ApiModelProperty(value = "操作记录") + private String content; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManagePermission.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManagePermission.java new file mode 100644 index 000000000..bdfd2c301 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManagePermission.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: OTA管理权限列表 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +@Data +@TableName("ota_manage_permission") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ota_manage_permission对象", description="OTA管理权限列表") +public class OtaManagePermission 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; + + /**人员ID*/ + @Excel(name = "人员ID", width = 15) + @ApiModelProperty(value = "人员ID") + private String userId; + + /**对应applyID*/ + @Excel(name = "对应applyID", width = 15) + @ApiModelProperty(value = "对应applyID") + private String applyId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageHistoryMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageHistoryMapper.java new file mode 100644 index 000000000..dd380419d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageHistoryMapper.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.OtaManageHistory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: OTA管理列表历史记录 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +public interface OtaManageHistoryMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManagePermissionMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManagePermissionMapper.java new file mode 100644 index 000000000..2586bd800 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManagePermissionMapper.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.OtaManagePermission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: OTA管理权限列表 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +public interface OtaManagePermissionMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageHistoryMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageHistoryMapper.xml new file mode 100644 index 000000000..cb0bdd8b2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageHistoryMapper.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/OtaManagePermissionMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManagePermissionMapper.xml new file mode 100644 index 000000000..968d254a8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManagePermissionMapper.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/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index fc89308a2..7322edd59 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -112,11 +112,11 @@ public interface IOtaManageApplyEOService extends IService { void temporarySave(List list, String cut); - List updateVdrBatch(String ids, String projectVersion, String attestationSchedule, String remark, String cut); + List updateVdrBatch(List list, String projectVersion, String attestationSchedule, String remark, String cut); - List applyRematch(String ids, String cut); + List applyRematch(String ids, String projectVersion,String cut); List confirm(String ids, String cut); - List reject(String ids, String cut); + List reject(String ids, String rejectReason,String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageHistoryService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageHistoryService.java new file mode 100644 index 000000000..c16382cb4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageHistoryService.java @@ -0,0 +1,64 @@ +package com.jero.modules.ota.service; + +import com.jero.modules.ota.entity.OtaManageHistory; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: OTA管理列表历史记录 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +public interface IOtaManageHistoryService extends IService { + + /** + * 保存 + * + * @param otaManageHistory + * @return + */ + void add(OtaManageHistory otaManageHistory); + + + void add(String appId,String content); + + /** + * 更新 + * + * @param otaManageHistory + * @return + */ + void editById(OtaManageHistory otaManageHistory); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OtaManageHistory queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManagePermissionService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManagePermissionService.java new file mode 100644 index 000000000..1a1a5ab1e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManagePermissionService.java @@ -0,0 +1,61 @@ +package com.jero.modules.ota.service; + +import com.jero.modules.ota.entity.OtaManagePermission; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: OTA管理权限列表 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +public interface IOtaManagePermissionService extends IService { + + /** + * 保存 + * + * @param otaManagePermission + * @return + */ + void add(OtaManagePermission otaManagePermission); + + /** + * 更新 + * + * @param otaManagePermission + * @return + */ + void editById(OtaManagePermission otaManagePermission); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OtaManagePermission queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 1f50d5ae4..8905ec4f3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -14,6 +14,7 @@ import com.jero.modules.ota.enums.OtaHomoImpactEnum; import com.jero.modules.ota.enums.OtaStatusEnum; import com.jero.modules.ota.mapper.OtaManageApplyEOMapper; import com.jero.modules.ota.service.IOtaManageApplyEOService; +import com.jero.modules.ota.service.IOtaManageHistoryService; import com.jero.modules.ota.vo.VersionVO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskPlanning; @@ -62,6 +63,10 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl 1){ + market = conditionSplit[1]; + } if (StringUtils.isNotBlank(market)) { if (market.equals("CN")) { //项目库里市场存的是China 不是CN @@ -543,18 +551,20 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl submit(List list, String cut) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List msgList = new ArrayList<>(); for (OtaManageApplyEO oma : list) { if (StringUtils.isBlank(oma.getProjectVersion())) { //需要先选版本 msgList.add("VDR:" + oma.getVdr() + " 需要先选择版本！"); - } else if (oma.getStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey()) - || oma.getStatus().equals(OtaStatusEnum.LOCKED.getKey()) - || oma.getStatus().equals(OtaStatusEnum.NA.getKey())) { + } else if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey()) + || oma.getMatchStatus().equals(OtaStatusEnum.LOCKED.getKey()) + || oma.getMatchStatus().equals(OtaStatusEnum.NA.getKey())) { //状态不对 msgList.add("VDR:" + oma.getVdr() + " 状态不对！"); } else { oma.setMatchStatus(OtaStatusEnum.TO_BE_APPROVED.getKey()); + otaManageHistoryService.add(oma.getId(),user.getUsername() + " 提交了数据！"); } } this.saveOrUpdateBatch(list); @@ -562,36 +572,38 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl updateVdrBatch(String ids, String projectVersion, String attestationSchedule, String remark, String cut) { + public List updateVdrBatch(List list, String projectVersion, String attestationSchedule, String remark, String cut) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List msgList = new ArrayList<>(); //TODO 需要根据数据判断是否可以编辑 - if (StringUtils.isNotEmpty(ids)) { - List idList = Arrays.asList(ids.split(",")); - List omaList = this.getListByIds(idList); - for (OtaManageApplyEO oma : omaList) { - if (StringUtils.isNotEmpty(projectVersion)) { - oma.setProjectVersion(projectVersion); - } - if (StringUtils.isNotEmpty(attestationSchedule)) { - oma.setAttestationSchedule(attestationSchedule); - } - if (StringUtils.isNotEmpty(remark)) { - oma.setRemark(remark); - } + for (OtaManageApplyEO oma : list) { + if (StringUtils.isNotEmpty(projectVersion)) { + oma.setProjectVersion(projectVersion); } + if (StringUtils.isNotEmpty(attestationSchedule)) { + oma.setAttestationSchedule(attestationSchedule); + } + if (StringUtils.isNotEmpty(remark)) { + oma.setRemark(remark); + } + otaManageHistoryService.add(oma.getId(),user.getUsername() + " 编辑了数据！"); } + this.saveOrUpdateBatch(list); return msgList; } @Override - public List applyRematch(String ids, String cut) { + public List applyRematch(String ids, String projectVersion, String cut) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List msgList = new ArrayList<>(); if (StringUtils.isNotEmpty(ids)) { List idList = Arrays.asList(ids.split(",")); List omaList = this.getListByIds(idList); for (OtaManageApplyEO oma : omaList) { - if (oma.getStatus().equals(OtaStatusEnum.LOCKED.getKey())) { + if (oma.getMatchStatus().equals(OtaStatusEnum.LOCKED.getKey())) { oma.setMatchStatus(OtaStatusEnum.TO_BE_REMATCHED.getKey()); + oma.setProjectVersion(projectVersion); + otaManageHistoryService.add(oma.getId(),user.getUsername() + " 重新匹配了数据！"); } else { //状态不对 msgList.add("VDR:" + oma.getVdr() + " 状态不对！"); @@ -604,16 +616,18 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl confirm(String ids, String cut) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List msgList = new ArrayList<>(); if (StringUtils.isNotEmpty(ids)) { List idList = Arrays.asList(ids.split(",")); List omaList = this.getListByIds(idList); for (OtaManageApplyEO oma : omaList) { - if (oma.getStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) { - oma.setMatchStatus(OtaStatusEnum.TO_BE_REMATCHED.getKey()); + if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) { + oma.setMatchStatus(OtaStatusEnum.LOCKED.getKey()); } else { //状态不对 msgList.add("VDR:" + oma.getVdr() + " 状态不对！"); + otaManageHistoryService.add(oma.getId(),user.getUsername() + " 确认了数据！"); } } this.saveOrUpdateBatch(omaList); @@ -622,14 +636,16 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl reject(String ids, String cut) { + public List reject(String ids, String rejectReason,String cut) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List msgList = new ArrayList<>(); if (StringUtils.isNotEmpty(ids)) { List idList = Arrays.asList(ids.split(",")); List omaList = this.getListByIds(idList); for (OtaManageApplyEO oma : omaList) { - if (oma.getStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) { + if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) { oma.setMatchStatus(OtaStatusEnum.REJECTED.getKey()); + otaManageHistoryService.add(oma.getId(),user.getUsername() + " 退回了数据！拒绝原因:"+rejectReason); } else { //状态不对 msgList.add("VDR:" + oma.getVdr() + " 状态不对！"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageHistoryServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageHistoryServiceImpl.java new file mode 100644 index 000000000..60ddae4c7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageHistoryServiceImpl.java @@ -0,0 +1,97 @@ +package com.jero.modules.ota.service.impl; + +import com.jero.modules.ota.entity.OtaManageHistory; +import com.jero.modules.ota.mapper.OtaManageHistoryMapper; +import com.jero.modules.ota.service.IOtaManageHistoryService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: OTA管理列表历史记录 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +@Service +public class OtaManageHistoryServiceImpl extends ServiceImpl implements IOtaManageHistoryService { + + /** + * 保存 + * + * @param otaManageHistory + * @return + */ + @Override + public void add(OtaManageHistory otaManageHistory) { + Date now = new Date(); + otaManageHistory.setCreateTime(now); + otaManageHistory.setUpdateTime(now); + save(otaManageHistory); + } + + @Override + public void add(String appId,String content) { + OtaManageHistory his = new OtaManageHistory(); + his.setApplyId(appId); + his.setContent(content); + this.add(his); + } + + /** + * 更新 + * + * @param otaManageHistory + * @return + */ + @Override + public void editById(OtaManageHistory otaManageHistory) { + Date now = new Date(); + otaManageHistory.setUpdateTime(now); + saveOrUpdate(otaManageHistory); + } + + /** + * 通过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 OtaManageHistory 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/OtaManagePermissionServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManagePermissionServiceImpl.java new file mode 100644 index 000000000..2dbe16f5d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManagePermissionServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.ota.service.impl; + +import com.jero.modules.ota.entity.OtaManagePermission; +import com.jero.modules.ota.mapper.OtaManagePermissionMapper; +import com.jero.modules.ota.service.IOtaManagePermissionService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: OTA管理权限列表 + * @Author: jero-boot + * @Date: 2023-08-20 + * @Version: V1.0 + */ +@Service +public class OtaManagePermissionServiceImpl extends ServiceImpl implements IOtaManagePermissionService { + + /** + * 保存 + * + * @param otaManagePermission + * @return + */ + @Override + public void add(OtaManagePermission otaManagePermission) { + Date now = new Date(); + otaManagePermission.setCreateTime(now); + otaManagePermission.setUpdateTime(now); + save(otaManagePermission); + } + + /** + * 更新 + * + * @param otaManagePermission + * @return + */ + @Override + public void editById(OtaManagePermission otaManagePermission) { + Date now = new Date(); + otaManagePermission.setUpdateTime(now); + saveOrUpdate(otaManagePermission); + } + + /** + * 通过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 OtaManagePermission queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +}