From e1eff532a555feb8382e8f6c3018cc99319af9d7 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Thu, 14 Mar 2024 09:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/ArticleController.java | 23 +++- .../cms/controller/FormController.java | 108 ++++++++++++++++++ .../cms/controller/FormRecordController.java | 108 ++++++++++++++++++ .../gxwebsoft/cms/entity/ArticleContent.java | 3 + .../java/com/gxwebsoft/cms/entity/Form.java | 64 +++++++++++ .../com/gxwebsoft/cms/entity/FormRecord.java | 60 ++++++++++ .../com/gxwebsoft/cms/mapper/FormMapper.java | 37 ++++++ .../cms/mapper/FormRecordMapper.java | 37 ++++++ .../gxwebsoft/cms/mapper/xml/FormMapper.xml | 59 ++++++++++ .../cms/mapper/xml/FormRecordMapper.xml | 51 +++++++++ .../com/gxwebsoft/cms/param/FormParam.java | 60 ++++++++++ .../gxwebsoft/cms/param/FormRecordParam.java | 51 +++++++++ .../cms/service/FormRecordService.java | 42 +++++++ .../gxwebsoft/cms/service/FormService.java | 42 +++++++ .../service/impl/FormRecordServiceImpl.java | 47 ++++++++ .../cms/service/impl/FormServiceImpl.java | 47 ++++++++ .../com/gxwebsoft/generator/CmsGenerator.java | 2 + 17 files changed, 836 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/cms/controller/FormController.java create mode 100644 src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java create mode 100644 src/main/java/com/gxwebsoft/cms/entity/Form.java create mode 100644 src/main/java/com/gxwebsoft/cms/entity/FormRecord.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/FormMapper.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/FormRecordMapper.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/xml/FormMapper.xml create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/xml/FormRecordMapper.xml create mode 100644 src/main/java/com/gxwebsoft/cms/param/FormParam.java create mode 100644 src/main/java/com/gxwebsoft/cms/param/FormRecordParam.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/FormRecordService.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/FormService.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/FormRecordServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/FormServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java index c7d4d8f..23431ed 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java @@ -1,6 +1,5 @@ package com.gxwebsoft.cms.controller; -import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.cms.entity.Article; import com.gxwebsoft.cms.entity.ArticleCategory; @@ -9,13 +8,18 @@ import com.gxwebsoft.cms.param.ArticleParam; import com.gxwebsoft.cms.service.ArticleCategoryService; import com.gxwebsoft.cms.service.ArticleContentService; import com.gxwebsoft.cms.service.ArticleService; -import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -92,6 +96,7 @@ public class ArticleController extends BaseController { } @ApiOperation("添加文章记录表") + @Transactional(rollbackFor = {Exception.class}) @PostMapping() public ApiResult save(@RequestBody Article article) { // 记录当前登录用户id @@ -114,14 +119,22 @@ public class ArticleController extends BaseController { } @ApiOperation("修改文章记录表") + @Transactional(rollbackFor = {Exception.class}) @PutMapping() public ApiResult update(@RequestBody Article article) { if (articleService.updateById(article)) { - article.setUpdateTime(DateUtil.date()); - articleService.updateById(article); // 更新文章内容 - ArticleContent content = articleContentService.getById(article.getArticleId()); + ArticleContent content = new ArticleContent(); + content.setArticleId(article.getArticleId()); content.setContent(article.getContent()); + if(articleContentService.count(new LambdaQueryWrapper().eq(ArticleContent::getArticleId,article.getArticleId())) > 0){ + articleContentService.updateById(content); + }else { + articleContentService.save(content); + } + // 更新时间 + article.setUpdateTime(new Date()); + articleService.updateById(article); return success("修改成功"); } return fail("修改失败"); diff --git a/src/main/java/com/gxwebsoft/cms/controller/FormController.java b/src/main/java/com/gxwebsoft/cms/controller/FormController.java new file mode 100644 index 0000000..a7c7733 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/controller/FormController.java @@ -0,0 +1,108 @@ +package com.gxwebsoft.cms.controller; + +import com.gxwebsoft.cms.entity.Form; +import com.gxwebsoft.cms.param.FormParam; +import com.gxwebsoft.cms.service.FormService; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 表单设计表控制器 + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +@Api(tags = "表单设计表管理") +@RestController +@RequestMapping("/api/cms/form") +public class FormController extends BaseController { + @Resource + private FormService formService; + + @ApiOperation("分页查询表单设计表") + @GetMapping("/page") + public ApiResult> page(FormParam param) { + // 使用关联查询 + return success(formService.pageRel(param)); + } + + @ApiOperation("查询全部表单设计表") + @GetMapping() + public ApiResult> list(FormParam param) { + // 使用关联查询 + return success(formService.listRel(param)); + } + + @ApiOperation("根据id查询表单设计表") + @GetMapping("/{id}") + public ApiResult
get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(formService.getByIdRel(id)); + } + + @ApiOperation("添加表单设计表") + @PostMapping() + public ApiResult save(@RequestBody Form form) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + form.setUserId(loginUser.getUserId()); + } + if (formService.save(form)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改表单设计表") + @PutMapping() + public ApiResult update(@RequestBody Form form) { + if (formService.updateById(form)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除表单设计表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (formService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加表单设计表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (formService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改表单设计表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(formService, "form_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除表单设计表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (formService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java b/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java new file mode 100644 index 0000000..15a9efb --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/controller/FormRecordController.java @@ -0,0 +1,108 @@ +package com.gxwebsoft.cms.controller; + +import com.gxwebsoft.cms.entity.FormRecord; +import com.gxwebsoft.cms.param.FormRecordParam; +import com.gxwebsoft.cms.service.FormRecordService; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 表单数据记录表控制器 + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +@Api(tags = "表单数据记录表管理") +@RestController +@RequestMapping("/api/cms/form-record") +public class FormRecordController extends BaseController { + @Resource + private FormRecordService formRecordService; + + @ApiOperation("分页查询表单数据记录表") + @GetMapping("/page") + public ApiResult> page(FormRecordParam param) { + // 使用关联查询 + return success(formRecordService.pageRel(param)); + } + + @ApiOperation("查询全部表单数据记录表") + @GetMapping() + public ApiResult> list(FormRecordParam param) { + // 使用关联查询 + return success(formRecordService.listRel(param)); + } + + @ApiOperation("根据id查询表单数据记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(formRecordService.getByIdRel(id)); + } + + @ApiOperation("添加表单数据记录表") + @PostMapping() + public ApiResult save(@RequestBody FormRecord formRecord) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + formRecord.setUserId(loginUser.getUserId()); + } + if (formRecordService.save(formRecord)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改表单数据记录表") + @PutMapping() + public ApiResult update(@RequestBody FormRecord formRecord) { + if (formRecordService.updateById(formRecord)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除表单数据记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (formRecordService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加表单数据记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (formRecordService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改表单数据记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(formRecordService, "form_record_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除表单数据记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (formRecordService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleContent.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleContent.java index 03d3a96..e21099e 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/ArticleContent.java +++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleContent.java @@ -1,5 +1,7 @@ package com.gxwebsoft.cms.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -23,6 +25,7 @@ public class ArticleContent implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "文章ID") + @TableId(value = "article_id", type = IdType.AUTO) private Integer articleId; @ApiModelProperty(value = "文章内容") diff --git a/src/main/java/com/gxwebsoft/cms/entity/Form.java b/src/main/java/com/gxwebsoft/cms/entity/Form.java new file mode 100644 index 0000000..953e2db --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/entity/Form.java @@ -0,0 +1,64 @@ +package com.gxwebsoft.cms.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +/** + * 表单设计表 + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Form对象", description = "表单设计表") +@TableName("cms_form") +public class Form implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @TableId(value = "form_id", type = IdType.AUTO) + private Integer formId; + + @ApiModelProperty(value = "表单标题") + private String name; + + @ApiModelProperty(value = "顶部图片") + private String photo; + + @ApiModelProperty(value = "背景图片") + private String background; + + @ApiModelProperty(value = "提交次数") + private Integer submitNumber; + + @ApiModelProperty(value = "页面布局") + private String layout; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + private Integer status; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/src/main/java/com/gxwebsoft/cms/entity/FormRecord.java b/src/main/java/com/gxwebsoft/cms/entity/FormRecord.java new file mode 100644 index 0000000..5770dac --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/entity/FormRecord.java @@ -0,0 +1,60 @@ +package com.gxwebsoft.cms.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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +/** + * 表单数据记录表 + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "FormRecord对象", description = "表单数据记录表") +@TableName("cms_form_record") +public class FormRecord implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @TableId(value = "form_record_id", type = IdType.AUTO) + private Integer formRecordId; + + @ApiModelProperty(value = "表单ID") + private Integer formId; + + @ApiModelProperty(value = "表单数据") + private String formData; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + private Integer status; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "表单名称") + @TableField(exist = false) + private String formName; + +} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/FormMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/FormMapper.java new file mode 100644 index 0000000..63cbd50 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/FormMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.cms.entity.Form; +import com.gxwebsoft.cms.param.FormParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 表单设计表Mapper + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +public interface FormMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") FormParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") FormParam param); + +} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/FormRecordMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/FormRecordMapper.java new file mode 100644 index 0000000..d0e462a --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/FormRecordMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.cms.entity.FormRecord; +import com.gxwebsoft.cms.param.FormRecordParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 表单数据记录表Mapper + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +public interface FormRecordMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") FormRecordParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") FormRecordParam param); + +} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/FormMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/FormMapper.xml new file mode 100644 index 0000000..9d3f6eb --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/FormMapper.xml @@ -0,0 +1,59 @@ + + + + + + + SELECT a.* + FROM cms_form a + + + AND a.form_id = #{param.formId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.photo LIKE CONCAT('%', #{param.photo}, '%') + + + AND a.background LIKE CONCAT('%', #{param.background}, '%') + + + AND a.submit_number = #{param.submitNumber} + + + AND a.layout LIKE CONCAT('%', #{param.layout}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.status = #{param.status} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/FormRecordMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/FormRecordMapper.xml new file mode 100644 index 0000000..1c76edc --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/FormRecordMapper.xml @@ -0,0 +1,51 @@ + + + + + + + SELECT a.*,b.name as formName + FROM cms_form_record a + LEFT JOIN cms_form b ON a.form_id = b.form_id + + + AND a.form_record_id = #{param.formRecordId} + + + AND a.form_id = #{param.formId} + + + AND a.form_data LIKE CONCAT('%', #{param.formData}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.status = #{param.status} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/cms/param/FormParam.java b/src/main/java/com/gxwebsoft/cms/param/FormParam.java new file mode 100644 index 0000000..ca9329d --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/param/FormParam.java @@ -0,0 +1,60 @@ +package com.gxwebsoft.cms.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 表单设计表查询参数 + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "FormParam对象", description = "表单设计表查询参数") +public class FormParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @QueryField(type = QueryType.EQ) + private Integer formId; + + @ApiModelProperty(value = "表单标题") + private String name; + + @ApiModelProperty(value = "顶部图片") + private String photo; + + @ApiModelProperty(value = "背景图片") + private String background; + + @ApiModelProperty(value = "提交次数") + @QueryField(type = QueryType.EQ) + private Integer submitNumber; + + @ApiModelProperty(value = "页面布局") + private String layout; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + @QueryField(type = QueryType.EQ) + private Integer status; + +} diff --git a/src/main/java/com/gxwebsoft/cms/param/FormRecordParam.java b/src/main/java/com/gxwebsoft/cms/param/FormRecordParam.java new file mode 100644 index 0000000..e746069 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/param/FormRecordParam.java @@ -0,0 +1,51 @@ +package com.gxwebsoft.cms.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 表单数据记录表查询参数 + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "FormRecordParam对象", description = "表单数据记录表查询参数") +public class FormRecordParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @QueryField(type = QueryType.EQ) + private Integer formRecordId; + + @ApiModelProperty(value = "表单ID") + @QueryField(type = QueryType.EQ) + private Integer formId; + + @ApiModelProperty(value = "表单数据") + private String formData; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + @QueryField(type = QueryType.EQ) + private Integer status; + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/FormRecordService.java b/src/main/java/com/gxwebsoft/cms/service/FormRecordService.java new file mode 100644 index 0000000..51e6d1e --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/FormRecordService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.cms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.cms.entity.FormRecord; +import com.gxwebsoft.cms.param.FormRecordParam; + +import java.util.List; + +/** + * 表单数据记录表Service + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +public interface FormRecordService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(FormRecordParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(FormRecordParam param); + + /** + * 根据id查询 + * + * @param formRecordId ID + * @return FormRecord + */ + FormRecord getByIdRel(Integer formRecordId); + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/FormService.java b/src/main/java/com/gxwebsoft/cms/service/FormService.java new file mode 100644 index 0000000..9c55450 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/FormService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.cms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.cms.entity.Form; +import com.gxwebsoft.cms.param.FormParam; + +import java.util.List; + +/** + * 表单设计表Service + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +public interface FormService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(FormParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(FormParam param); + + /** + * 根据id查询 + * + * @param formId ID + * @return Form + */ + Form getByIdRel(Integer formId); + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/FormRecordServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/FormRecordServiceImpl.java new file mode 100644 index 0000000..dde4489 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/impl/FormRecordServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.cms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.cms.mapper.FormRecordMapper; +import com.gxwebsoft.cms.service.FormRecordService; +import com.gxwebsoft.cms.entity.FormRecord; +import com.gxwebsoft.cms.param.FormRecordParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 表单数据记录表Service实现 + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +@Service +public class FormRecordServiceImpl extends ServiceImpl implements FormRecordService { + + @Override + public PageResult pageRel(FormRecordParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(FormRecordParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public FormRecord getByIdRel(Integer formRecordId) { + FormRecordParam param = new FormRecordParam(); + param.setFormRecordId(formRecordId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/FormServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/FormServiceImpl.java new file mode 100644 index 0000000..ee0fbed --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/impl/FormServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.cms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.cms.mapper.FormMapper; +import com.gxwebsoft.cms.service.FormService; +import com.gxwebsoft.cms.entity.Form; +import com.gxwebsoft.cms.param.FormParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 表单设计表Service实现 + * + * @author 科技小王子 + * @since 2024-03-14 08:59:33 + */ +@Service +public class FormServiceImpl extends ServiceImpl implements FormService { + + @Override + public PageResult pageRel(FormParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(FormParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Form getByIdRel(Integer formId) { + FormParam param = new FormParam(); + param.setFormId(formId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/CmsGenerator.java b/src/test/java/com/gxwebsoft/generator/CmsGenerator.java index fb37bbb..ae24653 100644 --- a/src/test/java/com/gxwebsoft/generator/CmsGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/CmsGenerator.java @@ -54,6 +54,8 @@ public class CmsGenerator { // "cms_design_record", // "cms_website", // "cms_website_field", + "cms_form", + "cms_form_record" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{