igor/org.ccalm.main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repair warn_air

Browse Source
This commit is contained in:
igor
2025-07-04 07:27:49 +05:00
parent 6e4c74c426
commit 39db27fca1
5 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.ccalm</groupId> <groupId>org.ccalm</groupId>
<artifactId>main</artifactId> <artifactId>main</artifactId>
<version>1.0.1</version> <version>1.0.2</version>
<name>main</name> <name>main</name>
<description>main</description> <description>main</description>
<properties> <properties>

11
src/main/java/org/ccalm/main/AcceptASDCController.java
View File

@ -3038,17 +3038,6 @@ public class AcceptASDCController implements ServletContextAware {
@ResponseBody @ResponseBody
public FileSystemResource sendPhoto(HttpServletResponse response,@RequestParam(required=true,name="table") String tableName,@RequestParam(required=true,name="file") String fileName) { public FileSystemResource sendPhoto(HttpServletResponse response,@RequestParam(required=true,name="table") String tableName,@RequestParam(required=true,name="file") String fileName) {
//Load DB configuration
String data_dir = "";
Properties prop = new Properties();
try {
prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file
data_dir = prop.getProperty("data.dir");
} catch (Exception ex) {
ex.printStackTrace();
logger.error("Error load org_ccalm_main.properties",ex); //TODO delete .properties file and use .yaml file
}
File file = new File(data_dir + "data/" + tableName + "/" + fileName); File file = new File(data_dir + "data/" + tableName + "/" + fileName);
if(file.exists()) if(file.exists())
{ {

4
src/main/java/org/ccalm/main/SendWarning.java
View File

@ -191,7 +191,7 @@ public class SendWarning {
update update
main.frmcheckpoints main.frmcheckpoints
set set
warn_air=true warn_air=false
where uid=CAST(:uid AS uuid) where uid=CAST(:uid AS uuid)
"""; """;
MapSqlParameterSource param = new MapSqlParameterSource(); MapSqlParameterSource param = new MapSqlParameterSource();
@ -246,7 +246,7 @@ public class SendWarning {
update update
main.frmcheckpoints main.frmcheckpoints
set set
warn_soil=true warn_soil=false
where uid=CAST(:uid AS uuid) where uid=CAST(:uid AS uuid)
"""; """;
MapSqlParameterSource param = new MapSqlParameterSource(); MapSqlParameterSource param = new MapSqlParameterSource();

26
src/main/resources/templates/engine/index.html
View File

@ -28,20 +28,20 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script--> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script-->
<script type="text/javascript" src="/api/translation/v01/array"></script> <script type="text/javascript" src="/api/translation/v01/array"></script>
<link rel="stylesheet" type="text/css" href="../resources/metadata/dbms/dbms.css?v=14"/> <link rel="stylesheet" type="text/css" href="../resources/metadata/dbms/dbms.css?v=15"/>
<script type="text/javascript" src="../resources/metadata/dbms/BrowserDetect.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/dbms/BrowserDetect.js?v=15"></script>
<script type="text/javascript" src="../resources/metadata/dbms/tools.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/dbms/tools.js?v=15"></script>
<script type="text/javascript" src="../resources/metadata/dbms/window.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/dbms/window.js?v=15"></script>
<script type="text/javascript" src="../resources/metadata/dbms/editrecord.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/dbms/editrecord.js?v=15"></script>
<script type="text/javascript" src="../resources/metadata/dbms/showrecord.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/dbms/showrecord.js?v=15"></script>
<script type="text/javascript" src="../resources/metadata/dbms/tabs.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/dbms/tabs.js?v=15"></script>
<script type="text/javascript" src="../resources/metadata/dbms/login.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/dbms/login.js?v=15"></script>
<script type="text/javascript" src="../resources/metadata/dbms/log.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/dbms/log.js?v=15"></script>
<script type="text/javascript" src="../resources/metadata/tree/tree.js?v=14"></script> <script type="text/javascript" src="../resources/metadata/tree/tree.js?v=15"></script>
<script type="text/javascript" src="../resources/engine/popup.js?v=14"></script> <script type="text/javascript" src="../resources/engine/popup.js?v=15"></script>
<script type="text/javascript" src="../resources/engine/index.js?v=21"></script> <script type="text/javascript" src="../resources/engine/index.js?v=22"></script>
<script type="text/javascript" src="../resources/engine/user.js?v=16"></script> <script type="text/javascript" src="../resources/engine/user.js?v=17"></script>
<style> <style>
html, html,

16
src/main/resources/templates/test.html
View File

@ -10,16 +10,16 @@
<script type="text/javascript" src="/api/translation/v01/array"></script> <script type="text/javascript" src="/api/translation/v01/array"></script>
<script src="./resources/metadata/dbms/tools.js?v=9"></script> <script src="./resources/metadata/dbms/tools.js?v=10"></script>
<script src="./resources/metadata/dbms/window.js?v=10"></script> <script src="./resources/metadata/dbms/window.js?v=11"></script>
<link rel="stylesheet" href="./resources/engine/css/buttons.css?v=7"> <link rel="stylesheet" href="./resources/engine/css/buttons.css?v=8">
<link rel="stylesheet" href="./resources/engine/normalize.css?v=7"> <link rel="stylesheet" href="./resources/engine/normalize.css?v=8">
<link rel="stylesheet" href="./resources/metadata/dbms/dbms.css?v=7"/> <link rel="stylesheet" href="./resources/metadata/dbms/dbms.css?v=8"/>
<link rel="stylesheet" href="./resources/engine/index.css?v=7"> <link rel="stylesheet" href="./resources/engine/index.css?v=8">
<script type="text/javascript" src="./resources/engine/popup.js?v=03"></script> <script type="text/javascript" src="./resources/engine/popup.js?v=04"></script>
<script type="text/javascript" src="./resources/index.js?v=01"></script> <script type="text/javascript" src="./resources/index.js?v=02"></script>
<link rel="stylesheet" href="./resources/engine/openlayers/ol.css" type="text/css"> <link rel="stylesheet" href="./resources/engine/openlayers/ol.css" type="text/css">
<link rel="stylesheet" href="./resources/engine/openlayers/ol-ext.css" /> <link rel="stylesheet" href="./resources/engine/openlayers/ol-ext.css" />