pipIrr-SV.git - Gitblit

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

			import com.alibaba.fastjson2.JSONArray;
			import com.dy.common.webUtil.BaseResponse;
			import com.dy.common.webUtil.BaseResponseUtils;
			import com.dy.common.webUtil.QueryResultVo;
			@@ -9,7 +8,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 +17,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 +44,14 @@
			*/
			@PostMapping(path = "addIssueReport")
			@Transactional(rollbackFor = Exception.class)
			public BaseResponse<Boolean> addIssueReport(@RequestBody @Valid DtoIssueReport po, BindingResult bindingResult) {
			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) ;
			@@ -88,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());