Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java

@@ -1,13 +1,16 @@
package cn.gistack.sm.sjztmd.mapper;

import cn.gistack.sm.intelligentCall.entity.Scene;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
import cn.gistack.sm.sjztmd.vo.PersonVO;
import cn.gistack.sm.sjztmd.vo.UserPersonVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Set;

/**
 * @ClassName AttResManagePersonMapper
@@ -19,6 +22,7 @@
public interface AttResManagePersonMapper extends BaseMapper<AttResManagePerson> {

   Integer updateResManagePersonByGuid(@Param("attResManagePerson")AttResManagePerson attResManagePerson);

   Integer insertResManagePersion(@Param("attResManagePerson")AttResManagePerson attResManagePerson);

   List<AttResManagePerson> attResManagePersonListByResId(List<Long> resId);
@@ -33,4 +37,39 @@
    */
   @DS("zt")
   List<PersonVO> getPersonListByResGuid(@Param("res_cd")String res_cd, @Param("list") List<String> personList);

   List<UserPersonVO> getPersonByUserNotExists();

   List<UserPersonVO> getPersonByUser();

   int updateUserByPerson();

   /**
    * 通过水库代码获取巡查责任人及技术责任人手机号
    * @param list
    * @return
    */
   @DS("zt")
    Set<String> getPersonListByWaterCodeList(@Param("list") List<String> list);

   /**
    * 根据水库编号查询市县水利部人员姓名及联系方式
    * @param res_cd 水库编号
    * @param roleAlias 角色别名
    * @param type 人员类型
    * @return
    */
    List<PersonVO> getCityCountyPersonListByResGuid(@Param("adCode") String res_cd,
                                           @Param("roleAlias") String roleAlias,
                                           @Param("type") String type);

   List<PatrolResponsiblePerson> getPatrolResponsiblePersonByResCdList(@Param("ids") List<String> reservoirList);

   /**
    * 通过水库代码获取水库及巡查责任人信息
    * @param list
    * @return
    */
   @DS("zt")
   Set<Scene>  getPatrolPersonListByWaterCodeList(@Param("list") List<String> list);
}