judaur2005/fiscad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ch-evo-24-01-2025' into 'main'

Browse Source 
Latest commit on 10/02/2025

See merge request christianakpona/fiscad!3
This commit is contained in:
Christian AKPONA
2025-02-10 10:33:47 +00:00
parent 4f755a5b51 d6d448eab8
commit 6db6bd19fe
360 changed files with 2845 additions and 1971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,4 +1,4 @@
infocad.log*
fiscad.log*
.idea
.DS_Store
target/*

8
mvnw vendored
View File

@@ -51,8 +51,8 @@ cygwin=false;
darwin=false;
mingw=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
CYGWIN*) cygwin=true ;
MINGW*) mingw=true;
Darwin*) darwin=true
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
@@ -63,7 +63,7 @@ case "`uname`" in
export JAVA_HOME="/Library/Java/Home"
fi
fi
;;
;
esac
if [ -z "$JAVA_HOME" ] ; then
@@ -217,7 +217,7 @@ else
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
fi
while IFS="=" read key value; do
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
case "$key" in (wrapperUrl) jarUrl="$value"; break ;
esac
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
if [ "$MVNW_VERBOSE" = true ]; then

27
pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.4</version>
<version>3.4.2</version>
<relativePath/>
</parent>
<groupId>io.gmss</groupId>
@@ -40,16 +40,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-oas</artifactId>
<version>3.0.0</version>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
@@ -88,6 +85,18 @@
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<!--Dépendance géométry
<dependency>
<groupId>org.locationtech.jts</groupId>

4
src/main/java/io/gmss/infocad/FiscadApplication.java → src/main/java/io/gmss/fiscad/FiscadApplication.java
View File

@@ -1,13 +1,11 @@
package io.gmss.infocad;
package io.gmss.fiscad;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
import springfox.documentation.oas.annotations.EnableOpenApi;
@SpringBootApplication
@EnableOpenApi
@ConfigurationPropertiesScan
public class FiscadApplication implements CommandLineRunner {

14
src/main/java/io/gmss/infocad/component/DataLoadConfig.java → src/main/java/io/gmss/fiscad/component/DataLoadConfig.java
View File

@@ -1,15 +1,15 @@
package io.gmss.infocad.component;
package io.gmss.fiscad.component;
import io.gmss.infocad.entities.user.Role;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.UserRole;
import io.gmss.infocad.repositories.user.RoleRepository;
import io.gmss.infocad.repositories.user.UserRepository;
import io.gmss.fiscad.entities.user.Role;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.UserRole;
import io.gmss.fiscad.repositories.user.RoleRepository;
import io.gmss.fiscad.repositories.user.UserRepository;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.HashSet;
import java.util.Set;

49
src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java Normal file
View File

@@ -0,0 +1,49 @@
package io.gmss.fiscad.configuration;
import io.gmss.fiscad.security.CustomUserDetailsService;
import io.gmss.fiscad.security.JwtAuthenticationFilter;
import lombok.RequiredArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
@RequiredArgsConstructor
@Configuration
public class ApplicationConfig {
private final CustomUserDetailsService customUserDetailsService;
@Bean
public AuthenticationProvider authenticationProvider() {
DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
authProvider.setUserDetailsService(customUserDetailsService);
authProvider.setPasswordEncoder(passwordEncoder());
return authProvider;
}
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
@Bean
public JwtAuthenticationFilter jwtAuthenticationFilter() {
return new JwtAuthenticationFilter();
}
@Bean
public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception {
return config.getAuthenticationManager();
}
@Bean
public ModelMapper modelMapper() {
return new ModelMapper();
}
}

4
src/main/java/io/gmss/infocad/configuration/AuditConfig.java → src/main/java/io/gmss/fiscad/configuration/AuditConfig.java
View File

@@ -1,7 +1,7 @@
package io.gmss.infocad.configuration;
package io.gmss.fiscad.configuration;
import io.gmss.infocad.repositories.user.UserRepository;
import io.gmss.fiscad.repositories.user.UserRepository;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.domain.AuditorAware;

6
src/main/java/io/gmss/infocad/configuration/AuditorAwareImpl.java → src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java
View File

@@ -1,7 +1,7 @@
package io.gmss.infocad.configuration;
package io.gmss.fiscad.configuration;
import io.gmss.infocad.repositories.user.UserRepository;
import io.gmss.infocad.security.UserPrincipal;
import io.gmss.fiscad.repositories.user.UserRepository;
import io.gmss.fiscad.security.UserPrincipal;
import org.springframework.data.domain.AuditorAware;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication;

2
src/main/java/io/gmss/infocad/configuration/JdbcConfig.java → src/main/java/io/gmss/fiscad/configuration/JdbcConfig.java
View File

@@ -1,4 +1,4 @@
package io.gmss.infocad.configuration;
package io.gmss.fiscad.configuration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

58
src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java Normal file
View File

@@ -0,0 +1,58 @@
package io.gmss.fiscad.configuration;
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn;
import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
import io.swagger.v3.oas.annotations.info.Contact;
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.info.License;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.security.SecurityScheme;
import io.swagger.v3.oas.annotations.servers.Server;
@OpenAPIDefinition(
info = @Info(
contact = @Contact(
name = "Novatic",
email = "contact@novatic.org",
url = "https://novatic.org"
),
description = "Cette page présente toutes les ressources API pour la gestion des données socio-foncières et fiscales",
title = "FISCAD",
version = "1.0",
license = @License(
name = "Licence name",
url = "https://novatic.org"
),
termsOfService = "Terms of service"
),
servers = {
@Server(
description = "Local ENV",
url = "http://localhost:8282"
),
@Server(
description = "PROD ENV (http)",
url = "http://161.97.163.53:20002"
),
@Server(
description = "PROD ENV (https)",
url = "https://fiscadbackend.novatic.org"
)
},
security = {
@SecurityRequirement(
name = "bearer"
)
}
)
@SecurityScheme(
name = "bearer",
description = "Authentification Json Web Token",
scheme = "Bearer",
type = SecuritySchemeType.HTTP,
bearerFormat = "JWT",
in = SecuritySchemeIn.HEADER
)
public class OpenApiConfig {
}

74
src/main/java/io/gmss/fiscad/configuration/SpringSecurityConfig.java Executable file
View File

@@ -0,0 +1,74 @@
package io.gmss.fiscad.configuration;
import io.gmss.fiscad.security.JwtAuthenticationEntryPoint;
import io.gmss.fiscad.security.JwtAuthenticationFilter;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.web.cors.CorsConfiguration;
import java.util.Arrays;
import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS;
@EnableWebSecurity
@Configuration
@EnableGlobalMethodSecurity(securedEnabled = true, jsr250Enabled = true, prePostEnabled = true)
@RequiredArgsConstructor
public class SpringSecurityConfig {
private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
private final AuthenticationProvider authenticationProvider;
private final JwtAuthenticationFilter jwtAuthenticationFilter;
private static final String[] AUTH_WHITELIST = {
"/api/**",
"/api/auth/login",
"/api/open/**",
"/api/synchronisation/references",
"/v3/api-docs/**",
"/swagger-ui/**",
"/swagger-ui.html"
};
@Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http
.cors(cors -> cors.configurationSource(request -> {
CorsConfiguration configuration = new CorsConfiguration();
configuration.setAllowedOrigins(Arrays.asList("*"));
configuration.setAllowedMethods(Arrays.asList("*"));
configuration.setAllowedHeaders(Arrays.asList("*"));
return configuration;
}))
.csrf(AbstractHttpConfigurer::disable)
// .csrf(csrf -> {
// csrf.ignoringRequestMatchers("/api/**");
// })
.authorizeHttpRequests(req ->
req
//.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
.requestMatchers(AUTH_WHITELIST).permitAll()
.anyRequest()
.authenticated()
)
.authenticationProvider(authenticationProvider)
.sessionManagement(session -> session.sessionCreationPolicy(STATELESS))
.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
.exceptionHandling(ex -> ex.authenticationEntryPoint(jwtAuthenticationEntryPoint))
;
return http.build();
}
}

61
src/main/java/io/gmss/fiscad/configuration/SwaggerConfig.java Executable file
View File

@@ -0,0 +1,61 @@
//package io.gmss.fiscad.configuration;
//
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import springfox.documentation.builders.ApiInfoBuilder;
//import springfox.documentation.builders.PathSelectors;
//import springfox.documentation.builders.RequestHandlerSelectors;
//import springfox.documentation.service.ApiInfo;
//import springfox.documentation.service.Contact;
//import springfox.documentation.spi.DocumentationType;
//import springfox.documentation.spring.web.plugins.Docket;
//import springfox.documentation.swagger.web.*;
//
//@Configuration
////@Import(SpringDataRestConfiguration.class)
//public class SwaggerConfig {
// @Bean
// public Docket api() {
// return new Docket(DocumentationType.OAS_30)
// .select()
// .apis(RequestHandlerSelectors.basePackage("io.gmss.fiscad.controllers.od"))
// .paths(PathSelectors.any()).build().apiInfo(this.getApiInfo());
//// .securitySchemes(this.securitySchemes())
//// .securityContexts(Arrays.asList(this.securityContext()));
// }
//
//
//
//// public SecurityContext securityContext() {
//// AuthorizationScope[] scopes = { new AuthorizationScope("read", "for read operation"),
//// new AuthorizationScope("write", "for write operation") };
//// List<SecurityReference> securityReferences = Arrays.asList(new SecurityReference("basicAuth", scopes),
//// new SecurityReference("Key", scopes), new SecurityReference("Authorization", scopes));
//// return SecurityContext.builder().securityReferences(securityReferences)
//// .forPaths(PathSelectors.any())
//// .build();
//// }
//
//// public List<SecurityScheme> securitySchemes() {
//// // SecurityScheme basicAuth = new BasicAuth("basicAuth");
//// SecurityScheme userAuthToken = new ApiKey("Authorization", "Authorization", "header");
//// // SecurityScheme keyAuth = new ApiKey("Key", "Key", "header");
//// return Arrays.asList(
//// // keyAuth,
//// userAuthToken
//// //, basicAuth
//// );
//// }
//
// private ApiInfo getApiInfo() {
// Contact contact = new Contact("INFOCAD", "https://gmss.com/", "contact@gmss.com");
// return new ApiInfoBuilder()
// .title("LIST OF API")
// .description("This page show all ressources that you could handle to communicate with database via REST API.")
// .version("1.0")
// .license("INFOCAD v.1.0")
// .licenseUrl("https://www.apache.org/licenses/LICENSE-3.0")
// .contact(contact)
// .build();
// }
//}

165
src/main/java/io/gmss/fiscad/configuration/SwaggerOAS3Config.java Normal file
View File

@@ -0,0 +1,165 @@
package io.gmss.fiscad.configuration;
import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
@Configuration
public class SwaggerOAS3Config {
private static final String[] RFU_METIER = {
"/api/batiment/**", "/api/caracteristique-caracteristiqueBatiment/**", "/api/caracteristique-parcelle/**",
"/api/caracteristique-unite-logement/**", "/api/enquete-batiment/**", "/api/enquete-unite-logement/**",
"/api/unite-logement/**"
};
private static final String[] RFU_PARAMETRE = {
"/api/campagne/**", "/api/caracteristique/**", "/api/equipe/**", "/api/type-caracteristique/**"
};
private static final String[] DECOUPAGE = {
"/api/arrondissement/**", "/api/commune/**", "/api/departement/**", "/api/nationalite/**", "/api/quartier/**"
};
private static final String[] INFOCAD_METIER = {
//metier
"/api/acteur-concerne/**","/api/commentaire/**","/api/enquete/**","/api/tpe/**","/api/upload/**",
};
private static final String[] INFOCAD_PARAMETERS = {
"/api/bloc/**","/api/mode-acquisition/**","/api/nature-domaine/**","/api/position-representation/**",
"/api/profession/**","/api/situation-geographique/**","/api/situation-matrimoniale/**","/api/source-droit/**",
"/api/structure/**","/api/type-contestation/**","/api/type-domaine/**","/api/type-personne/**","/api/type-piece/**",
"/api/type-representation/**"
};
private static final String[] NOTIFICATION = {
"/api/email/**"
};
private static final String[] RAPPORT = {
"/api/rapport/**"
};
private static final String[] STATISTIQUE = {
"/api/statistique/**"
};
private static final String[] SYNCHRONISATION = {
"/api/synchronisation/**", "/api/restauration/**"
};
private static final String[] USER = {
"/api/auth/**", "/api/demande-reinitialisation-mp/**", "/api/role/**", "/api/user/**"
};
@Bean
public GroupedOpenApi publicApi() {
return GroupedOpenApi.builder()
.group("ALL")
.pathsToMatch("/**")
.build();
}
@Bean
public GroupedOpenApi rfuMetierApi() {
return GroupedOpenApi.builder()
.group("RFU_METIER")
.pathsToMatch(RFU_METIER)
.build();
}
@Bean
public GroupedOpenApi rfuParametreApi() {
return GroupedOpenApi.builder()
.group("RFU_PARAMETRE")
.pathsToMatch(RFU_PARAMETRE)
.build();
}
@Bean
public GroupedOpenApi infocadMetierApi() {
return GroupedOpenApi.builder()
.group("INFOCAD_METIER")
.pathsToMatch(INFOCAD_METIER)
.build();
}
@Bean
public GroupedOpenApi infocadParametreApi() {
return GroupedOpenApi.builder()
.group("INFOCAD_PARAMETRE")
.pathsToMatch(INFOCAD_PARAMETERS)
.build();
}
@Bean
public GroupedOpenApi decoupageApi() {
return GroupedOpenApi.builder()
.group("DECOUPAGE")
.pathsToMatch(DECOUPAGE)
.build();
}
@Bean
public GroupedOpenApi notificationApi() {
return GroupedOpenApi.builder()
.group("NOTIFICATION")
.pathsToMatch(NOTIFICATION)
.build();
}
@Bean
public GroupedOpenApi rapportApi() {
return GroupedOpenApi.builder()
.group("RAPPORT")
.pathsToMatch(RAPPORT)
.build();
}
@Bean
public GroupedOpenApi statistiqueApi() {
return GroupedOpenApi.builder()
.group("STATISTIQUE")
.pathsToMatch(STATISTIQUE)
.build();
}
@Bean
public GroupedOpenApi synchronisationApi() {
return GroupedOpenApi.builder()
.group("SYNCHRONISATION")
.pathsToMatch(SYNCHRONISATION)
.build();
}
@Bean
public GroupedOpenApi userApi() {
return GroupedOpenApi.builder()
.group("USER")
.pathsToMatch(USER)
.build();
}
@Bean
public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
config.addAllowedOrigin("*");
config.addAllowedHeader("*");
config.addAllowedMethod("*");
source.registerCorsConfiguration("/v3/api-docs", config);
return new CorsFilter(source);
}
}

21
src/main/java/io/gmss/fiscad/configuration/WebConfig.java Normal file
View File

@@ -0,0 +1,21 @@
//package io.gmss.fiscad.configuration;
//
//import org.springframework.context.annotation.Configuration;
//import org.springframework.web.servlet.config.annotation.CorsRegistry;
//import org.springframework.web.servlet.config.annotation.EnableWebMvc;
//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
//
//@Configuration
//@EnableWebMvc
//public class WebConfig implements WebMvcConfigurer {
//
// private final long MAX_AGE_SECS = 3600;
//
// @Override
// public void addCorsMappings(CorsRegistry registry) {
// registry.addMapping("/**")
// .allowedOrigins("*")
// .allowedMethods("HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE")
// .maxAge(MAX_AGE_SECS);
// }
//}

10
src/main/java/io/gmss/infocad/controllers/OpenController.java → src/main/java/io/gmss/fiscad/controllers/OpenController.java
View File

@@ -1,15 +1,13 @@
package io.gmss.infocad.controllers;
package io.gmss.fiscad.controllers;
import io.swagger.v3.oas.annotations.tags.Tag;
import net.sf.jasperreports.engine.JasperCompileManager;
import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.util.JRSaver;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.io.File;
import java.io.FileInputStream;
@@ -18,6 +16,8 @@ import java.io.InputStream;
@RestController
@RequestMapping(value = "api/open", produces = MediaType.APPLICATION_JSON_VALUE)
@Tag(name = "Open")
@CrossOrigin(origins = "*")
public class OpenController {
@Value("${file.jasper-reports}")

33
src/main/java/io/gmss/infocad/controllers/decoupage/ArrondissementController.java → src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java
View File

@@ -1,10 +1,14 @@
package io.gmss.infocad.controllers.decoupage;
package io.gmss.fiscad.controllers.decoupage;
import io.gmss.infocad.entities.decoupage.Arrondissement;
import io.gmss.infocad.exceptions.NotFoundException;
import io.gmss.infocad.interfaces.decoupage.ArrondissementService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.decoupage.Arrondissement;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -13,10 +17,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/arrondissement", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Arrondissement")
@CrossOrigin(origins = "*")
public class ArrondissementController {
private final ArrondissementService arrondissementService;
@@ -25,6 +32,13 @@ public class ArrondissementController {
this.arrondissementService = arrondissementService;
}
@Operation(
description = "Cette ressource permet de créer un nouvel arrondissement",
summary = "Arrondissement",
responses = {
@io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Success", responseCode = "200"),
@io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Unauthorized / Invalid Token", responseCode = "403")}
)
@PostMapping("/create")
public ResponseEntity<?> createArrondissement(@RequestBody @Valid @Validated Arrondissement arrondissement) {
try{
@@ -41,6 +55,13 @@ public class ArrondissementController {
}
}
@Operation(
description = "Cette ressource permet de modifier un arrondissement",
summary = "Arrondissement",
responses = {
@io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Success", responseCode = "200"),
@io.swagger.v3.oas.annotations.responses.ApiResponse(description = "Unauthorized / Invalid Token", responseCode = "403")}
)
@PutMapping("/update/{id}")
public ResponseEntity<?> updateArrondissement(@PathVariable Long id, @RequestBody Arrondissement arrondissement) {
try{

18
src/main/java/io/gmss/infocad/controllers/decoupage/CommuneController.java → src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java
View File

@@ -1,10 +1,13 @@
package io.gmss.infocad.controllers.decoupage;
package io.gmss.fiscad.controllers.decoupage;
import io.gmss.infocad.entities.decoupage.Commune;
import io.gmss.infocad.exceptions.NotFoundException;
import io.gmss.infocad.interfaces.decoupage.CommuneService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.decoupage.Commune;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.decoupage.CommuneService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -13,10 +16,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/commune", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Commune")
@CrossOrigin(origins = "*")
public class CommuneController {
private final CommuneService communeService;

16
src/main/java/io/gmss/infocad/controllers/decoupage/DepartementController.java → src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.decoupage;
package io.gmss.fiscad.controllers.decoupage;
import io.gmss.infocad.entities.decoupage.Departement;
import io.gmss.infocad.interfaces.decoupage.DepartementService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.decoupage.Departement;
import io.gmss.fiscad.interfaces.decoupage.DepartementService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/departement", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Département")
@CrossOrigin(origins = "*")
public class DepartementController {
private final DepartementService departementService;

16
src/main/java/io/gmss/infocad/controllers/decoupage/NationaliteController.java → src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.decoupage;
package io.gmss.fiscad.controllers.decoupage;
import io.gmss.infocad.entities.decoupage.Nationalite;
import io.gmss.infocad.interfaces.decoupage.NationaliteService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.decoupage.Nationalite;
import io.gmss.fiscad.interfaces.decoupage.NationaliteService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/nationalite", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Nationalité")
@CrossOrigin(origins = "*")
public class NationaliteController {
private final NationaliteService nationaliteService;

17
src/main/java/io/gmss/infocad/controllers/decoupage/QuartierController.java → src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java
View File

@@ -1,10 +1,13 @@
package io.gmss.infocad.controllers.decoupage;
package io.gmss.fiscad.controllers.decoupage;
import io.gmss.infocad.entities.decoupage.Quartier;
import io.gmss.infocad.exceptions.NotFoundException;
import io.gmss.infocad.interfaces.decoupage.QuartierService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.decoupage.Quartier;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.decoupage.QuartierService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -13,10 +16,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/quartier", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Quartier")
@CrossOrigin(origins = "*")
public class QuartierController {
private final QuartierService quartierService;

16
src/main/java/io/gmss/infocad/controllers/infocad/metier/ActeurConcerneController.java → src/main/java/io/gmss/fiscad/controllers/infocad/metier/ActeurConcerneController.java
View File

@@ -1,17 +1,19 @@
package io.gmss.infocad.controllers.infocad.metier;
package io.gmss.fiscad.controllers.infocad.metier;
import io.gmss.infocad.interfaces.infocad.metier.ActeurConcerneService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.interfaces.infocad.metier.ActeurConcerneService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "api/acteur-concerne", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Actuer concerné")
@CrossOrigin(origins = "*")
public class ActeurConcerneController {
private final ActeurConcerneService acteurConcerneService;

30
src/main/java/io/gmss/infocad/controllers/infocad/metier/CommentaireController.java → src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java
View File

@@ -1,24 +1,28 @@
package io.gmss.infocad.controllers.infocad.metier;
package io.gmss.fiscad.controllers.infocad.metier;
import io.gmss.infocad.entities.infocad.metier.Commentaire;
import io.gmss.infocad.interfaces.infocad.metier.CommentaireService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.infocad.paylaods.request.CommentaireRequest;
import io.gmss.infocad.paylaods.request.SyncCommentaireRequest;
import io.swagger.annotations.ApiOperation;
import io.gmss.fiscad.entities.infocad.metier.Commentaire;
import io.gmss.fiscad.interfaces.infocad.metier.CommentaireService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.request.CommentaireRequest;
import io.gmss.fiscad.paylaods.request.SyncCommentaireRequest;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.time.LocalDateTime;
import java.util.List;
@RestController
@RequestMapping(value = "api/commentaire", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Commentaire")
@CrossOrigin(origins = "*")
public class CommentaireController {
private final CommentaireService commentaireService;
@@ -109,7 +113,7 @@ public class CommentaireController {
}
@PostMapping("/enquete-and-state")
@ApiOperation(value = "Cette ressource permet d'avoir la liste de tous les commentaires d'une enquête avec le statut (lu ou non lu). Les champs a renseigner pour le payload sont idEnquete et lu")
//@ApiOperation(value = "Cette ressource permet d'avoir la liste de tous les commentaires d'une enquête avec le statut (lu ou non lu). Les champs a renseigner pour le payload sont idEnquete et lu")
public ResponseEntity<?> getcommentaireByEnqueteAndStatut(@RequestBody Commentaire commentaire) {
return new ResponseEntity<>(
new ApiResponse<>(true, commentaireService.getCommentairesByEnqueteAndLu(commentaire.getIdEnquete(), commentaire.isLu()), "Liste des commentaires chargée avec succès."),
@@ -118,7 +122,7 @@ public class CommentaireController {
}
@PostMapping("/all-by-params")
@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non lus provenant du Web. \n 2 - Liste des commentaires lus provenant du Web \n 3 - Liste des commentaires non lus provenant du mobile. \n 4 - Liste des commentaires lus provenant du mobile. \n A savoir : Les variables Origine et lu sont à varier pour avoir le résultat")
//@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non lus provenant du Web. \n 2 - Liste des commentaires lus provenant du Web \n 3 - Liste des commentaires non lus provenant du mobile. \n 4 - Liste des commentaires lus provenant du mobile. \n A savoir : Les variables Origine et lu sont à varier pour avoir le résultat")
public ResponseEntity<?> getcommentaireByParams(@RequestBody CommentaireRequest commentaireRequest) {
return new ResponseEntity<>(
new ApiResponse<>(true, commentaireService.getCommentairesByOrigineAndStateReadAndTerminalId(commentaireRequest.getOrigine(), commentaireRequest.isLu(), commentaireRequest.getTerminalId()), "Liste des commentaires chargée avec succès."),
@@ -127,7 +131,7 @@ public class CommentaireController {
}
@PostMapping("synchronise/from-mobile")
@ApiOperation(value = "Cette ressource permet de synchroniser tous les commentaires effectués sur le mobile vers le backend.")
//@ApiOperation(value = "Cette ressource permet de synchroniser tous les commentaires effectués sur le mobile vers le backend.")
public ResponseEntity<?> synchroniseCommentairesFromMobile(@RequestBody List<Commentaire> commentaires) {
return new ResponseEntity<>(
new ApiResponse<>(true, commentaireService.saveAllCommentairesFromMobile(commentaires), "Liste des commentaires synchronisée avec succès."),
@@ -136,7 +140,7 @@ public class CommentaireController {
}
@PostMapping("synchronise/from-web")
@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non synchronisés provenant du Web. \n 2 - Liste des commentaires synchronisés provenant du Web \n 3 - Liste des commentaires non synchronisés provenant du mobile. \n 4 - Liste des commentaires synchronisés provenant du mobile. \n A savoir : Les variables Origine et Synchronise sont à varier pour avoir le résultat")
//@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non synchronisés provenant du Web. \n 2 - Liste des commentaires synchronisés provenant du Web \n 3 - Liste des commentaires non synchronisés provenant du mobile. \n 4 - Liste des commentaires synchronisés provenant du mobile. \n A savoir : Les variables Origine et Synchronise sont à varier pour avoir le résultat")
public ResponseEntity<?> synchroniseCommentairesFromWeb(@RequestBody CommentaireRequest commentaireRequest) {
return new ResponseEntity<>(
new ApiResponse<>(true, commentaireService.getCommentairesByOrigineAndStateSynchronizedAndTerminalId(commentaireRequest.getOrigine(), commentaireRequest.isSynchronise(), commentaireRequest.getTerminalId()), "Liste des commentaires chargée avec succès."),
@@ -145,7 +149,7 @@ public class CommentaireController {
}
@PostMapping("synchronise/notify-done-from-mobile")
@ApiOperation(value = "Cette ressource permet matérialiser coté backend les commentaires du WEB déjà synchronisé avec le MOBILE pour que les prochaines extractions ne prennent pas en compte cela. ")
//@ApiOperation(value = "Cette ressource permet matérialiser coté backend les commentaires du WEB déjà synchronisé avec le MOBILE pour que les prochaines extractions ne prennent pas en compte cela. ")
public ResponseEntity<?> notifyDoneSynchronizedFromMobile(@RequestBody List<SyncCommentaireRequest> syncCommentaireRequests) {
return new ResponseEntity<>(
new ApiResponse<>(true, commentaireService.notifySynchronizedDoneFromMobile(syncCommentaireRequests), "Synchronisation terminée."),

19
src/main/java/io/gmss/infocad/controllers/infocad/metier/EnqueteController.java → src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java
View File

@@ -1,10 +1,13 @@
package io.gmss.infocad.controllers.infocad.metier;
package io.gmss.fiscad.controllers.infocad.metier;
import io.gmss.infocad.interfaces.infocad.metier.EnqueteService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.infocad.paylaods.request.EnquetePayLoad;
import io.gmss.infocad.paylaods.request.EnqueteTraitementPayLoad;
import io.gmss.infocad.paylaods.request.FiltreEnquetePayLoad;
import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -13,11 +16,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@RestController
@RequestMapping(value = "api/enquete", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Enquête")
@CrossOrigin(origins = "*")
public class EnqueteController {
private final EnqueteService enqueteService ;

15
src/main/java/io/gmss/infocad/controllers/infocad/metier/TpeController.java → src/main/java/io/gmss/fiscad/controllers/infocad/metier/TpeController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.metier;
package io.gmss.fiscad.controllers.infocad.metier;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.interfaces.infocad.metier.TpeService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.interfaces.infocad.metier.TpeService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/tpe", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Tpe")
@CrossOrigin(origins = "*")
public class TpeController {
private final TpeService tpeService;

30
src/main/java/io/gmss/infocad/controllers/infocad/metier/UploadController.java → src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java
View File

@@ -1,12 +1,13 @@
package io.gmss.infocad.controllers.infocad.metier;
package io.gmss.fiscad.controllers.infocad.metier;
import io.gmss.infocad.entities.infocad.metier.Upload;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.infocad.repositories.infocad.metier.UploadRepository;
import io.gmss.infocad.service.FileStorageService;
import io.gmss.infocad.service.StringManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.gmss.fiscad.entities.infocad.metier.Upload;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.repositories.infocad.metier.UploadRepository;
import io.gmss.fiscad.service.FileStorageService;
import io.gmss.fiscad.service.StringManager;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import lombok.Data;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
@@ -30,9 +30,10 @@ import java.time.format.DateTimeFormatter;
*/
@RestController
@RequestMapping(value = "/api/upload", produces = MediaType.APPLICATION_JSON_VALUE)
@Api(value = "Uploads controllers", description = "API for accessing to uploads files details.", tags = {"Uploads"})
@CrossOrigin(origins = "*", maxAge = 3600)
@Data
@SecurityRequirement(name = "bearer")
@Tag(name = "Upload")
@CrossOrigin(origins = "*")
public class UploadController {
boolean headIsValid=false;
@@ -73,7 +74,6 @@ public class UploadController {
@GetMapping("/all")
@ApiOperation(value = "List of uploads files.")
public ResponseEntity<?> all() {
try {
if (uploadRepository.findAll().isEmpty()) {
@@ -117,7 +117,6 @@ public class UploadController {
@GetMapping("/id/{id}")
@ApiOperation(value = "Get one upload by his id.")
public ResponseEntity<?> one(@PathVariable Long id) {
try {
@@ -144,8 +143,7 @@ public class UploadController {
* @param request
* @return
*/
@ApiOperation(value = "This resource is used to download one file from server.")
@GetMapping("/downloadFile/{fileName:.+}")
@GetMapping("/downloadfile/{fileName:.+}")
public ResponseEntity<Resource> downloadFile(@PathVariable String fileName, HttpServletRequest request) {
// Load file as Resource
Resource resource = fileStorageService.loadFileAsResource(fileName);
@@ -170,7 +168,6 @@ public class UploadController {
}
@PostMapping("/save")
@ApiOperation(value = "Add one upload.")
public ResponseEntity<?> save(@RequestPart(required = true) MultipartFile file , @RequestParam String reference,@RequestParam String description /*, @RequestParam Long idTypeUpload*/) {
try {
@@ -207,7 +204,6 @@ public class UploadController {
@DeleteMapping("/delete/id/{id}")
@ApiOperation(value = "Delete one upload.")
public ResponseEntity<?> delete(@PathVariable Long id) {
try {
if (id != null || uploadRepository.findById(id).isPresent()) {

20
src/main/java/io/gmss/infocad/controllers/infocad/parametre/BlocController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java
View File

@@ -1,11 +1,14 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.Bloc;
import io.gmss.infocad.interfaces.infocad.parametre.BlocService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.infocad.security.CurrentUser;
import io.gmss.infocad.security.UserPrincipal;
import io.gmss.fiscad.entities.infocad.parametre.Bloc;
import io.gmss.fiscad.interfaces.infocad.parametre.BlocService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.security.CurrentUser;
import io.gmss.fiscad.security.UserPrincipal;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -14,10 +17,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/bloc", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Bloc")
@CrossOrigin(origins = "*")
public class BlocController {
private final BlocService blocService;

16
src/main/java/io/gmss/infocad/controllers/infocad/parametre/ModeAcquisitionController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.ModeAcquisition;
import io.gmss.infocad.interfaces.infocad.parametre.ModeAcquisitionService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition;
import io.gmss.fiscad.interfaces.infocad.parametre.ModeAcquisitionService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/mode-acquisition", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Mode d'acquisition")
@CrossOrigin(origins = "*")
public class ModeAcquisitionController {
private final ModeAcquisitionService modeAcquisitionService;

16
src/main/java/io/gmss/infocad/controllers/infocad/parametre/NatureDomaineController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
import io.gmss.infocad.interfaces.infocad.parametre.NatureDomaineService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
import io.gmss.fiscad.interfaces.infocad.parametre.NatureDomaineService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/nature-domaine", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Nature domaine")
@CrossOrigin(origins = "*")
public class NatureDomaineController {
private final NatureDomaineService natureDomaineService;

15
src/main/java/io/gmss/infocad/controllers/infocad/parametre/PositionRepresentationController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
import io.gmss.infocad.interfaces.infocad.parametre.PositionRepresentationService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
import io.gmss.fiscad.interfaces.infocad.parametre.PositionRepresentationService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/position-representation", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Position représentation")
@CrossOrigin(origins = "*")
public class PositionRepresentationController {
private final PositionRepresentationService positionRepresentationService;

15
src/main/java/io/gmss/infocad/controllers/infocad/parametre/ProfessionController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.Profession;
import io.gmss.infocad.interfaces.infocad.parametre.ProfessionService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.Profession;
import io.gmss.fiscad.interfaces.infocad.parametre.ProfessionService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/profession", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Profession")
@CrossOrigin(origins = "*")
public class ProfessionController {
private final ProfessionService professionService;

15
src/main/java/io/gmss/infocad/controllers/infocad/parametre/SituationGeographiqueController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.SituationGeographique;
import io.gmss.infocad.interfaces.infocad.parametre.SituationGeographiqueService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.SituationGeographique;
import io.gmss.fiscad.interfaces.infocad.parametre.SituationGeographiqueService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/situation-geographique", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Situation géographique")
@CrossOrigin(origins = "*")
public class SituationGeographiqueController {
private final SituationGeographiqueService situationGeographiqueService;

15
src/main/java/io/gmss/infocad/controllers/infocad/parametre/SituationMatrimonialeController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.SituationMatrimoniale;
import io.gmss.infocad.interfaces.infocad.parametre.SituationMatrimonialeService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.SituationMatrimoniale;
import io.gmss.fiscad.interfaces.infocad.parametre.SituationMatrimonialeService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/situation-matrimoniale", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Situation matrimoniale")
@CrossOrigin(origins = "*")
public class SituationMatrimonialeController {
private final SituationMatrimonialeService situationMatrimonialeService;

15
src/main/java/io/gmss/infocad/controllers/infocad/parametre/SourceDroitController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.SourceDroit;
import io.gmss.infocad.interfaces.infocad.parametre.SourceDroitService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.SourceDroit;
import io.gmss.fiscad.interfaces.infocad.parametre.SourceDroitService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/source-droit", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Source de droit")
@CrossOrigin(origins = "*")
public class SourceDroitController {
private final SourceDroitService sourceDroitService;

17
src/main/java/io/gmss/infocad/controllers/infocad/parametre/StructureController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java
View File

@@ -1,10 +1,13 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.Structure;
import io.gmss.infocad.interfaces.decoupage.ArrondissementService;
import io.gmss.infocad.interfaces.infocad.parametre.StructureService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.Structure;
import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -13,10 +16,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/structure", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Structure")
@CrossOrigin(origins = "*")
public class StructureController {
private final StructureService structureService;

15
src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeContestationController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.TypeContestation;
import io.gmss.infocad.interfaces.infocad.parametre.TypeContestationService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
import io.gmss.fiscad.interfaces.infocad.parametre.TypeContestationService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/type-contestation", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Type de contestation")
@CrossOrigin(origins = "*")
public class TypeContestationController {
private final TypeContestationService typeContestationService;

15
src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeDomaineController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.TypeDomaine;
import io.gmss.infocad.interfaces.infocad.parametre.TypeDomaineService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
import io.gmss.fiscad.interfaces.infocad.parametre.TypeDomaineService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/type-domaine", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Type de domaine")
@CrossOrigin(origins = "*")
public class TypeDomaineController {
private final TypeDomaineService typeDomaineService;

16
src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypePersonneController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.TypePersonne;
import io.gmss.infocad.interfaces.infocad.parametre.TypePersonneService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.TypePersonne;
import io.gmss.fiscad.interfaces.infocad.parametre.TypePersonneService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/type-personne", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Type de personne")
@CrossOrigin(origins = "*")
public class TypePersonneController {
private final TypePersonneService typePersonneService;

16
src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypePieceController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.TypePiece;
import io.gmss.infocad.interfaces.infocad.parametre.TypePieceService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.TypePiece;
import io.gmss.fiscad.interfaces.infocad.parametre.TypePieceService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/type-piece", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Type de pièce")
@CrossOrigin(origins = "*")
public class TypePieceController {
private final TypePieceService typePieceService;

16
src/main/java/io/gmss/infocad/controllers/infocad/parametre/TypeRepresentationController.java → src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.infocad.parametre;
package io.gmss.fiscad.controllers.infocad.parametre;
import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
import io.gmss.infocad.interfaces.infocad.parametre.TypeRepresentationService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
import io.gmss.fiscad.interfaces.infocad.parametre.TypeRepresentationService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/type-representation", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Type de représentation")
@CrossOrigin(origins = "*")
public class TypeRepresentationController {
private final TypeRepresentationService typeRepresentationService;

16
src/main/java/io/gmss/infocad/controllers/notification/EmailController.java → src/main/java/io/gmss/fiscad/controllers/notification/EmailController.java
View File

@@ -1,15 +1,17 @@
package io.gmss.infocad.controllers.notification;
package io.gmss.fiscad.controllers.notification;
import io.gmss.infocad.interfaces.notification.EmailService;
import io.gmss.infocad.paylaods.EmailDetails;
import io.gmss.fiscad.interfaces.notification.EmailService;
import io.gmss.fiscad.paylaods.EmailDetails;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "api/email", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Email")
@CrossOrigin(origins = "*")
public class EmailController {
private final EmailService emailService;

26
src/main/java/io/gmss/infocad/controllers/report/ReportingController.java → src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java
View File

@@ -3,29 +3,30 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package io.gmss.infocad.controllers.report;
package io.gmss.fiscad.controllers.report;
import io.gmss.infocad.enums.FormatRapport;
import io.gmss.infocad.paylaods.request.FiltreEnquetePayLoad;
import io.gmss.infocad.repositories.infocad.parametre.BlocRepository;
import io.gmss.infocad.repositories.infocad.parametre.StructureRepository;
import io.gmss.infocad.service.ReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.gmss.fiscad.enums.FormatRapport;
import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository;
import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository;
import io.gmss.fiscad.service.ReportService;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
/**
* @author AKAKPO Aurince
*/
@RestController
@RequestMapping(value = "/api/rapport", produces = MediaType.APPLICATION_JSON_VALUE)
@Api(value = "controleur rapport", description = "API d'edition des rapport.", tags = {"Rapports"})
@CrossOrigin(origins = "*", maxAge = 3600)
@SecurityRequirement(name = "bearer")
@Tag(name = "Report")
@CrossOrigin(origins = "*")
public class ReportingController {
private final ReportService reportService;
private final BlocRepository blocRepository;
@@ -40,7 +41,6 @@ public class ReportingController {
@GetMapping("/structure/blocs/{formatRapport}/{structureId}")
@ApiOperation(value = "Liste des blos d'une structure.")
public void imprimerBlocsParStructure(HttpServletResponse response, @PathVariable FormatRapport formatRapport, @PathVariable Long structureId) {
try {
reportService.imprimerBlocsStructure(response,formatRapport,structureId);
@@ -50,7 +50,6 @@ public class ReportingController {
}
@GetMapping("/bloc/enquetes/{formatRapport}/{blocId}")
@ApiOperation(value = "Liste des zones ou quartiers d'intervention d'une structure.")
public void imprimerEnqueteParBloc(HttpServletResponse response, @PathVariable FormatRapport formatRapport, @PathVariable Long blocId) {
try {
reportService.imprimerEnqueteParBloc(response,formatRapport,blocId);
@@ -60,7 +59,6 @@ public class ReportingController {
}
@PostMapping("/filtre/enquetes/{formatRapport}")
@ApiOperation(value = "Liste des zones ou quartiers d'intervention d'une structure.")
public void imprimerEnqueteParFiltre(HttpServletResponse response, @RequestBody FiltreEnquetePayLoad filtreEnquetePayLoad, @PathVariable FormatRapport formatRapport) {
try {
reportService.imprimerEnqueteParFiltre(response,filtreEnquetePayLoad,formatRapport);

16
src/main/java/io/gmss/infocad/controllers/rfu/metier/BatimentController.java → src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.metier;
package io.gmss.fiscad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.Batiment;
import io.gmss.infocad.interfaces.rfu.metier.BatimentService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.metier.Batiment;
import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/batiment", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Batiment")
@CrossOrigin(origins = "*")
public class BatimentController {
private final BatimentService batimentService;

16
src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueBatimentController.java → src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.metier;
package io.gmss.fiscad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueBatimentService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/caracteristique-caracteristiqueBatiment", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Caractéristique batiment")
@CrossOrigin(origins = "*")
public class CaracteristiqueBatimentController {
private final CaracteristiqueBatimentService caracteristiqueBatimentService;

16
src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueParcelleController.java → src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.metier;
package io.gmss.fiscad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueParcelleService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/caracteristique-parcelle", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Caractéristique parcelle")
@CrossOrigin(origins = "*")
public class CaracteristiqueParcelleController {
private final CaracteristiqueParcelleService caracteristiqueParcelleService;

16
src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java → src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.metier;
package io.gmss.fiscad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/caracteristique-unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Caractéristique unité de logement")
@CrossOrigin(origins = "*")
public class CaracteristiqueUniteLogementController {
private final CaracteristiqueUniteLogementService caracteristiqueUniteLogementService;

16
src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteBatimentController.java → src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.metier;
package io.gmss.fiscad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.infocad.interfaces.rfu.metier.EnqueteBatimentService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/enquete-batiment", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Enquête batiment")
@CrossOrigin(origins = "*")
public class EnqueteBatimentController {
private final EnqueteBatimentService enqueteBatimentService;

16
src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteUniteLogementController.java → src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.metier;
package io.gmss.fiscad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.infocad.interfaces.rfu.metier.EnqueteUniteLogementService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/enquete-unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Enquête unité de logement")
@CrossOrigin(origins = "*")
public class EnqueteUniteLogementController {
private final EnqueteUniteLogementService enqueteUniteLogementService;

16
src/main/java/io/gmss/infocad/controllers/rfu/metier/UniteLogementController.java → src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.metier;
package io.gmss.fiscad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.UniteLogement;
import io.gmss.infocad.interfaces.rfu.metier.UniteLogementService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.metier.UniteLogement;
import io.gmss.fiscad.interfaces.rfu.metier.UniteLogementService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,13 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Unité de logement")
@CrossOrigin(origins = "*")
public class UniteLogementController {
private final UniteLogementService enqueteUniteLogementService;

22
src/main/java/io/gmss/infocad/controllers/rfu/parametre/CampagneController.java → src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CampagneController.java
View File

@@ -1,21 +1,27 @@
package io.gmss.infocad.controllers.rfu.parametre;
package io.gmss.fiscad.controllers.rfu.parametre;
import io.gmss.infocad.entities.rfu.parametre.Campagne;
import io.gmss.infocad.enums.TypeCampagne;
import io.gmss.infocad.exceptions.NotFoundException;
import io.gmss.infocad.interfaces.rfu.parametre.CampagneService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.parametre.Campagne;
import io.gmss.fiscad.enums.TypeCampagne;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.rfu.parametre.CampagneService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping("api/campagne")
@RequestMapping(value = "api/campagne", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Campagne")
public class CampagneController {
private final CampagneService campagneService;

15
src/main/java/io/gmss/infocad/controllers/rfu/parametre/CaracteristiqueController.java → src/main/java/io/gmss/fiscad/controllers/rfu/parametre/CaracteristiqueController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.parametre;
package io.gmss.fiscad.controllers.rfu.parametre;
import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
import io.gmss.infocad.interfaces.rfu.parametre.CaracteristiqueService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
import io.gmss.fiscad.interfaces.rfu.parametre.CaracteristiqueService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/caracteristique", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Caractéristique")
public class CaracteristiqueController {
private final CaracteristiqueService caracteristiqueService;

18
src/main/java/io/gmss/infocad/controllers/rfu/parametre/EquipeController.java → src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java
View File

@@ -1,19 +1,25 @@
package io.gmss.infocad.controllers.rfu.parametre;
package io.gmss.fiscad.controllers.rfu.parametre;
import io.gmss.infocad.entities.rfu.parametre.Equipe;
import io.gmss.infocad.interfaces.rfu.parametre.EquipeService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.parametre.Equipe;
import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping("api/equipe")
@RequestMapping(value = "api/equipe", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Equipe")
public class EquipeController {
private final EquipeService equipeService;

14
src/main/java/io/gmss/infocad/controllers/rfu/parametre/TypeCaracteristiqueController.java → src/main/java/io/gmss/fiscad/controllers/rfu/parametre/TypeCaracteristiqueController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.rfu.parametre;
package io.gmss.fiscad.controllers.rfu.parametre;
import io.gmss.infocad.entities.rfu.parametre.TypeCaracteristique;
import io.gmss.infocad.interfaces.rfu.parametre.TypeCaracteristiqueService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique;
import io.gmss.fiscad.interfaces.rfu.parametre.TypeCaracteristiqueService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,11 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/type-caracteristique", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Type de caractéristique")
public class TypeCaracteristiqueController {
private final TypeCaracteristiqueService typeCaracteristiqueService;

16
src/main/java/io/gmss/infocad/controllers/statistique/StatistiqueController.java → src/main/java/io/gmss/fiscad/controllers/statistique/StatistiqueController.java
View File

@@ -1,17 +1,19 @@
package io.gmss.infocad.controllers.statistique;
package io.gmss.fiscad.controllers.statistique;
import io.gmss.infocad.interfaces.statistique.StatistiquesService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.interfaces.statistique.StatistiquesService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "api/statistique", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Statistique")
@CrossOrigin(origins = "*")
public class StatistiqueController {
private final StatistiquesService statistiquesService ;

16
src/main/java/io/gmss/infocad/controllers/synchronisation/RestaurationController.java → src/main/java/io/gmss/fiscad/controllers/synchronisation/RestaurationController.java
View File

@@ -1,17 +1,19 @@
package io.gmss.infocad.controllers.synchronisation;
package io.gmss.fiscad.controllers.synchronisation;
import io.gmss.infocad.interfaces.synchronisation.RestaurationService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.interfaces.synchronisation.RestaurationService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "api/restauration", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Restauration")
@CrossOrigin(origins = "*")
public class RestaurationController {
public final RestaurationService restaurationService;

21
src/main/java/io/gmss/infocad/controllers/synchronisation/SynchronisationController.java → src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java
View File

@@ -1,8 +1,10 @@
package io.gmss.infocad.controllers.synchronisation;
package io.gmss.fiscad.controllers.synchronisation;
import io.gmss.infocad.interfaces.synchronisation.SynchronisationService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.infocad.paylaods.request.*;
import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.request.*;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@@ -13,6 +15,9 @@ import java.util.List;
@RestController
@RequestMapping(value = "api/synchronisation", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Synchronisation")
@CrossOrigin(origins = "*")
public class SynchronisationController {
private final SynchronisationService synchronisationService;
@@ -92,7 +97,9 @@ public class SynchronisationController {
@RequestParam(required=false) Long max_numero_piece_id,
@RequestParam(required=false) Long max_numero_upload_id,
@RequestParam(required=false) Long max_numero_acteur_concerne_id,
@RequestParam(required=false) Long enqueteId
@RequestParam(required=false) Long enqueteId,
@RequestParam(required=false) Long enqueteBatimentId,
@RequestParam(required=false) Long enqueteUniteLogementId
) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncFiles(file,
@@ -106,7 +113,7 @@ public class SynchronisationController {
max_numero_piece_id,
max_numero_upload_id,
max_numero_acteur_concerne_id,
enqueteId), "Liste des fichiers synchronisée avec succès."),
enqueteId, enqueteBatimentId, enqueteUniteLogementId), "Liste des fichiers synchronisée avec succès."),
HttpStatus.OK
);
}
@@ -158,7 +165,7 @@ public class SynchronisationController {
);
}
@PostMapping(path = "/caracteristique-enquete")
@PostMapping(path = "/caracteristique-parcelle")
public ResponseEntity<?> syncCaracteristiqueParcelle(@RequestBody List<CaracteristiqueParcellePaylod> caracteristiqueParcellePaylods) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncCaracteristiqueParcelle(caracteristiqueParcellePaylods), "Liste des caractéristiques des parcelles synchronisée avec succès."),

34
src/main/java/io/gmss/infocad/controllers/user/AuthController.java → src/main/java/io/gmss/fiscad/controllers/user/AuthController.java
View File

@@ -1,30 +1,32 @@
package io.gmss.infocad.controllers.user;
package io.gmss.fiscad.controllers.user;
import io.gmss.infocad.entities.user.Role;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.UserRole;
import io.gmss.infocad.interfaces.infocad.parametre.StructureService;
import io.gmss.infocad.interfaces.user.RoleService;
import io.gmss.infocad.interfaces.user.UserService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.infocad.paylaods.JwtAuthenticationResponse;
import io.gmss.infocad.paylaods.Login;
import io.gmss.infocad.paylaods.UserRequest;
import io.gmss.fiscad.entities.user.Role;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.UserRole;
import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
import io.gmss.fiscad.interfaces.user.RoleService;
import io.gmss.fiscad.interfaces.user.UserService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.JwtAuthenticationResponse;
import io.gmss.fiscad.paylaods.Login;
import io.gmss.fiscad.paylaods.UserRequest;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.HashSet;
import java.util.Set;
@RestController
@RequestMapping(value = "api/auth", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Authentification")
@CrossOrigin(origins = "*")
public class AuthController {
private final UserService userService;

27
src/main/java/io/gmss/infocad/controllers/user/DemandeReinitialisationMPController.java → src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java
View File

@@ -1,16 +1,18 @@
package io.gmss.infocad.controllers.user;
package io.gmss.fiscad.controllers.user;
import io.gmss.infocad.entities.user.DemandeReinitialisationMP;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.UserRole;
import io.gmss.infocad.interfaces.user.DemandeReinitialisationMPService;
import io.gmss.infocad.interfaces.user.RoleService;
import io.gmss.infocad.interfaces.user.UserService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.infocad.paylaods.DemandeReinitialisationMPResponse;
import io.gmss.infocad.security.CurrentUser;
import io.gmss.infocad.security.UserPrincipal;
import io.gmss.fiscad.entities.user.DemandeReinitialisationMP;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.UserRole;
import io.gmss.fiscad.interfaces.user.DemandeReinitialisationMPService;
import io.gmss.fiscad.interfaces.user.RoleService;
import io.gmss.fiscad.interfaces.user.UserService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.DemandeReinitialisationMPResponse;
import io.gmss.fiscad.security.CurrentUser;
import io.gmss.fiscad.security.UserPrincipal;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -20,6 +22,9 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "api/demande-reinitialisation-mp", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Demande de réinitialisation mot de passe")
@CrossOrigin(origins = "*")
public class DemandeReinitialisationMPController {
private final DemandeReinitialisationMPService demandeReinitialisationMPService;

15
src/main/java/io/gmss/infocad/controllers/user/RoleController.java → src/main/java/io/gmss/fiscad/controllers/user/RoleController.java
View File

@@ -1,9 +1,12 @@
package io.gmss.infocad.controllers.user;
package io.gmss.fiscad.controllers.user;
import io.gmss.infocad.entities.user.Role;
import io.gmss.infocad.interfaces.user.RoleService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.fiscad.entities.user.Role;
import io.gmss.fiscad.interfaces.user.RoleService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -12,10 +15,12 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/role", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "Role")
@CrossOrigin(origins = "*")
public class RoleController {
private final RoleService roleService;

24
src/main/java/io/gmss/infocad/controllers/user/UserController.java → src/main/java/io/gmss/fiscad/controllers/user/UserController.java
View File

@@ -1,23 +1,29 @@
package io.gmss.infocad.controllers.user;
package io.gmss.fiscad.controllers.user;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.UserRole;
import io.gmss.infocad.interfaces.user.UserService;
import io.gmss.infocad.paylaods.ApiResponse;
import io.gmss.infocad.paylaods.Login;
import io.gmss.infocad.security.CurrentUser;
import io.gmss.infocad.security.UserPrincipal;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.UserRole;
import io.gmss.fiscad.interfaces.user.UserService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.Login;
import io.gmss.fiscad.security.CurrentUser;
import io.gmss.fiscad.security.UserPrincipal;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@RestController
@RequestMapping(value = "api/user", produces = MediaType.APPLICATION_JSON_VALUE)
@SecurityRequirement(name = "bearer")
@Tag(name = "User")
@CrossOrigin(origins = "*")
public class UserController {
private final UserService userService;

2
src/main/java/io/gmss/infocad/deserializer/LocalDateDeserializer.java → src/main/java/io/gmss/fiscad/deserializer/LocalDateDeserializer.java
View File

@@ -1,4 +1,4 @@
package io.gmss.infocad.deserializer;
package io.gmss.fiscad.deserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;

2
src/main/java/io/gmss/infocad/deserializer/LocalDateTimeDeserializer.java → src/main/java/io/gmss/fiscad/deserializer/LocalDateTimeDeserializer.java
View File

@@ -1,4 +1,4 @@
package io.gmss.infocad.deserializer;
package io.gmss.fiscad.deserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;

6
src/main/java/io/gmss/infocad/entities/BaseEntity.java → src/main/java/io/gmss/fiscad/entities/BaseEntity.java
View File

@@ -1,6 +1,8 @@
package io.gmss.infocad.entities;
package io.gmss.fiscad.entities;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.MappedSuperclass;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.CreatedBy;
@@ -9,8 +11,6 @@ import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.io.Serializable;
import java.time.Instant;

8
src/main/java/io/gmss/infocad/entities/decoupage/Arrondissement.java → src/main/java/io/gmss/fiscad/entities/decoupage/Arrondissement.java
View File

@@ -1,15 +1,15 @@
package io.gmss.infocad.entities.decoupage;
package io.gmss.fiscad.entities.decoupage;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.parametre.Bloc;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.parametre.Bloc;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

8
src/main/java/io/gmss/infocad/entities/decoupage/Commune.java → src/main/java/io/gmss/fiscad/entities/decoupage/Commune.java
View File

@@ -1,15 +1,15 @@
package io.gmss.infocad.entities.decoupage;
package io.gmss.fiscad.entities.decoupage;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

6
src/main/java/io/gmss/infocad/entities/decoupage/Departement.java → src/main/java/io/gmss/fiscad/entities/decoupage/Departement.java
View File

@@ -1,14 +1,14 @@
package io.gmss.infocad.entities.decoupage;
package io.gmss.fiscad.entities.decoupage;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.fiscad.entities.BaseEntity;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

8
src/main/java/io/gmss/infocad/entities/decoupage/Nationalite.java → src/main/java/io/gmss/fiscad/entities/decoupage/Nationalite.java
View File

@@ -1,8 +1,9 @@
package io.gmss.infocad.entities.decoupage;
package io.gmss.fiscad.entities.decoupage;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

10
src/main/java/io/gmss/infocad/entities/decoupage/Quartier.java → src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java
View File

@@ -1,14 +1,15 @@
package io.gmss.infocad.entities.decoupage;
package io.gmss.fiscad.entities.decoupage;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.parametre.Bloc;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@@ -27,5 +28,8 @@ public class Quartier extends BaseEntity implements Serializable {
@JsonIgnore
@ManyToOne
private Arrondissement arrondissement;
@JsonIgnore
@OneToOne(mappedBy = "quartier")
private Bloc bloc;
}

18
src/main/java/io/gmss/infocad/entities/infocad/metier/ActeurConcerne.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java
View File

@@ -1,13 +1,14 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
import io.gmss.infocad.entities.infocad.parametre.TypeContestation;
import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
import io.gmss.infocad.enums.RoleActeur;
import io.gmss.infocad.enums.TypeDroit;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
import io.gmss.fiscad.entities.infocad.parametre.TypeContestation;
import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
import io.gmss.fiscad.enums.RoleActeur;
import io.gmss.fiscad.enums.TypeDroit;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,7 +17,6 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

10
src/main/java/io/gmss/infocad/entities/infocad/metier/Commentaire.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/Commentaire.java
View File

@@ -1,10 +1,11 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateTimeDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.enums.Origine;
import io.gmss.fiscad.deserializer.LocalDateTimeDeserializer;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.enums.Origine;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,7 +13,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDateTime;

41
src/main/java/io/gmss/infocad/entities/infocad/metier/Enquete.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java
View File

@@ -1,30 +1,29 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.decoupage.Arrondissement;
import io.gmss.infocad.entities.infocad.parametre.Bloc;
import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.infocad.entities.rfu.parametre.Campagne;
import io.gmss.infocad.entities.rfu.parametre.Equipe;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.StatusEnquete;
import io.gmss.infocad.enums.StatutEnregistrement;
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.decoupage.Arrondissement;
import io.gmss.fiscad.entities.infocad.parametre.Bloc;
import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.fiscad.entities.rfu.parametre.Campagne;
import io.gmss.fiscad.entities.rfu.parametre.Equipe;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.StatusEnquete;
import io.gmss.fiscad.enums.StatutEnregistrement;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;
@@ -76,7 +75,6 @@ public class Enquete extends BaseEntity implements Serializable {
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateRejet;
@Type(type="text")
private String descriptionMotifRejet;
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
@@ -88,7 +86,6 @@ public class Enquete extends BaseEntity implements Serializable {
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateSynchronisation;
private boolean synchronise;
@Type(type="text")
private String observationParticuliere;
@Transient
private String nomPrenomEnqueteur;
@@ -133,12 +130,12 @@ public class Enquete extends BaseEntity implements Serializable {
private String emplacement;
private float altitude;
private float precision;
private byte nbreCoProprietaire;
private byte nbreIndivisiaire;
private int nbreCoProprietaire;
private int nbreIndivisiaire;
private String autreAdresse;
private String surface;
private byte nbreBatiment;
private byte nbrePiscine;
private int nbreBatiment;
private int nbrePiscine;
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateDebutExcemption;

8
src/main/java/io/gmss/infocad/entities/infocad/metier/EnqueteFiltreResponse.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/EnqueteFiltreResponse.java
View File

@@ -1,9 +1,9 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Id;
import java.time.LocalDate;
@Entity
@Data
@@ -31,5 +31,7 @@ public class EnqueteFiltreResponse{
private String typedomaine;
private String naturedomaine;
private String nupprovisoire;
private String qip;
private String numtitrefoncier;
}

12
src/main/java/io/gmss/infocad/entities/infocad/metier/MembreGroupe.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/MembreGroupe.java
View File

@@ -1,10 +1,11 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.infocad.entities.infocad.parametre.PositionRepresentation;
import io.gmss.infocad.entities.infocad.parametre.TypeRepresentation;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.infocad.parametre.PositionRepresentation;
import io.gmss.fiscad.entities.infocad.parametre.TypeRepresentation;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,7 +13,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Set;

12
src/main/java/io/gmss/infocad/entities/infocad/metier/Parcelle.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java
View File

@@ -1,10 +1,11 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.decoupage.Quartier;
import io.gmss.infocad.entities.infocad.parametre.NatureDomaine;
import io.gmss.infocad.entities.rfu.metier.Batiment;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.decoupage.Quartier;
import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
import io.gmss.fiscad.entities.rfu.metier.Batiment;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,7 +14,6 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

16
src/main/java/io/gmss/infocad/entities/infocad/metier/Piece.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java
View File

@@ -1,14 +1,15 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.parametre.ModeAcquisition;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.infocad.entities.infocad.parametre.SourceDroit;
import io.gmss.infocad.entities.infocad.parametre.TypePiece;
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.infocad.parametre.SourceDroit;
import io.gmss.fiscad.entities.infocad.parametre.TypePiece;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,7 +18,6 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;

6
src/main/java/io/gmss/infocad/entities/infocad/metier/Tpe.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/Tpe.java
View File

@@ -1,7 +1,8 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.fiscad.entities.BaseEntity;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

15
src/main/java/io/gmss/infocad/entities/infocad/metier/Upload.java → src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java
View File

@@ -1,14 +1,14 @@
package io.gmss.infocad.entities.infocad.metier;
package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import javax.persistence.*;
import java.io.Serializable;
@Entity
@@ -55,7 +55,10 @@ public class Upload extends BaseEntity implements Serializable {
}
public String getURIFile() {
return this.serverContext()+fileName;
String url = this.serverContext() + fileName;
System.out.println("url = " + url);
return url != null ? url.toLowerCase().startsWith("https") ? url : url.toLowerCase().replaceFirst("http", "https") : null;
}
private String serverContext(){

19
src/main/java/io/gmss/infocad/entities/infocad/parametre/Bloc.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java
View File

@@ -1,11 +1,12 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.decoupage.Arrondissement;
import io.gmss.infocad.entities.decoupage.Quartier;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.entities.user.User;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.decoupage.Arrondissement;
import io.gmss.fiscad.entities.decoupage.Quartier;
import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.entities.user.User;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,7 +14,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
@@ -38,6 +38,7 @@ public class Bloc extends BaseEntity implements Serializable {
private Long id;
@Column(updatable = false)
private String cote;
private String coteq;
private String nom;
@JsonIgnore
private String idBlocParArrondissement;
@@ -52,6 +53,10 @@ public class Bloc extends BaseEntity implements Serializable {
private Set<Quartier> quartiers;
@ManyToOne
private Arrondissement arrondissement;
@OneToOne
private Quartier quartier;
@ManyToOne
private Structure structure;
@JsonIgnore

8
src/main/java/io/gmss/infocad/entities/infocad/parametre/ModeAcquisition.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/ModeAcquisition.java
View File

@@ -1,8 +1,9 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Piece;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Piece;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Set;

8
src/main/java/io/gmss/infocad/entities/infocad/parametre/NatureDomaine.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/NatureDomaine.java
View File

@@ -1,8 +1,9 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Parcelle;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Parcelle;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Set;

18
src/main/java/io/gmss/infocad/entities/infocad/parametre/Personne.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java
View File

@@ -1,13 +1,14 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.decoupage.Commune;
import io.gmss.infocad.entities.decoupage.Nationalite;
import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
import io.gmss.infocad.entities.infocad.metier.Piece;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.enums.Categorie;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.decoupage.Commune;
import io.gmss.fiscad.entities.decoupage.Nationalite;
import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
import io.gmss.fiscad.entities.infocad.metier.Piece;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.enums.Categorie;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,7 +17,6 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

10
src/main/java/io/gmss/infocad/entities/infocad/parametre/PositionRepresentation.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/PositionRepresentation.java
View File

@@ -1,9 +1,10 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
import io.gmss.infocad.entities.infocad.metier.MembreGroupe;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
import io.gmss.fiscad.entities.infocad.metier.MembreGroupe;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

6
src/main/java/io/gmss/infocad/entities/infocad/parametre/Profession.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/Profession.java
View File

@@ -1,7 +1,8 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.fiscad.entities.BaseEntity;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

12
src/main/java/io/gmss/infocad/entities/infocad/parametre/SituationGeographique.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationGeographique.java
View File

@@ -1,6 +1,10 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.fiscad.entities.BaseEntity;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -8,10 +12,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)

6
src/main/java/io/gmss/infocad/entities/infocad/parametre/SituationMatrimoniale.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/SituationMatrimoniale.java
View File

@@ -1,7 +1,8 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.fiscad.entities.BaseEntity;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

8
src/main/java/io/gmss/infocad/entities/infocad/parametre/SourceDroit.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/SourceDroit.java
View File

@@ -1,8 +1,9 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Piece;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Piece;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Set;

10
src/main/java/io/gmss/infocad/entities/infocad/parametre/SourceDroitExerce.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/SourceDroitExerce.java
View File

@@ -1,8 +1,9 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
import io.gmss.infocad.entities.infocad.metier.Piece;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
import io.gmss.fiscad.entities.infocad.metier.Piece;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Set;

10
src/main/java/io/gmss/infocad/entities/infocad/parametre/Structure.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java
View File

@@ -1,9 +1,10 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.decoupage.Arrondissement;
import io.gmss.infocad.entities.user.User;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.decoupage.Arrondissement;
import io.gmss.fiscad.entities.user.User;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Set;

8
src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeContestation.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeContestation.java
View File

@@ -1,8 +1,9 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

6
src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeDomaine.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeDomaine.java
View File

@@ -1,7 +1,8 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.fiscad.entities.BaseEntity;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

8
src/main/java/io/gmss/infocad/entities/infocad/parametre/TypePersonne.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePersonne.java
View File

@@ -1,8 +1,9 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.enums.Categorie;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.enums.Categorie;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +11,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

10
src/main/java/io/gmss/infocad/entities/infocad/parametre/TypePiece.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypePiece.java
View File

@@ -1,9 +1,10 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Piece;
import io.gmss.infocad.enums.CategoriePiece;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Piece;
import io.gmss.fiscad.enums.CategoriePiece;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,7 +13,6 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

10
src/main/java/io/gmss/infocad/entities/infocad/parametre/TypeRepresentation.java → src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRepresentation.java
View File

@@ -1,9 +1,10 @@
package io.gmss.infocad.entities.infocad.parametre;
package io.gmss.fiscad.entities.infocad.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.ActeurConcerne;
import io.gmss.infocad.entities.infocad.metier.MembreGroupe;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
import io.gmss.fiscad.entities.infocad.metier.MembreGroupe;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

12
src/main/java/io/gmss/infocad/entities/rfu/metier/Batiment.java → src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java
View File

@@ -1,19 +1,19 @@
package io.gmss.infocad.entities.rfu.metier;
package io.gmss.fiscad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Parcelle;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Parcelle;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;

10
src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueBatiment.java → src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java
View File

@@ -1,9 +1,10 @@
package io.gmss.infocad.entities.rfu.metier;
package io.gmss.fiscad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)

12
src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueParcelle.java → src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java
View File

@@ -1,10 +1,11 @@
package io.gmss.infocad.entities.rfu.metier;
package io.gmss.fiscad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,7 +13,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)

10
src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueUniteLogement.java → src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java
View File

@@ -1,9 +1,10 @@
package io.gmss.infocad.entities.rfu.metier;
package io.gmss.fiscad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)

33
src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteBatiment.java → src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java
View File

@@ -1,17 +1,17 @@
package io.gmss.infocad.entities.rfu.metier;
package io.gmss.fiscad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.infocad.metier.Upload;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.StatusEnquete;
import io.gmss.infocad.enums.StatutEnregistrement;
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.entities.infocad.metier.Upload;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.StatutEnregistrement;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,7 +19,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;
@@ -46,13 +45,13 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
private String numCompteurSbee;
private boolean soneb;
private String numCompteurSoneb;
private byte nbreLotUnite;
private byte nbreUniteLocation;
private int nbreLotUnite;
private int nbreUniteLocation;
private float surfaceLouee;
private byte nbreMenage;
private byte nbreHabitant;
private int nbreMenage;
private int nbreHabitant;
private float valeurMensuelleLocation;
private byte nbreMoisLocation;
private int nbreMoisLocation;
private String autreCaracteristiquePhysique;
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
@@ -75,8 +74,6 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
@JsonIgnore
@ManyToOne
private User user;
@Enumerated(EnumType.STRING)
private StatusEnquete statusEnquete;
@JsonIgnore
@OneToMany(mappedBy = "enqueteBatiment")
private List<Upload> uploads;

31
src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteUniteLogement.java → src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java
View File

@@ -1,17 +1,17 @@
package io.gmss.infocad.entities.rfu.metier;
package io.gmss.fiscad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.infocad.metier.Upload;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.StatusEnquete;
import io.gmss.infocad.enums.StatutEnregistrement;
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.entities.infocad.metier.Upload;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.StatutEnregistrement;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,7 +19,6 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;
@@ -40,13 +39,13 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private float surface;
private byte nbrePiece; //les champs byte sont des integer,
private int nbrePiece; //les champs int sont des integer,
// c'est juste la taille en mémoire que je veux préserver
private byte nbreHabitant;
private byte nbreMenage;
private int nbreHabitant;
private int nbreMenage;
private boolean enLocation;
private float montantMensuelLoyer;
private byte nbreMoisEnLocation;
private int nbreMoisEnLocation;
private float montantLocatifAnnuelDeclare;
private float surfaceLouee;
private boolean sbee;
@@ -80,6 +79,4 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
@JsonIgnore
@Enumerated(EnumType.STRING)
private StatutEnregistrement statutEnregistrement;
@Enumerated(EnumType.STRING)
private StatusEnquete statusEnquete;
}

8
src/main/java/io/gmss/infocad/entities/rfu/metier/UniteLogement.java → src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java
View File

@@ -1,15 +1,15 @@
package io.gmss.infocad.entities.rfu.metier;
package io.gmss.fiscad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;

12
src/main/java/io/gmss/infocad/entities/rfu/parametre/Campagne.java → src/main/java/io/gmss/fiscad/entities/rfu/parametre/Campagne.java
View File

@@ -1,19 +1,19 @@
package io.gmss.infocad.entities.rfu.parametre;
package io.gmss.fiscad.entities.rfu.parametre;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.enums.TypeCampagne;
import io.gmss.fiscad.deserializer.LocalDateDeserializer;
import io.gmss.fiscad.entities.BaseEntity;
import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.enums.TypeCampagne;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;

Some files were not shown because too many files have changed in this diff Show More