From 0bdd1bda41e6fa8436d070b1f4e5b1f19f86d9d8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 27 Feb 2024 14:34:46 +0800
Subject: [PATCH] Merge branch 'jtdev' into 20240222-patrol

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java |   78 ++++++++++++++++++++++++++++++++------
 1 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
index f239444..6a85f17 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -3,8 +3,13 @@
 import cn.gistack.sm.intelligentCall.mapper.CallTaskMapper;
 import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO;
 import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.entity.RelResLabel;
 import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper;
 import cn.gistack.sm.sjztmd.service.IAttResBaseService;
+import cn.gistack.sm.sjztmd.service.IRelResLabelService;
+import cn.gistack.sm.sjztmd.vo.AttResAdVO;
+import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
+import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
 import cn.gistack.sm.sjztmd.vo.ManagePersonVO;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,6 +17,7 @@
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.ArrayList;
@@ -32,9 +38,18 @@
 	@Autowired
 	private CallTaskMapper callTaskMapper;
 
+	@Autowired
+	private IRelResLabelService relResLabelService;
+
+
 	@Override
 	public IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase) {
 		return page.setRecords(baseMapper.selectAttResBasePage(page,attResBase));
+	}
+
+	@Override
+	public IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
+		return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
 	}
 
 	@Override
@@ -56,30 +71,67 @@
 	@Override
 	public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
 
-		Object adCode = params.get("adCode");
-		String ad_code = "";
-		String code = adCode.toString();
-		if (code.substring(0,4).indexOf("00") > -1) {
-			ad_code = adCode.toString().substring(0,2);
-		} else if (code.substring(0,6).indexOf("00") > -1) {
-			ad_code = adCode.toString().substring(0,4);
-		} else {
-			ad_code = adCode.toString().substring(0,6);
-		}
 		Object isExport = params.get("isExport");
-
 		// 判断是否导出，导出不分页
 		if (null != isExport && !isExport.equals("")) {
-			return baseMapper.getAttResBaseUserPage(null,ad_code,params);
+			return baseMapper.getAttResBaseUserPage(null,params);
 		}
-		List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,ad_code,params);
+		List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,params);
 		// 返回数据
 		return page.setRecords(attResBaseUserDTOList);
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean updateResBaseByGuid(AttResBase attResBase) {
 		attResBase.setUpdateTime(DateUtil.now());
+
+
+		//向水库标签表中更新数据
+		relResLabelService.updateEntity(attResBase.getGuid(),attResBase.getLabel());
+
+
 		return baseMapper.updateResBaseByGuid(attResBase);
 	}
+
+	/**
+	 * 查询当前水库对应的市级编号和县区编号
+	 * @param res_cd
+	 * @return
+	 */
+	@Override
+	public AttResBaseVO getCityCountyCodeByResGuid(String res_cd) {
+		return baseMapper.getCityCountyCodeByResGuid(res_cd);
+	}
+
+	/**
+	 * 根据水库编码获取行政区数据
+	 * @param guid
+	 * @return
+	 */
+	@Override
+	public AttResAdVO getWaterRegionInfoByResGuid(String guid) {
+		return baseMapper.getWaterRegionInfoByResGuid(guid);
+	}
+
+	@Override
+	public int getDimResInfoACount() {
+		return baseMapper.getDimResInfoACount();
+	}
+
+	@Override
+	public Boolean updateIsShowStatus(String ids, Integer status) {
+		return baseMapper.updateIsShowStatus(ids,status);
+	}
+
+	/**
+	 * 根据水库名称、所在区域查询改水库的数量
+	 * @param resName 水库名称
+	 * @param countyCode 区县
+	 * @return
+	 */
+	@Override
+	public Integer getWaterCountByResNameAndCountyName(String resName, String countyCode) {
+		return baseMapper.getWaterCountByResNameAndCountyName(resName,countyCode);
+	}
 }

--
Gitblit v1.9.3