From e14233c2322b0d21f3a4cbec1a29f7f00c63b298 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 14:25:17 +0800
Subject: [PATCH] 2024-10-31 删除部分废弃代码（Feedback）
---
/dev/null | 43 -------------------------------------------
1 files changed, 0 insertions(+), 43 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeFeedbackMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeFeedbackMapper.java
deleted file mode 100644
index 29a60a9..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeFeedbackMapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.dy.pipIrrGlobal.daoOp;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoOp.OpeFeedback;
-import com.dy.pipIrrGlobal.voOp.Vofeedback;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author :WuZeYu
- * @Date :2024/7/29 16:45
- * @LastEditTime :2024/7/29 16:45
- * @Description
- */
-@Mapper
-public interface OpeFeedbackMapper extends BaseMapper<OpeFeedback> {
- int deleteByPrimaryKey(Long id);
-
- int insert(OpeFeedback record);
-
- int insertSelective(OpeFeedback record);
-
- OpeFeedback selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(OpeFeedback record);
-
- int updateByPrimaryKey(OpeFeedback record);
-
- Long getRecordCount(Map<String, Object> params);
-
- List<Vofeedback> getFeedbacks(Map<String, Object> params);
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeFeedbackReplyMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeFeedbackReplyMapper.java
deleted file mode 100644
index 56fc68d..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeFeedbackReplyMapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dy.pipIrrGlobal.daoOp;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoOp.OpeFeedbackReply;
-import com.dy.pipIrrGlobal.voOp.VofeedbackReply;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author :WuZeYu
- * @Date :2024/7/31 15:35
- * @LastEditTime :2024/7/31 15:35
- * @Description
- */
-@Mapper
-public interface OpeFeedbackReplyMapper extends BaseMapper<OpeFeedbackReply> {
- int deleteByPrimaryKey(Long id);
-
- int insert(OpeFeedbackReply record);
-
- int insertSelective(OpeFeedbackReply record);
-
- OpeFeedbackReply selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(OpeFeedbackReply record);
-
- int updateByPrimaryKey(OpeFeedbackReply record);
-
- /**
- * 鑾峰彇鍙嶉鍥炲鏁伴噺
- * @param params
- * @return
- */
- Long getRecordCount(Map<String, Object> params);
-
- /**
- * 鑾峰彇鍙嶉鍥炲
- * @param params
- * @return
- */
- List<VofeedbackReply> getFeedbackReply(Map<String, Object> params);
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeFeedback.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeFeedback.java
deleted file mode 100644
index 2680a36..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeFeedback.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.dy.pipIrrGlobal.pojoOp;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.*;
-import org.hibernate.validator.constraints.Length;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author :WuZeYu
- * @Date :2024/7/29 16:45
- * @LastEditTime :2024/7/29 16:45
- * @Description
- */
-/**
- * 闂鍙嶉琛�
- */
-@TableName(value="ope_feedback", autoResultMap = true)
-@Data
-@ToString
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "闂鍙嶉琛�")
-public class OpeFeedback implements BaseEntity {
- /**
- * 涓婚敭
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- private Long id;
-
- /**
- * 鍙嶉鍐呭
- */
- @Length(message = "鍙嶉鍐呭涓嶅ぇ浜巤max}瀛�", max = 200)
- private String content;
-
- /**
- * 鍥剧墖;鏈�澶�3寮犲浘鐗�
- */
- @Length(message = "鍥剧墖涓嶅ぇ浜巤max}瀛�", max = 255)
- private String image;
-
- /**
- * 闊抽;鏈�澶�1涓�
- */
- @Length(message = "闊抽涓嶅ぇ浜巤max}瀛�", max = 255)
- private String audio;
-
- /**
- * 瑙嗛;鏈�澶�1涓�
- */
- @Length(message = "瑙嗛涓嶅ぇ浜巤max}瀛楋紝", max = 255)
- private String video;
-
- /**
- * 鑱旂郴鐢佃瘽;鑱旂郴鐢佃瘽
- */
- @Length(message = "鑱旂郴鐢佃瘽涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 11, max = 11)
- private String phone;
-
- /**
- * 鍐滄埛ID
- */
- private Long feedbackerId;
-
- /**
- * 鍙嶉鏃堕棿
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date feedbackTime;
-
- /**
- * 缁忓害
- */
- private Double lng;
-
- /**
- * 绾害
- */
- private Double lat;
-
- /**
- * 鍙嶉鐘舵��;0-杩涜涓紝1-绠＄悊鍛樼粨鏉燂紝2-绠＄悊鍛樺垹闄�
- */
- private Byte state;
-
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeFeedbackReply.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeFeedbackReply.java
deleted file mode 100644
index e970e7b..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeFeedbackReply.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.dy.pipIrrGlobal.pojoOp;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.*;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
-
-import java.util.Date;
-
-/**
- * @author :WuZeYu
- * @Date :2024/7/31 15:35
- * @LastEditTime :2024/7/31 15:35
- * @Description
- */
-/**
- * 鍙嶉鍥炲璁板綍琛�;
- */
-@TableName(value="ope_feedback_reply", autoResultMap = true)
-@Data
-@ToString
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "鍙嶉鍥炲璁板綍琛�")
-public class OpeFeedbackReply implements BaseEntity {
- /**
- * 涓婚敭
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- private Long id;
-
- /**
- * 鍙嶉缂栧彿
- */
- @NotNull
- private Long feedbackId;
-
- /**
- * 鍥炲鍐呭
- */
- @NotBlank
- private String replyContent;
-
- /**
- * 鍥炲鏃堕棿
- */
- private Date replyTime;
-
- /**
- * 鍥炲浜篒D
- */
- @NotNull
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- private Long replierId;
-
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml
deleted file mode 100644
index 60bfee9..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?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.dy.pipIrrGlobal.daoOp.OpeFeedbackMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoOp.OpeFeedback">
- <!--@mbg.generated-->
- <!--@Table ope_feedback-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="content" jdbcType="VARCHAR" property="content" />
- <result column="image" jdbcType="VARCHAR" property="image" />
- <result column="audio" jdbcType="VARCHAR" property="audio" />
- <result column="video" jdbcType="VARCHAR" property="video" />
- <result column="phone" jdbcType="VARCHAR" property="phone" />
- <result column="feedbacker_id" jdbcType="BIGINT" property="feedbackerId" />
- <result column="feedback_time" jdbcType="TIMESTAMP" property="feedbackTime" />
- <result column="lng" jdbcType="DOUBLE" property="lng" />
- <result column="lat" jdbcType="DOUBLE" property="lat" />
- <result column="state" jdbcType="TINYINT" property="state" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, content, image, audio, video, phone, feedbacker_id, feedback_time, lng, lat,
- `state`
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from ope_feedback
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from ope_feedback
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeFeedback">
- <!--@mbg.generated-->
- insert into ope_feedback (id, content, image,
- audio, video, phone,
- feedbacker_id, feedback_time, lng,
- lat, `state`)
- values (#{id,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{image,jdbcType=VARCHAR},
- #{audio,jdbcType=VARCHAR}, #{video,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
- #{feedbackerId,jdbcType=BIGINT}, #{feedbackTime,jdbcType=TIMESTAMP}, #{lng,jdbcType=DOUBLE},
- #{lat,jdbcType=DOUBLE}, #{state,jdbcType=TINYINT})
- </insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeFeedback">
- <!--@mbg.generated-->
- insert into ope_feedback
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="content != null">
- content,
- </if>
- <if test="image != null">
- image,
- </if>
- <if test="audio != null">
- audio,
- </if>
- <if test="video != null">
- video,
- </if>
- <if test="phone != null">
- phone,
- </if>
- <if test="feedbackerId != null">
- feedbacker_id,
- </if>
- <if test="feedbackTime != null">
- feedback_time,
- </if>
- <if test="lng != null">
- lng,
- </if>
- <if test="lat != null">
- lat,
- </if>
- <if test="state != null">
- `state`,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=BIGINT},
- </if>
- <if test="content != null">
- #{content,jdbcType=VARCHAR},
- </if>
- <if test="image != null">
- #{image,jdbcType=VARCHAR},
- </if>
- <if test="audio != null">
- #{audio,jdbcType=VARCHAR},
- </if>
- <if test="video != null">
- #{video,jdbcType=VARCHAR},
- </if>
- <if test="phone != null">
- #{phone,jdbcType=VARCHAR},
- </if>
- <if test="feedbackerId != null">
- #{feedbackerId,jdbcType=BIGINT},
- </if>
- <if test="feedbackTime != null">
- #{feedbackTime,jdbcType=TIMESTAMP},
- </if>
- <if test="lng != null">
- #{lng,jdbcType=DOUBLE},
- </if>
- <if test="lat != null">
- #{lat,jdbcType=DOUBLE},
- </if>
- <if test="state != null">
- #{state,jdbcType=TINYINT},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeFeedback">
- <!--@mbg.generated-->
- update ope_feedback
- <set>
- <if test="content != null">
- content = #{content,jdbcType=VARCHAR},
- </if>
- <if test="image != null">
- image = #{image,jdbcType=VARCHAR},
- </if>
- <if test="audio != null">
- audio = #{audio,jdbcType=VARCHAR},
- </if>
- <if test="video != null">
- video = #{video,jdbcType=VARCHAR},
- </if>
- <if test="phone != null">
- phone = #{phone,jdbcType=VARCHAR},
- </if>
- <if test="feedbackerId != null">
- feedbacker_id = #{feedbackerId,jdbcType=BIGINT},
- </if>
- <if test="feedbackTime != null">
- feedback_time = #{feedbackTime,jdbcType=TIMESTAMP},
- </if>
- <if test="lng != null">
- lng = #{lng,jdbcType=DOUBLE},
- </if>
- <if test="lat != null">
- lat = #{lat,jdbcType=DOUBLE},
- </if>
- <if test="state != null">
- `state` = #{state,jdbcType=TINYINT},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeFeedback">
- <!--@mbg.generated-->
- update ope_feedback
- set content = #{content,jdbcType=VARCHAR},
- image = #{image,jdbcType=VARCHAR},
- audio = #{audio,jdbcType=VARCHAR},
- video = #{video,jdbcType=VARCHAR},
- phone = #{phone,jdbcType=VARCHAR},
- feedbacker_id = #{feedbackerId,jdbcType=BIGINT},
- feedback_time = #{feedbackTime,jdbcType=TIMESTAMP},
- lng = #{lng,jdbcType=DOUBLE},
- lat = #{lat,jdbcType=DOUBLE},
- `state` = #{state,jdbcType=TINYINT}
- where id = #{id,jdbcType=BIGINT}
- </update>
- <!--鑷畾涔夋煡璇㈡暟閲�-->
- <select id="getRecordCount" resultType="java.lang.Long">
- select
- count(*) AS recordCount
- from ope_feedback ofb
- left join se_client sc on ofb.feedbacker_id = sc.id
- <where>
- <if test="feedbackerId != null">
- and ofb.feedbacker_id = #{feedbackerId,jdbcType=BIGINT}
- </if>
- <if test="feedbackerName != null">
- and sc.name = #{feedbackerName,jdbcType=VARCHAR}
- </if>
- <if test="timeStart != null">
- and ofb.feedback_time >= #{timeStart,jdbcType=TIMESTAMP}
- </if>
- <if test="timeStop != null">
- and ofb.feedback_time <= #{timeStop,jdbcType=TIMESTAMP}
- </if>
- <if test="state != null">
- and ofb.`state` = #{state,jdbcType=TINYINT}
- </if>
- </where>
- </select>
- <!--鑷畾涔夋煡璇�-->
- <select id="getFeedbacks" resultType="com.dy.pipIrrGlobal.voOp.Vofeedback">
- select
- cast(ofb.id as char) as id,
- ofb.content as content,
- ofb.image as image,
- ofb.audio as audio,
- ofb.video as video,
- ofb.phone as phone,
- cast(ofb.feedbacker_id as char) as feedbackerId,
- ofb.feedback_time as feedbackTime,
- ofb.lng as lng,
- ofb.lat as lat,
- ofb.`state` as state,
- sc.name feedbackerName
- from ope_feedback ofb
- left join se_client sc on ofb.feedbacker_id = sc.id
- <where>
- <if test="feedbackerId != null and feedbackerId != '' ">
- and ofb.feedbacker_id = #{feedbackerId,jdbcType=BIGINT}
- </if>
- <if test="feedbackerName != null and feedbackerName != '' ">
- and sc.name = #{feedbackerName,jdbcType=VARCHAR}
- </if>
- <if test="timeStart != null">
- and ofb.feedback_time >= #{timeStart,jdbcType=TIMESTAMP}
- </if>
- <if test="timeStop != null">
- and ofb.feedback_time <= #{timeStop,jdbcType=TIMESTAMP}
- </if>
- <if test="state != null">
- and ofb.`state` = #{state,jdbcType=TINYINT}
- </if>
- </where>
- order by ofb.id desc
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackReplyMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackReplyMapper.xml
deleted file mode 100644
index 9200aaf..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackReplyMapper.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?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.dy.pipIrrGlobal.daoOp.OpeFeedbackReplyMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoOp.OpeFeedbackReply">
- <!--@mbg.generated-->
- <!--@Table ope_feedback_reply-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="feedback_id" jdbcType="BIGINT" property="feedbackId" />
- <result column="reply_content" jdbcType="VARCHAR" property="replyContent" />
- <result column="reply_time" jdbcType="TIMESTAMP" property="replyTime" />
- <result column="replier_id" jdbcType="BIGINT" property="replierId" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, feedback_id, reply_content, reply_time, replier_id
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from ope_feedback_reply
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from ope_feedback_reply
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeFeedbackReply">
- <!--@mbg.generated-->
- insert into ope_feedback_reply (id, feedback_id, reply_content,
- reply_time, replier_id)
- values (#{id,jdbcType=BIGINT}, #{feedbackId,jdbcType=BIGINT}, #{replyContent,jdbcType=VARCHAR},
- #{replyTime,jdbcType=TIMESTAMP}, #{replierId,jdbcType=BIGINT})
- </insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeFeedbackReply">
- <!--@mbg.generated-->
- insert into ope_feedback_reply
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="feedbackId != null">
- feedback_id,
- </if>
- <if test="replyContent != null">
- reply_content,
- </if>
- <if test="replyTime != null">
- reply_time,
- </if>
- <if test="replierId != null">
- replier_id,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=BIGINT},
- </if>
- <if test="feedbackId != null">
- #{feedbackId,jdbcType=BIGINT},
- </if>
- <if test="replyContent != null">
- #{replyContent,jdbcType=VARCHAR},
- </if>
- <if test="replyTime != null">
- #{replyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="replierId != null">
- #{replierId,jdbcType=BIGINT},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeFeedbackReply">
- <!--@mbg.generated-->
- update ope_feedback_reply
- <set>
- <if test="feedbackId != null">
- feedback_id = #{feedbackId,jdbcType=BIGINT},
- </if>
- <if test="replyContent != null">
- reply_content = #{replyContent,jdbcType=VARCHAR},
- </if>
- <if test="replyTime != null">
- reply_time = #{replyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="replierId != null">
- replier_id = #{replierId,jdbcType=BIGINT},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeFeedbackReply">
- <!--@mbg.generated-->
- update ope_feedback_reply
- set feedback_id = #{feedbackId,jdbcType=BIGINT},
- reply_content = #{replyContent,jdbcType=VARCHAR},
- reply_time = #{replyTime,jdbcType=TIMESTAMP},
- replier_id = #{replierId,jdbcType=BIGINT}
- where id = #{id,jdbcType=BIGINT}
- </update>
-
- <select id="getRecordCount" resultType="java.lang.Long">
- select count(*) from ope_feedback_reply ofbr
- inner join ope_feedback ofb on ofbr.feedback_id = ofb.id
- <where>
- <if test="feedbackId != null and feedbackId != '' ">
- and ofbr.feedback_id = #{feedbackId,jdbcType=BIGINT}
- </if>
- <if test="replierId != null and replierId != '' ">
- and ofbr.replier_id = #{replierId,jdbcType=BIGINT}
- </if>
- <if test="replyTimeStart != null">
- and ofbr.reply_time >= #{replyTimeStart}
- </if>
- <if test="replyTimeStop != null">
- and ofbr.reply_time <= #{replyTimeStop}
- </if>
- </where>
- </select>
-
- <select id="getFeedbackReply" resultType="com.dy.pipIrrGlobal.voOp.VofeedbackReply">
- select
- CAST(ofbr.id as char) AS id,
- CAST(ofbr.feedback_id as char) AS feedbackId,
- ofbr.reply_content as replyContent,
- ofbr.reply_time as replyTime,
- CAST(ofbr.replier_id as char) AS replierId
- from ope_feedback_reply ofbr
- inner join ope_feedback ofb on ofbr.feedback_id = ofb.id
- <where>
- <if test="feedbackId != null and feedbackId != '' ">
- and ofbr.feedback_id = #{feedbackId,jdbcType=BIGINT}
- </if>
- <if test="replierId != null and replierId != '' ">
- and ofbr.replier_id = #{replierId,jdbcType=BIGINT}
- </if>
- <if test="replyTimeStart != null">
- and ofbr.reply_time >= #{replyTimeStart}
- </if>
- <if test="replyTimeStop != null">
- and ofbr.reply_time <= #{replyTimeStop}
- </if>
- </where>
- order by ofbr.id desc
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/FeedbackCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/FeedbackCtrl.java
deleted file mode 100644
index 7308978..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/FeedbackCtrl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package com.dy.pipIrrOperation.feedback;
-
-import com.dy.common.aop.SsoAop;
-import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
-import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.pojoOp.OpeFeedback;
-import com.dy.pipIrrGlobal.pojoOp.OpeFeedbackReply;
-import com.dy.pipIrrGlobal.voOp.Vofeedback;
-import com.dy.pipIrrGlobal.voOp.VofeedbackReply;
-import io.swagger.v3.oas.annotations.Parameter;
-import jakarta.validation.Valid;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-07-29 13:42
- * @LastEditTime 2024-07-29 13:42
- * @Description
- */
-
-@Slf4j
-@RestController
-@RequestMapping(path="feedback")
-@RequiredArgsConstructor
-public class FeedbackCtrl {
- private final FeedbackSv feedbackSv;
-
- /**
- * 娣诲姞闂鍙嶉
- * @param feedback
- * @param bindingResult
- * @return
- */
- @PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
- @SsoAop
- public BaseResponse<Boolean> add(@RequestBody @Valid OpeFeedback feedback, @Parameter(hidden = true) BindingResult bindingResult){
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- if (feedback.getFeedbackerId() == null){
- return BaseResponseUtils.buildFail("璇蜂紶鍏ュ啘鎴穒d");
- }
- Integer rec = Optional.ofNullable(feedbackSv.add(feedback)).orElse(0);
- if (rec == 0) {
- return BaseResponseUtils.buildFail("娣诲姞澶辫触");
- }
- return BaseResponseUtils.buildSuccess(true);
- }
-
- /**
- * 淇敼闂鍙嶉鐘舵��
- * @param feedback
- * @param bindingResult
- * @return
- */
- @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
- @SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid OpeFeedback feedback, @Parameter(hidden = true) BindingResult bindingResult) {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- if (feedback.getId() == null){
- return BaseResponseUtils.buildFail("璇蜂紶鍏d");
- }
- if (feedback.getState() == null){
- return BaseResponseUtils.buildFail("璇蜂紶鍏ョ姸鎬�");
- }
- int count ;
- try {
- count = feedbackSv.update(feedback);
- } catch (Exception e) {
- log.error("淇敼闂鍙嶉鐘舵�佸紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
- if (count <= 0) {
- return BaseResponseUtils.buildFail("淇敼鐘舵�佸け璐�");
- } else {
- return BaseResponseUtils.buildSuccess(true);
- }
- }
-
- /**
- * 鍒犻櫎闂鍙嶉
- * @param map
- * @return
- */
- @PostMapping(path = "delete")
- @Transactional(rollbackFor = Exception.class)
- @SsoAop()
- public BaseResponse<Boolean> delete(@RequestBody Map map) {
- if (map == null || map.size() <= 0) {
- return BaseResponseUtils.buildFail("璇蜂紶鍏d");
- }
- Long id = Long.parseLong(map.get("id").toString());
- try {
- Integer recordCount = Optional.ofNullable(feedbackSv.delete(id)).orElse(0);
- if (recordCount == 0) {
- return BaseResponseUtils.buildFail("鍒犻櫎澶辫触");
- } else {
- return BaseResponseUtils.buildSuccess(true);
- }
- } catch (Exception e) {
- log.error("鍒犻櫎寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
- }
-
- /**
- * 鍒嗛〉鏌ヨ闂鍙嶉
- * @param qo
- * @return
- */
- @GetMapping(path = "getFeedbacks")
- @SsoAop()
- public BaseResponse<QueryResultVo<List<Vofeedback>>> getFeedbacks(QueryVo qo) {
- try {
- QueryResultVo<List<Vofeedback>> res = feedbackSv.getFeedbacks(qo);
- if (res == null) {
- return BaseResponseUtils.buildFail("鏌ヨ澶辫触");
- }
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
- }
-
-
- /**
- * 娣诲姞闂鍙嶉鍥炲
- * @param reply
- * @param bindingResult
- * @return
- */
- @PostMapping(path = "addReply", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
- @SsoAop
- public BaseResponse<Boolean> addReply(@RequestBody @Valid OpeFeedbackReply reply, @Parameter(hidden = true) BindingResult bindingResult){
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- Integer rec = Optional.ofNullable(feedbackSv.addReply(reply)).orElse(0);
- if (rec == 0) {
- return BaseResponseUtils.buildFail("娣诲姞鍥炲澶辫触");
- }
- return BaseResponseUtils.buildSuccess(true);
- }
-
- /**
- * 淇敼闂鍙嶉鍥炲
- * @param reply
- * @param bindingResult
- * @return
- */
- @PostMapping(path = "updateReply", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
- @SsoAop()
- public BaseResponse<Boolean> updateReply(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid OpeFeedbackReply reply, @Parameter(hidden = true) BindingResult bindingResult) {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- int count ;
- try {
- count = feedbackSv.updateReply(reply);
- } catch (Exception e) {
- log.error("淇敼闂鍙嶉鍥炲寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
- if (count <= 0) {
- return BaseResponseUtils.buildFail("淇敼鍙嶉鍥炲澶辫触");
- } else {
- return BaseResponseUtils.buildSuccess(true);
- }
- }
-
- /**
- * 鍒犻櫎闂鍙嶉鍥炲
- * @param map
- * @return
- */
- @PostMapping(path = "deleteReply")
- @Transactional(rollbackFor = Exception.class)
- @SsoAop()
- public BaseResponse<Boolean> deleteReply(@RequestBody Map map) {
- if (map == null || map.size() <= 0) {
- return BaseResponseUtils.buildFail("璇蜂紶鍏d");
- }
- Long id = Long.parseLong(map.get("id").toString());
- try {
- Integer recordCount = Optional.ofNullable(feedbackSv.deleteReply(id)).orElse(0);
- if (recordCount == 0) {
- return BaseResponseUtils.buildFail("鍒犻櫎澶辫触");
- } else {
- return BaseResponseUtils.buildSuccess(true);
- }
- } catch (Exception e) {
- log.error("鍒犻櫎寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
- }
-
-
- /**
- * 鍒嗛〉鏌ヨ闂鍙嶉鍥炲
- * @param qo
- * @return
- */
- @GetMapping(path = "getFeedbackReply")
- @SsoAop()
- public BaseResponse<QueryResultVo<List<VofeedbackReply>>> getFeedbackReply(ReplyQueryVo qo) {
- try {
- QueryResultVo<List<VofeedbackReply>> res = feedbackSv.getFeedbackReply(qo);
- if (res == null) {
- return BaseResponseUtils.buildFail("鏌ヨ澶辫触");
- }
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/FeedbackSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/FeedbackSv.java
deleted file mode 100644
index ccc704d..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/FeedbackSv.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.dy.pipIrrOperation.feedback;
-
-import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.daoOp.OpeFeedbackMapper;
-import com.dy.pipIrrGlobal.daoOp.OpeFeedbackReplyMapper;
-import com.dy.pipIrrGlobal.pojoOp.OpeFeedback;
-import com.dy.pipIrrGlobal.pojoOp.OpeFeedbackReply;
-import com.dy.pipIrrGlobal.voOp.Vofeedback;
-import com.dy.pipIrrGlobal.voOp.VofeedbackReply;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.common.utils.PojoUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-07-29 13:42
- * @LastEditTime 2024-07-29 13:42
- * @Description
- */
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class FeedbackSv {
- @Autowired
- private OpeFeedbackMapper opeFeedbackMapper;
-
- @Autowired
- private OpeFeedbackReplyMapper opeFeedbackReplyMapper;
-
- /**
- * 娣诲姞闂鍙嶉
- * @param feedback
- * @return
- */
- public int add(OpeFeedback feedback) {
- feedback.setState((byte)0);
- feedback.setFeedbackTime(new Date());
- int i = opeFeedbackMapper.insertSelective(feedback);
- return i;
- }
-
- /**
- * 淇敼闂鍙嶉鐘舵��
- * @param feedback
- * @return
- */
- public int update(OpeFeedback feedback) {
- int i = opeFeedbackMapper.updateByPrimaryKeySelective(feedback);
- return i;
- }
-
- /**
- * 鍒犻櫎闂鍙嶉
- * @param id
- * @return
- */
- public int delete(Long id) {
- int i = opeFeedbackMapper.deleteByPrimaryKey(id);
- return i;
- }
-
- /**
- * 鑾峰彇闂鍙嶉
- * @param qo
- * @return
- */
- public QueryResultVo<List<Vofeedback>> getFeedbacks(QueryVo qo) {
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
- Long itemTotal = opeFeedbackMapper.getRecordCount(params);
-
- QueryResultVo<List<Vofeedback>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = qo.pageSize;
- rsVo.pageCurr = qo.pageCurr;
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = opeFeedbackMapper.getFeedbacks(params);
- return rsVo;
- }
-
- /**
- * 娣诲姞闂鍙嶉鍥炲
- * @param reply
- * @return
- */
- public Integer addReply(OpeFeedbackReply reply) {
- reply.setReplyTime(new Date());
- return opeFeedbackReplyMapper.insertSelective(reply);
- }
-
- /**
- * 淇敼闂鍙嶉鍥炲
- * @param reply
- * @return
- */
- public int updateReply(OpeFeedbackReply reply) {
- reply.setReplyTime(new Date());
- return opeFeedbackReplyMapper.updateByPrimaryKeySelective(reply);
- }
-
- /**
- * 鍒犻櫎闂鍙嶉鍥炲
- * @param id
- * @return
- */
- public Integer deleteReply(Long id) {
- return opeFeedbackReplyMapper.deleteByPrimaryKey(id);
- }
-
- /**
- * 鑾峰彇鍙嶉鍥炲
- * @param qo
- * @return
- */
- public QueryResultVo<List<VofeedbackReply>> getFeedbackReply(ReplyQueryVo qo) {
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
- Long itemTotal = opeFeedbackReplyMapper.getRecordCount(params);
-
- QueryResultVo<List<VofeedbackReply>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = qo.pageSize;
- rsVo.pageCurr = qo.pageCurr;
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = opeFeedbackReplyMapper.getFeedbackReply(params);
- return rsVo;
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/QueryVo.java
deleted file mode 100644
index d12a8f8..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/QueryVo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.dy.pipIrrOperation.feedback;
-
-import com.dy.common.webUtil.QueryConditionVo;
-import lombok.*;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author :WuZeYu
- * @Date :2024/7/30 9:32
- * @LastEditTime :2024/7/30 9:32
- * @Description
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ToString(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class QueryVo extends QueryConditionVo {
- /**
- * 鍙嶉浜篿d
- */
- private String feedbackerId;
- /**
- * 鍙嶉浜哄鍚�
- */
- private String feedbackerName;
- /**
- * 鍙嶉鐘舵��
- */
- private Byte state;
- /**
- * 鏌ヨ寮�濮嬫棩鏈�
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date timeStart;
-
- /**
- * 鏌ヨ缁撴潫鏃ユ湡
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date timeStop;
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/ReplyQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/ReplyQueryVo.java
deleted file mode 100644
index c9b887d..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/feedback/ReplyQueryVo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.dy.pipIrrOperation.feedback;
-
-import com.dy.common.webUtil.QueryConditionVo;
-import lombok.*;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author :WuZeYu
- * @Date :2024/8/1 19:40
- * @LastEditTime :2024/8/1 19:40
- * @Description
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ToString(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class ReplyQueryVo extends QueryConditionVo {
- /**
- * 鍙嶉缂栧彿
- */
- private String feedbackId;
-
- /**
- * 鍥炲浜�
- */
- private String replierId;
- /**
- * 鍥炲鏃堕棿寮�濮嬫棩鏈�
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date replyTimeStart;
-
- /**
- * 鍥炲鏃堕棿缁撴潫鏃ユ湡
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date replyTimeStop;
-
-}
--
Gitblit v1.8.0