diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java new file mode 100644 index 000000000..aae740ccc --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java @@ -0,0 +1,123 @@ +package com.bsd.pjcloud.integrated.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.integrated.entity.FeedbackEntity; +import com.bsd.pjcloud.integrated.service.FeedbackService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 意见反馈 + * + * @author zjf + * @date 2025-03-21 14:34:27 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/feedback" ) +@Tag(description = "feedback" , name = "意见反馈管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class FeedbackController { + + private final FeedbackService feedbackService; + + /** + * 分页查询 + * @param page 分页对象 + * @param feedback 意见反馈 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('integrated_feedback_view')" ) + public R getFeedbackPage(@ParameterObject Page page, @ParameterObject FeedbackEntity feedback) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(feedback.getTitle()),FeedbackEntity::getTitle,feedback.getTitle()); + wrapper.eq(StrUtil.isNotBlank(feedback.getStatus()),FeedbackEntity::getStatus,feedback.getStatus()); + wrapper.eq(StrUtil.isNotBlank(feedback.getType()),FeedbackEntity::getType,feedback.getType()); + return R.ok(feedbackService.page(page, wrapper)); + } + + + /** + * 通过id查询意见反馈 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('integrated_feedback_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(feedbackService.getById(id)); + } + + /** + * 新增意见反馈 + * @param feedback 意见反馈 + * @return R + */ + @Operation(summary = "新增意见反馈" , description = "新增意见反馈" ) + @SysLog("新增意见反馈" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('integrated_feedback_add')" ) + public R save(@RequestBody FeedbackEntity feedback) { + return R.ok(feedbackService.save(feedback)); + } + + /** + * 修改意见反馈 + * @param feedback 意见反馈 + * @return R + */ + @Operation(summary = "修改意见反馈" , description = "修改意见反馈" ) + @SysLog("修改意见反馈" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('integrated_feedback_edit')" ) + public R updateById(@RequestBody FeedbackEntity feedback) { + return R.ok(feedbackService.updateById(feedback)); + } + + /** + * 通过id删除意见反馈 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除意见反馈" , description = "通过id删除意见反馈" ) + @SysLog("通过id删除意见反馈" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('integrated_feedback_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(feedbackService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param feedback 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('integrated_feedback_export')" ) + public List export(FeedbackEntity feedback,Long[] ids) { + return feedbackService.list(Wrappers.lambdaQuery(feedback).in(ArrayUtil.isNotEmpty(ids), FeedbackEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackLogController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackLogController.java new file mode 100644 index 000000000..b5ee545d0 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackLogController.java @@ -0,0 +1,122 @@ +package com.bsd.pjcloud.integrated.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.integrated.entity.FeedbackLogEntity; +import com.bsd.pjcloud.integrated.service.FeedbackLogService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 意见反馈 + * + * @author zjf + * @date 2025-03-21 16:31:22 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/feedbackLog" ) +@Tag(description = "feedbackLog" , name = "意见反馈管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class FeedbackLogController { + + private final FeedbackLogService feedbackLogService; + + /** + * 分页查询 + * @param page 分页对象 + * @param feedbackLog 意见反馈 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('integrated_feedbackLog_view')" ) + public R getFeedbackLogPage(@ParameterObject Page page, @ParameterObject FeedbackLogEntity feedbackLog) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StrUtil.isNotBlank(feedbackLog.getStatus()),FeedbackLogEntity::getStatus,feedbackLog.getStatus()); + wrapper.eq(Objects.nonNull(feedbackLog.getFeedbackId()),FeedbackLogEntity::getFeedbackId,feedbackLog.getFeedbackId()); + return R.ok(feedbackLogService.page(page, wrapper)); + } + + + /** + * 通过id查询意见反馈 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('integrated_feedbackLog_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(feedbackLogService.getById(id)); + } + + /** + * 新增意见反馈 + * @param feedbackLog 意见反馈 + * @return R + */ + @Operation(summary = "新增意见反馈" , description = "新增意见反馈" ) + @SysLog("新增意见反馈" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('integrated_feedbackLog_add')" ) + public R save(@RequestBody FeedbackLogEntity feedbackLog) { + return R.ok(feedbackLogService.save(feedbackLog)); + } + + /** + * 修改意见反馈 + * @param feedbackLog 意见反馈 + * @return R + */ + @Operation(summary = "修改意见反馈" , description = "修改意见反馈" ) + @SysLog("修改意见反馈" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('integrated_feedbackLog_edit')" ) + public R updateById(@RequestBody FeedbackLogEntity feedbackLog) { + return R.ok(feedbackLogService.updateById(feedbackLog)); + } + + /** + * 通过id删除意见反馈 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除意见反馈" , description = "通过id删除意见反馈" ) + @SysLog("通过id删除意见反馈" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('integrated_feedbackLog_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(feedbackLogService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param feedbackLog 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('integrated_feedbackLog_export')" ) + public List export(FeedbackLogEntity feedbackLog,Long[] ids) { + return feedbackLogService.list(Wrappers.lambdaQuery(feedbackLog).in(ArrayUtil.isNotEmpty(ids), FeedbackLogEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/FeedbackEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/FeedbackEntity.java new file mode 100644 index 000000000..520b8cdbd --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/FeedbackEntity.java @@ -0,0 +1,121 @@ +package com.bsd.pjcloud.integrated.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 意见反馈 + * + * @author zjf + * @date 2025-03-21 14:34:27 + */ +@Data +@TenantTable +@TableName("feedback") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "意见反馈") +public class FeedbackEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 标题 + */ + @Schema(description="标题") + private String title; + + /** + * 图片 + */ + @Schema(description="图片") + private String picUrl; + + /** + * 排序 + */ + @Schema(description="排序") + private Integer sort; + + /** + * 描述 + */ + @Schema(description="描述") + private String description; + + /** + * 状态（0未处理，1已处理） + */ + @Schema(description="状态（0未处理，1已处理）") + private String status; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 上报人 + */ + @Schema(description="上报人") + private Long userId; + + /** + * 反馈类型（'投诉','建议','BUG报告','功能需求'） + */ + @Schema(description="反馈类型（'投诉','建议','BUG报告','功能需求'）") + private String type; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建者") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新者") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/FeedbackLogEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/FeedbackLogEntity.java new file mode 100644 index 000000000..dc8168289 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/FeedbackLogEntity.java @@ -0,0 +1,97 @@ +package com.bsd.pjcloud.integrated.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 意见反馈 + * + * @author zjf + * @date 2025-03-21 16:31:22 + */ +@Data +@TenantTable +@TableName("feedback_log") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "意见反馈") +public class FeedbackLogEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 处理描述 + */ + @Schema(description="处理描述") + private String description; + + /** + * 状态（0未处理，1已处理） + */ + @Schema(description="状态（0未处理，1已处理）") + private String status; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 主表id + */ + @Schema(description="主表id") + private Long feedbackId; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建者") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新者") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/FeedbackLogMapper.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/FeedbackLogMapper.java new file mode 100644 index 000000000..2181fcf6d --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/FeedbackLogMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.integrated.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.integrated.entity.FeedbackLogEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface FeedbackLogMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/FeedbackMapper.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/FeedbackMapper.java new file mode 100644 index 000000000..8aa85a41a --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/FeedbackMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.integrated.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.integrated.entity.FeedbackEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface FeedbackMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackLogService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackLogService.java new file mode 100644 index 000000000..d209f3fb3 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackLogService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.integrated.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.integrated.entity.FeedbackLogEntity; + +public interface FeedbackLogService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackService.java new file mode 100644 index 000000000..0368586ba --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/FeedbackService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.integrated.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.integrated.entity.FeedbackEntity; + +public interface FeedbackService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackLogServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackLogServiceImpl.java new file mode 100644 index 000000000..26d1ee7b8 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackLogServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.integrated.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.integrated.entity.FeedbackLogEntity; +import com.bsd.pjcloud.integrated.mapper.FeedbackLogMapper; +import com.bsd.pjcloud.integrated.service.FeedbackLogService; +import org.springframework.stereotype.Service; +/** + * 意见反馈 + * + * @author zjf + * @date 2025-03-21 16:31:22 + */ +@Service +public class FeedbackLogServiceImpl extends ServiceImpl implements FeedbackLogService { +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackServiceImpl.java new file mode 100644 index 000000000..c77b00510 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/FeedbackServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.integrated.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.integrated.entity.FeedbackEntity; +import com.bsd.pjcloud.integrated.mapper.FeedbackMapper; +import com.bsd.pjcloud.integrated.service.FeedbackService; +import org.springframework.stereotype.Service; +/** + * 意见反馈 + * + * @author zjf + * @date 2025-03-21 14:34:27 + */ +@Service +public class FeedbackServiceImpl extends ServiceImpl implements FeedbackService { +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/FeedbackLogMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/FeedbackLogMapper.xml new file mode 100644 index 000000000..c4aa55b06 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/FeedbackLogMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/FeedbackMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/FeedbackMapper.xml new file mode 100644 index 000000000..3058cc324 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/FeedbackMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file