问题反馈

hx-common/src/main/java/com/fjhx/common/controller/problem/ProblemFeedbackController.java

@@ -0,0 +1,62 @@
+package com.fjhx.common.controller.problem;
+
+import com.ruoyi.common.annotation.TenantIgnore;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
+import com.fjhx.common.entity.problem.dto.ProblemFeedbackSelectDto;
+import com.fjhx.common.entity.problem.dto.ProblemFeedbackDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.common.service.problem.ProblemFeedbackService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 问题反馈 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-04
+ */
+@RestController
+@RequestMapping("/problemFeedback")
+public class ProblemFeedbackController {
+
+    @Autowired
+    private ProblemFeedbackService problemFeedbackService;
+
+    /**
+     * 问题反馈分页
+     */
+    @TenantIgnore
+    @PostMapping("/page")
+    public Page<ProblemFeedbackVo> page(@RequestBody ProblemFeedbackSelectDto dto) {
+        return problemFeedbackService.getPage(dto);
+    }
+
+    /**
+     * 问题反馈明细
+     */
+    @PostMapping("/detail")
+    public ProblemFeedbackVo detail(@RequestBody BaseSelectDto dto) {
+        return problemFeedbackService.detail(dto.getId());
+    }
+
+    /**
+     * 问题反馈新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ProblemFeedbackDto problemFeedbackDto) {
+        problemFeedbackService.add(problemFeedbackDto);
+    }
+
+    /**
+     * 问题反馈编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ProblemFeedbackDto problemFeedbackDto) {
+        problemFeedbackService.edit(problemFeedbackDto);
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/entity/problem/dto/ProblemFeedbackDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.problem.dto;
+
+import com.fjhx.common.entity.problem.po.ProblemFeedback;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 问题反馈新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-04
+ */
+@Getter
+@Setter
+public class ProblemFeedbackDto extends ProblemFeedback {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/problem/dto/ProblemFeedbackSelectDto.java

@@ -0,0 +1,27 @@
+package com.fjhx.common.entity.problem.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 问题反馈列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-04
+ */
+@Getter
+@Setter
+public class ProblemFeedbackSelectDto extends BaseSelectDto {
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 回复状态 0待回复 1已回复
+     */
+    private Integer status;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/problem/po/ProblemFeedback.java

@@ -0,0 +1,61 @@
+package com.fjhx.common.entity.problem.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 问题反馈
+ * </p>
+ *
+ * @author
+ * @since 2023-05-04
+ */
+@Getter
+@Setter
+@TableName("problem_feedback")
+public class ProblemFeedback extends BasePo {
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 联系方式
+     */
+    private String contactInformation;
+
+    /**
+     * 模块类型
+     */
+    private String moduleType;
+
+    /**
+     * 问题说明
+     */
+    private String problemStatement;
+
+    /**
+     * 0待回复 1已回复
+     */
+    private Integer status;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/problem/vo/ProblemFeedbackVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.problem.vo;
+
+import com.fjhx.common.entity.problem.po.ProblemFeedback;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 问题反馈列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-04
+ */
+@Getter
+@Setter
+public class ProblemFeedbackVo extends ProblemFeedback {
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/problem/ProblemFeedbackMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.problem;
+
+import com.fjhx.common.entity.problem.po.ProblemFeedback;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 问题反馈 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-04
+ */
+public interface ProblemFeedbackMapper extends BaseMapper<ProblemFeedback> {
+
+    /**
+     * 问题反馈分页
+     */
+    Page<ProblemFeedbackVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProblemFeedback> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/service/problem/ProblemFeedbackService.java

@@ -0,0 +1,41 @@
+package com.fjhx.common.service.problem;
+
+import com.fjhx.common.entity.problem.po.ProblemFeedback;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
+import com.fjhx.common.entity.problem.dto.ProblemFeedbackSelectDto;
+import com.fjhx.common.entity.problem.dto.ProblemFeedbackDto;
+
+
+/**
+ * <p>
+ * 问题反馈 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-04
+ */
+public interface ProblemFeedbackService extends BaseService<ProblemFeedback> {
+
+    /**
+     * 问题反馈分页
+     */
+    Page<ProblemFeedbackVo> getPage(ProblemFeedbackSelectDto dto);
+
+    /**
+     * 问题反馈明细
+     */
+    ProblemFeedbackVo detail(Long id);
+
+    /**
+     * 问题反馈新增
+     */
+    void add(ProblemFeedbackDto problemFeedbackDto);
+
+    /**
+     * 问题反馈编辑
+     */
+    void edit(ProblemFeedbackDto problemFeedbackDto);
+
+}

hx-common/src/main/java/com/fjhx/common/service/problem/impl/ProblemFeedbackServiceImpl.java

@@ -0,0 +1,56 @@
+package com.fjhx.common.service.problem.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.entity.problem.dto.ProblemFeedbackDto;
+import com.fjhx.common.entity.problem.dto.ProblemFeedbackSelectDto;
+import com.fjhx.common.entity.problem.po.ProblemFeedback;
+import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
+import com.fjhx.common.mapper.problem.ProblemFeedbackMapper;
+import com.fjhx.common.service.problem.ProblemFeedbackService;
+import com.ruoyi.common.constant.StatusConstant;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 问题反馈 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-05-04
+ */
+@Service
+public class ProblemFeedbackServiceImpl extends ServiceImpl<ProblemFeedbackMapper, ProblemFeedback> implements ProblemFeedbackService {
+
+    @Override
+    public Page<ProblemFeedbackVo> getPage(ProblemFeedbackSelectDto dto) {
+        IWrapper<ProblemFeedback> wrapper = getWrapper();
+        wrapper.eq("pf", ProblemFeedback::getTenantId, dto.getTenantId());
+        wrapper.eq("pf", ProblemFeedback::getStatus, dto.getStatus());
+        wrapper.orderByDesc("pf", ProblemFeedback::getId);
+        Page<ProblemFeedbackVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public ProblemFeedbackVo detail(Long id) {
+        ProblemFeedback ProblemFeedback = this.getById(id);
+        ProblemFeedbackVo result = BeanUtil.toBean(ProblemFeedback, ProblemFeedbackVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ProblemFeedbackDto problemFeedbackDto) {
+        this.save(problemFeedbackDto);
+    }
+
+    @Override
+    public void edit(ProblemFeedbackDto problemFeedbackDto) {
+        problemFeedbackDto.setStatus(StatusConstant.YES);
+        this.updateById(problemFeedbackDto);
+    }
+
+}

hx-common/src/main/resources/mapper/problem/ProblemFeedbackMapper.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.fjhx.common.mapper.problem.ProblemFeedbackMapper">
+    <select id="getPage" resultType="com.fjhx.common.entity.problem.vo.ProblemFeedbackVo">
+        select
+            pf.id,
+            pf.name,
+            pf.company_name,
+            pf.contact_information,
+            pf.module_type,
+            pf.problem_statement,
+            pf.status,
+            pf.create_user,
+            pf.create_time,
+            pf.update_user,
+            pf.update_time
+        from problem_feedback pf
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-dingding/src/main/java/com/fjhx/utils/DingUtil.java

@@ -31,7 +31,7 @@ import lombok.extern.slf4j.Slf4j;
 public class DingUtil {
 
     public static void main(String[] args) {
-        GetUserTokenResponseBody userToken = DingUtil.getUserToken("8f9511a2dbf439328ee0331a3fee125c123");
+        GetUserTokenResponseBody userToken = DingUtil.getUserToken("9688f43aebe531238c9398fa5004c7a7");
         String accessToken = userToken.getAccessToken();
     }
 
@@ -45,7 +45,6 @@ public class DingUtil {
      * https://open.dingtalk.com/document/isvapp/obtain-user-token
      */
     public static GetUserTokenResponseBody getUserToken(String code) {
-
         GetUserTokenRequest getUserTokenRequest = new GetUserTokenRequest()
                 .setClientId(SUITE_KEY)
                 .setClientSecret(SUITE_SECRET)