diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java new file mode 100644 index 000000000..203feb722 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.cert.collect.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.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; +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: 2022-05-05 + * @Version: V1.0 + */ +@Api(tags="参数收集清单") +@RestController +@RequestMapping("/params/collectManifest") +@Slf4j +public class ParamsCollectManifestEOController extends JeroController { + @Autowired + private IParamsCollectManifestEOService paramsCollectManifestEOService; + + /** + * 分页列表查询 + * + * @param paramsCollectManifestEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "参数收集清单-分页列表查询") + @ApiOperation(value="参数收集清单-分页列表查询", notes="参数收集清单-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ParamsCollectManifestEO paramsCollectManifestEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = paramsCollectManifestEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "参数收集清单-列表查询") + @ApiOperation(value="参数收集清单-列表查询", notes="参数收集清单-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = paramsCollectManifestEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param paramsCollectManifestEO + * @return + */ + @AutoLog(value = "参数收集清单-添加") + @ApiOperation(value="参数收集清单-添加", notes="参数收集清单-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ParamsCollectManifestEO paramsCollectManifestEO) { + paramsCollectManifestEOService.add(paramsCollectManifestEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param paramsCollectManifestEO + * @return + */ + @AutoLog(value = "参数收集清单-编辑") + @ApiOperation(value="参数收集清单-编辑", notes="参数收集清单-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ParamsCollectManifestEO paramsCollectManifestEO) { + paramsCollectManifestEOService.editById(paramsCollectManifestEO); + 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) { + paramsCollectManifestEOService.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.paramsCollectManifestEOService.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) { + ParamsCollectManifestEO paramsCollectManifestEO = paramsCollectManifestEOService.queryById(id); + if(paramsCollectManifestEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paramsCollectManifestEO); + } + + /** + * 导出excel + * + * @param request + * @param paramsCollectManifestEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ParamsCollectManifestEO paramsCollectManifestEO) { + return super.exportXls(request, paramsCollectManifestEO, ParamsCollectManifestEO.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, ParamsCollectManifestEO.class); + } + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java new file mode 100644 index 000000000..2797d3060 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java @@ -0,0 +1,171 @@ +package com.jero.modules.cert.collect.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.cert.collect.entity.ParamsConfigDataEO; +import com.jero.modules.cert.collect.service.IParamsConfigDataEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + + + /** + * @Description: 参数配置数据 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +@Api(tags="参数配置数据") +@RestController +@RequestMapping("/params/configData") +@Slf4j +public class ParamsConfigDataEOController extends JeroController { + @Autowired + private IParamsConfigDataEOService paramsConfigDataEOService; + + /** + * 分页列表查询 + * + * @param paramsConfigDataEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "参数配置数据-分页列表查询") + @ApiOperation(value="参数配置数据-分页列表查询", notes="参数配置数据-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ParamsConfigDataEO paramsConfigDataEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paramsConfigDataEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = paramsConfigDataEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "参数配置数据-列表查询") + @ApiOperation(value="参数配置数据-列表查询", notes="参数配置数据-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = paramsConfigDataEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param paramsConfigDataEO + * @return + */ + @AutoLog(value = "参数配置数据-添加") + @ApiOperation(value="参数配置数据-添加", notes="参数配置数据-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ParamsConfigDataEO paramsConfigDataEO) { + paramsConfigDataEOService.add(paramsConfigDataEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param paramsConfigDataEO + * @return + */ + @AutoLog(value = "参数配置数据-编辑") + @ApiOperation(value="参数配置数据-编辑", notes="参数配置数据-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ParamsConfigDataEO paramsConfigDataEO) { + paramsConfigDataEOService.editById(paramsConfigDataEO); + 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) { + paramsConfigDataEOService.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.paramsConfigDataEOService.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) { + ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryById(id); + if(paramsConfigDataEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paramsConfigDataEO); + } + + /** + * 导出excel + * + * @param request + * @param paramsConfigDataEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ParamsConfigDataEO paramsConfigDataEO) { + return super.exportXls(request, paramsConfigDataEO, ParamsConfigDataEO.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, ParamsConfigDataEO.class); + } + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java new file mode 100644 index 000000000..2b5950150 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java @@ -0,0 +1,149 @@ +package com.jero.modules.cert.collect.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.modules.cert.collect.entity.ParamsConfigEO; +import com.jero.modules.cert.collect.service.IParamsConfigEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + + + /** + * @Description: 参数配置 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +@Api(tags="参数配置") +@RestController +@RequestMapping("/params/config") +@Slf4j +public class ParamsConfigEOController extends JeroController { + @Autowired + private IParamsConfigEOService paramsConfigEOService; + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "参数配置-列表查询") + @ApiOperation(value="参数配置-列表查询", notes="参数配置-列表查询") + @GetMapping(value = "/list") + public Result> queryList(@RequestParam(name = "cut") String cut, + @RequestParam(name = "paramsManifestId") String paramsManifestId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId); + List list = paramsConfigEOService.list(queryWrapper); + return Result.OK(cut, list); + } + + /** + * 添加 + * + * @param paramsConfigEO + * @return + */ + @AutoLog(value = "参数配置-添加") + @ApiOperation(value="参数配置-添加", notes="参数配置-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ParamsConfigEO paramsConfigEO) { + paramsConfigEOService.add(paramsConfigEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param paramsConfigEO + * @return + */ + @AutoLog(value = "参数配置-编辑") + @ApiOperation(value="参数配置-编辑", notes="参数配置-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ParamsConfigEO paramsConfigEO) { + paramsConfigEOService.editById(paramsConfigEO); + 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) { + paramsConfigEOService.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.paramsConfigEOService.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) { + ParamsConfigEO paramsConfigEO = paramsConfigEOService.queryById(id); + if(paramsConfigEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paramsConfigEO); + } + + /** + * 导出excel + * + * @param request + * @param paramsConfigEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ParamsConfigEO paramsConfigEO) { + return super.exportXls(request, paramsConfigEO, ParamsConfigEO.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, ParamsConfigEO.class); + } + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java new file mode 100644 index 000000000..730dca29b --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -0,0 +1,200 @@ +package com.jero.modules.cert.collect.controller; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.collect.service.IParamsManifestEOService; +import com.jero.modules.cert.template.entity.ParamsTemplateEO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + + + /** + * @Description: 参数清单 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +@Api(tags="参数清单") +@RestController +@RequestMapping("/params/manifest") +@Slf4j +public class ParamsManifestEOController extends JeroController { + @Autowired + private IParamsManifestEOService paramsManifestEOService; + + /** + * 分页列表查询 + * + * @param paramsManifestEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "参数清单-分页列表查询") + @ApiOperation(value="参数清单-分页列表查询", notes="参数清单-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ParamsManifestEO paramsManifestEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut") String cut, + HttpServletRequest req) { + IPage page = new Page(pageNo, pageSize); + IPage pageList = paramsManifestEOService.pageInfo(page, paramsManifestEO); + return Result.OK(cut, pageList); + } + + /** + * 参数模板列表查询 + * + * @return + */ + @AutoLog(value = "参数清单-参数模板列表查询") + @ApiOperation(value="参数清单-参数模板列表查询", notes="参数清单-参数模板列表查询") + @GetMapping(value = "/getParamsTemplateList") + public Result> getParamsTemplateList(ParamsTemplateEO paramsTemplateEO, + @RequestParam(name="cut") String cut) { + List list = paramsManifestEOService.getNewestPublishList(paramsTemplateEO); + return Result.OK(cut, list); + } + + /** + * 标题唯一校验 同一项目下标题唯一 + * + * @return + */ + @AutoLog(value = "参数清单-标题唯一校验") + @ApiOperation(value="参数清单-标题唯一校验", notes="参数清单-标题唯一校验") + @GetMapping(value = "/verifyTitle") + public Result verifyTitle(String title, String projectId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsManifestEO::getTitle, title); + queryWrapper.eq(ParamsManifestEO::getProjectId, projectId); + List paramsManifestEOList = paramsManifestEOService.list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { + return Result.OK(false); // 有重复 + } + return Result.OK(true); // 无重复 + } + + /** + * 添加 + * + * @param paramsManifestEO + * @return + */ + @AutoLog(value = "参数清单-添加") + @ApiOperation(value="参数清单-添加", notes="参数清单-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) { + boolean isSuccess = paramsManifestEOService.add(paramsManifestEO); + if (isSuccess) { + return Result.OK("添加成功！"); + } else { + return Result.error("添加失败！"); + } + } + + /** + * 编辑 + * + * @param paramsManifestEO + * @return + */ + @AutoLog(value = "参数清单-编辑") + @ApiOperation(value="参数清单-编辑", notes="参数清单-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) { + boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO); + if (isSuccess) { + return Result.OK("编辑成功!"); + } else { + return Result.error("编辑失败!"); + } + } + + /** + * 通过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) { + paramsManifestEOService.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.paramsManifestEOService.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) { + ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(id); + if(paramsManifestEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paramsManifestEO); + } + + /** + * 导出excel + * + * @param request + * @param paramsManifestEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ParamsManifestEO paramsManifestEO) { + return super.exportXls(request, paramsManifestEO, ParamsManifestEO.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, ParamsManifestEO.class); + } + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java new file mode 100644 index 000000000..6798b6777 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java @@ -0,0 +1,161 @@ +package com.jero.modules.cert.collect.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: 2022-05-05 + * @Version: V1.0 + */ +@Data +@TableName("params_collect_manifest") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_collect_manifest对象", description="参数收集清单") +public class ParamsCollectManifestEO 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; + + /**nio编号*/ + @Excel(name = "nio编号", width = 15) + @ApiModelProperty(value = "nio编号") + private String nioNumber; + + /**是否必填*/ + @Excel(name = "是否必填", width = 15) + @ApiModelProperty(value = "是否必填") + private String isMust; + + /**参数名称*/ + @Excel(name = "参数名称", width = 15) + @ApiModelProperty(value = "参数名称") + private String paramsName; + + /**技术领域*/ + @Excel(name = "技术领域", width = 15) + @ApiModelProperty(value = "技术领域") + private String technologyTerritory; + + /**参数批次*/ + @Excel(name = "参数批次", width = 15) + @ApiModelProperty(value = "参数批次") + private String paramsBatch; + + /**责任领域*/ + @Excel(name = "责任领域", width = 15) + @ApiModelProperty(value = "责任领域") + private String dutyTerritory; + + /**参数说明*/ + @Excel(name = "参数说明", width = 15) + @ApiModelProperty(value = "参数说明") + private String description; + + /**认证类别*/ + @Excel(name = "认证类别", width = 15) + @ApiModelProperty(value = "认证类别") + private String certCategory; + + /**控件类型*/ + @Excel(name = "控件类型", width = 15) + @ApiModelProperty(value = "控件类型") + private String controlType; + + /**控件备选值*/ + @Excel(name = "控件备选值", width = 15) + @ApiModelProperty(value = "控件备选值") + private String controlValues; + + /**控件校验*/ + @Excel(name = "控件校验", width = 15) + @ApiModelProperty(value = "控件校验") + private String controlVerify; + + /**附件模板*/ + @Excel(name = "附件模板", width = 15) + @ApiModelProperty(value = "附件模板") + private String fileTemplate; + + /**参数模板id*/ + @Excel(name = "参数模板id", width = 15) + @ApiModelProperty(value = "参数模板id") + private String paramsTemplateId; + + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private String state; + + /**工程接口人*/ + @Excel(name = "工程接口人", width = 15) + @ApiModelProperty(value = "工程接口人") + private String sdt; + + /**填写人*/ + @Excel(name = "填写人", width = 15) + @ApiModelProperty(value = "填写人") + private String dre; + + /**截止时间*/ + @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 deadline; + + /**参数清单id*/ + @Excel(name = "参数清单id", width = 15) + @ApiModelProperty(value = "参数清单id") + private String paramsManifestId; + + /**是否冻结*/ + @Excel(name = "是否冻结", width = 15) + @ApiModelProperty(value = "是否冻结") + private String isLock; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java new file mode 100644 index 000000000..260c49008 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java @@ -0,0 +1,89 @@ +package com.jero.modules.cert.collect.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: 2022-05-05 + * @Version: V1.0 + */ +@Data +@TableName("params_config_data") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_config_data对象", description="参数配置数据") +public class ParamsConfigDataEO 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 textData; + + /**下拉类型数据*/ + @Excel(name = "下拉类型数据", width = 15) + @ApiModelProperty(value = "下拉类型数据") + private String pullData; + + /**附件类型数据*/ + @Excel(name = "附件类型数据", width = 15) + @ApiModelProperty(value = "附件类型数据") + private String fileConnectId; + + /**参数配置id*/ + @Excel(name = "参数配置id", width = 15) + @ApiModelProperty(value = "参数配置id") + private String paramsConfigId; + + /**参数收集清单id*/ + @Excel(name = "参数收集清单id", width = 15) + @ApiModelProperty(value = "参数收集清单id") + private String paramsCollectManifestId; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java new file mode 100644 index 000000000..f9bd8debc --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java @@ -0,0 +1,89 @@ +package com.jero.modules.cert.collect.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: 2022-05-05 + * @Version: V1.0 + */ +@Data +@TableName("params_config") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_config对象", description="参数配置") +public class ParamsConfigEO 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 configName; + + /**版本*/ + @Excel(name = "版本", width = 15) + @ApiModelProperty(value = "版本") + private String version; + + /**电池*/ + @Excel(name = "电池", width = 15) + @ApiModelProperty(value = "电池") + private String battery; + + /**电机*/ + @Excel(name = "电机", width = 15) + @ApiModelProperty(value = "电机") + private String motor; + + /**参数清单id*/ + @Excel(name = "参数清单id", width = 15) + @ApiModelProperty(value = "参数清单id") + private String paramsManifestId; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java new file mode 100644 index 000000000..c8c106fc6 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -0,0 +1,101 @@ +package com.jero.modules.cert.collect.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: 参数清单 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +@Data +@TableName("params_manifest") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_manifest对象", description="参数清单") +public class ParamsManifestEO 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 title; + + /**状态: 收集中，已完成*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private String state; + + /**收集完成时间*/ + @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 finishTime; + + /**版本*/ + @Excel(name = "版本", width = 15) + @ApiModelProperty(value = "版本") + private Integer version; + + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private String projectId; + + /**参数模板id*/ + @Excel(name = "参数模板id", width = 15) + @ApiModelProperty(value = "参数模板id") + private String paramsTemplateId; + + /**对应参数模板发布版本*/ + @Excel(name = "对应参数模板发布版本", width = 15) + @ApiModelProperty(value = "对应参数模板发布版本") + private Integer paramsTemplatePublishVersion; + + @TableField(exist = false) + private String paramsTemplateName; +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java new file mode 100644 index 000000000..4994d5041 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java @@ -0,0 +1,35 @@ +package com.jero.modules.cert.collect.enums; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 16:19 2022/5/5 + */ +public enum ManifestStateEnum { + COLLECTING("收集中","收集中"), + FINISHED("已完成","已完成"); + + String name; + String value; + + ManifestStateEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java new file mode 100644 index 000000000..ac6ce5c2e --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.cert.collect.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 参数收集清单 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface ParamsCollectManifestEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java new file mode 100644 index 000000000..9d17c32b9 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.cert.collect.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 参数配置数据 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface ParamsConfigDataEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java new file mode 100644 index 000000000..1b3aa689b --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.cert.collect.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 参数配置 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface ParamsConfigEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java new file mode 100644 index 000000000..198356d60 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java @@ -0,0 +1,16 @@ +package com.jero.modules.cert.collect.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import org.apache.ibatis.annotations.Param; + +/** + * @Description: 参数清单 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface ParamsManifestEOMapper extends BaseMapper { + IPage pageInfo(@Param("page") IPage page, @Param("paramsManifestEO") ParamsManifestEO paramsManifestEO); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml new file mode 100644 index 000000000..ddee20ad5 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml new file mode 100644 index 000000000..3c62b14d7 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml new file mode 100644 index 000000000..821f83d29 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml new file mode 100644 index 000000000..32addf5f3 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + pm.id as id, + pm.create_by as create_by, + pm.create_time as create_time, + pm.update_by as update_by, + pm.update_time as update_time, + pm.sys_org_code as sys_org_code, + pm.title as title, + pm.state as state, + pm.finish_time as finish_time, + pm.version as version, + pm.project_id as project_id, + pm.params_template_id as params_template_id, + pm.params_template_publish_version as params_template_publish_version, + pt.params_template_name as params_template_name + + + + + + + AND title LIKE CONCAT(CONCAT('%',#{paramsManifestEO.title}),'%') + + + AND project_id LIKE CONCAT(CONCAT('%',#{paramsManifestEO.projectId}),'%') + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java new file mode 100644 index 000000000..b769d47cf --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.cert.collect.service; + +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 参数收集清单 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface IParamsCollectManifestEOService extends IService { + + /** + * 保存 + * + * @param paramsCollectManifestEO + * @return + */ + void add(ParamsCollectManifestEO paramsCollectManifestEO); + + /** + * 更新 + * + * @param paramsCollectManifestEO + * @return + */ + void editById(ParamsCollectManifestEO paramsCollectManifestEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ParamsCollectManifestEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java new file mode 100644 index 000000000..f0e015c27 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.cert.collect.service; + +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 参数配置数据 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface IParamsConfigDataEOService extends IService { + + /** + * 保存 + * + * @param paramsConfigDataEO + * @return + */ + void add(ParamsConfigDataEO paramsConfigDataEO); + + /** + * 更新 + * + * @param paramsConfigDataEO + * @return + */ + void editById(ParamsConfigDataEO paramsConfigDataEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ParamsConfigDataEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java new file mode 100644 index 000000000..1fbc02fba --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.cert.collect.service; + +import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 参数配置 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface IParamsConfigEOService extends IService { + + /** + * 保存 + * + * @param paramsConfigEO + * @return + */ + void add(ParamsConfigEO paramsConfigEO); + + /** + * 更新 + * + * @param paramsConfigEO + * @return + */ + void editById(ParamsConfigEO paramsConfigEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ParamsConfigEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java new file mode 100644 index 000000000..394f31a0a --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -0,0 +1,72 @@ +package com.jero.modules.cert.collect.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.template.entity.ParamsTemplateEO; + +import java.util.List; + +/** + * @Description: 参数清单 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface IParamsManifestEOService extends IService { + + /** + * 保存 + * + * @param paramsManifestEO + * @return + */ + boolean add(ParamsManifestEO paramsManifestEO); + + /** + * 更新 + * + * @param paramsManifestEO + * @return + */ + boolean editById(ParamsManifestEO paramsManifestEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ParamsManifestEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 查询已发布的最新版的参数模板列表 + * @return + */ + List getNewestPublishList(ParamsTemplateEO paramsTemplateEO); + + IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java new file mode 100644 index 000000000..b7bdc3ca7 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.cert.collect.service.impl; + +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper; +import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; +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: 2022-05-05 + * @Version: V1.0 + */ +@Service +public class ParamsCollectManifestEOServiceImpl extends ServiceImpl implements IParamsCollectManifestEOService { + + /** + * 保存 + * + * @param paramsCollectManifestEO + * @return + */ + @Override + public void add(ParamsCollectManifestEO paramsCollectManifestEO) { + Date now = new Date(); + paramsCollectManifestEO.setCreateTime(now); + paramsCollectManifestEO.setUpdateTime(now); + save(paramsCollectManifestEO); + } + + /** + * 更新 + * + * @param paramsCollectManifestEO + * @return + */ + @Override + public void editById(ParamsCollectManifestEO paramsCollectManifestEO) { + Date now = new Date(); + paramsCollectManifestEO.setUpdateTime(now); + saveOrUpdate(paramsCollectManifestEO); + } + + /** + * 通过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 ParamsCollectManifestEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java new file mode 100644 index 000000000..b5f540990 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.cert.collect.service.impl; + +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; +import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper; +import com.jero.modules.cert.collect.service.IParamsConfigDataEOService; +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: 2022-05-05 + * @Version: V1.0 + */ +@Service +public class ParamsConfigDataEOServiceImpl extends ServiceImpl implements IParamsConfigDataEOService { + + /** + * 保存 + * + * @param paramsConfigDataEO + * @return + */ + @Override + public void add(ParamsConfigDataEO paramsConfigDataEO) { + Date now = new Date(); + paramsConfigDataEO.setCreateTime(now); + paramsConfigDataEO.setUpdateTime(now); + save(paramsConfigDataEO); + } + + /** + * 更新 + * + * @param paramsConfigDataEO + * @return + */ + @Override + public void editById(ParamsConfigDataEO paramsConfigDataEO) { + Date now = new Date(); + paramsConfigDataEO.setUpdateTime(now); + saveOrUpdate(paramsConfigDataEO); + } + + /** + * 通过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 ParamsConfigDataEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java new file mode 100644 index 000000000..d2f0528f2 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.cert.collect.service.impl; + +import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper; +import com.jero.modules.cert.collect.service.IParamsConfigEOService; +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: 2022-05-05 + * @Version: V1.0 + */ +@Service +public class ParamsConfigEOServiceImpl extends ServiceImpl implements IParamsConfigEOService { + + /** + * 保存 + * + * @param paramsConfigEO + * @return + */ + @Override + public void add(ParamsConfigEO paramsConfigEO) { + Date now = new Date(); + paramsConfigEO.setCreateTime(now); + paramsConfigEO.setUpdateTime(now); + save(paramsConfigEO); + } + + /** + * 更新 + * + * @param paramsConfigEO + * @return + */ + @Override + public void editById(ParamsConfigEO paramsConfigEO) { + Date now = new Date(); + paramsConfigEO.setUpdateTime(now); + saveOrUpdate(paramsConfigEO); + } + + /** + * 通过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 ParamsConfigEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java new file mode 100644 index 000000000..64e1cb0bd --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -0,0 +1,150 @@ +package com.jero.modules.cert.collect.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.collect.enums.ManifestStateEnum; +import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; +import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; +import com.jero.modules.cert.collect.service.IParamsManifestEOService; +import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; +import com.jero.modules.cert.template.entity.ParamsTemplateEO; +import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; +import com.jero.modules.cert.template.service.IParamsTemplateEOService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +/** + * @Description: 参数清单 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +@Service +public class ParamsManifestEOServiceImpl extends ServiceImpl implements IParamsManifestEOService { + + @Autowired + private ParamsManifestEOMapper paramsManifestEOMapper; + + @Autowired + private IParamsTemplateEOService paramsTemplateEOService; + + @Autowired + private IParamsCollectManifestEOService paramsCollectManifestEOService; + + @Autowired + private IParamsInfoPublishEOService paramsInfoPublishEOService; + + /** + * 保存 + * + * @param paramsManifestEO + * @return + */ + @Override + public boolean add(ParamsManifestEO paramsManifestEO) { + String paramsManifestId = UUID.randomUUID().toString().replace("-",""); + + // 根据参数模板id发布版本查询对应参数项集合 + List paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsManifestEO.getParamsTemplateId(),paramsManifestEO.getParamsTemplatePublishVersion()); + + // 复制参数项 + List paramsCollectManifestEOList = new ArrayList<>(); + for (ParamsInfoPublishEO source : paramsInfoPublishEOList) { + ParamsCollectManifestEO target = new ParamsCollectManifestEO(); + BeanUtils.copyProperties(source, target); + target.setId(UUID.randomUUID().toString().replace("-","")); + target.setParamsManifestId(paramsManifestId); + paramsCollectManifestEOList.add(target); + } + paramsCollectManifestEOService.saveBatch(paramsCollectManifestEOList); + + // 对应参数模板发布版本 前端传过来 + paramsManifestEO.setId(paramsManifestId); + paramsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue()); + paramsManifestEO.setVersion(1); + Date now = new Date(); + paramsManifestEO.setCreateTime(now); + paramsManifestEO.setUpdateTime(now); + return save(paramsManifestEO); + } + + /** + * 更新 只对标题进行编辑 + * + * @param paramsManifestEO + * @return + */ + @Override + public boolean editById(ParamsManifestEO paramsManifestEO) { + Date now = new Date(); + paramsManifestEO.setUpdateTime(now); + return updateById(paramsManifestEO); + } + + /** + * 通过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 ParamsManifestEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public List getNewestPublishList(ParamsTemplateEO paramsTemplateEO) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.gt(ParamsTemplateEO::getVersion, 0) // 已发布的 + .eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion()) // 查询条件：适用地区 + .like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()); // 查询条件：参数模板 + return paramsTemplateEOService.list(queryWrapper); + } + + @Override + public IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO) { + return paramsManifestEOMapper.pageInfo(page, paramsManifestEO); + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java index d326581c9..d4a823ab8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java @@ -59,6 +59,8 @@ public interface IParamsInfoPublishEOService extends IService queryList(); + List getListByPublishVersion(String paramsTemplateId, int publishVersion); + int publishTemplate(String paramsTemplateId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java index 6d96f17c8..576700be8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.template.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.template.entity.*; @@ -103,6 +104,15 @@ public class ParamsInfoPublishEOServiceImpl extends ServiceImpl getListByPublishVersion(String paramsTemplateId, int publishVersion) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsTemplateId) + .eq(ParamsInfoPublishEO::getVersion, publishVersion); + List paramsInfoPublishEOList = list(queryWrapper); + return paramsInfoPublishEOList; + } + @Override public int publishTemplate(String paramsTemplateId) {