From 4f023af6fd0eac21b28bfec1369245dd73cc1496 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 11 十一月 2024 17:15:50 +0800
Subject: [PATCH] 巡检仪问题上报接口、农户问题上报接口代码优化
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeIssueReport.java | 95 ++++++++++
/dev/null | 64 -------
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java | 51 +++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeIssueReport.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java | 14 +
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java | 55 ++++++
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java | 27 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml | 173 +++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java | 33 ---
10 files changed, 423 insertions(+), 95 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java
new file mode 100644
index 0000000..dde252e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pipIrrGlobal.daoOp;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-11 16:18
+ * @LastEditTime 2024-11-11 16:18
+ * @Description
+ */
+
+@Mapper
+public interface OpeIssueReportMapper extends BaseMapper<OpeIssueReport> {
+ int deleteByPrimaryKey(Long id);
+
+ int insert(OpeIssueReport record);
+
+ int insertSelective(OpeIssueReport record);
+
+ OpeIssueReport selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(OpeIssueReport record);
+
+ int updateByPrimaryKey(OpeIssueReport record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeIssueReport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeIssueReport.java
new file mode 100644
index 0000000..8cf2652
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeIssueReport.java
@@ -0,0 +1,95 @@
+package com.dy.pipIrrGlobal.pojoOp;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+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 com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-11 16:18
+ * @LastEditTime 2024-11-11 16:18
+ * @Description 宸℃鍛橀棶棰樹笂鎶ュ疄浣撶被
+ */
+
+@TableName(value="ope_issue_report", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class OpeIssueReport implements BaseEntity {
+ public static final long serialVersionUID = 202411111622001L;
+
+ /**
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ private Long id;
+
+ /**
+ * 闂鍐呭
+ */
+ private String content;
+
+ /**
+ * 鐓х墖鍒楄〃
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private JSONArray images;
+
+ /**
+ * 闊抽鍒楄〃
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private JSONArray audios;
+
+ /**
+ * 瑙嗛鍒楄〃
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private JSONArray videos;
+
+ /**
+ * 缁忓害
+ */
+ private BigDecimal lng;
+
+ /**
+ * 绾害
+ */
+ private BigDecimal lat;
+
+ /**
+ * 宸℃鍛業D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long inspectorId;
+
+ /**
+ * 涓婃姤鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reportTime;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String phone;
+
+ /**
+ * 鐘舵��;1-鏈彈鐞嗭紝2-宸插彈鐞嗭紝3宸插垹闄�
+ */
+ private Byte state;
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeIssueReport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeIssueReport.java
index 1fca704..c2f83b4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeIssueReport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeIssueReport.java
@@ -19,7 +19,7 @@
* @author ZhuBaoMin
* @date 2024-10-29 16:53
* @LastEditTime 2024-10-29 16:53
- * @Description 闂涓婃姤瀹炰綋绫�
+ * @Description 鍐滄埛闂涓婃姤瀹炰綋绫�
*/
@TableName(value="se_issue_report", autoResultMap = true)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
new file mode 100644
index 0000000..8dedb69
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
@@ -0,0 +1,173 @@
+<?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.OpeIssueReportMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoOp.OpeIssueReport">
+ <!--@mbg.generated-->
+ <!--@Table ope_issue_report-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ <result column="images" jdbcType="JAVA_OBJECT" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" property="images" />
+ <result column="audios" jdbcType="JAVA_OBJECT" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" property="audios" />
+ <result column="videos" jdbcType="JAVA_OBJECT" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" property="videos" />
+ <result column="lng" jdbcType="DECIMAL" property="lng" />
+ <result column="lat" jdbcType="DECIMAL" property="lat" />
+ <result column="inspector_id" jdbcType="BIGINT" property="inspectorId" />
+ <result column="report_time" jdbcType="TIMESTAMP" property="reportTime" />
+ <result column="phone" jdbcType="VARCHAR" property="phone" />
+ <result column="state" jdbcType="TINYINT" property="state" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, content, images, audios, videos, lng, lat, inspector_id, report_time, phone,
+ `state`
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ope_issue_report
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from ope_issue_report
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeIssueReport">
+ <!--@mbg.generated-->
+ insert into ope_issue_report (id, content, images,
+ audios, videos, lng,
+ lat, inspector_id, report_time,
+ phone, `state`)
+ values (#{id,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{images,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ #{audios,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}, #{videos,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}, #{lng,jdbcType=DECIMAL},
+ #{lat,jdbcType=DECIMAL}, #{inspectorId,jdbcType=BIGINT}, #{reportTime,jdbcType=TIMESTAMP},
+ #{phone,jdbcType=VARCHAR}, #{state,jdbcType=TINYINT})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeIssueReport">
+ <!--@mbg.generated-->
+ insert into ope_issue_report
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="content != null">
+ content,
+ </if>
+ <if test="images != null">
+ images,
+ </if>
+ <if test="audios != null">
+ audios,
+ </if>
+ <if test="videos != null">
+ videos,
+ </if>
+ <if test="lng != null">
+ lng,
+ </if>
+ <if test="lat != null">
+ lat,
+ </if>
+ <if test="inspectorId != null">
+ inspector_id,
+ </if>
+ <if test="reportTime != null">
+ report_time,
+ </if>
+ <if test="phone != null">
+ phone,
+ </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="images != null">
+ #{images,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ </if>
+ <if test="audios != null">
+ #{audios,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ </if>
+ <if test="videos != null">
+ #{videos,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ </if>
+ <if test="lng != null">
+ #{lng,jdbcType=DECIMAL},
+ </if>
+ <if test="lat != null">
+ #{lat,jdbcType=DECIMAL},
+ </if>
+ <if test="inspectorId != null">
+ #{inspectorId,jdbcType=BIGINT},
+ </if>
+ <if test="reportTime != null">
+ #{reportTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="phone != null">
+ #{phone,jdbcType=VARCHAR},
+ </if>
+ <if test="state != null">
+ #{state,jdbcType=TINYINT},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoOp.OpeIssueReport">
+ <!--@mbg.generated-->
+ update ope_issue_report
+ <set>
+ <if test="content != null">
+ content = #{content,jdbcType=VARCHAR},
+ </if>
+ <if test="images != null">
+ images = #{images,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ </if>
+ <if test="audios != null">
+ audios = #{audios,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ </if>
+ <if test="videos != null">
+ videos = #{videos,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ </if>
+ <if test="lng != null">
+ lng = #{lng,jdbcType=DECIMAL},
+ </if>
+ <if test="lat != null">
+ lat = #{lat,jdbcType=DECIMAL},
+ </if>
+ <if test="inspectorId != null">
+ inspector_id = #{inspectorId,jdbcType=BIGINT},
+ </if>
+ <if test="reportTime != null">
+ report_time = #{reportTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="phone != null">
+ phone = #{phone,jdbcType=VARCHAR},
+ </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.OpeIssueReport">
+ <!--@mbg.generated-->
+ update ope_issue_report
+ set content = #{content,jdbcType=VARCHAR},
+ images = #{images,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ audios = #{audios,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ videos = #{videos,jdbcType=JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
+ lng = #{lng,jdbcType=DECIMAL},
+ lat = #{lat,jdbcType=DECIMAL},
+ inspector_id = #{inspectorId,jdbcType=BIGINT},
+ report_time = #{reportTime,jdbcType=TIMESTAMP},
+ phone = #{phone,jdbcType=VARCHAR},
+ `state` = #{state,jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
new file mode 100644
index 0000000..9fb6484
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
@@ -0,0 +1,55 @@
+package com.dy.pipIrrApp.issue;
+
+import com.dy.common.aop.SsoAop;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-11 16:29
+ * @LastEditTime 2024-11-11 16:29
+ * @Description
+ */
+
+@Slf4j
+@RestController
+@RequestMapping(path="issue")
+@RequiredArgsConstructor
+public class IssueCtrl {
+ private final IssueSv issueSv;
+
+ /**
+ * 娣诲姞宸℃鍛橀棶棰樹笂鎶ヨ褰�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "addIssueReport")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> addIssueReport(@RequestBody @Valid OpeIssueReport po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ String result = issueSv.addIssueReport(po);
+ if(!result.equals("success")) {
+ return BaseResponseUtils.buildErrorMsg(result);
+ }
+
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
new file mode 100644
index 0000000..36f7867
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
@@ -0,0 +1,51 @@
+package com.dy.pipIrrApp.issue;
+
+import com.dy.pipIrrGlobal.daoOp.OpeIssueReportMapper;
+import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-11 16:29
+ * @LastEditTime 2024-11-11 16:29
+ * @Description
+ */
+
+@Slf4j
+@Service
+public class IssueSv {
+ @Autowired
+ private OpeIssueReportMapper opeIssueReportMapper;
+
+ /**
+ * 娣诲姞宸℃鍛橀棶棰樹笂鎶�
+ * @param po
+ * @return
+ */
+ public String addIssueReport(OpeIssueReport po) {
+ po.setReportTime(new Date());
+ po.setState((byte)1);
+ opeIssueReportMapper.insert(po);
+ Long issueReportId = po.getId();
+ if(issueReportId == null) {
+ return "宸℃鍛橀棶棰樹笂鎶ュけ璐�";
+ }
+
+ return "success";
+ }
+
+ /**
+ * 娣诲姞宸℃鍛橀棶棰樹笂鎶ヤ俊鎭�
+ * @param po
+ * @return
+ */
+ //public Long insertIssueReport(OpeIssueReport po) {
+ // opeIssueReportMapper.insert(po);
+ // return po.getId();
+ //}
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
index 08c7db2..38b9743 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
@@ -170,6 +170,7 @@
* @return
*/
@GetMapping(path = "/getOneWorkOrder")
+ @SsoAop()
public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
try {
return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrderById(workOrderId));
@@ -191,6 +192,7 @@
*/
@PostMapping(path = "addProcessingResult")
@Transactional(rollbackFor = Exception.class)
+ @SsoAop()
public BaseResponse<Boolean> addProcessingResult(@RequestBody @Valid OpeProcessingResult po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -235,6 +237,7 @@
* @return
*/
@GetMapping(path = "/getProResult")
+ @SsoAop()
public BaseResponse<VoProcessingResult> getProResult(@RequestParam("proResultId") Long proResultId) {
try {
String aa = JSON.toJSONString(workOrderSv.getProResultById(proResultId));
@@ -254,6 +257,7 @@
*/
@PostMapping(path = "approveProResult")
@Transactional(rollbackFor = Exception.class)
+ @SsoAop()
public BaseResponse<Boolean> approveProResult(@RequestBody @Valid OpeApproveResult po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
index 925dad6..e7bfaba 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
@@ -1,6 +1,6 @@
package com.dy.pipIrrWechat.issue;
-import com.alibaba.fastjson2.JSONArray;
+import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
@@ -9,7 +9,6 @@
import com.dy.pipIrrGlobal.voSe.VoIssueReport;
import com.dy.pipIrrGlobal.voSe.VoIssueReportReply;
import com.dy.pipIrrWechat.issue.dto.DtoDeleteParam;
-import com.dy.pipIrrWechat.issue.dto.DtoIssueReport;
import com.dy.pipIrrWechat.issue.dto.DtoReportReply;
import com.dy.pipIrrWechat.issue.qo.QoIssueReport;
import jakarta.validation.Valid;
@@ -19,7 +18,6 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -47,34 +45,15 @@
*/
@PostMapping(path = "addIssueReport")
@Transactional(rollbackFor = Exception.class)
- public BaseResponse<Boolean> addIssueReport(@RequestBody @Valid DtoIssueReport po, BindingResult bindingResult) {
+ @SsoAop()
+ public BaseResponse<Boolean> addIssueReport(@RequestBody @Valid SeIssueReport po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- Long clientId = po.getClientId();
- String phone = Optional.ofNullable(po.getPhone()).orElse("");
- BigDecimal lng = Optional.ofNullable(po.getLng()).orElse(BigDecimal.valueOf(0));
- BigDecimal lat = Optional.ofNullable(po.getLat()).orElse(BigDecimal.valueOf(0));
- String content = Optional.ofNullable(po.getContent()).orElse("");
- JSONArray images = Optional.ofNullable(po.getImages()).orElse(new JSONArray());
- JSONArray audios = Optional.ofNullable(po.getAudios()).orElse(new JSONArray());
- JSONArray videos = Optional.ofNullable(po.getVideos()).orElse(new JSONArray());
-
- SeIssueReport seIssueReport = new SeIssueReport();
- seIssueReport.setClientId(clientId);
- seIssueReport.setPhone(phone);
- seIssueReport.setLng(lng);
- seIssueReport.setLat(lat);
- seIssueReport.setContent(content);
- seIssueReport.setImages(images);
- seIssueReport.setAudios(audios);
- seIssueReport.setVideos(videos);
- seIssueReport.setReportTime(new Date());
- seIssueReport.setState((byte)1);
- Long issueReportId = issueSv.insertIssueReport(seIssueReport);
- if(issueReportId == null) {
- return BaseResponseUtils.buildErrorMsg("鍐滄埛闂涓婃姤澶辫触");
+ String result = issueSv.addIssueReport(po);
+ if(!result.equals("success")) {
+ return BaseResponseUtils.buildErrorMsg(result);
}
return BaseResponseUtils.buildSuccess(true) ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
index 367d6b9..2b6e52c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -33,13 +34,20 @@
private SeReportReplyMapper seReportReplyMapper;
/**
- * 娣诲姞闂涓婃姤淇℃伅
+ * 娣诲姞鐢ㄦ埛闂涓婃姤
* @param po
* @return
*/
- public Long insertIssueReport(SeIssueReport po) {
+ public String addIssueReport(SeIssueReport po) {
+ po.setReportTime(new Date());
+ po.setState((byte)1);
seIssueReportMapper.insert(po);
- return po.getId();
+ Long issueReportId = po.getId();
+ if(issueReportId == null) {
+ return "鍐滄埛闂涓婃姤澶辫触";
+ }
+
+ return "success";
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/dto/DtoIssueReport.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/dto/DtoIssueReport.java
deleted file mode 100644
index 39a693f..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/dto/DtoIssueReport.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.dy.pipIrrWechat.issue.dto;
-
-import com.alibaba.fastjson2.JSONArray;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-10-30 10:45
- * @LastEditTime 2024-10-30 10:45
- * @Description 鍐滄埛闂涓婃姤浼犺緭绫�
- */
-
-@Data
-public class DtoIssueReport {
- public static final long serialVersionUID = 202410301046001L;
-
- /**
- * 鍙嶉鍐呭
- */
- private String content;
-
- /**
- * 鐓х墖鍒楄〃
- */
- //@TableField(typeHandler = JacksonTypeHandler.class)
- private JSONArray images;
-
- /**
- * 闊抽鍒楄〃
- */
- //@TableField(typeHandler = JacksonTypeHandler.class)
- private JSONArray audios;
-
- /**
- * 瑙嗛鍒楄〃
- */
- //@TableField(typeHandler = JacksonTypeHandler.class)
- private JSONArray videos;
-
- /**
- * 缁忓害
- */
- private BigDecimal lng;
-
- /**
- * 绾害
- */
- private BigDecimal lat;
-
- /**
- * 鍐滄埛ID
- */
- @NotNull(message = "鍐滄埛涓嶈兘涓虹┖")
- private Long clientId;
-
- /**
- * 鑱旂郴鐢佃瘽
- */
- private String phone;
-
-}
--
Gitblit v1.8.0