| @@ -7,9 +7,11 @@ |
| |
| import csip.ModelDataService; |
| import csip.ServiceException; |
| +import csip.annotations.Resource; |
| import csip.utils.JSONUtils; |
| import java.sql.Connection; |
| import java.sql.ResultSet; |
| +import java.sql.SQLException; |
| import java.sql.Statement; |
| import java.util.ArrayList; |
| import java.util.List; |
| @@ -20,7 +22,8 @@ |
| import org.codehaus.jettison.json.JSONArray; |
| import org.codehaus.jettison.json.JSONException; |
| import org.codehaus.jettison.json.JSONObject; |
| -import wqm.utils.WQMTools; |
| +import wqm.utils.DBResources; |
| +import static wqm.utils.DBResources.SSURGO_ID; |
| |
| /** |
| * WQM-01: Water Quality Sensitivity Rating (WQSR) |
| @@ -32,9 +35,10 @@ |
| + "Sensitivity Rating (WQSR) spatial layer and computes a sensitivity rating and treatment " |
| + "level required for mitigating nutrient and pesticide loss potentials and hazards.") |
| @Path("m/wqm/wqsr/1.0") |
| +@Resource(from = DBResources.class) |
| public class V1_0 extends ModelDataService { |
| |
| - List<V1_0.AoA> list = new ArrayList<>(); |
| + List<AoA> list = new ArrayList<>(); |
| |
| @Override |
| public void preProcess() throws ServiceException, JSONException { |
| @@ -65,11 +69,11 @@ |
| } |
| |
| @Override |
| - public String process() throws ServiceException { |
| - try (Connection tempCon = WQMTools.getConnection("ssurgo", LOG)) { |
| - tempCon.setAutoCommit(false); |
| - try (Statement stmt = tempCon.createStatement()) { |
| - for (V1_0.AoA aoa : list) { |
| + public void doProcess() throws ServiceException, SQLException { |
| + try (Connection tempCon = getResourceJDBC(SSURGO_ID); |
| + Statement stmt = tempCon.createStatement()) { |
| + |
| + for (AoA aoa : list) { |
| double aoaBaseArea = 0.0; |
| double aoaSensitiveArea = 0.0; |
| double aoaCriticalArea = 0.0; |
| @@ -102,17 +106,17 @@ |
| } |
| } |
| } |
| - } catch (Exception e) { |
| + catch (Exception e) { |
| LOG.info(e.toString()); |
| throw new ServiceException(e); |
| } |
| - return EXEC_OK; |
| + |
| } |
| |
| @Override |
| public void postProcess() throws JSONException { |
| JSONArray finalArr = new JSONArray(); |
| - for (V1_0.AoA aoa : list) { |
| + for (AoA aoa : list) { |
| JSONArray resultArr = new JSONArray(); |
| resultArr.put(JSONUtils.dataDesc("AoAId", aoa.getAoAId(), "Area of Analysis Identifier")); |
| resultArr.put(JSONUtils.dataDesc("wqs_Rating", aoa.getWQSRating(), "WQS Rating")); |