Browse Source

状态修改

chenweida 8 years ago
parent
commit
fa42dbe3df

+ 1 - 1
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/MFunction.java

@ -11,7 +11,7 @@ public class MFunction {
    private String name; //功能名称
    private String saasId; // saasid
    private String parentCode; //父功能code
    private Integer status; //状态 -1 已删除 0可用
    private Integer status; //状态 -1 删除 0 禁用 可用
    private String createUser;
    private String createUserName;
    private Date createTime;

+ 1 - 1
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/MModule.java

@ -11,7 +11,7 @@ public class MModule {
    private String name; //模块名称
    private String saasId; //关联 Saas code
    private String parentCode;//父id
    private Integer status;
    private Integer status; //-1 删除 0 禁用 可用
    private String createUser;
    private String createUserName;
    private Date createTime;

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

@ -10,12 +10,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface FunctionDao extends PagingAndSortingRepository<Function, Long>, JpaSpecificationExecutor<Function> {
    @Query("from Function f where f.name=?1 and f.status=0")
    @Query("from Function f where f.name=?1 and f.status=1")
    Function findByName(String name);
    @Query("from Function f where f.name=?1 and f.status=0 and f.code != ?2")
    @Query("from Function f where f.name=?1 and f.status=1 and f.code != ?2")
    Function findByNameExcludeCode(String name, String code);
    @Query("from Function f where f.code=?1 and f.status=0")
    @Query("from Function f where f.code=?1 and f.status=1")
    Function findByCode(String code);
}

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

@ -9,12 +9,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * Created by chenweida on 2017/5/19.
 */
public interface ModuleDao extends PagingAndSortingRepository<Module, Long>, JpaSpecificationExecutor<Module> {
    @Query("from Module f where f.name=?1 and f.status=0")
    @Query("from Module f where f.name=?1 and f.status=1")
    Module findByName(String name);
    @Query("from Module f where f.name=?1 and f.status=0 and f.code != ?2")
    @Query("from Module f where f.name=?1 and f.status=1 and f.code != ?2")
    Module findByNameExcludeCode(String name, String code);
    @Query("from Module f where f.code=?1 and f.status=0")
    @Query("from Module f where f.code=?1 and f.status=1")
    Module findByCode(String code);
}

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

@ -9,12 +9,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * Created by chenweida on 2017/5/19.
 */
public interface SaasDao extends PagingAndSortingRepository<Saas, Long>, JpaSpecificationExecutor<Saas> {
    @Query("from Saas f where f.name=?1 and f.status=0")
    @Query("from Saas f where f.name=?1 and f.status=1")
    Saas findByName(String name);
    @Query("from Saas f where f.name=?1 and f.status=0 and f.code != ?2")
    @Query("from Saas f where f.name=?1 and f.status=1 and f.code != ?2")
    Saas findByNameExcludeCode(String name, String code);
    @Query("from Saas f where f.code=?1 and f.status=0")
    @Query("from Saas f where f.code=?1 and f.status=1")
    Saas findByCode(String code);
}

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

@ -11,12 +11,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface SmsDao extends PagingAndSortingRepository<BaseSms, Long>, JpaSpecificationExecutor<BaseSms> {
    @Query("from Function f where f.name=?1 and f.status=0")
    @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=0 and f.code != ?2")
    @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=0")
    @Query("from Function f where f.code=?1 and f.status=1")
    BaseSms findByCode(String code);
}

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

@ -10,12 +10,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * Created by chenweida on 2017/5/22.
 */
public interface SmsGatewayDao extends PagingAndSortingRepository<BaseSmsGateway, Long>, JpaSpecificationExecutor<BaseSmsGateway> {
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=0")
    @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=0 and f.code != ?2")
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=1 and f.code != ?2")
    BaseSmsGateway findByNameExcludeCode(String name, String code);
    @Query("from BaseSmsGateway f where f.code=?1 and f.status=0")
    @Query("from BaseSmsGateway f where f.code=?1 and f.status=1")
    BaseSmsGateway findByCode(String code);
}

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/model/Function.java

@ -19,7 +19,7 @@ public class Function extends IdEntity implements java.io.Serializable {
	private String name; //功能名称
	private String saasId; // saasid
	private String parentCode; //父功能code
	private Integer status; //状态 -1 已删除 0可用
	private Integer status; //状态 -1 删除 0 禁用 可用
	private String createUser;
	private String createUserName;
	private Date createTime;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/model/Module.java

@ -18,7 +18,7 @@ public class Module extends IdEntity implements java.io.Serializable {
	private String name; //模块名称
	private String saasId; //关联 Saas code
	private String parentCode;//父id
	private Integer status;
	private Integer status; //-1 删除 0 禁用 可用
	private String createUser;
	private String createUserName;
	private Date createTime;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/model/sms/BaseSmsGateway.java

@ -24,7 +24,7 @@ public class BaseSmsGateway  extends IdEntity implements java.io.Serializable {
	private String username;  //短信接口的账号
	private String password;	//短信接口的密码
	private String url;	//短信接口的url
	private Integer status;// -1 删除 0可用
	private Integer status;// -1 删除 0 禁用 可用
	// Constructors

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/service/FunctionService.java

@ -98,7 +98,7 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
    }
    public List<MFunction> getModuleFunctions(String saasCode) {
        String sql=" select m.code,m.parent_code,m.name from base_function f,base_module_function mf where f.code=mf.function_id and f.status=0 and mf.module_id=?";
        String sql=" select m.code,m.parent_code,m.name from base_function f,base_module_function mf where f.code=mf.function_id and f.status=1 and mf.module_id=?";
        return jdbcTemplate.queryForList(sql,MFunction.class,saasCode);
    }

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/service/ModuleService.java

@ -103,7 +103,7 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    }
    public List<MModule> getSaasModules(String saasCode) {
        String sql=" select m.code,m.parent_code,m.name from base_module m,base_saas_module sm where m.code=sm.module_id and m.status=0 and sm.saas_id=?";
        String sql=" select m.code,m.parent_code,m.name from base_module m,base_saas_module sm where m.code=sm.module_id and m.status=1 and sm.saas_id=?";
       return jdbcTemplate.queryForList(sql,MModule.class,saasCode);
    }
}