From d339f4abfe156445fb9819c02975976dbf6d3a2c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 29 Apr 2022 16:19:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E8=AF=84?= =?UTF-8?q?=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCommentEOController.java | 171 ++++++++++++++++++ .../controller/ProjectReplyEOController.java | 170 +++++++++++++++++ .../project/entity/ProjectCommentEO.java | 74 ++++++++ .../project/entity/ProjectReplyEO.java | 74 ++++++++ .../mapper/ProjectCommentEOMapper.java | 17 ++ .../project/mapper/ProjectReplyEOMapper.java | 17 ++ .../mapper/xml/ProjectCommentEOMapper.xml | 14 ++ .../mapper/xml/ProjectReplyEOMapper.xml | 14 ++ .../service/IProjectCommentEOService.java | 66 +++++++ .../service/IProjectReplyEOService.java | 61 +++++++ .../impl/ProjectCommentEOServiceImpl.java | 144 +++++++++++++++ .../impl/ProjectReplyEOServiceImpl.java | 89 +++++++++ .../modules/project/vo/ProjectCommentVO.java | 52 ++++++ 13 files changed, 963 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCommentEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectReplyEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCommentEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectReplyEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCommentEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectReplyEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectReplyEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectReplyEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProjectCommentVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java new file mode 100644 index 000000000..53ea08cfd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java @@ -0,0 +1,171 @@ +package com.jero.modules.project.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.project.entity.ProjectCommentEO; +import com.jero.modules.project.service.IProjectCommentEOService; +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.modules.project.vo.ProjectCommentVO; +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-04-29 + * @Version: V1.0 + */ +@Api(tags="法规清单评论表") +@RestController +@RequestMapping("/project/projectCommentEO") +@Slf4j +public class ProjectCommentEOController extends JeroController { + @Autowired + private IProjectCommentEOService projectCommentEOService; + + /** + * 分页列表查询 + * + * @param projectCommentEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规清单评论表-分页列表查询") + @ApiOperation(value="法规清单评论表-分页列表查询", notes="法规清单评论表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectCommentEO projectCommentEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectCommentEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectCommentEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规清单评论表-列表查询") + @ApiOperation(value="法规清单评论表-列表查询", notes="法规清单评论表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = projectCommentEOService.getInfoList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectCommentEO + * @return + */ + @AutoLog(value = "法规清单评论表-添加") + @ApiOperation(value="法规清单评论表-添加", notes="法规清单评论表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectCommentEO projectCommentEO) { + projectCommentEOService.add(projectCommentEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectCommentEO + * @return + */ + @AutoLog(value = "法规清单评论表-编辑") + @ApiOperation(value="法规清单评论表-编辑", notes="法规清单评论表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectCommentEO projectCommentEO) { + projectCommentEOService.editById(projectCommentEO); + 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) { + projectCommentEOService.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.projectCommentEOService.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) { + ProjectCommentEO projectCommentEO = projectCommentEOService.queryById(id); + if(projectCommentEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectCommentEO); + } + + /** + * 导出excel + * + * @param request + * @param projectCommentEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectCommentEO projectCommentEO) { + return super.exportXls(request, projectCommentEO, ProjectCommentEO.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, ProjectCommentEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java new file mode 100644 index 000000000..cec006357 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.project.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.project.entity.ProjectReplyEO; +import com.jero.modules.project.service.IProjectReplyEOService; +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-04-29 + * @Version: V1.0 + */ +@Api(tags="法规清单回复表") +@RestController +@RequestMapping("/project/projectReplyEO") +@Slf4j +public class ProjectReplyEOController extends JeroController { + @Autowired + private IProjectReplyEOService projectReplyEOService; + + /** + * 分页列表查询 + * + * @param projectReplyEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规清单回复表-分页列表查询") + @ApiOperation(value="法规清单回复表-分页列表查询", notes="法规清单回复表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectReplyEO projectReplyEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectReplyEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectReplyEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规清单回复表-列表查询") + @ApiOperation(value="法规清单回复表-列表查询", notes="法规清单回复表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = projectReplyEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectReplyEO + * @return + */ + @AutoLog(value = "法规清单回复表-添加") + @ApiOperation(value="法规清单回复表-添加", notes="法规清单回复表-添加") + @PostMapping(value = "/add") + public Result add(ProjectReplyEO projectReplyEO) { + projectReplyEOService.add(projectReplyEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectReplyEO + * @return + */ + @AutoLog(value = "法规清单回复表-编辑") + @ApiOperation(value="法规清单回复表-编辑", notes="法规清单回复表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectReplyEO projectReplyEO) { + projectReplyEOService.editById(projectReplyEO); + 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) { + projectReplyEOService.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.projectReplyEOService.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) { + ProjectReplyEO projectReplyEO = projectReplyEOService.queryById(id); + if(projectReplyEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectReplyEO); + } + + /** + * 导出excel + * + * @param request + * @param projectReplyEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectReplyEO projectReplyEO) { + return super.exportXls(request, projectReplyEO, ProjectReplyEO.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, ProjectReplyEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCommentEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCommentEO.java new file mode 100644 index 000000000..7eeaa313b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCommentEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.project.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-04-29 + * @Version: V1.0 + */ +@Data +@TableName("project_comment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_comment对象", description="法规清单评论表") +public class ProjectCommentEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**项目库id*/ + @Excel(name = "项目库id", width = 15) + @ApiModelProperty(value = "项目库id") + private java.lang.String projectLibraryId; + + /**评论内容*/ + @Excel(name = "评论内容", width = 15) + @ApiModelProperty(value = "评论内容") + private java.lang.String commentContent; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectReplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectReplyEO.java new file mode 100644 index 000000000..de20811f8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectReplyEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.project.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-04-29 + * @Version: V1.0 + */ +@Data +@TableName("project_reply") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_reply对象", description="法规清单回复表") +public class ProjectReplyEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**法规清单评论表id*/ + @Excel(name = "法规清单评论表id", width = 15) + @ApiModelProperty(value = "法规清单评论表id") + private java.lang.String projectCommentId; + + /**回复内容*/ + @Excel(name = "回复内容", width = 15) + @ApiModelProperty(value = "回复内容") + private java.lang.String replyContent; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCommentEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCommentEOMapper.java new file mode 100644 index 000000000..dce5b1990 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectCommentEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectCommentEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface ProjectCommentEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectReplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectReplyEOMapper.java new file mode 100644 index 000000000..7c966a82d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectReplyEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectReplyEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规清单回复表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface ProjectReplyEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCommentEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCommentEOMapper.xml new file mode 100644 index 000000000..8cf42763e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectCommentEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectReplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectReplyEOMapper.xml new file mode 100644 index 000000000..95be9d882 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectReplyEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java new file mode 100644 index 000000000..e13ad165b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java @@ -0,0 +1,66 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectCommentEO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.project.vo.ProjectCommentVO; + +import java.util.List; + +/** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface IProjectCommentEOService extends IService { + + /** + * 保存 + * + * @param projectCommentEO + * @return + */ + void add(ProjectCommentEO projectCommentEO); + + /** + * 更新 + * + * @param projectCommentEO + * @return + */ + void editById(ProjectCommentEO projectCommentEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectCommentEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + + List getInfoList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectReplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectReplyEOService.java new file mode 100644 index 000000000..af40206d0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectReplyEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectReplyEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 法规清单回复表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +public interface IProjectReplyEOService extends IService { + + /** + * 保存 + * + * @param projectReplyEO + * @return + */ + void add(ProjectReplyEO projectReplyEO); + + /** + * 更新 + * + * @param projectReplyEO + * @return + */ + void editById(ProjectReplyEO projectReplyEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectReplyEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java new file mode 100644 index 000000000..55cd1e5ea --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java @@ -0,0 +1,144 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ProjectCommentEO; +import com.jero.modules.project.entity.ProjectReplyEO; +import com.jero.modules.project.mapper.ProjectCommentEOMapper; +import com.jero.modules.project.service.IProjectCommentEOService; +import com.jero.modules.project.service.IProjectReplyEOService; +import com.jero.modules.project.vo.ProjectCommentVO; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Date; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Service +public class ProjectCommentEOServiceImpl extends ServiceImpl implements IProjectCommentEOService { + + @Autowired + private IProjectReplyEOService iProjectReplyEOService; + /** + * 保存 + * + * @param projectCommentEO + * @return + */ + @Override + public void add(ProjectCommentEO projectCommentEO) { + Date now = new Date(); + projectCommentEO.setCreateTime(now); + projectCommentEO.setUpdateTime(now); + save(projectCommentEO); + } + + /** + * 更新 + * + * @param projectCommentEO + * @return + */ + @Override + public void editById(ProjectCommentEO projectCommentEO) { + Date now = new Date(); + projectCommentEO.setUpdateTime(now); + saveOrUpdate(projectCommentEO); + } + + /** + * 通过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 ProjectCommentEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public List getInfoList() { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //评论的内容 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()); + List projectCommentEOS = this.list(wrapper); + List projectCommentIdList = projectCommentEOS.stream().map(ProjectCommentEO::getId).collect(Collectors.toList()); + + List projectCommentVOList = new ArrayList<>(); + if(projectCommentIdList.size() != 0){ + //回复的内容 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(ProjectReplyEO::getProjectCommentId,projectCommentIdList); + List projectReplyEOList = iProjectReplyEOService.list(lambdaQueryWrapper); + //封装数据 + for (ProjectCommentEO projectCommentEO : projectCommentEOS) { + //每条评论对应的回复 + List projectReplyEOS = projectReplyEOList.stream() + .filter(e -> projectCommentEO.getId().equals(e.getProjectCommentId())).collect(Collectors.toList()); + ProjectCommentVO projectCommentVO = new ProjectCommentVO(); + projectCommentVO.setId(projectCommentEO.getId()); + projectCommentVO.setName(projectCommentEO.getCreateBy()); + projectCommentVO.setCreateTime(projectCommentEO.getCreateTime()); + projectCommentVO.setContent(projectCommentEO.getCommentContent()); + List projectCommentVOS = new ArrayList<>(); + if(projectReplyEOS.size() != 0){ + for (ProjectReplyEO projectReplyEO : projectReplyEOS) { + ProjectCommentVO projectCommentVOTemp = new ProjectCommentVO(); + projectCommentVOTemp.setName(projectReplyEO.getCreateBy()); + projectCommentVOTemp.setCreateTime(projectReplyEO.getCreateTime()); + projectCommentVOTemp.setContent(projectReplyEO.getReplyContent()); + projectCommentVOS.add(projectCommentVOTemp); + } + projectCommentVO.setProjectCommentVOList(projectCommentVOS); + } + projectCommentVOList.add(projectCommentVO); + } + } + return projectCommentVOList; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectReplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectReplyEOServiceImpl.java new file mode 100644 index 000000000..2e924f46f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectReplyEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.project.service.impl; + +import com.jero.modules.project.entity.ProjectReplyEO; +import com.jero.modules.project.mapper.ProjectReplyEOMapper; +import com.jero.modules.project.service.IProjectReplyEOService; +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-04-29 + * @Version: V1.0 + */ +@Service +public class ProjectReplyEOServiceImpl extends ServiceImpl implements IProjectReplyEOService { + + /** + * 保存 + * + * @param projectReplyEO + * @return + */ + @Override + public void add(ProjectReplyEO projectReplyEO) { + Date now = new Date(); + projectReplyEO.setCreateTime(now); + projectReplyEO.setUpdateTime(now); + save(projectReplyEO); + } + + /** + * 更新 + * + * @param projectReplyEO + * @return + */ + @Override + public void editById(ProjectReplyEO projectReplyEO) { + Date now = new Date(); + projectReplyEO.setUpdateTime(now); + saveOrUpdate(projectReplyEO); + } + + /** + * 通过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 ProjectReplyEO 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/project/vo/ProjectCommentVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProjectCommentVO.java new file mode 100644 index 000000000..32fac965b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/ProjectCommentVO.java @@ -0,0 +1,52 @@ +package com.jero.modules.project.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +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; +import java.util.List; + + +/** + * @Description: 法规清单评论表 + * @Author: jero-boot + * @Date: 2022-04-29 + * @Version: V1.0 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_comment对象", description="法规清单评论表") +public class ProjectCommentVO implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + private String id; + + @ApiModelProperty(value = "评论人或回复人") + private String name; + + + @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 content; + + private List ProjectCommentVOList; + + + +}