From ca2417166fe917aeb45d08df6ff152f9c7a0060a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 四月 2025 10:57:17 +0800 Subject: [PATCH] 修改拦载器 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/network/NetworkCtrl.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/network/NetworkCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/network/NetworkCtrl.java new file mode 100644 index 0000000..103f8d8 --- /dev/null +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/network/NetworkCtrl.java @@ -0,0 +1,97 @@ +package com.dy.pipIrrProject.network; + +import com.dy.common.aop.SsoAop; +import com.dy.common.webUtil.BaseResponse; +import com.dy.common.webUtil.BaseResponseUtils; +import com.dy.pipIrrGlobal.voPr.VoNetwork; +import com.dy.pipIrrProject.network.dto.Network; +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.List; +import java.util.Objects; + +/** + * @author ZhuBaoMin + * @date 2024-08-27 17:08 + * @LastEditTime 2024-08-27 17:08 + * @Description + */ + +@Slf4j +@RestController +@RequestMapping(path = "network") +@RequiredArgsConstructor +public class NetworkCtrl { + private final NetworkSv networkSv; + + /** + * 娣诲姞绠$綉 + * @param po + * @param bindingResult + * @return + */ + @PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE) + @Transactional(rollbackFor = Exception.class) + @SsoAop() + public BaseResponse<Boolean> save(@RequestBody @Valid Network po, BindingResult bindingResult) { + if (bindingResult != null && bindingResult.hasErrors()) { + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + String result = networkSv.addNetworks(po); + if(result.trim().length()> 0) { + return BaseResponseUtils.buildErrorMsg(result); + } + + //PrWaterNetwork prWaterNetwork = null; + //Long networkId = null; + // + //JSONArray networks = po.getData(); + //for (int i = 0; i < networks.size(); i++) { + // // 鍙栧嚭涓�绗旂粯鐢� + // JSONObject polyline = networks.getJSONObject(i); + // // 娣诲姞璇ョ瑪缁樼敾 + // prWaterNetwork = new PrWaterNetwork(); + // prWaterNetwork.setNetworkType(po.getType()); + // networkId = networkSv.addNetwork(prWaterNetwork); + // + // // 鍙栧嚭涓�绗旂粯鐢讳腑鐨勫潗鏍囩偣 + // JSONArray coordinates = polyline.getJSONArray("coordinates"); + // for (int j = 0; j < coordinates.size(); j++) { + // JSONObject point = coordinates.getJSONObject(j); + // + // PrNetworkCoordinates prNetworkCoordinates = new PrNetworkCoordinates(); + // prNetworkCoordinates.setNetworkId(networkId); + // prNetworkCoordinates.setLat(point.getBigDecimal("lat")); + // prNetworkCoordinates.setLng(point.getBigDecimal("lng")); + // + // Long coordinateId = Optional.ofNullable(networkSv.addNetworkCoordinate(prNetworkCoordinates)).orElse(0L); + // if (coordinateId.equals(0)) { + // return BaseResponseUtils.buildErrorMsg(ProjectResultCode.SAVA_NETWORK_ERROR.getMessage()); + // } + // } + //} + return BaseResponseUtils.buildSuccess(true); + } + + /** + * 鑾峰彇鍏ㄩ儴绠$綉 + * @return + */ + @GetMapping(path = "/all") + @SsoAop() + public BaseResponse<List<VoNetwork>> getNetworks() { + try { + return BaseResponseUtils.buildSuccess(networkSv.getNetworks()); + } catch (Exception e) { + log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e); + return BaseResponseUtils.buildException(e.getMessage()); + } + } +} -- Gitblit v1.8.0