diff --git a/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BDatabaseInformation.class b/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BDatabaseInformation.class index 194b998..27c6a6b 100644 Binary files a/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BDatabaseInformation.class and b/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BDatabaseInformation.class differ diff --git a/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BInsertData.class b/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BInsertData.class index 5296e6a..3b87f19 100644 Binary files a/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BInsertData.class and b/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BInsertData.class differ diff --git a/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BInsertData2.class b/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BInsertData2.class index 62d4ce6..dd1b85c 100644 Binary files a/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BInsertData2.class and b/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BInsertData2.class differ diff --git a/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BUpdateData.class b/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BUpdateData.class index 738b83f..6636e5e 100644 Binary files a/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BUpdateData.class and b/solarInsertDB/solarInsertDB-rt/build/classes/java/main/com/mjm/solarInsertDB/BUpdateData.class differ diff --git a/solarInsertDB/solarInsertDB-rt/build/libs/solarInsertDB-rt-1.0.jar b/solarInsertDB/solarInsertDB-rt/build/libs/solarInsertDB-rt-1.0.jar index ad7a66d..869b6b8 100644 Binary files a/solarInsertDB/solarInsertDB-rt/build/libs/solarInsertDB-rt-1.0.jar and b/solarInsertDB/solarInsertDB-rt/build/libs/solarInsertDB-rt-1.0.jar differ diff --git a/solarInsertDB/solarInsertDB-rt/build/tmp/jar/module.xml b/solarInsertDB/solarInsertDB-rt/build/tmp/jar/module.xml index 0d34d6b..9a37b2f 100644 --- a/solarInsertDB/solarInsertDB-rt/build/tmp/jar/module.xml +++ b/solarInsertDB/solarInsertDB-rt/build/tmp/jar/module.xml @@ -1,5 +1,5 @@ - + diff --git a/solarInsertDB/solarInsertDB-rt/src/com/mjm/solarInsertDB/BInsertData.java b/solarInsertDB/solarInsertDB-rt/src/com/mjm/solarInsertDB/BInsertData.java index 4199c19..3215142 100644 --- a/solarInsertDB/solarInsertDB-rt/src/com/mjm/solarInsertDB/BInsertData.java +++ b/solarInsertDB/solarInsertDB-rt/src/com/mjm/solarInsertDB/BInsertData.java @@ -23,11 +23,7 @@ import java.util.*; { @NiagaraProperty(name = "DatabaseInformation", type = "BDatabaseInformation", defaultValue = "new BDatabaseInformation()", flags = Flags.SUMMARY), @NiagaraProperty(name = "disable", type = "boolean", defaultValue = "true", flags = Flags.SUMMARY), -// @NiagaraProperty(name = "exception", type = "boolean", defaultValue = "false", flags = Flags.SUMMARY), -// @NiagaraProperty(name = "working", type = "boolean", defaultValue = "false", flags = Flags.SUMMARY), - @NiagaraProperty(name = "showMessage", type = "boolean", defaultValue = "true", flags = Flags.SUMMARY), -// @NiagaraProperty(name = "path", type = "String", defaultValue = "", flags = Flags.SUMMARY), -// @NiagaraProperty(name = "fileName", type = "String", defaultValue = "", flags = Flags.SUMMARY) + @NiagaraProperty(name = "showMessage", type = "boolean", defaultValue = "true", flags = Flags.SUMMARY) }, actions = { diff --git a/solarInsertDB/solarInsertDB-rt/src/com/mjm/solarInsertDB/BUpdateData.java b/solarInsertDB/solarInsertDB-rt/src/com/mjm/solarInsertDB/BUpdateData.java index dc3c80a..baa1f88 100644 --- a/solarInsertDB/solarInsertDB-rt/src/com/mjm/solarInsertDB/BUpdateData.java +++ b/solarInsertDB/solarInsertDB-rt/src/com/mjm/solarInsertDB/BUpdateData.java @@ -26,11 +26,7 @@ import java.util.*; { @NiagaraProperty(name = "DatabaseInformation", type = "BDatabaseInformation", defaultValue = "new BDatabaseInformation()", flags = Flags.SUMMARY), @NiagaraProperty(name = "disable", type = "boolean", defaultValue = "true", flags = Flags.SUMMARY), - @NiagaraProperty(name = "exception", type = "boolean", defaultValue = "false", flags = Flags.SUMMARY), - @NiagaraProperty(name = "working", type = "boolean", defaultValue = "false", flags = Flags.SUMMARY), - @NiagaraProperty(name = "showMessage", type = "boolean", defaultValue = "true", flags = Flags.SUMMARY), - @NiagaraProperty(name = "path", type = "String", defaultValue = "", flags = Flags.SUMMARY), - @NiagaraProperty(name = "fileName", type = "String", defaultValue = "", flags = Flags.SUMMARY) + @NiagaraProperty(name = "showMessage", type = "boolean", defaultValue = "true", flags = Flags.SUMMARY) }, actions = { @@ -42,8 +38,8 @@ import java.util.*; public class BUpdateData extends BComponent { /*+ ------------ BEGIN BAJA AUTO GENERATED CODE ------------ +*/ -/*@ $com.mjm.solarInsertDB.BUpdateData(2177564192)1.0$ @*/ -/* Generated Mon Mar 10 19:48:33 CST 2025 by Slot-o-Matic (c) Tridium, Inc. 2012 */ +/*@ $com.mjm.solarInsertDB.BUpdateData(3014327933)1.0$ @*/ +/* Generated Wed Mar 26 21:11:32 CST 2025 by Slot-o-Matic (c) Tridium, Inc. 2012 */ //////////////////////////////////////////////////////////////// // Property "DatabaseInformation" @@ -91,52 +87,6 @@ public class BUpdateData extends BComponent { */ public void setDisable(boolean v) { setBoolean(disable, v, null); } -//////////////////////////////////////////////////////////////// -// Property "exception" -//////////////////////////////////////////////////////////////// - - /** - * Slot for the {@code exception} property. - * @see #getException - * @see #setException - */ - public static final Property exception = newProperty(Flags.SUMMARY, false, null); - - /** - * Get the {@code exception} property. - * @see #exception - */ - public boolean getException() { return getBoolean(exception); } - - /** - * Set the {@code exception} property. - * @see #exception - */ - public void setException(boolean v) { setBoolean(exception, v, null); } - -//////////////////////////////////////////////////////////////// -// Property "working" -//////////////////////////////////////////////////////////////// - - /** - * Slot for the {@code working} property. - * @see #getWorking - * @see #setWorking - */ - public static final Property working = newProperty(Flags.SUMMARY, false, null); - - /** - * Get the {@code working} property. - * @see #working - */ - public boolean getWorking() { return getBoolean(working); } - - /** - * Set the {@code working} property. - * @see #working - */ - public void setWorking(boolean v) { setBoolean(working, v, null); } - //////////////////////////////////////////////////////////////// // Property "showMessage" //////////////////////////////////////////////////////////////// @@ -160,52 +110,6 @@ public class BUpdateData extends BComponent { */ public void setShowMessage(boolean v) { setBoolean(showMessage, v, null); } -//////////////////////////////////////////////////////////////// -// Property "path" -//////////////////////////////////////////////////////////////// - - /** - * Slot for the {@code path} property. - * @see #getPath - * @see #setPath - */ - public static final Property path = newProperty(Flags.SUMMARY, "", null); - - /** - * Get the {@code path} property. - * @see #path - */ - public String getPath() { return getString(path); } - - /** - * Set the {@code path} property. - * @see #path - */ - public void setPath(String v) { setString(path, v, null); } - -//////////////////////////////////////////////////////////////// -// Property "fileName" -//////////////////////////////////////////////////////////////// - - /** - * Slot for the {@code fileName} property. - * @see #getFileName - * @see #setFileName - */ - public static final Property fileName = newProperty(Flags.SUMMARY, "", null); - - /** - * Get the {@code fileName} property. - * @see #fileName - */ - public String getFileName() { return getString(fileName); } - - /** - * Set the {@code fileName} property. - * @see #fileName - */ - public void setFileName(String v) { setString(fileName, v, null); } - //////////////////////////////////////////////////////////////// // Action "update" //////////////////////////////////////////////////////////////// @@ -250,6 +154,7 @@ public class BUpdateData extends BComponent { + BDatabaseInformation databaseInformation = null; public void started() { @@ -278,13 +183,12 @@ public class BUpdateData extends BComponent { List conditionName = new ArrayList(); List conditionValue = new ArrayList(); - if (this.getDisable() || this.getException()) { + if (this.getDisable()) { if (this.getShowMessage()) { System.out.println("disable or exception"); } } else { try { - this.setWorking(true); Property property[] = this.getDynamicPropertiesArray(); for (int i = 0; i < property.length; i++) { @@ -320,10 +224,8 @@ public class BUpdateData extends BComponent { } } catch (Exception e) { System.out.println(e); - this.setException(true); e.printStackTrace(); } finally { - this.setWorking(false); } } } else { @@ -355,7 +257,7 @@ public class BUpdateData extends BComponent { SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd"); Date date = new Date(); String strDate = sdFormat.format(date); - String outputFile = "../../shared/" + this.getPath() + strDate + this.getFileName(); + String outputFile = "../../shared/"; // before we open the file check to see if it already exists boolean alreadyExists = new File(outputFile).exists(); @@ -363,15 +265,6 @@ public class BUpdateData extends BComponent { // use FileWriter constructor that specifies open for appending if (!alreadyExists) { deleteFile(); - if (!this.getPath().equals("")) { - File file = new File(outputFile); - file.getParentFile().mkdir(); - try { - file.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } } CsvWriter csvOutput = new CsvWriter(new FileWriter(outputFile, true), ','); @@ -408,7 +301,7 @@ public class BUpdateData extends BComponent { Date sDate = sdf.parse(before90); long beforeTimestamp = sDate.getTime() / 1000; // System.out.println(beforeTimestamp); - String fullpath = "../../shared/" + this.getPath(); + String fullpath = "../../shared/"; File a = new File(fullpath); if (a.isDirectory()) { String[] filenames = a.list();