Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

svr/svr-base/pom.xml

@@ -47,7 +47,7 @@
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
            <artifactId>spring-cloud-netflix-eureka-client</artifactId>
        </dependency>
        <!--注释掉就不会读取git的配置，只会读取yml中的配置-->
        <dependency>

svr/svr-base/src/main/java/com/yihu/SvrBaseApplication.java

@@ -4,7 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.context.annotation.Bean;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

svr/svr-base/src/main/java/com/yihu/jw/base/config/SpringSecurityAuditorAware.java

@@ -10,8 +10,8 @@ import java.util.Optional;
@Configuration
public class SpringSecurityAuditorAware implements AuditorAware {
    @Override
    public Object getCurrentAuditor() {
    public Object getCurrentAuditor1() {
//        return Optional.ofNullable(SecurityContextHolder.getContext())
//                .map(SecurityContext::getAuthentication)
//                .filter(Authentication::isAuthenticated)
@@ -20,4 +20,10 @@ public class SpringSecurityAuditorAware implements AuditorAware {
        return "123";
    }
    @Override
    public Optional getCurrentAuditor() {
        return Optional.empty();
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/ImGetuiConfigDao.java

@@ -2,10 +2,10 @@ package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.im.ImGetuiConfigDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * @author yeshijie on 2018/8/29.
 */
public interface ImGetuiConfigDao extends PagingAndSortingRepository<ImGetuiConfigDO, String>, JpaSpecificationExecutor<ImGetuiConfigDO> {
public interface ImGetuiConfigDao extends JpaRepository<ImGetuiConfigDO, String>, JpaSpecificationExecutor<ImGetuiConfigDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/KnowledgeArticleDeptDao.java

@@ -1,8 +1,8 @@
package com.yihu.jw.base.dao.article;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
 * @author huangwenjie
 * @date 2019/9/18 10:03
 */
public interface KnowledgeArticleDeptDao extends PagingAndSortingRepository<KnowledgeArticleDeptDO, String>, JpaSpecificationExecutor<KnowledgeArticleDeptDO> {
public interface KnowledgeArticleDeptDao extends JpaRepository<KnowledgeArticleDeptDO, String>, JpaSpecificationExecutor<KnowledgeArticleDeptDO> {
	
	List<KnowledgeArticleDeptDO> findByArticleId(String articleId);
	

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/KnowledgeArticleDictDao.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
 * @author huangwenjie
 * @date 2019/9/10 14:07
 */
public interface KnowledgeArticleDictDao extends PagingAndSortingRepository<KnowledgeArticleDictDO, String>, JpaSpecificationExecutor<KnowledgeArticleDictDO> {
public interface KnowledgeArticleDictDao extends JpaRepository<KnowledgeArticleDictDO, String>, JpaSpecificationExecutor<KnowledgeArticleDictDO> {
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and (categoryFirst = ?1 or categorySecond=?1)")
	List<KnowledgeArticleDictDO> findByCategory(String category);
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and categoryFirst = ?1 ")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/KnowledgeArticleMenuDao.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleMenuDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
 * @author huangwenjie
 * @date 2019/9/18 10:03
 */
public interface KnowledgeArticleMenuDao extends PagingAndSortingRepository<KnowledgeArticleMenuDO, String>, JpaSpecificationExecutor<KnowledgeArticleMenuDO> {
public interface KnowledgeArticleMenuDao extends JpaRepository<KnowledgeArticleMenuDO, String>, JpaSpecificationExecutor<KnowledgeArticleMenuDO> {
	
	List<KnowledgeArticleMenuDO> findByArticleId(String articleId);
	

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/KnowledgeArticleUserDao.java

@@ -3,14 +3,14 @@ package com.yihu.jw.base.dao.article;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 健康文章中间库DAO
 * @author
 * @date 2019/9/10 14:07
 */
public interface KnowledgeArticleUserDao extends PagingAndSortingRepository<KnowledgeArticleUserDO, String>, JpaSpecificationExecutor<KnowledgeArticleUserDO> {
public interface KnowledgeArticleUserDao extends JpaRepository<KnowledgeArticleUserDO, String>, JpaSpecificationExecutor<KnowledgeArticleUserDO> {
	@Query("select a from KnowledgeArticleUserDO a where a.del=1 and a.relationCode=?1 and a.user=?2")
	KnowledgeArticleUserDO findByrelationCodeAndUserAndDel(String relationCode, String user);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/KnowledgeCategoryDao.java

@@ -4,13 +4,13 @@ import com.yihu.jw.entity.hospital.article.KnowledgeCategoryDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 健康文章分类
 * @author huangwenjie
 */
public interface KnowledgeCategoryDao extends PagingAndSortingRepository<KnowledgeCategoryDO, String>, JpaSpecificationExecutor<KnowledgeCategoryDO> {
public interface KnowledgeCategoryDao extends JpaRepository<KnowledgeCategoryDO, String>, JpaSpecificationExecutor<KnowledgeCategoryDO> {
	@Query("update KnowledgeCategoryDO c set c.del = 0 where c.id = ?1")
	@Modifying
	void updateDel(String id);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/childManage/BaseChildManageDao.java

@@ -2,10 +2,10 @@ package com.yihu.jw.base.dao.childManage;
import com.yihu.jw.entity.child.BaseChildManage;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created by wsl on 2022/7/20
 */
public interface BaseChildManageDao extends PagingAndSortingRepository<BaseChildManage,String>, JpaSpecificationExecutor<BaseChildManage> {
public interface BaseChildManageDao extends JpaRepository<BaseChildManage,String>, JpaSpecificationExecutor<BaseChildManage> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/course/CourseCatalogueDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.course;
import com.yihu.jw.entity.care.course.CourseCatalogueDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created with IntelliJ IDEA.
@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @Date: 2021/5/12
 * @Description:
 */
public interface CourseCatalogueDao extends PagingAndSortingRepository<CourseCatalogueDO, String>, JpaSpecificationExecutor<CourseCatalogueDO> {
public interface CourseCatalogueDao extends JpaRepository<CourseCatalogueDO, String>, JpaSpecificationExecutor<CourseCatalogueDO> {

svr/svr-base/src/main/java/com/yihu/jw/base/dao/course/CourseDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.course;
import com.yihu.jw.entity.care.course.CourseDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created with IntelliJ IDEA.
@@ -11,6 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @Date: 2021/5/12
 * @Description:
 */
public interface CourseDao extends PagingAndSortingRepository<CourseDO, String>, JpaSpecificationExecutor<CourseDO> {
public interface CourseDao extends JpaRepository<CourseDO, String>, JpaSpecificationExecutor<CourseDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/course/CourseSalesOrderRecordDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.course;
import com.yihu.jw.entity.care.course.CourseSalesOrderRecordDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created with IntelliJ IDEA.
@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @Date: 2021/5/17
 * @Description:
 */
public interface CourseSalesOrderRecordDao extends PagingAndSortingRepository<CourseSalesOrderRecordDO, String>
public interface CourseSalesOrderRecordDao extends JpaRepository<CourseSalesOrderRecordDO, String>
        , JpaSpecificationExecutor<CourseSalesOrderRecordDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/course/CustomerServiceDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.course;
import com.yihu.jw.entity.care.course.CustomerServiceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
 * @Date: 2021/5/12
 * @Description:
 */
public interface CustomerServiceDao extends PagingAndSortingRepository<CustomerServiceDO, String>, JpaSpecificationExecutor<CustomerServiceDO> {
public interface CustomerServiceDao extends JpaRepository<CustomerServiceDO, String>, JpaSpecificationExecutor<CustomerServiceDO> {
    List<CustomerServiceDO> findByOrgCode(String orgCode);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/course/DoctorPatientTmpDao.java

@@ -4,14 +4,14 @@ import com.yihu.jw.entity.care.course.DoctorPatientTmpDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * Created by Bing on 2021/6/7.
 */
public interface DoctorPatientTmpDao extends PagingAndSortingRepository<DoctorPatientTmpDO,String>,
public interface DoctorPatientTmpDao extends JpaRepository<DoctorPatientTmpDO,String>,
        JpaSpecificationExecutor<DoctorPatientTmpDO> {
    DoctorPatientTmpDO findByRelationCode(String relationCode);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/course/PatientOrderRefundDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.course;
import com.yihu.jw.entity.care.course.PatientOrderRefundDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created with IntelliJ IDEA.
@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @Date: 2021/5/17
 * @Description:
 */
public interface PatientOrderRefundDao extends PagingAndSortingRepository<PatientOrderRefundDO, String>
public interface PatientOrderRefundDao extends JpaRepository<PatientOrderRefundDO, String>
        , JpaSpecificationExecutor<PatientOrderRefundDO> {
    PatientOrderRefundDO findByTypeAndOrderId(String type,String orderId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/course/RecruitStudentsDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.course;
import com.yihu.jw.entity.care.course.RecruitStudentsDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created with IntelliJ IDEA.
@@ -11,6 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @Date: 2021/5/12
 * @Description:
 */
public interface RecruitStudentsDao extends PagingAndSortingRepository<RecruitStudentsDO, String>, JpaSpecificationExecutor<RecruitStudentsDO> {
public interface RecruitStudentsDao extends JpaRepository<RecruitStudentsDO, String>, JpaSpecificationExecutor<RecruitStudentsDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/course/RecruitStudentsRecordDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.care.course.RecruitStudentsRecordDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -16,7 +16,7 @@ import java.util.List;
 * @Date: 2021/5/12
 * @Description:
 */
public interface RecruitStudentsRecordDao extends PagingAndSortingRepository<RecruitStudentsRecordDO, String>,
public interface RecruitStudentsRecordDao extends JpaRepository<RecruitStudentsRecordDO, String>,
        JpaSpecificationExecutor<RecruitStudentsRecordDO> {
    List<RecruitStudentsRecordDO> findByRecruitStudentsIdAndStatus(String recruitStudentsId,String status);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/customize/UserHideModuleInterfaceDao.java

@@ -2,12 +2,12 @@ package com.yihu.jw.base.dao.customize;
import com.yihu.jw.entity.base.customize.UserHideModuleInterfaceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Dao - 用户取消订阅的模块或功能
 * @author progr1mmer.
 * @date Created on 2018/8/20.
 */
public interface UserHideModuleInterfaceDao extends PagingAndSortingRepository<UserHideModuleInterfaceDO, Integer>, JpaSpecificationExecutor<UserHideModuleInterfaceDO> {
public interface UserHideModuleInterfaceDao extends JpaRepository<UserHideModuleInterfaceDO, Integer>, JpaSpecificationExecutor<UserHideModuleInterfaceDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/device/DeviceDao.java

@@ -7,11 +7,11 @@ package com.yihu.jw.base.dao.device;
import com.yihu.jw.entity.care.device.Device;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface DeviceDao extends PagingAndSortingRepository<Device, Long> {
public interface DeviceDao extends JpaRepository<Device, Long> {
	@Query("select a from Device a where a.categoryCode = ?1 and a.del = '1'")
	List<Device> findByCategoryCode(String categoryCode);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/device/DeviceDetailDao.java

@@ -3,14 +3,14 @@ package com.yihu.jw.base.dao.device;
import com.yihu.jw.entity.care.device.DeviceDetail;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * @author yeshijie on 2018/1/10.
 */
public interface DeviceDetailDao extends PagingAndSortingRepository<DeviceDetail, Long>, JpaSpecificationExecutor<DeviceDetail> {
public interface DeviceDetailDao extends JpaRepository<DeviceDetail, Long>, JpaSpecificationExecutor<DeviceDetail> {
    @Query(value = "select a.* from wlyy_devices a where a.device_code=?1 limit 0,1",nativeQuery = true)
    DeviceDetail findBySn(String sn);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/device/PatientDeviceDao.java

@@ -5,11 +5,11 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface PatientDeviceDao extends PagingAndSortingRepository<DevicePatientDevice, Long>, JpaSpecificationExecutor<DevicePatientDevice> {
public interface PatientDeviceDao extends JpaRepository<DevicePatientDevice, Long>, JpaSpecificationExecutor<DevicePatientDevice> {
    @Query("select a from DevicePatientDevice a where a.user = ?1 ")
    Iterable<DevicePatientDevice> findByUser(String user);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/device/YsConfigDao.java

@@ -3,12 +3,12 @@ package com.yihu.jw.base.dao.device;
import com.yihu.jw.entity.care.device.YsConfigDo;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created by Bing on 2021/10/20.
 */
public interface YsConfigDao extends PagingAndSortingRepository<YsConfigDo,Long>, JpaSpecificationExecutor<YsConfigDo> {
public interface YsConfigDao extends JpaRepository<YsConfigDo,Long>, JpaSpecificationExecutor<YsConfigDo> {
    @Query("select c from YsConfigDo c,YsDeviceDo de where c.configId = de.configId and de.deviceSn = ?1")
    YsConfigDo getYsConfigByDeviceSn(String deviceSn);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/BusinessSysDictDao.java

@@ -3,7 +3,7 @@ package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.care.common.BusinessSysDictDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
 * @Date: 2021/5/10
 * @Description:
 */
public interface BusinessSysDictDao extends PagingAndSortingRepository<BusinessSysDictDO, String>, JpaSpecificationExecutor<BusinessSysDictDO> {
public interface BusinessSysDictDao extends JpaRepository<BusinessSysDictDO, String>, JpaSpecificationExecutor<BusinessSysDictDO> {
    List<BusinessSysDictDO> findByDictName(String dictName);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictDietDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.care.common.DictDietDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created with IntelliJ IDEA.
@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @Date: 2021/5/8
 * @Description:
 */
public interface DictDietDao extends PagingAndSortingRepository<DictDietDO, String>, JpaSpecificationExecutor<DictDietDO> {
public interface DictDietDao extends JpaRepository<DictDietDO, String>, JpaSpecificationExecutor<DictDietDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictDiseaseDao.java

@@ -6,7 +6,7 @@ import feign.Param;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Map;
@@ -24,7 +24,7 @@ import java.util.Map;
 * </pre>
 * @since 1.
 */
public interface DictDiseaseDao extends PagingAndSortingRepository<DictDiseaseDO, Integer>, JpaSpecificationExecutor<DictDiseaseDO>  {
public interface DictDiseaseDao extends JpaRepository<DictDiseaseDO, Integer>, JpaSpecificationExecutor<DictDiseaseDO>  {
    @Query("select code as code,name as name from DictDiseaseDO where saasId = :saasId")
    List<Map<String,Object>> findCodeAndNameBySaasId(@Param("saasId") String saasId, Pageable pageable);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictDoctorDutyDao.java

@@ -2,7 +2,7 @@
//
//import com.yihu.jw.entity.base.dict.DictDoctorDutyDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.repository.PagingAndSortingRepository;
//import org.springframework.data.jpa.repository.JpaRepository;
//
//
///**
@@ -17,7 +17,7 @@
// * </pre>
// * @since 1.
// */
//public interface DictDoctorDutyDao extends PagingAndSortingRepository<DictDoctorDutyDO, Integer>, JpaSpecificationExecutor<DictDoctorDutyDO>  {
//public interface DictDoctorDutyDao extends JpaRepository<DictDoctorDutyDO, Integer>, JpaSpecificationExecutor<DictDoctorDutyDO>  {
//
//    boolean existsByCode(String code);
//

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictHealthProblemDao.java

@@ -6,7 +6,7 @@ import feign.Param;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import com.yihu.jw.entity.base.dict.DictHealthProblemDO;
@@ -25,7 +25,7 @@ import java.util.Map;
 * </pre>
 * @since 1.
 */
public interface DictHealthProblemDao extends PagingAndSortingRepository<DictHealthProblemDO, Integer>, JpaSpecificationExecutor<DictHealthProblemDO>  {
public interface DictHealthProblemDao extends JpaRepository<DictHealthProblemDO, Integer>, JpaSpecificationExecutor<DictHealthProblemDO>  {
    @Query("select code as code,name as name from DictHealthProblemDO where saasId = ?1")
    List<Map<String,Object>> findCodeAndNameBySaasId(String saasId, Pageable pageable);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictHospitalDeptDao.java

@@ -6,7 +6,7 @@
//import org.springframework.data.domain.Pageable;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.PagingAndSortingRepository;
//import org.springframework.data.jpa.repository.JpaRepository;
//
//import java.util.List;
//import java.util.Map;
@@ -23,7 +23,7 @@
// * </pre>
// * @since 1.
// */
//public interface DictHospitalDeptDao extends PagingAndSortingRepository<DictHospitalDeptDO, Integer>, JpaSpecificationExecutor<DictHospitalDeptDO>  {
//public interface DictHospitalDeptDao extends JpaRepository<DictHospitalDeptDO, Integer>, JpaSpecificationExecutor<DictHospitalDeptDO>  {
//
//    @Query("select code as code,name as name from DictHospitalDeptDO where orgCode in ?1")
//    List<Map<String,Object>> findByOrgCodeIn( String orgCode, Pageable pageable);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictIcd10Dao.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Map;
@@ -22,7 +22,7 @@ import java.util.Map;
 * </pre>
 * @since 1.
 */
public interface DictIcd10Dao extends PagingAndSortingRepository<DictIcd10DO, Integer>, JpaSpecificationExecutor<DictIcd10DO>  {
public interface DictIcd10Dao extends JpaRepository<DictIcd10DO, Integer>, JpaSpecificationExecutor<DictIcd10DO>  {
    @Query("select code as code,name as name from DictIcd10DO where saasId = ?1")
    List<Map<String,Object>> findCodeAndNameSaasId(String saasId, Pageable pageable);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictJobTitleDao.java

@@ -6,7 +6,7 @@ import feign.Param;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Map;
@@ -23,7 +23,7 @@ import java.util.Map;
 * </pre>
 * @since 1.
 */
public interface DictJobTitleDao extends PagingAndSortingRepository<DictJobTitleDO, Integer>, JpaSpecificationExecutor<DictJobTitleDO>  {
public interface DictJobTitleDao extends JpaRepository<DictJobTitleDO, Integer>, JpaSpecificationExecutor<DictJobTitleDO>  {
    @Query("select code as code,name as name from DictJobTitleDO where saasId = ?1")
    List<Map<String,Object>> findCodeAndNameBySaasId(String saasId, Pageable pageable);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictMedicineDao.java

@@ -6,7 +6,7 @@ import feign.Param;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Map;
@@ -24,7 +24,7 @@ import java.util.Map;
 * </pre>
 * @since 1.
 */
public interface DictMedicineDao extends PagingAndSortingRepository<DictMedicineDO, Integer>, JpaSpecificationExecutor<DictMedicineDO>  {
public interface DictMedicineDao extends JpaRepository<DictMedicineDO, Integer>, JpaSpecificationExecutor<DictMedicineDO>  {
    @Query("select code as code,name as name from DictMedicineDO where saasId = :saasId")
    List<Map<String,Object>> findCodeAndNameBySaasId(@Param("saasId") String saasId, Pageable pageable);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictMedicineDistributeOrgDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictMedicineDistributeOrgDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
@@ -17,5 +17,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface DictMedicineDistributeOrgDao extends PagingAndSortingRepository<DictMedicineDistributeOrgDO, Integer>, JpaSpecificationExecutor<DictMedicineDistributeOrgDO>  {
public interface DictMedicineDistributeOrgDao extends JpaRepository<DictMedicineDistributeOrgDO, Integer>, JpaSpecificationExecutor<DictMedicineDistributeOrgDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictMedicineDosageFormDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictMedicineDosageFormDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
@@ -17,5 +17,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface DictMedicineDosageFormDao extends PagingAndSortingRepository<DictMedicineDosageFormDO, Integer>, JpaSpecificationExecutor<DictMedicineDosageFormDO>  {
public interface DictMedicineDosageFormDao extends JpaRepository<DictMedicineDosageFormDO, Integer>, JpaSpecificationExecutor<DictMedicineDosageFormDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictMedicineSubjectDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictMedicineSubjectDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
@@ -17,5 +17,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface DictMedicineSubjectDao extends PagingAndSortingRepository<DictMedicineSubjectDO, Integer>, JpaSpecificationExecutor<DictMedicineSubjectDO>  {
public interface DictMedicineSubjectDao extends JpaRepository<DictMedicineSubjectDO, Integer>, JpaSpecificationExecutor<DictMedicineSubjectDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DiseaseManageDao.java

@@ -6,7 +6,7 @@ import feign.Param;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Map;
@@ -24,7 +24,7 @@ import java.util.Map;
 * </pre>
 * @since 1.
 */
public interface DiseaseManageDao extends PagingAndSortingRepository<DiseaseManageDO, String>, JpaSpecificationExecutor<DiseaseManageDO>  {
public interface DiseaseManageDao extends JpaRepository<DiseaseManageDO, String>, JpaSpecificationExecutor<DiseaseManageDO>  {
    @Query("select code as code,name as name from DiseaseManageDO where saasId = :saasId")
    List<Map<String,Object>> findCodeAndNameBySaasId(@Param("saasId") String saasId, Pageable pageable);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseDoctorDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.doctor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -21,6 +21,6 @@ import java.util.Map;
 * </pre>
 * @since 1.
 */
//public interface BaseDoctorDao extends PagingAndSortingRepository<BaseDoctorDO, String>, JpaSpecificationExecutor<BaseDoctorDO>  {
//public interface BaseDoctorDao extends JpaRepository<BaseDoctorDO, String>, JpaSpecificationExecutor<BaseDoctorDO>  {
//
//}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseDoctorHospitalDao.java

@@ -3,7 +3,7 @@
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.PagingAndSortingRepository;
//import org.springframework.data.jpa.repository.JpaRepository;
//
//import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
//
@@ -23,7 +23,7 @@
// * </pre>
// * @since 1.
// */
//public interface BaseDoctorHospitalDao extends PagingAndSortingRepository<BaseDoctorHospitalDO, Integer>, JpaSpecificationExecutor<BaseDoctorHospitalDO>  {
//public interface BaseDoctorHospitalDao extends JpaRepository<BaseDoctorHospitalDO, Integer>, JpaSpecificationExecutor<BaseDoctorHospitalDO>  {
//
//    List<BaseDoctorHospitalDO> findByOrgCodeAndDoctorCode(String orgCode, String doctorCode);
//

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseDoctorIncentiveDao.java

@@ -3,11 +3,11 @@ package com.yihu.jw.base.dao.doctor;
import com.yihu.jw.entity.base.doctor.BaseDoctorIncentiveDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.domain.Pageable;
import java.util.List;
public interface BaseDoctorIncentiveDao extends PagingAndSortingRepository<BaseDoctorIncentiveDO, String>, JpaSpecificationExecutor<BaseDoctorIncentiveDO> {
public interface BaseDoctorIncentiveDao extends JpaRepository<BaseDoctorIncentiveDO, String>, JpaSpecificationExecutor<BaseDoctorIncentiveDO> {
    @Query("from BaseDoctorIncentiveDO where doctorCode = ?1 and isDel = '1'")
    List<BaseDoctorIncentiveDO> findByDoctorCode(String doctorCode);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseDoctorRoleDao.java

@@ -3,7 +3,7 @@
//import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.PagingAndSortingRepository;
//import org.springframework.data.jpa.repository.JpaRepository;
//
//import java.util.List;
//import java.util.Set;
@@ -21,7 +21,7 @@
// * </pre>
// * @since 1.
// */
//public interface BaseDoctorRoleDao extends PagingAndSortingRepository<BaseDoctorRoleDO, Integer>, JpaSpecificationExecutor<BaseDoctorRoleDO>  {
//public interface BaseDoctorRoleDao extends JpaRepository<BaseDoctorRoleDO, Integer>, JpaSpecificationExecutor<BaseDoctorRoleDO>  {
//
//    @Query("select id from BaseDoctorRoleDO where doctorCode = ?1")
//    Set<Object> findIdListByDoctorCode(String doctorCode);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseDoctorRoleDictDao.java

@@ -4,11 +4,11 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDictDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface BaseDoctorRoleDictDao extends PagingAndSortingRepository<BaseDoctorRoleDictDO, String>, JpaSpecificationExecutor<BaseDoctorRoleDictDO> {
public interface BaseDoctorRoleDictDao extends JpaRepository<BaseDoctorRoleDictDO, String>, JpaSpecificationExecutor<BaseDoctorRoleDictDO> {
    @Query(value = "select * from base_doctor_role_dict where name = ?1",nativeQuery = true)
    List<BaseDoctorRoleDictDO> getByname(String name);
    boolean existsByCode(String code);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseDoctorRoleInfoDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Set;
@@ -22,7 +22,7 @@ import java.util.Set;
 * </pre>
 * @since 1.
 */
public interface BaseDoctorRoleInfoDao extends PagingAndSortingRepository<BaseDoctorRoleInfoDO, Integer>, JpaSpecificationExecutor<BaseDoctorRoleInfoDO>  {
public interface BaseDoctorRoleInfoDao extends JpaRepository<BaseDoctorRoleInfoDO, Integer>, JpaSpecificationExecutor<BaseDoctorRoleInfoDO>  {
    BaseDoctorRoleInfoDO findBySaasidAndName(String saasId,String name);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseModuleRoleDao.java

@@ -3,7 +3,7 @@ package com.yihu.jw.base.dao.doctor;
import com.yihu.jw.entity.base.doctor.BaseModuleRoleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Set;
@@ -21,7 +21,7 @@ import java.util.Set;
 * </pre>
 * @since 1.
 */
public interface BaseModuleRoleDao extends PagingAndSortingRepository<BaseModuleRoleDO, Integer>, JpaSpecificationExecutor<BaseModuleRoleDO>  {
public interface BaseModuleRoleDao extends JpaRepository<BaseModuleRoleDO, Integer>, JpaSpecificationExecutor<BaseModuleRoleDO>  {
    @Query("select id from BaseModuleRoleDO where roleCode = ?1")
    Set<Object> findModuleIdList(String id);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/DoctorServicePermissionsDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.doctor;
import com.yihu.jw.entity.care.common.DoctorServicePermissionsDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
 * @Date: 2021/9/7
 * @Description:
 */
public interface DoctorServicePermissionsDao extends PagingAndSortingRepository<DoctorServicePermissionsDO, String>, JpaSpecificationExecutor<DoctorServicePermissionsDO> {
public interface DoctorServicePermissionsDao extends JpaRepository<DoctorServicePermissionsDO, String>, JpaSpecificationExecutor<DoctorServicePermissionsDO> {
    List<DoctorServicePermissionsDO> findByDoctor(String doctor);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/BaseHospitalEquipmentDao.java

@@ -4,11 +4,11 @@ import com.yihu.jw.entity.equipment.BaseHospitalEquipmentDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface BaseHospitalEquipmentDao extends PagingAndSortingRepository<BaseHospitalEquipmentDO, String>, JpaSpecificationExecutor<BaseHospitalEquipmentDO> {
public interface BaseHospitalEquipmentDao extends JpaRepository<BaseHospitalEquipmentDO, String>, JpaSpecificationExecutor<BaseHospitalEquipmentDO> {
    @Query("select id from BaseHospitalEquipmentDO where code = ?1 ")
    BaseHospitalEquipmentDO findAllByCode(String code);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/WlyyUserAreaDao.java

@@ -5,11 +5,11 @@ import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface WlyyUserAreaDao extends PagingAndSortingRepository<WlyyUserAreaDO, String>, JpaSpecificationExecutor<WlyyUserAreaDO> {
public interface WlyyUserAreaDao extends JpaRepository<WlyyUserAreaDO, String>, JpaSpecificationExecutor<WlyyUserAreaDO> {
    @Query("select id from WlyyUserAreaDO where userId = ?1 ")
    List<WlyyUserAreaDO> findAllByUserId(String userId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/WlyyUserEquipmentDao.java

@@ -5,11 +5,11 @@ import com.yihu.jw.entity.equipment.WlyyUserEquipmentDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface WlyyUserEquipmentDao extends PagingAndSortingRepository<WlyyUserEquipmentDO, String>, JpaSpecificationExecutor<WlyyUserEquipmentDO> {
public interface WlyyUserEquipmentDao extends JpaRepository<WlyyUserEquipmentDO, String>, JpaSpecificationExecutor<WlyyUserEquipmentDO> {
    @Modifying
    @Query("delete from WlyyUserEquipmentDO p where p.userId=?1 and del=1 ")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/errorCode/ErrorCodeDao.java

@@ -3,12 +3,12 @@ package com.yihu.jw.base.dao.errorCode;
import com.yihu.jw.entity.base.dict.ErrorCodeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * @author yeshijie on 2018/9/26.
 */
public interface ErrorCodeDao extends PagingAndSortingRepository<ErrorCodeDO, String>, JpaSpecificationExecutor<ErrorCodeDO> {
public interface ErrorCodeDao extends JpaRepository<ErrorCodeDO, String>, JpaSpecificationExecutor<ErrorCodeDO> {
    @Query("select count(*) from ErrorCodeDO a where a.errorCode = ?1 ")
    int isExistsErrorCode(String errorCode);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/function/FunctionDao.java

@@ -3,7 +3,7 @@
//import com.yihu.jw.entity.base.function.FunctionDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.PagingAndSortingRepository;
//import org.springframework.data.jpa.repository.JpaRepository;
//import org.springframework.data.repository.query.Param;
//
//import java.util.List;
@@ -12,7 +12,7 @@
// * Dao - 功能
// * Created by chenweida on 2017/5/19.
// */
//public interface FunctionDao extends PagingAndSortingRepository<FunctionDO, String>, JpaSpecificationExecutor<FunctionDO> {
//public interface FunctionDao extends JpaRepository<FunctionDO, String>, JpaSpecificationExecutor<FunctionDO> {
//
//    @Query("select f from FunctionDO  f where f.moduleId in (:moduleId)")
//    List<FunctionDO> findFunctionDOSByModuleIdExists(@Param("moduleId") String[] moduleId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/gw/BaseHomePageDao.java

@@ -2,11 +2,11 @@ package com.yihu.jw.base.dao.gw;
import com.yihu.jw.entity.base.gw.BaseHomePageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created by yeshijie on 2022/2/21.
 */
public interface BaseHomePageDao extends PagingAndSortingRepository<BaseHomePageDO, String>, JpaSpecificationExecutor<BaseHomePageDO> {
public interface BaseHomePageDao extends JpaRepository<BaseHomePageDO, String>, JpaSpecificationExecutor<BaseHomePageDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/gw/BaseRulesDao.java

@@ -2,11 +2,11 @@ package com.yihu.jw.base.dao.gw;
import com.yihu.jw.entity.base.gw.BaseRulesDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created by yeshijie on 2022/2/21.
 */
public interface BaseRulesDao extends PagingAndSortingRepository<BaseRulesDO, String>, JpaSpecificationExecutor<BaseRulesDO> {
public interface BaseRulesDao extends JpaRepository<BaseRulesDO, String>, JpaSpecificationExecutor<BaseRulesDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/gw/BaseWebInfoDao.java

@@ -3,14 +3,14 @@ package com.yihu.jw.base.dao.gw;
import com.yihu.jw.entity.base.gw.BaseWebInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * Created by yeshijie on 2022/2/21.
 */
public interface BaseWebInfoDao extends PagingAndSortingRepository<BaseWebInfoDO, String>, JpaSpecificationExecutor<BaseWebInfoDO> {
public interface BaseWebInfoDao extends JpaRepository<BaseWebInfoDO, String>, JpaSpecificationExecutor<BaseWebInfoDO> {
    @Query("from BaseWebInfoDO")
    List<BaseWebInfoDO> findAll();

svr/svr-base/src/main/java/com/yihu/jw/base/dao/lifeCare/LifeCareItemDictDao.java

@@ -3,14 +3,14 @@ package com.yihu.jw.base.dao.lifeCare;
import com.yihu.jw.entity.care.lifeCare.LifeCareItemDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * Created by yeshijie on 2021/3/26.
 */
public interface LifeCareItemDictDao extends PagingAndSortingRepository<LifeCareItemDictDO, String>, JpaSpecificationExecutor<LifeCareItemDictDO> {
public interface LifeCareItemDictDao extends JpaRepository<LifeCareItemDictDO, String>, JpaSpecificationExecutor<LifeCareItemDictDO> {
    @Query("from LifeCareItemDictDO w where  w.del=1 order by sort asc")
    List<LifeCareItemDictDO> findByAll();

svr/svr-base/src/main/java/com/yihu/jw/base/dao/log/BasePatientPadPushOnOffDao.java

@@ -2,12 +2,12 @@ package com.yihu.jw.base.dao.log;
import com.yihu.jw.entity.log.BasePatientPadPushOnOffEntity;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created by wsl on 2022/7/28
 */
public interface BasePatientPadPushOnOffDao extends PagingAndSortingRepository<BasePatientPadPushOnOffEntity, String>, JpaSpecificationExecutor<BasePatientPadPushOnOffEntity> {
public interface BasePatientPadPushOnOffDao extends JpaRepository<BasePatientPadPushOnOffEntity, String>, JpaSpecificationExecutor<BasePatientPadPushOnOffEntity> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/log/BasePushRecordLogDao.java

@@ -3,14 +3,14 @@ package com.yihu.jw.base.dao.log;
import com.yihu.jw.entity.log.BasePushRecordLogEntity;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * Created by wsl on 2022/7/4
 */
public interface BasePushRecordLogDao extends PagingAndSortingRepository<BasePushRecordLogEntity, String>, JpaSpecificationExecutor<BasePushRecordLogEntity> {
public interface BasePushRecordLogDao extends JpaRepository<BasePushRecordLogEntity, String>, JpaSpecificationExecutor<BasePushRecordLogEntity> {
    @Query("from BasePushRecordLogEntity")
    List<BasePushRecordLogEntity> findAll();

svr/svr-base/src/main/java/com/yihu/jw/base/dao/log/BasePushrecordLogInfoDao.java

@@ -4,12 +4,12 @@ import com.yihu.jw.entity.log.BasePushrecordLogInfoEntity;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created by wsl on 2022/7/5
 */
public interface BasePushrecordLogInfoDao extends PagingAndSortingRepository<BasePushrecordLogInfoEntity, String>, JpaSpecificationExecutor<BasePushrecordLogInfoEntity> {
public interface BasePushrecordLogInfoDao extends JpaRepository<BasePushrecordLogInfoEntity, String>, JpaSpecificationExecutor<BasePushrecordLogInfoEntity> {
    @Modifying

svr/svr-base/src/main/java/com/yihu/jw/base/dao/menu/BaseLinkDictDao.java

@@ -5,9 +5,9 @@ import com.yihu.jw.entity.base.menu.BaseMenuDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
public interface BaseLinkDictDao extends PagingAndSortingRepository<BaseLinkDictDO, String>, JpaSpecificationExecutor<BaseLinkDictDO> {
public interface BaseLinkDictDao extends JpaRepository<BaseLinkDictDO, String>, JpaSpecificationExecutor<BaseLinkDictDO> {
    @Query( value = "select max(t.link_sort) AS \"zuida\" from base_link_dict t where t.is_del='1'",nativeQuery = true)
    Integer getMaxSort();
    @Query( value = "select min(t.link_sort) AS \"zuixiao\" from base_link_dict t  where t.is_del='1'",nativeQuery = true)

svr/svr-base/src/main/java/com/yihu/jw/base/dao/menu/BaseMenuDictDao.java

@@ -5,11 +5,11 @@ import com.yihu.jw.entity.base.role.MenuDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface BaseMenuDictDao extends PagingAndSortingRepository<BaseMenuDictDO, String>, JpaSpecificationExecutor<BaseMenuDictDO> {
public interface BaseMenuDictDao extends JpaRepository<BaseMenuDictDO, String>, JpaSpecificationExecutor<BaseMenuDictDO> {
    @Query( value = "select max(t.menu_sort) AS \"zuida\" from base_menu_dict t where t.parent_id=?1 and t.is_del='1'",nativeQuery = true)
    Integer getMaxSort(String parentId);
    @Query( value = "select min(t.menu_sort) AS \"zuixiao\" from base_menu_dict t where t.parent_id=?1 and t.is_del='1'",nativeQuery = true)

svr/svr-base/src/main/java/com/yihu/jw/base/dao/menu/BaseMenuShowDao.java

@@ -5,9 +5,9 @@ import com.yihu.jw.entity.base.menu.BaseMenuShowDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
public interface BaseMenuShowDao  extends PagingAndSortingRepository<BaseMenuShowDO, String>, JpaSpecificationExecutor<BaseMenuShowDO> {
public interface BaseMenuShowDao  extends JpaRepository<BaseMenuShowDO, String>, JpaSpecificationExecutor<BaseMenuShowDO> {
    @Modifying
    @Query("update BaseMenuShowDO p set p.isDel=?2 where p.id=?1")
    BaseMenuShowDO updateStatus(String id,String status);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/message/BaseMessageDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.message;
import com.yihu.jw.entity.base.message.BaseMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
@@ -17,5 +17,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BaseMessageDao extends PagingAndSortingRepository<BaseMessageDO, Integer>, JpaSpecificationExecutor<BaseMessageDO>  {
public interface BaseMessageDao extends JpaRepository<BaseMessageDO, Integer>, JpaSpecificationExecutor<BaseMessageDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/message/BaseMessageTypeDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.message;
import com.yihu.jw.entity.base.message.BaseMessageTypeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
@@ -17,5 +17,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BaseMessageTypeDao extends PagingAndSortingRepository<BaseMessageTypeDO, Integer>, JpaSpecificationExecutor<BaseMessageTypeDO>  {
public interface BaseMessageTypeDao extends JpaRepository<BaseMessageTypeDO, Integer>, JpaSpecificationExecutor<BaseMessageTypeDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/message/MqMessageDao.java

@@ -2,11 +2,11 @@ package com.yihu.jw.base.dao.message;
import com.yihu.jw.entity.base.message.MqMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Dao - 基于MQ的消息推送
 * Created by progr1mmer on 2018/8/20.
 */
public interface MqMessageDao extends PagingAndSortingRepository<MqMessageDO, String>, JpaSpecificationExecutor<MqMessageDO> {
public interface MqMessageDao extends JpaRepository<MqMessageDO, String>, JpaSpecificationExecutor<MqMessageDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/message/MqMessageSubscriberDao.java

@@ -2,11 +2,11 @@ package com.yihu.jw.base.dao.message;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Dao - 基于MQ的消息推送订阅者
 * Created by progr1mmer on 2018/8/20.
 */
public interface MqMessageSubscriberDao extends PagingAndSortingRepository<MqMessageSubscriberDO, String>, JpaSpecificationExecutor<MqMessageSubscriberDO> {
public interface MqMessageSubscriberDao extends JpaRepository<MqMessageSubscriberDO, String>, JpaSpecificationExecutor<MqMessageSubscriberDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/InterfaceDao.java

@@ -4,14 +4,14 @@ import com.yihu.jw.entity.base.module.InterfaceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 接口
 * @author yeshijie on 2018/9/28.
 */
public interface InterfaceDao extends PagingAndSortingRepository<InterfaceDO, String>, JpaSpecificationExecutor<InterfaceDO> {
public interface InterfaceDao extends JpaRepository<InterfaceDO, String>, JpaSpecificationExecutor<InterfaceDO> {
    @Modifying
    @Query("update InterfaceDO p set p.status=?2 where p.id=?1")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/InterfaceErrorCodeDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.base.module.InterfaceErrorCodeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
 * 接口错误说明
 * @author yeshijie on 2018/9/28.
 */
public interface InterfaceErrorCodeDao extends PagingAndSortingRepository<InterfaceErrorCodeDO, String>, JpaSpecificationExecutor<InterfaceErrorCodeDO> {
public interface InterfaceErrorCodeDao extends JpaRepository<InterfaceErrorCodeDO, String>, JpaSpecificationExecutor<InterfaceErrorCodeDO> {
    @Query("from InterfaceErrorCodeDO w where w.interfaceId =?1 and w.del=1")
    List<InterfaceErrorCodeDO> findByInterfaceId(String interfaceId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/InterfaceParamDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.base.module.InterfaceParamDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
 * 接口入参出参
 * @author yeshijie on 2018/9/28.
 */
public interface InterfaceParamDao extends PagingAndSortingRepository<InterfaceParamDO, String>, JpaSpecificationExecutor<InterfaceParamDO> {
public interface InterfaceParamDao extends JpaRepository<InterfaceParamDO, String>, JpaSpecificationExecutor<InterfaceParamDO> {
    @Query("from InterfaceParamDO w where w.interfaceId =?1 and w.del=1")
    List<InterfaceParamDO> findByInterfaceId(String interfaceId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/ModuleDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.base.module.ModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
 * Dao - 模块
 * Created by chenweida on 2017/5/19.
 */
public interface ModuleDao extends PagingAndSortingRepository<ModuleDO, String>, JpaSpecificationExecutor<ModuleDO> {
public interface ModuleDao extends JpaRepository<ModuleDO, String>, JpaSpecificationExecutor<ModuleDO> {
    @Modifying
    @Query("update ModuleDO p set p.status=?2 where p.id=?1")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/SaasInterfaceDao.java

@@ -4,13 +4,13 @@ import com.yihu.jw.entity.base.module.SaasInterfaceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 租户接口
 * @author yeshijie on 2018/10/11.
 */
public interface SaasInterfaceDao extends PagingAndSortingRepository<SaasInterfaceDO, String>, JpaSpecificationExecutor<SaasInterfaceDO> {
public interface SaasInterfaceDao extends JpaRepository<SaasInterfaceDO, String>, JpaSpecificationExecutor<SaasInterfaceDO> {
    @Modifying
    @Query("update SaasInterfaceDO p set p.status=?2 where p.id=?1")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/SaasInterfaceErrorCodeDao.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.base.module.SaasInterfaceErrorCodeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
 * 接口错误说明
 * @author yeshijie on 2018/10/11.
 */
public interface SaasInterfaceErrorCodeDao extends PagingAndSortingRepository<SaasInterfaceErrorCodeDO, String>,
public interface SaasInterfaceErrorCodeDao extends JpaRepository<SaasInterfaceErrorCodeDO, String>,
        JpaSpecificationExecutor<SaasInterfaceErrorCodeDO> {
    @Query("from SaasInterfaceErrorCodeDO w where w.saasInterfaceId =?1 and w.del=1")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/SaasInterfaceParamDao.java

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.base.module.SaasInterfaceParamDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
 * 接口入参出参
 * @author yeshijie on 2018/10/11.
 */
public interface SaasInterfaceParamDao extends PagingAndSortingRepository<SaasInterfaceParamDO, String>,
public interface SaasInterfaceParamDao extends JpaRepository<SaasInterfaceParamDO, String>,
        JpaSpecificationExecutor<SaasInterfaceParamDO> {
    @Query("from SaasInterfaceParamDO w where w.saasInterfaceId =?1 and w.del=1")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/SaasModuleDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.base.module.SaasModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
 * Entity - 租户模块
 * Created by yeshijie on 2018/10/11.
 */
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModuleDO, String>, JpaSpecificationExecutor<SaasModuleDO> {
public interface SaasModuleDao extends JpaRepository<SaasModuleDO, String>, JpaSpecificationExecutor<SaasModuleDO> {
    @Query("select count(*) from SaasModuleDO a where a.moduleId = ?1 ")
    int isExistModule(String moduleId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/module/SaasTypeModuleDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.base.module.SaasTypeModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import javax.transaction.Transactional;
@@ -12,7 +12,7 @@ import javax.transaction.Transactional;
 * Entity - 租户类型模块
 * Created by yeshijie on 2018/10/11.
 */
public interface SaasTypeModuleDao extends PagingAndSortingRepository<SaasTypeModuleDO, String>, JpaSpecificationExecutor<SaasTypeModuleDO> {
public interface SaasTypeModuleDao extends JpaRepository<SaasTypeModuleDO, String>, JpaSpecificationExecutor<SaasTypeModuleDO> {
    @Query("select count(*) from SaasTypeModuleDO a where a.moduleId = ?1 ")
    int isExistModule(String moduleId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/notice/NoticeDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.notice;
import com.yihu.jw.entity.base.notice.NoticeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
 * 公告通知
 * @author yeshijie on 2018/9/30.
 */
public interface NoticeDao extends PagingAndSortingRepository<NoticeDO, String>, JpaSpecificationExecutor<NoticeDO> {
public interface NoticeDao extends JpaRepository<NoticeDO, String>, JpaSpecificationExecutor<NoticeDO> {
    List<NoticeDO> findByStatusAndSendType(Integer status,Integer sendType);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/notice/UserNoticeDao.java

@@ -2,13 +2,13 @@ package com.yihu.jw.base.dao.notice;
import com.yihu.jw.entity.base.notice.UserNoticeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 用户公告通知
 * @author yeshijie on 2018/9/30.
 */
public interface UserNoticeDao extends PagingAndSortingRepository<UserNoticeDO, String>, JpaSpecificationExecutor<UserNoticeDO> {
public interface UserNoticeDao extends JpaRepository<UserNoticeDO, String>, JpaSpecificationExecutor<UserNoticeDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/org/BaseOrgDao.java

@@ -5,7 +5,7 @@
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.jpa.repository.Modifying;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.PagingAndSortingRepository;
//import org.springframework.data.jpa.repository.JpaRepository;
//
//import java.util.List;
//import java.util.Map;
@@ -22,7 +22,7 @@
// * </pre>
// * @since 1.
// */
//public interface BaseOrgDao extends PagingAndSortingRepository<BaseOrgDO, String>, JpaSpecificationExecutor<BaseOrgDO>  {
//public interface BaseOrgDao extends JpaRepository<BaseOrgDO, String>, JpaSpecificationExecutor<BaseOrgDO>  {
//
//    @Query(value="select b.* from base_org b where b.code= ?1 and b.saasid= ?2 limit 1",nativeQuery = true)
//    BaseOrgDO findByCodeAndSaasId(String code,String saasId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/org/BaseOrgSaasDao.java

@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Set;
@@ -23,7 +23,7 @@ import java.util.Set;
 * </pre>
 * @since 1.
 */
public interface BaseOrgSaasDao extends PagingAndSortingRepository<BaseOrgSaasDO, String>, JpaSpecificationExecutor<BaseOrgSaasDO>  {
public interface BaseOrgSaasDao extends JpaRepository<BaseOrgSaasDO, String>, JpaSpecificationExecutor<BaseOrgSaasDO>  {
    List<BaseOrgSaasDO> findBySaasid(String saasId);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/org/BaseOrgUserDao.java

@@ -3,7 +3,7 @@ package com.yihu.jw.base.dao.org;
import com.yihu.jw.entity.base.org.BaseOrgUserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Set;
@@ -21,7 +21,7 @@ import java.util.Set;
 * </pre>
 * @since 1.
 */
public interface BaseOrgUserDao extends PagingAndSortingRepository<BaseOrgUserDO, String>, JpaSpecificationExecutor<BaseOrgUserDO>  {
public interface BaseOrgUserDao extends JpaRepository<BaseOrgUserDO, String>, JpaSpecificationExecutor<BaseOrgUserDO>  {
    List<BaseOrgUserDO> findAllByOrgCode(String orgCode);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/org/OrgTreeDao.java

@@ -7,7 +7,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
import java.util.Map;
@@ -25,7 +25,7 @@ import java.util.Set;
 * </pre>
 * @since 1.
 */
public interface OrgTreeDao extends PagingAndSortingRepository<OrgTree, Integer>, JpaSpecificationExecutor<OrgTree>  {
public interface OrgTreeDao extends JpaRepository<OrgTree, Integer>, JpaSpecificationExecutor<OrgTree>  {
    List<OrgTree> findByLevel(Integer level);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/patient/BasePatientFamilyMemberDao.java

@@ -2,12 +2,12 @@ package com.yihu.jw.base.dao.patient;
import com.yihu.jw.entity.base.patient.BasePatientFamilyMemberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BasePatientFamilyMemberDao extends PagingAndSortingRepository<BasePatientFamilyMemberDO, String>, JpaSpecificationExecutor<BasePatientFamilyMemberDO> {
public interface BasePatientFamilyMemberDao extends JpaRepository<BasePatientFamilyMemberDO, String>, JpaSpecificationExecutor<BasePatientFamilyMemberDO> {
    public BasePatientFamilyMemberDO findByPatientAndFamilyMember(String patient,String member);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/population/BasePopulationDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.population;
import com.yihu.jw.entity.base.population.BasePopulationDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
@@ -17,5 +17,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BasePopulationDao extends PagingAndSortingRepository<BasePopulationDO, String>, JpaSpecificationExecutor<BasePopulationDO>  {
public interface BasePopulationDao extends JpaRepository<BasePopulationDO, String>, JpaSpecificationExecutor<BasePopulationDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/population/BaseYearDao.java

@@ -3,14 +3,14 @@ package com.yihu.jw.base.dao.population;
import com.yihu.jw.entity.base.population.BaseYearDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * Created by zdm on 2018/10/12.
 */
public interface BaseYearDao extends PagingAndSortingRepository<BaseYearDO, String>, JpaSpecificationExecutor<BaseYearDO>  {
public interface BaseYearDao extends JpaRepository<BaseYearDO, String>, JpaSpecificationExecutor<BaseYearDO>  {
    @Query("select year from BaseYearDO ")
    List<String> findYears();
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/radio/WlyyRadioDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.care.radio.WlyyRadioDO;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
 * @create 2022-07-04 13:36
 * @slogan 他化自在，我自逍遥
 */
public interface WlyyRadioDao extends PagingAndSortingRepository<WlyyRadioDO, String>, JpaSpecificationExecutor<WlyyRadioDO> {
public interface WlyyRadioDao extends JpaRepository<WlyyRadioDO, String>, JpaSpecificationExecutor<WlyyRadioDO> {
    @Query("select r from WlyyRadioDO r where r.status = 1 ")
    List<WlyyRadioDO> findByPage(Pageable pageable);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/BaseRoleMenuDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.role;
import com.yihu.jw.entity.base.role.BaseRoleMenuDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
@@ -17,5 +17,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * </pre>
 * @since 1.
 */
public interface BaseRoleMenuDao extends PagingAndSortingRepository<BaseRoleMenuDO, Integer>, JpaSpecificationExecutor<BaseRoleMenuDO>  {
public interface BaseRoleMenuDao extends JpaRepository<BaseRoleMenuDO, Integer>, JpaSpecificationExecutor<BaseRoleMenuDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/MenuDao.java

@@ -4,12 +4,12 @@ import com.yihu.jw.entity.base.role.MenuDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * @author yeshijie on 2018/9/26.
 */
public interface MenuDao extends PagingAndSortingRepository<MenuDO, String>, JpaSpecificationExecutor<MenuDO> {
public interface MenuDao extends JpaRepository<MenuDO, String>, JpaSpecificationExecutor<MenuDO> {
    @Modifying
    @Query("update MenuDO p set p.status=?2 where p.id=?1")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/RoleAuthorityDao.java

@@ -2,12 +2,12 @@ package com.yihu.jw.base.dao.role;
import com.yihu.jw.entity.base.role.RoleAuthorityDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Dao - 角色权限
 * @author progr1mmer.
 * @date Created on 2018/9/14.
 */
public interface RoleAuthorityDao extends PagingAndSortingRepository<RoleAuthorityDO, Integer>, JpaSpecificationExecutor<RoleAuthorityDO> {
public interface RoleAuthorityDao extends JpaRepository<RoleAuthorityDO, Integer>, JpaSpecificationExecutor<RoleAuthorityDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/RoleDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.role;
import com.yihu.jw.entity.base.role.RoleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
 * Dao - 角色
 * Created by progr1mmer on 2018/8/17.
 */
public interface RoleDao extends PagingAndSortingRepository<RoleDO, String>, JpaSpecificationExecutor<RoleDO> {
public interface RoleDao extends JpaRepository<RoleDO, String>, JpaSpecificationExecutor<RoleDO> {
    RoleDO findByCode(String code);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/RoleMenuDao.java

@@ -2,14 +2,14 @@ package com.yihu.jw.base.dao.role;
import com.yihu.jw.entity.base.role.RoleMenuDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * @author yeshijie on 2018/9/26.
 */
public interface RoleMenuDao extends PagingAndSortingRepository<RoleMenuDO, String>, JpaSpecificationExecutor<RoleMenuDO> {
public interface RoleMenuDao extends JpaRepository<RoleMenuDO, String>, JpaSpecificationExecutor<RoleMenuDO> {
    List<RoleMenuDO> findByRoleId(String roleId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/WlyyRoleDao.java

@@ -7,12 +7,12 @@ package com.yihu.jw.base.dao.role;
import com.yihu.jw.entity.care.role.DoctorRole;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface WlyyRoleDao extends PagingAndSortingRepository<DoctorRole, Long> {
public interface WlyyRoleDao extends JpaRepository<DoctorRole, Long> {
    @Query(value = "select b.* from wlyy_user_role a,wlyy_role b where a.role = b.code and a.user = ?1",nativeQuery = true)
    List<DoctorRole> findUserRole(String user);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/WlyyUserRoleDao.java

@@ -8,10 +8,10 @@ package com.yihu.jw.base.dao.role;
import com.yihu.jw.entity.care.role.WlyyUserRole;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
public interface WlyyUserRoleDao extends PagingAndSortingRepository<WlyyUserRole, Long> {
public interface WlyyUserRoleDao extends JpaRepository<WlyyUserRole, Long> {
    @Modifying
    @Query("update WlyyUserRole r set r.role=?1 where r.id=?2")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/BaseEmailTemplateConfigDao.java

@@ -1,15 +1,14 @@
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.BaseEmailTemplateConfigDO;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Dao - BaseEmailTemplateConfig
 * Created by zdm on 2018/8/14.
 */
public interface BaseEmailTemplateConfigDao extends PagingAndSortingRepository<BaseEmailTemplateConfigDO, String> {
public interface BaseEmailTemplateConfigDao extends JpaRepository<BaseEmailTemplateConfigDO, String> {
    BaseEmailTemplateConfigDO findById(String id);
    BaseEmailTemplateConfigDO findByTemplateName(String templateName);
    BaseEmailTemplateConfigDO findByCode(String code);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasBusinessCardDao.java

@@ -2,12 +2,12 @@ package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasBusinessCardDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Dao - SAAS名片
 * Created by progr1mmer on 2018/9/7.
 */
public interface SaasBusinessCardDao extends PagingAndSortingRepository<SaasBusinessCardDO, Integer>, JpaSpecificationExecutor<SaasBusinessCardDO> {
public interface SaasBusinessCardDao extends JpaRepository<SaasBusinessCardDO, Integer>, JpaSpecificationExecutor<SaasBusinessCardDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasDO;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -10,12 +10,10 @@ import java.util.List;
 * Dao - SAAS
 * Created by progr1mmer on 2018/8/14.
 */
public interface SaasDao extends PagingAndSortingRepository<SaasDO, String> {
public interface SaasDao extends JpaRepository<SaasDO, String> {
    SaasDO findByName(String name);
    SaasDO findById(String id);
    SaasDO findByCreateUser(String createUser);
    @Query("from SaasDO  ")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasDefaultModuleFunctionDao.java

@@ -3,7 +3,7 @@
//import com.yihu.jw.entity.base.saas.SaasDO;
//import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.repository.PagingAndSortingRepository;
//import org.springframework.data.jpa.repository.JpaRepository;
//
//import java.util.List;
//
@@ -11,7 +11,7 @@
// * Dao - Saas默认模块功能
// * Created by progr1mmer on 2018/8/17.
// */
//public interface SaasDefaultModuleFunctionDao extends PagingAndSortingRepository<SaasDefaultModuleFunctionDO, Integer>, JpaSpecificationExecutor<SaasDefaultModuleFunctionDO> {
//public interface SaasDefaultModuleFunctionDao extends JpaRepository<SaasDefaultModuleFunctionDO, Integer>, JpaSpecificationExecutor<SaasDefaultModuleFunctionDO> {
//
//    List<SaasDefaultModuleFunctionDO> findBySaasType(Integer saasType);
//

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasModuleFunctionDao.java

@@ -2,12 +2,12 @@
//
//import com.yihu.jw.entity.base.saas.SaasModuleFunctionDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.repository.PagingAndSortingRepository;
//import org.springframework.data.jpa.repository.JpaRepository;
//
///**
// * Dao - Saas所分配的模块功能
// * Created by progr1mmer on 2018/8/17.
// */
//public interface SaasModuleFunctionDao extends PagingAndSortingRepository<SaasModuleFunctionDO, String>, JpaSpecificationExecutor<SaasModuleFunctionDO> {
//public interface SaasModuleFunctionDao extends JpaRepository<SaasModuleFunctionDO, String>, JpaSpecificationExecutor<SaasModuleFunctionDO> {
//
//}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasThemeDao.java

@@ -1,13 +1,13 @@
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasThemeDO;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 租户主题风格
 * @author yeshijie on 2018/10/16.
 */
public interface SaasThemeDao extends PagingAndSortingRepository<SaasThemeDO, String> {
public interface SaasThemeDao extends JpaRepository<SaasThemeDO, String> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasThemeExtendDao.java

@@ -1,13 +1,13 @@
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasThemeExtendDO;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 主题风格扩展表（type=2时存多图）
 * @author yeshijie on 2018/10/16.
 */
public interface SaasThemeExtendDao extends PagingAndSortingRepository<SaasThemeExtendDO, String> {
public interface SaasThemeExtendDao extends JpaRepository<SaasThemeExtendDO, String> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasTypeDictDao.java

@@ -3,7 +3,7 @@ package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -11,12 +11,10 @@ import java.util.List;
/**
 * Created by zdm on 2018/10/10.
 */
public interface SaasTypeDictDao extends PagingAndSortingRepository<SaasTypeDictDO, String> {
public interface SaasTypeDictDao extends JpaRepository<SaasTypeDictDO, String> {
    SaasTypeDictDO findByName(String name);
    SaasTypeDictDO findById(String id);
    SaasTypeDictDO findByCode(Integer code);
    List<SaasTypeDictDO> findListByStatus(SaasTypeDictDO.Status status);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/searchClient/BaseSearchNoveltyRepeatDao.java

@@ -3,14 +3,14 @@ package com.yihu.jw.base.dao.searchClient;
import com.yihu.jw.entity.base.searchClient.BaseSearchNoveltyRepeatDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * Created by wsy on 2021/9/4.
 */
public interface BaseSearchNoveltyRepeatDao extends PagingAndSortingRepository<BaseSearchNoveltyRepeatDO,String>{
public interface BaseSearchNoveltyRepeatDao extends JpaRepository<BaseSearchNoveltyRepeatDO,String>{
    @Query(value = "select b from BaseSearchNoveltyRepeatDO b where name = ?1 or subject = ?1 or content = ?1")
    List<BaseSearchNoveltyRepeatDO> findBySearchData(String searchData);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/servicePackage/ServicePackageDao.java

@@ -2,13 +2,13 @@ package com.yihu.jw.base.dao.servicePackage;
import com.yihu.jw.entity.base.servicePackage.ServicePackageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 *
 * @author yeshijie on 2018/8/17.
 */
public interface ServicePackageDao extends PagingAndSortingRepository<ServicePackageDO, String>, JpaSpecificationExecutor<ServicePackageDO> {
public interface ServicePackageDao extends JpaRepository<ServicePackageDO, String>, JpaSpecificationExecutor<ServicePackageDO> {
}