Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Fix

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-04-04 15:08:36 +02:00
parent 2b14a047a3
commit 8ab0cd5465
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ems-core/src/main/java/it/integry/ems/controller/EmsController.java
View File

@@ -859,7 +859,7 @@ public class EmsController {
} }
@RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_DTB_DOC_PDF, method = RequestMethod.GET) @RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_DTB_DOC_PDF, method = RequestMethod.GET)
public byte[] downloadDtbDocPdf(HttpServletRequest request, HttpServletResponse response, public byte[] downloadDtbDocPdf(HttpServletResponse response,
@RequestParam(CommonConstants.PROFILE_DB) String config, @RequestParam(CommonConstants.PROFILE_DB) String config,
@RequestParam String dataDoc, @RequestParam String dataDoc,
@RequestParam String serDoc, @RequestParam String serDoc,
@@ -1147,8 +1147,7 @@ public class EmsController {
@RequestMapping(value = EmsRestConstants.PATH_CLEAN_DIRECTORIES, method = RequestMethod.POST) @RequestMapping(value = EmsRestConstants.PATH_CLEAN_DIRECTORIES, method = RequestMethod.POST)
public @ResponseBody public @ResponseBody
ServiceRestResponse cleanDirectories(HttpServletRequest httpRequest, HttpServletResponse httpResponse, ServiceRestResponse cleanDirectories(@RequestParam(CommonConstants.PROFILE_DB) String config) throws Exception {
@RequestParam(CommonConstants.PROFILE_DB) String config) throws Exception {
try { try {
emsServices.cleanDirectories(); emsServices.cleanDirectories();
return ServiceRestResponse.createPositiveResponse(); return ServiceRestResponse.createPositiveResponse();
@@ -1167,9 +1166,7 @@ public class EmsController {
@RequestMapping(value = EmsRestConstants.PATH_GET_ENTITY_MAPPING, method = RequestMethod.GET) @RequestMapping(value = EmsRestConstants.PATH_GET_ENTITY_MAPPING, method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
ServiceRestResponse getEntityMapping(HttpServletRequest httpRequest, ServiceRestResponse getEntityMapping(@RequestParam(CommonConstants.PROFILE_DB) String config) throws Exception {
HttpServletResponse httpResponse,
@RequestParam(CommonConstants.PROFILE_DB) String config) throws Exception {
try { try {
List<EntityHierarchyDTO> mapping = emsServices.getEntityMapping(); List<EntityHierarchyDTO> mapping = emsServices.getEntityMapping();
return ServiceRestResponse.createPositiveResponse(mapping); return ServiceRestResponse.createPositiveResponse(mapping);
@@ -1181,9 +1178,7 @@ public class EmsController {
@RequestMapping(value = EmsRestConstants.PATH_GET_HISTORY_PROFILE_DB, method = RequestMethod.GET) @RequestMapping(value = EmsRestConstants.PATH_GET_HISTORY_PROFILE_DB, method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
ServiceRestResponse getHistoryProfileDb(HttpServletRequest httpRequest, ServiceRestResponse getHistoryProfileDb(@RequestParam(CommonConstants.PROFILE_DB) String config) throws Exception {
HttpServletResponse httpResponse,
@RequestParam(CommonConstants.PROFILE_DB) String config) throws Exception {
try { try {
String historyProfileDb = settingsController.getHistoryProfileDb(); String historyProfileDb = settingsController.getHistoryProfileDb();
return ServiceRestResponse.createPositiveResponse(historyProfileDb); return ServiceRestResponse.createPositiveResponse(historyProfileDb);
@@ -1195,9 +1190,7 @@ public class EmsController {
@RequestMapping(value = EmsRestConstants.PATH_GET_ENTITY_DETAILS, method = RequestMethod.GET) @RequestMapping(value = EmsRestConstants.PATH_GET_ENTITY_DETAILS, method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
ServiceRestResponse getEntityDetails(HttpServletRequest httpRequest, ServiceRestResponse getEntityDetails(@RequestParam("entityName") String entityName,
HttpServletResponse httpResponse,
@RequestParam("entityName") String entityName,
@RequestParam(CommonConstants.PROFILE_DB) String config @RequestParam(CommonConstants.PROFILE_DB) String config
) throws Exception { ) throws Exception {
try { try {

2
ems-core/src/main/java/it/integry/ems_model/utility/UtilityHashMap.java
View File

@@ -15,7 +15,7 @@ public class UtilityHashMap {
return value; return value;
} }
public static <T> T getValueIfExists(HashMap<?, ?> map, String key) { public static <T> T getValueIfExists(Map<?, ?> map, String key) {
return getValueIfExists(map, key, null); return getValueIfExists(map, key, null);
} }