Browse Source

javadoc compile error modify

pull/2/head
qiaozhanwei 5 years ago
parent
commit
3a066f2272
  1. 5
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java
  2. 1
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java
  3. 6
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DataSourceFactory.java
  4. 1
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java
  5. 3
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
  6. 14
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
  7. 11
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java

5
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java

@ -135,11 +135,14 @@ public class AlertDao extends AbstractBaseDao {
alertMapper.insert(alert); alertMapper.insert(alert);
} }
/** /**
* task timeout warn * task timeout warn
* @param alertgroupId alertgroupId * @param alertgroupId alertgroupId
* @param receivers receivers * @param receivers receivers
* @param receiversCc receiversCc * @param receiversCc receiversCc
* @param processInstanceId processInstanceId
* @param processInstanceName processInstanceName
* @param taskId taskId * @param taskId taskId
* @param taskName taskName * @param taskName taskName
*/ */
@ -171,7 +174,7 @@ public class AlertDao extends AbstractBaseDao {
/** /**
* for test * for test
* @return * @return AlertMapper
*/ */
public AlertMapper getAlertMapper() { public AlertMapper getAlertMapper() {
return alertMapper; return alertMapper;

1
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java

@ -81,6 +81,7 @@ public abstract class BaseDataSource {
/** /**
* gets the JDBC url for the data source connection * gets the JDBC url for the data source connection
* @return getJdbcUrl
*/ */
public String getJdbcUrl() { public String getJdbcUrl() {
StringBuilder jdbcUrl = new StringBuilder(getAddress()); StringBuilder jdbcUrl = new StringBuilder(getAddress());

6
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DataSourceFactory.java

@ -29,6 +29,12 @@ public class DataSourceFactory {
private static final Logger logger = LoggerFactory.getLogger(DataSourceFactory.class); private static final Logger logger = LoggerFactory.getLogger(DataSourceFactory.class);
/**
* getDatasource
* @param dbType dbType
* @param parameter parameter
* @return getDatasource
*/
public static BaseDataSource getDatasource(DbType dbType, String parameter) { public static BaseDataSource getDatasource(DbType dbType, String parameter) {
try { try {
switch (dbType) { switch (dbType) {

1
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java

@ -51,7 +51,6 @@ public class SQLServerDataSource extends BaseDataSource {
/** /**
* test whether the data source can be connected successfully * test whether the data source can be connected successfully
* @throws Exception
*/ */
@Override @Override
public void isConnectable() { public void isConnectable() {

3
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java

@ -134,7 +134,8 @@ public class SpringConnectionFactory {
/** /**
* get sql session * get sql session
* @return sqlSession * @return SqlSession
* @throws Exception
*/ */
@Bean @Bean
public SqlSession sqlSession() throws Exception{ public SqlSession sqlSession() throws Exception{

14
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java

@ -78,6 +78,20 @@ public interface ProcessInstanceMapper extends BaseMapper<ProcessInstance> {
* @param endTime endTime * @param endTime endTime
* @return process instance IPage * @return process instance IPage
*/ */
/**
* process instance page
* @param page page
* @param projectId projectId
* @param processDefinitionId processDefinitionId
* @param searchVal searchVal
* @param executorId executorId
* @param statusArray statusArray
* @param host host
* @param startTime startTime
* @param endTime endTime
* @return process instance page
*/
IPage<ProcessInstance> queryProcessInstanceListPaging(Page<ProcessInstance> page, IPage<ProcessInstance> queryProcessInstanceListPaging(Page<ProcessInstance> page,
@Param("projectId") int projectId, @Param("projectId") int projectId,
@Param("processDefinitionId") Integer processDefinitionId, @Param("processDefinitionId") Integer processDefinitionId,

11
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java

@ -49,13 +49,15 @@ public interface ResourceMapper extends BaseMapper<Resource> {
@Param("userId") int userId, @Param("userId") int userId,
@Param("type") int type); @Param("type") int type);
/** /**
* resource page * resource page
* @param page page * @param page page
* @param userId query all if 0, then query the authed resources * @param userId userId
* @param id id
* @param type type * @param type type
* @param searchVal searchVal * @param searchVal searchVal
* @return resource list * @return resource page
*/ */
IPage<Resource> queryResourcePaging(IPage<Resource> page, IPage<Resource> queryResourcePaging(IPage<Resource> page,
@Param("userId") int userId, @Param("userId") int userId,
@ -94,10 +96,13 @@ public interface ResourceMapper extends BaseMapper<Resource> {
*/ */
<T> List<Resource> listAuthorizedResource(@Param("userId") int userId,@Param("resNames")T[] resNames); <T> List<Resource> listAuthorizedResource(@Param("userId") int userId,@Param("resNames")T[] resNames);
/** /**
* list authorized resource * list authorized resource
* @param userId userId * @param userId userId
* @param resIds resource ids * @param resIds resIds
* @param <T> T
* @return resource list * @return resource list
*/ */
<T> List<Resource> listAuthorizedResourceById(@Param("userId") int userId,@Param("resIds")T[] resIds); <T> List<Resource> listAuthorizedResourceById(@Param("userId") int userId,@Param("resIds")T[] resIds);

Loading…
Cancel
Save