yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-08-21 23:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify compliance DAO (#688)

Browse Source
This commit is contained in:
Yi (Alan) Wang 2017-08-20 17:32:23 -07:00 committed by GitHub
parent 0ba5315a6c
commit 47b1799a0c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wherehows-dao/src/main/java/wherehows/dao/DatasetsDao.java
View File

@ -14,7 +14,6 @@
package wherehows.dao;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.sql.PreparedStatement;
@ -225,12 +224,11 @@ public class DatasetsDao {
return record;
}
public DatasetCompliance updateDatasetComplianceInfo(JdbcTemplate jdbcTemplate,
NamedParameterJdbcTemplate namedParameterJdbcTemplate, int datasetId, JsonNode node, String user)
public void updateDatasetComplianceInfo(JdbcTemplate jdbcTemplate,
NamedParameterJdbcTemplate namedParameterJdbcTemplate, int datasetId, DatasetCompliance record, String user)
throws Exception {
ObjectMapper om = new ObjectMapper();
DatasetCompliance record = om.convertValue(node, DatasetCompliance.class);
if (record.getDatasetId() != null && datasetId != record.getDatasetId()) {
throw new IllegalArgumentException("Dataset id doesn't match.");
}
@ -253,7 +251,5 @@ public class DatasetsDao {
parameters.put("modified_by", user);
parameters.put("modified_time", System.currentTimeMillis() / 1000);
namedParameterJdbcTemplate.update(INSERT_DATASET_COMPLIANCE, parameters);
return record;
}
}

5
wherehows-frontend/app/controllers/api/v1/Dataset.java
View File

@ -777,8 +777,9 @@ public class Dataset extends Controller {
}
try {
DATASETS_DAO.updateDatasetComplianceInfo(JDBC_TEMPLATE, NAMED_JDBC_TEMPLATE, datasetId, request().body().asJson(),
username);
DatasetCompliance record = Json.mapper().convertValue(request().body().asJson(), DatasetCompliance.class);
DATASETS_DAO.updateDatasetComplianceInfo(JDBC_TEMPLATE, NAMED_JDBC_TEMPLATE, datasetId, record, username);
} catch (Exception e) {
JsonNode result = Json.newObject()
.put("status", "failed")