Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-12-03 07648f0083e80cc590ba8bc77a9e72be5ad66748

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
import com.dy.pipIrrGlobal.voOp.VoIssueReport_temp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -42,7 +42,7 @@
     * @param params
     * @return
     */
    List<VoIssueReport> getIssueReports(Map<?, ?> params);
    List<VoIssueReport_temp> getIssueReports(Map<?, ?> params);

    /**
     * 根据上报ID及巡检员ID获取未删除的上报，删除上报判断使用

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -54,5 +54,5 @@
     * @param proResultId
     * @return
     */
    VoProcessingResult getProResultById(Long proResultId);
    VoProcessingResult_temp getProResultById(Long proResultId);
}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeIssueReportMapper.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SeIssueReport;
import com.dy.pipIrrGlobal.voSe.VoIssueReport;
import com.dy.pipIrrGlobal.voSe.VoIssueReport_temp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -42,7 +42,7 @@
     * @param params
     * @return
     */
    List<VoIssueReport> getIssueReports(Map<?, ?> params);
    List<VoIssueReport_temp> getIssueReports(Map<?, ?> params);

    /**
     * 根据上报ID及农户ID获取未删除的上报，删除上报判断使用

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport.java

@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voOp;

import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
@@ -11,15 +12,15 @@

/**
 * @author ZhuBaoMin
 * @date 2024-11-12 14:46
 * @LastEditTime 2024-11-12 14:46
 * @date 2024-12-03 15:02
 * @LastEditTime 2024-12-03 15:02
 * @Description 巡检员问题上报视图对象
 */

@Data
@JsonPropertyOrder({"issueReportId", "inspectorName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
public class VoIssueReport implements BaseEntity {
    private static final long serialVersionUID = 202411121448001L;
    private static final long serialVersionUID = 202412031504001L;

    /**
     * 巡检员问题上报ID
@@ -51,17 +52,17 @@
    /**
     * 照片列表
     */
    private String images;
    private JSONArray images;

    /**
     * 音频列表
     */
    private String audios;
    private JSONArray audios;

    /**
     * 视频列表
     */
    private String videos;
    private JSONArray videos;

    /**
     * 上报回复时间

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoIssueReport_temp.java

New file
@@ -0,0 +1,81 @@
package com.dy.pipIrrGlobal.voOp;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

import java.util.Date;

/**
 * @author ZhuBaoMin
 * @date 2024-11-12 14:46
 * @LastEditTime 2024-11-12 14:46
 * @Description 巡检员问题上报临时视图对象
 */

@Data
@JsonPropertyOrder({"issueReportId", "inspectorName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
public class VoIssueReport_temp implements BaseEntity {
    private static final long serialVersionUID = 202411121448001L;

    /**
     * 巡检员问题上报ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long issueReportId;

    /**
     * 巡检员姓名
     */
    private String inspectorName;

    /**
     * 联系电话
     */
    private String phone;

    /**
     * 上报时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date reportTime;

    /**
     * 上报内容
     */
    private String content;

    /**
     * 照片列表
     */
    private String images;

    /**
     * 音频列表
     */
    private String audios;

    /**
     * 视频列表
     */
    private String videos;

    /**
     * 上报回复时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date replyTime;

    /**
     * 状态值
     */
    private Integer stateId;

    /**
     * 状态描述
     */
    private String state;
}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java

@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voOp;

import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
@@ -12,15 +13,15 @@

/**
 * @author ZhuBaoMin
 * @date 2024-11-08 14:59
 * @LastEditTime 2024-11-08 14:59
 * @Description
 * @date 2024-12-03 10:56
 * @LastEditTime 2024-12-03 10:56
 * @Description 处理结果详情视图对象
 */

@Data
@JsonPropertyOrder({"proResultId","workOrderId","inspector","content"," images"," audios"," videos","lng","lat","completeTime","reportTime","state","stateName"})
public class VoProcessingResult implements BaseEntity {
    public static final long serialVersionUID = 202411081500001L;
    public static final long serialVersionUID = 202412031505001L;

    /**
     * 处理结果ID
@@ -47,17 +48,17 @@
    /**
     * 照片列表
     */
    private String images;
    private JSONArray images;

    /**
     * 音频列表
     */
    private String audios;
    private JSONArray audios;

    /**
     * 视频列表
     */
    private String videos;
    private JSONArray videos;

    /**
     * 经度

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java

New file
@@ -0,0 +1,94 @@
package com.dy.pipIrrGlobal.voOp;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @author ZhuBaoMin
 * @date 2024-11-08 14:59
 * @LastEditTime 2024-11-08 14:59
 * @Description 处理结果详情临时视图对象
 */

@Data
@JsonPropertyOrder({"proResultId","workOrderId","inspector","content"," images"," audios"," videos","lng","lat","completeTime","reportTime","state","stateName"})
public class VoProcessingResult_temp implements BaseEntity {
    public static final long serialVersionUID = 202411081500001L;

    /**
     * 处理结果ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long proResultId;

    /**
     * 工单ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long workOrderId;

    /**
     * 巡检员
     */
    private String inspector;

    /**
     * 结果内容
     */
    private String content;

    /**
     * 照片列表
     */
    private String images;

    /**
     * 音频列表
     */
    private String audios;

    /**
     * 视频列表
     */
    private String videos;

    /**
     * 经度
     */
    private BigDecimal lng;

    /**
     * 纬度
     */
    private BigDecimal lat;

    /**
     * 任务完成时间;精确到分
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    private Date completeTime;

    /**
     * 上报时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date reportTime;

    /**
     * 状态;1-已上报，2-已通过，3-已驳回
     */
    private Byte state;

    /**
     * 状态名称
     */
    private String stateName;

}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport.java

@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voSe;

import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
@@ -11,15 +12,15 @@

/**
 * @author ZhuBaoMin
 * @date 2024-10-30 13:51
 * @LastEditTime 2024-10-30 13:51
 * @date 2024-12-03 15:56
 * @LastEditTime 2024-12-03 15:56
 * @Description 农户问题上报视图对象
 */

@Data
@JsonPropertyOrder({"issueReportId", "clientName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
public class VoIssueReport implements BaseEntity {
    private static final long serialVersionUID = 202410301354001L;
    private static final long serialVersionUID = 202412031557001L;

    /**
     * 农户问题上报ID
@@ -51,17 +52,17 @@
    /**
     * 照片列表
     */
    private String images;
    private JSONArray images;

    /**
     * 音频列表
     */
    private String audios;
    private JSONArray audios;

    /**
     * 视频列表
     */
    private String videos;
    private JSONArray videos;

    /**
     * 上报回复时间

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoIssueReport_temp.java

New file
@@ -0,0 +1,81 @@
package com.dy.pipIrrGlobal.voSe;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

import java.util.Date;

/**
 * @author ZhuBaoMin
 * @date 2024-10-30 13:51
 * @LastEditTime 2024-10-30 13:51
 * @Description 农户问题上报临时视图对象
 */

@Data
@JsonPropertyOrder({"issueReportId", "clientName", "phone", "reportTime", "content", "images", "audios", "videos", "replyTime", "stateId", "state"})
public class VoIssueReport_temp implements BaseEntity {
    private static final long serialVersionUID = 202410301354001L;

    /**
     * 农户问题上报ID
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long issueReportId;

    /**
     * 农户姓名
     */
    private String clientName;

    /**
     * 联系电话
     */
    private String phone;

    /**
     * 上报时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date reportTime;

    /**
     * 上报内容
     */
    private String content;

    /**
     * 照片列表
     */
    private String images;

    /**
     * 音频列表
     */
    private String audios;

    /**
     * 视频列表
     */
    private String videos;

    /**
     * 上报回复时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date replyTime;

    /**
     * 状态值
     */
    private Integer stateId;

    /**
     * 状态描述
     */
    private String state;
}

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml

@@ -203,7 +203,7 @@
  </select>

  <!--根据指定条件获取巡检员问题上报-->
  <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport">
  <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport_temp">
    SELECT
        rpt.id AS issueReportId,
        us.name AS inspectorName,

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml

@@ -212,7 +212,7 @@
  </update>

  <!--根据主键获取处理结果视图对象-->
  <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult">
  <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp">
    SELECT
        res.id AS proResultId,
        res.work_order_id AS workOrderId,

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml

@@ -202,7 +202,7 @@
  </select>

  <!--根据指定条件获取农户问题上报-->
  <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voSe.VoIssueReport" >
  <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voSe.VoIssueReport_temp" >
    SELECT
        rpt.id AS issueReportId,
        cli.name AS clientName,

 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java

@@ -7,7 +7,6 @@
import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
import com.dy.pipIrrGlobal.voOp.VoInspect;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;

 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java

@@ -66,8 +66,8 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) {
        try {
            QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo);
            return BaseResponseUtils.buildSuccess(res);
            //QueryResultVo<List<VoIssueReport_temp>> res = issueSv.getIssueReports(vo);
            return BaseResponseUtils.buildSuccess(issueSv.getIssueReports(vo));
        } catch (Exception e) {
            log.error("获取巡检员问题上报记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());

 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java

@@ -1,5 +1,7 @@
package com.dy.pipIrrApp.issue;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
@@ -11,14 +13,14 @@
import com.dy.pipIrrGlobal.pojoOp.OpeReportReply;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
import com.dy.pipIrrGlobal.voOp.VoIssueReportReply;
import com.dy.pipIrrGlobal.voOp.VoIssueReport_temp;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @author ZhuBaoMin
@@ -74,13 +76,32 @@
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);

        Long itemTotal = opeIssueReportMapper.getIssueReportsCount(params);
        //QueryResultVo<List<VoIssueReport_temp>> rsVo = new QueryResultVo<>();
        QueryResultVo<List<VoIssueReport>> rsVo = new QueryResultVo<>();

        rsVo.pageSize = queryVo.pageSize;
        rsVo.pageCurr = queryVo.pageCurr;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = opeIssueReportMapper.getIssueReports(params);

        List<VoIssueReport_temp> list_temp = opeIssueReportMapper.getIssueReports(params);
        List<VoIssueReport> list = new ArrayList<>();
        for (int i = 0; i < list_temp.size(); i++) {
            VoIssueReport_temp report_temp = list_temp.get(i);
            VoIssueReport report = new VoIssueReport();
            BeanUtils.copyProperties(report_temp, report);

            JSONArray images_array = Optional.ofNullable(JSON.parseArray(report_temp.getImages())).orElse(new JSONArray());
            JSONArray audios_array = Optional.ofNullable(JSON.parseArray(report_temp.getAudios())).orElse(new JSONArray());
            JSONArray videos_array = Optional.ofNullable(JSON.parseArray(report_temp.getVideos())).orElse(new JSONArray());
            report.setImages(images_array);
            report.setAudios(audios_array);
            report.setVideos(videos_array);
            list.add(report);
        }

        rsVo.obj = list;
        //rsVo.obj = opeIssueReportMapper.getIssueReports(params);
        return rsVo;
    }


 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java

@@ -1,5 +1,7 @@
package com.dy.pipIrrApp.workOrder;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
@@ -12,16 +14,19 @@
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
import com.dy.pipIrrGlobal.voBa.VoRoleSimple;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp;
import com.dy.pipIrrGlobal.voOp.VoTaskType;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * @author ZhuBaoMin
@@ -182,7 +187,18 @@
     * @return
     */
    public VoProcessingResult getProResultById(Long proResultId) {
        return opeProcessingResultMapper.getProResultById(proResultId);
        VoProcessingResult_temp result_temp = opeProcessingResultMapper.getProResultById(proResultId);
        VoProcessingResult result = new VoProcessingResult();
        BeanUtils.copyProperties(result_temp, result);

        JSONArray images_array = Optional.ofNullable(JSON.parseArray(result_temp.getImages())).orElse(new JSONArray());
        JSONArray audios_array = Optional.ofNullable(JSON.parseArray(result_temp.getAudios())).orElse(new JSONArray());
        JSONArray videos_array = Optional.ofNullable(JSON.parseArray(result_temp.getVideos())).orElse(new JSONArray());
        result.setImages(images_array);
        result.setAudios(audios_array);
        result.setVideos(videos_array);

        return result;
    }

    /**

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java

@@ -65,8 +65,8 @@
    @GetMapping(path = "/getIssueReports")
    public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) {
        try {
            QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo);
            return BaseResponseUtils.buildSuccess(res);
            //QueryResultVo<List<VoIssueReport_temp>> res = issueSv.getIssueReports(vo);
            return BaseResponseUtils.buildSuccess(issueSv.getIssueReports(vo));
        } catch (Exception e) {
            log.error("获取农户问题上报记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java

@@ -1,5 +1,7 @@
package com.dy.pipIrrWechat.issue;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSe.SeIssueReportMapper;
import com.dy.pipIrrGlobal.daoSe.SeReportReplyMapper;
@@ -7,15 +9,15 @@
import com.dy.pipIrrGlobal.pojoSe.SeReportReply;
import com.dy.pipIrrGlobal.voSe.VoIssueReport;
import com.dy.pipIrrGlobal.voSe.VoIssueReportReply;
import com.dy.pipIrrGlobal.voSe.VoIssueReport_temp;
import com.dy.pipIrrWechat.issue.qo.QoIssueReport;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @author ZhuBaoMin
@@ -86,7 +88,24 @@
        rsVo.pageCurr = queryVo.pageCurr;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = seIssueReportMapper.getIssueReports(params);

        List<VoIssueReport_temp> list_temp = seIssueReportMapper.getIssueReports(params);
        List<VoIssueReport> list = new ArrayList<>();
        for (int i = 0; i < list_temp.size(); i++) {
            VoIssueReport_temp report_temp = list_temp.get(i);
            VoIssueReport report = new VoIssueReport();
            BeanUtils.copyProperties(report_temp, report);

            JSONArray images_array = Optional.ofNullable(JSON.parseArray(report_temp.getImages())).orElse(new JSONArray());
            JSONArray audios_array = Optional.ofNullable(JSON.parseArray(report_temp.getAudios())).orElse(new JSONArray());
            JSONArray videos_array = Optional.ofNullable(JSON.parseArray(report_temp.getVideos())).orElse(new JSONArray());
            report.setImages(images_array);
            report.setAudios(audios_array);
            report.setVideos(videos_array);
            list.add(report);
        }

        rsVo.obj = list;
        return rsVo;
    }