zhubaomin
2024-11-12 88af52278ad3bf8642682a3ed8d3cdb3b0b9ad0d
巡检员问题上报逻辑删除接口
5个文件已修改
1个文件已添加
106 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/dto/DtoDeleteParam.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeIssueReportMapper.java
@@ -4,6 +4,7 @@
import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -42,4 +43,24 @@
     * @return
     */
    List<VoIssueReport> getIssueReports(Map<?, ?> params);
    /**
     * 根据上报ID及巡检员ID获取未删除的上报,删除上报判断使用
     * @param issueReportId
     * @param inspectorId
     * @return
     */
    OpeIssueReport getReport(@Param("issueReportId")Long issueReportId, @Param("inspectorId")Long inspectorId);
    /**
     * 逻辑删除一个农户问题上报
     * @param issueReportId
     * @return
     */
    /**
     * 逻辑删除一个巡检员问题上报
     * @param issueReportId
     * @return
     */
    Integer deleteIssueReport(Long issueReportId);
}
pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
@@ -5,9 +5,9 @@
            #name: ym
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#
            druid:
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
@@ -252,4 +252,14 @@
      </if>
    </trim>
  </select>
  <!--根据上报ID及巡检员ID获取未删除的上报,删除上报判断使用-->
  <select id="getReport" resultType="com.dy.pipIrrGlobal.pojoOp.OpeIssueReport">
    SELECT * FROM ope_issue_report WHERE state != 3 AND id = #{issueReportId} AND inspector_id = #{inspectorId}
  </select>
  <!--逻辑删除一个农户问题上报-->
  <update id="deleteIssueReport">
    UPDATE ope_issue_report SET state = 3 WHERE id = #{issueReportId}
  </update>
</mapper>
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java
@@ -4,6 +4,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.issue.dto.DtoDeleteParam;
import com.dy.pipIrrApp.issue.qo.QoIssueReport;
import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
import com.dy.pipIrrGlobal.voOp.VoIssueReport;
@@ -59,6 +60,7 @@
     * @return
     */
    @GetMapping(path = "/getIssueReports")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) {
        try {
            QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo);
@@ -69,4 +71,25 @@
        }
    }
    /**
     * 逻辑删除巡检员问题上报,删除前先判断要删除的上报是否存在
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "deleteIssueReport")
    public BaseResponse<Boolean> deleteIssueReport(@RequestBody @Valid DtoDeleteParam po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        String result = issueSv.deleteIssueReport(po);
        if(!result.equals("success")) {
            return BaseResponseUtils.buildErrorMsg(result);
        }
        return BaseResponseUtils.buildSuccess();
    }
}
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueSv.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrApp.issue;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.issue.dto.DtoDeleteParam;
import com.dy.pipIrrApp.issue.qo.QoIssueReport;
import com.dy.pipIrrGlobal.daoOp.OpeIssueReportMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport;
@@ -75,4 +76,23 @@
        return rsVo;
    }
    /**
     * 逻辑删除巡检员问题上报,删除前先判断要删除的上报是否存在
     * @param po
     * @return
     */
    public String deleteIssueReport(DtoDeleteParam po) {
        // 根据上报ID及巡检员ID获取未删除的上报,删除上报判断使用
        OpeIssueReport opeIssueReport = opeIssueReportMapper.getReport(po.getIssueReportId(), po.getInspectorId());
        if(opeIssueReport == null) {
            return "您要删除的问题上报不存在";
        }
        if(opeIssueReportMapper.deleteIssueReport(po.getIssueReportId()) == 0) {
            return "巡检员问题上报删除失败";
        }
        return "success";
    }
}
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/dto/DtoDeleteParam.java
New file
@@ -0,0 +1,28 @@
package com.dy.pipIrrApp.issue.dto;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
 * @author ZhuBaoMin
 * @date 2024-11-12 16:18
 * @LastEditTime 2024-11-12 16:18
 * @Description 巡检员问题上报删除参数对象
 */
@Data
public class DtoDeleteParam {
    public static final long serialVersionUID = 202411121619001L;
    /**
     * 巡检员问题上报ID
     */
    @NotNull(message = "请选择要删除的问题上报")
    private Long issueReportId;
    /**
     * 巡检员ID
     */
    @NotNull(message = "巡检员编号不能为空")
    private Long inspectorId;
}