Merge branch 'dev' of chenweida/jw2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/wlyy/WlyyRequestMapping.java

@@ -115,11 +115,11 @@ public class WlyyRequestMapping {
    广告相关操作
     */
    public static class Advertisement {
        public static final String api_common = "advertisement";
        public static final String api_create = "create";
        public static final String api_delete = "delete";
        public static final String api_create = "advertisement";
        public static final String api_delete = "advertisement";
        public static final String api_getById = "getById";
        public static final String api_update = "update";
        public static final String api_update = "advertisement";
        public static final String api_queryPage = "queryPage";
        public static final String api_getList = "getList";
        public static final String api_getListByPatientId = "getListByPatientId";

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

@@ -21,8 +21,8 @@ public interface FunctionDao extends PagingAndSortingRepository<Function, String
    @Query("from Function f where f.name=?1 and f.status=1 and f.id!=?2")
    Function findByNameExcludeId(String name,String id);
    @Query("from Function f where f.parentId=?1 and f.status=1")
    List<Function> getChildren(String parentId);
    @Query("from Function f where f.parentCode=?1 and f.status=1")
    List<Function> getChildren(String parentCode);
    @Query("from Function f where f.status=1")
    List<Function> findAll();

svr/svr-base/src/main/java/com/yihu/jw/business/sms/dao/SmsDao.java

@@ -1,21 +1,9 @@
package com.yihu.jw.business.sms.dao;
import com.fasterxml.jackson.databind.deser.Deserializers;
import com.yihu.jw.base.sms.BaseSms;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface SmsDao extends PagingAndSortingRepository<BaseSms, String>, JpaSpecificationExecutor<BaseSms> {
    @Query("from Function f where f.name=?1 and f.status=1")
    BaseSms findByName(String name);
    @Query("from Function f where f.name=?1 and f.status=1 and f.code != ?2")
    BaseSms findByNameExcludeCode(String name, String code);
    @Query("from Function f where f.code=?1 and f.status=1")
    BaseSms findByCode(String code);
}

svr/svr-base/src/main/java/com/yihu/jw/business/sms/dao/SmsGatewayDao.java

@@ -12,7 +12,7 @@ public interface SmsGatewayDao extends PagingAndSortingRepository<BaseSmsGateway
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=1")
    BaseSmsGateway findByName(String name);
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=1 and f.code != ?2")
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=1 and f.id != ?2")
    BaseSmsGateway findByNameExcludeCode(String name, String code);
    @Query("from BaseSmsGateway f where f.id=?1 and f.status=1")