diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..83a3b6f --- /dev/null +++ b/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/.project b/.project new file mode 100644 index 0000000..bf64825 --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + secure-api + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..abdea9a --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..5e4ec05 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/src/main/java/in/gov/secureapi/config/DataSourceConfig.java b/src/main/java/in/gov/secureapi/config/DataSourceConfig.java index f979d97..e4256d5 100644 --- a/src/main/java/in/gov/secureapi/config/DataSourceConfig.java +++ b/src/main/java/in/gov/secureapi/config/DataSourceConfig.java @@ -20,13 +20,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement public class DataSourceConfig { - // private static String host = "localhost:3306"; - // private static String dbpassword = "root"; +// private static String host = "localhost:3306"; +// private static String dbpassword = "root"; // private static String dbpassword = "gccroot"; // AWS - private static String host = - "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306"; + private static String host ="gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306"; private static String dbpassword = "gcc-facial-password"; ////////////////////////////// (For GCC APP) //////////////////////// diff --git a/src/main/java/in/gov/secureapi/controller/DBFOT_controller.java b/src/main/java/in/gov/secureapi/controller/DBFOT_controller.java index d76cd2e..69693f0 100644 --- a/src/main/java/in/gov/secureapi/controller/DBFOT_controller.java +++ b/src/main/java/in/gov/secureapi/controller/DBFOT_controller.java @@ -50,7 +50,7 @@ public class DBFOT_controller { @RequestParam(value = "complaint_raised_by", required = true) String complaint_raised_by, @RequestParam(value = "complaint_updated_on", required = true) String complaint_updated_on, @RequestParam(value = "complaint_updated_by", required = true) String complaint_updated_by, - @RequestParam(value = "remarks", required = true) String remarks, + @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "imgfile", required = false) MultipartFile imgfile, @RequestParam(value = "cby", required = true) String cby ) diff --git a/src/main/java/in/gov/secureapi/service/DBFOT_service.java b/src/main/java/in/gov/secureapi/service/DBFOT_service.java index eb8bc9f..5c459b6 100644 --- a/src/main/java/in/gov/secureapi/service/DBFOT_service.java +++ b/src/main/java/in/gov/secureapi/service/DBFOT_service.java @@ -233,6 +233,10 @@ public class DBFOT_service { Map response = new HashMap<>(); + if(remarks.isEmpty()) { + remarks=null; + } + try { String checkSql = diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7eeb759..ea2c1bb 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -# spring.profiles.active=local +#spring.profiles.active=local spring.profiles.active=production spring.application.name=