From 44eb64bef08ce231ac95d5ee482b046014dc8afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 九月 2025 11:29:26 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 102 +++++++++-----------------------------------------
1 files changed, 19 insertions(+), 83 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index 7bbc8ea..7e22357 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -12,9 +12,8 @@
import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
-import com.dy.pipIrrGlobal.voPr.VoAllIntake;
-import com.dy.pipIrrGlobal.voPr.VoIntake;
-import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
+import com.dy.pipIrrGlobal.voPr.*;
+import com.dy.pipIrrProject.intake.qo.QoIntake;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -110,32 +109,19 @@
return prIntakeMapper.getSupperByVillageId(vaId);
}
- /**
- * 淇濆瓨淇敼瀹炰綋
- *
- * @param po 瀹炰綋
- * @return 鏁伴噺
- */
-
public int update(PrIntake po) {
- if (po.getTownId() == null || po.getTownId() == 0) {
- Long townId = getSupperByVillageId(po.getVillageId());
- po.setTownId(townId);
- }
- if (po.getCountyId() == null || po.getCountyId() == 0) {
- Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
- po.setCountyId(countyId);
- }
+// if (po.getTownId() == null || po.getTownId() == 0) {
+// Long townId = getSupperByVillageId(po.getVillageId());
+// po.setTownId(townId);
+// }
+// if (po.getCountyId() == null || po.getCountyId() == 0) {
+// Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
+// po.setCountyId(countyId);
+// }
return this.prIntakeMapper.updateByPrimaryKeySelective(po);
// return this.prIntakeMapper.updateByPrimaryKey(po);
}
- /**
- * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍙栨按鍙ｈ褰�
- *
- * @param queryVo 鏌ヨ瑙嗗浘
- * @return 鍙栨按鍙ｈ褰曞垪琛�
- */
public QueryResultVo<List<VoIntake>> getIntakes(QueryVo queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
Long itemTotal = prIntakeMapper.getRecordCount(params);
@@ -148,76 +134,35 @@
return rsVo;
}
- /**
- * 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鍙栨按鍙ｅ垪琛�
- *
- * @param queryVo
- * @return
- */
public List<VoIntake> exportIntakes(QueryVo queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
List<VoIntake> rsVo = prIntakeMapper.getIntakes(params);
return rsVo;
}
- /**
- * 寰楀埌鎵�鏈夊彇姘村彛
- *
- * @return 鎵�鏈夊彇姘村彛闆嗗悎
- */
public QueryResultVo<List<VoAllIntake>> selectAll() {
QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
rsVo.obj = this.prIntakeMapper.selectAll();
return rsVo;
}
- /**
- * 寰楀埌涓�涓彇姘村彛
- *
- * @param id 鍙栨按鍙D
- * @return 鍙栨按鍙ｅ疄浣�
- */
- public PrIntake selectById(Long id) {
+ public VoAllIntake selectById(Long id) {
return this.prIntakeMapper.selectByPrimaryKey(id);
}
- /**
- * 閫昏緫鍒犻櫎瀹炰綋
- *
- * @param id 瀹炰綋ID
- * @return 鏁伴噺
- */
@Transactional
public int delete(Long id) {
return this.prIntakeMapper.deleteLogicById(id);
}
- /**
- * 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栨湭鍒犻櫎鐨勫彇姘村彛鏁伴噺
- *
- * @param intakeId
- * @return
- */
public Integer getRecordCountOfIntake(Long intakeId) {
return prIntakeMapper.getRecordCountOfIntake(intakeId);
}
- /**
- * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
- *
- * @param villageId 鏉慖d
- * @return address 鍏ㄩ儴浜旂骇鍦板潃
- */
public String getAddressByVillageId(long villageId) {
return prIntakeMapper.getAddressByVillageId(villageId);
}
- /**
- * 鏍规嵁鍖哄煙Id鑾峰彇鍖哄煙绛夌骇
- *
- * @param regionId 鍖哄煙Id
- * @return Level 鍖哄煙绛夌骇
- */
public int getLevelByRegionId(long regionId) {
return prIntakeMapper.getLevelByRegionId(regionId);
}
@@ -294,11 +239,6 @@
return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
}
- /**
- * 鍙戦�佸懡浠�
- *
- * @return
- */
protected BaseResponse sendCom2Mw(Command com) {
String url = UriComponentsBuilder.fromUriString(comSendUrl)
.build()
@@ -321,25 +261,21 @@
}
- /**
- * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
- *
- * @param intakeName
- * @return
- */
public List<Long> getIntakeIdsByName(String intakeName) {
return prIntakeMapper.getIntakeIdsByName(intakeName);
}
- /**
- * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
- *
- * @param intakeName
- * @return
- */
public List<Long> getIntakeIdByNameExcludeId(Long id, String intakeName) {
return prIntakeMapper.getIntakeIdByNameExcludeId(id, intakeName);
}
+ public int updateIntakeLngLat(IntakeUpdateLngLat po) {
+ return prIntakeMapper.updateByPrimaryKeySelective1(po);
+ }
+
+ public List<VoIntakeSimple> getFreeIntakes(QoIntake queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ return prIntakeMapper.getFreeIntakes(params);
+ }
}
--
Gitblit v1.8.0