Merge branch 'jtdev' into 20240222-patrol

guoshilong

2024-02-27 0bdd1bda41e6fa8436d070b1f4e5b1f19f86d9d8

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java

@@ -3,9 +3,12 @@
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;
@@ -14,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;
@@ -34,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
@@ -69,8 +82,15 @@
   }

   @Override
   @Transactional(rollbackFor = Exception.class)
   public Boolean updateResBaseByGuid(AttResBase attResBase) {
      attResBase.setUpdateTime(DateUtil.now());


      //向水库标签表中更新数据
      relResLabelService.updateEntity(attResBase.getGuid(),attResBase.getLabel());


      return baseMapper.updateResBaseByGuid(attResBase);
   }

@@ -93,4 +113,25 @@
   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);
   }
}