Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/HceReviewController.java

@@ -0,0 +1,70 @@
+package com.usky.system.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.system.domain.HceReview;
+import com.usky.system.service.HceReviewService;
+import com.usky.system.service.vo.HceReviewRequestVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 帮助中心建议反馈表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/hceReview")
+public class HceReviewController {
+    @Autowired
+    private HceReviewService hceReviewService;
+
+    /**
+     * 新增
+     * @param hceReview
+     * @return
+     */
+    @PostMapping
+    ApiResult<Void> add(@RequestBody HceReview hceReview){
+        hceReviewService.add(hceReview);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param hceReview
+     * @return
+     */
+    @PutMapping
+    ApiResult<Void> edit(@RequestBody HceReview hceReview){
+        hceReviewService.edit(hceReview);
+        return ApiResult.success();
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    ApiResult<Void> remove(@PathVariable("id") Integer id){
+        hceReviewService.remove(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 列表
+     * @param requestVO
+     * @return
+     */
+    @PostMapping("page")
+    ApiResult<CommonPage<HceReview>> page(@RequestBody HceReviewRequestVO requestVO){
+        return ApiResult.success(hceReviewService.page(requestVO));
+    }
+
+}
+

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/HceReview.java

@@ -0,0 +1,86 @@
+package com.usky.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 帮助中心建议反馈表
+ * </p>
+ *
+ * @author han
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class HceReview implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 反馈问题类型
+     */
+    private Integer reviewType;
+
+    /**
+     * 反馈问题内容
+     */
+    private String reviewContent;
+
+    /**
+     * 反馈图片
+     */
+    private String reviewPicture;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 处理人
+     */
+    private String handleName;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handleTime;
+
+    /**
+     * 组织结构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/HceReviewMapper.java

@@ -0,0 +1,16 @@
+package com.usky.system.mapper;
+
+import com.usky.system.domain.HceReview;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 帮助中心建议反馈表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2024-08-07
+ */
+public interface HceReviewMapper extends CrudMapper<HceReview> {
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/HceReviewService.java

@@ -0,0 +1,25 @@
+package com.usky.system.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.system.domain.HceReview;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.system.service.vo.HceReviewRequestVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * <p>
+ * 帮助中心建议反馈表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2024-08-07
+ */
+public interface HceReviewService extends CrudService<HceReview> {
+    void add(HceReview hceReview);
+
+    void edit(HceReview hceReview);
+
+    void remove(Integer id);
+
+    CommonPage<HceReview> page(HceReviewRequestVO requestVO);
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceReviewServiceImpl.java

@@ -0,0 +1,75 @@
+package com.usky.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.system.domain.HceReview;
+import com.usky.system.mapper.HceReviewMapper;
+import com.usky.system.service.HceReviewService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.system.service.vo.HceReviewRequestVO;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 帮助中心建议反馈表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2024-08-07
+ */
+@Service
+public class HceReviewServiceImpl extends AbstractCrudService<HceReviewMapper, HceReview> implements HceReviewService {
+
+    @Override
+    public void add(HceReview hceReview){
+        hceReview.setUserName(SecurityUtils.getUsername());
+        hceReview.setNickName(SecurityUtils.getLoginUser().getSysUser().getNickName());
+        hceReview.setStatus(0);
+        hceReview.setCreateTime(LocalDateTime.now());
+        hceReview.setTenantId(SecurityUtils.getTenantId());
+
+        this.save(hceReview);
+    }
+
+    @Override
+    public void edit(HceReview hceReview){
+        hceReview.setStatus(1);
+        hceReview.setHandleName(SecurityUtils.getUsername());
+        hceReview.setHandleTime(LocalDateTime.now());
+
+        this.updateById(hceReview);
+    }
+
+    @Override
+    public void remove(Integer id){
+        if(id == null || id == 0){
+            throw new BusinessException("栏目id不能为空或者等于0");
+        }
+
+        this.removeById(id);
+    }
+
+    @Override
+    public CommonPage<HceReview> page(HceReviewRequestVO requestVO){
+        IPage<HceReview> page = new Page<>(requestVO.getPageNum(),requestVO.getPageSize());
+        LambdaQueryWrapper<HceReview> queryWrapper = Wrappers.lambdaQuery();
+        if(StringUtils.isNotBlank(requestVO.getName())){
+            queryWrapper.and(wrapper->wrapper.like(HceReview::getUserName,requestVO.getName()).or().like(HceReview::getNickName,requestVO.getName()));
+        }
+        queryWrapper.between(StringUtils.isNotBlank(requestVO.getStartTime())&&StringUtils.isNotBlank(requestVO.getEndTime()),HceReview::getCreateTime,requestVO.getStartTime(),requestVO.getEndTime())
+                .orderByDesc(HceReview::getId);
+        page = this.page(page,queryWrapper);
+
+        return new CommonPage<>(page.getRecords(),page.getTotal(),requestVO.getPageSize(),requestVO.getPageNum());
+    }
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/HceReviewRequestVO.java

@@ -0,0 +1,35 @@
+package com.usky.system.service.vo;
+
+import lombok.Data;
+
+@Data
+public class HceReviewRequestVO {
+
+    /**
+     * 账号、昵称
+     */
+    private String name;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 当前页
+     *
+     */
+    private Integer pageNum;
+
+    /**
+     * 每页条数
+     */
+    private Integer pageSize;
+
+
+}

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/HceReviewMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.system.mapper.HceReviewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.system.domain.HceReview">
+        <id column="id" property="id" />
+        <result column="user_name" property="userName" />
+        <result column="nick_name" property="nickName" />
+        <result column="review_type" property="reviewType" />
+        <result column="review_content" property="reviewContent" />
+        <result column="review_picture" property="reviewPicture" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="handle_name" property="handleName" />
+        <result column="handle_time" property="handleTime" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>