From cb766b7c1fe11db66b117b2f91636c91d8965d2d Mon Sep 17 00:00:00 2001 From: "nabil.kadjouh" Date: Tue, 20 Jun 2023 15:30:49 +0200 Subject: [PATCH 1/2] Architecte Updated --- .../dao/impl/JdbcDossierRedevableDAO.java | 7 ++--- .../mappers/converter/ConverterLatin.java | 21 --------------- .../peup/mappers/converter/ConverterUtf8.java | 21 --------------- ...sierRedevableToDossierRedevableExport.java | 26 +++++++++++++++--- .../model/common/DossierRedevableExport.java | 27 ------------------- .../service/impl/DossierRedevableService.java | 3 ++- .../com/peup/service/impl/RmXmlWriter.java | 21 ++++++++++----- .../service/impl/TransformRMProcessor.java | 2 +- .../resources/integ/application.properties | 11 ++++++-- 9 files changed, 52 insertions(+), 87 deletions(-) delete mode 100644 src/main/java/com/peup/mappers/converter/ConverterLatin.java delete mode 100644 src/main/java/com/peup/mappers/converter/ConverterUtf8.java delete mode 100644 src/main/java/com/peup/model/common/DossierRedevableExport.java diff --git a/src/main/java/com/peup/dao/impl/JdbcDossierRedevableDAO.java b/src/main/java/com/peup/dao/impl/JdbcDossierRedevableDAO.java index 8047e2d..e236492 100644 --- a/src/main/java/com/peup/dao/impl/JdbcDossierRedevableDAO.java +++ b/src/main/java/com/peup/dao/impl/JdbcDossierRedevableDAO.java @@ -4,6 +4,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; +import com.peup.dto.DossierRedevableExport; import org.apache.log4j.Logger; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceUtils; @@ -16,9 +17,9 @@ public class JdbcDossierRedevableDAO{ private final static Logger logger = Logger.getLogger(JdbcDossierRedevableDAO.class); private JdbcTemplate varJdbcTemplate; - public Dossier updateTemplate(Dossier t) { - String sql = "update dossier_2 set set siret = %s where type='%s' and iddossierRedevable = %d"; - sql=String.format(sql,"011111",t.getDossier_id()); + public Dossier updateTemplate(DossierRedevableExport t) { + String sql = "update dossier_2 set siret = %s where dossier_id = %d"; + sql=String.format(sql,t.getSiretDossier(),t.getDossierRedevableDto().getDossierId()); logger.info(sql); try { execUpdate(sql); diff --git a/src/main/java/com/peup/mappers/converter/ConverterLatin.java b/src/main/java/com/peup/mappers/converter/ConverterLatin.java deleted file mode 100644 index 499e214..0000000 --- a/src/main/java/com/peup/mappers/converter/ConverterLatin.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.peup.mappers.converter; - -import java.io.UnsupportedEncodingException; - -import org.modelmapper.AbstractConverter; - -import com.peup.service.util.UtilService; - -public class ConverterLatin extends AbstractConverter{ - - @Override - protected String convert(String arg0) { - try { - return UtilService.convertLatin(arg0); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return null; - } - -} diff --git a/src/main/java/com/peup/mappers/converter/ConverterUtf8.java b/src/main/java/com/peup/mappers/converter/ConverterUtf8.java deleted file mode 100644 index 2632f89..0000000 --- a/src/main/java/com/peup/mappers/converter/ConverterUtf8.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.peup.mappers.converter; - -import java.io.UnsupportedEncodingException; - -import org.modelmapper.AbstractConverter; - -import com.peup.service.util.UtilService; - -public class ConverterUtf8 extends AbstractConverter{ - - @Override - protected String convert(String arg0) { - try { - return UtilService.convertUtf8(arg0); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return null; - } - -} diff --git a/src/main/java/com/peup/mappers/mapper/MappingDossierRedevableToDossierRedevableExport.java b/src/main/java/com/peup/mappers/mapper/MappingDossierRedevableToDossierRedevableExport.java index 802a2d0..7a40b78 100644 --- a/src/main/java/com/peup/mappers/mapper/MappingDossierRedevableToDossierRedevableExport.java +++ b/src/main/java/com/peup/mappers/mapper/MappingDossierRedevableToDossierRedevableExport.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.peup.dto.DossierRedevableDto; -import com.peup.model.common.DossierRedevableExport; +import com.peup.dto.DossierRedevableExport; import com.peup.service.util.DataValueException; @Component @@ -24,12 +24,30 @@ public class MappingDossierRedevableToDossierRedevableExport { throw new DataValueException("dossierRedevable is NULL"); } dossierRedevableExport =new DossierRedevableExport(); - dossierRedevableExport.setDossierRedevableDto(dossierRedevable); + logger.info("MappingDossierRedevableToDossierRedevableExport-> dossierRedevable:"+dossierRedevable.getDossierId()); - dossierRedevableExport.setSourcePath("database"); + dossierRedevableExport = peuplement(dossierRedevable); +// dossierRedevableExport.setDossierRedevableDto(dossierRedevable); +// dossierRedevableExport.setDossierState(); +// dossierRedevableExport.setSiretDossier(); +// dossierRedevableExport.setDistance(); +// dossierRedevableExport.setxStorAdr(); +// dossierRedevableExport.setyStorAdr(); +// dossierRedevableExport.setxFlatFile(); +// dossierRedevableExport.setyFlatFile(); + return dossierRedevableExport; } + //................................................... + // + //................................................... + private DossierRedevableExport peuplement(DossierRedevableDto dossierRedevable) + { + DossierRedevableExport resultat = new DossierRedevableExport(); + resultat.setDossierRedevableDto(dossierRedevable); + + return resultat; + } - } diff --git a/src/main/java/com/peup/model/common/DossierRedevableExport.java b/src/main/java/com/peup/model/common/DossierRedevableExport.java deleted file mode 100644 index 2e9389c..0000000 --- a/src/main/java/com/peup/model/common/DossierRedevableExport.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.peup.model.common; - -import org.springframework.stereotype.Component; - -import com.peup.dto.DossierRedevableDto; - -@Component -public class DossierRedevableExport { - DossierRedevableDto dossierRedevableDto; - String sourcePath; - - public DossierRedevableDto getDossierRedevableDto() { - return dossierRedevableDto; - } - - public void setDossierRedevableDto(DossierRedevableDto dossierRedevableDto) { - this.dossierRedevableDto = dossierRedevableDto; - } - - public String getSourcePath() { - return sourcePath; - } - - public void setSourcePath(String sourcePath) { - this.sourcePath = sourcePath; - } -} diff --git a/src/main/java/com/peup/service/impl/DossierRedevableService.java b/src/main/java/com/peup/service/impl/DossierRedevableService.java index 8787ea4..6bf837c 100644 --- a/src/main/java/com/peup/service/impl/DossierRedevableService.java +++ b/src/main/java/com/peup/service/impl/DossierRedevableService.java @@ -3,6 +3,7 @@ package com.peup.service.impl; import java.util.List; import java.util.Map; +import com.peup.dto.DossierRedevableExport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -52,7 +53,7 @@ public class DossierRedevableService implements IDossierRedevableService, IRMXmlWr public void write(List items) throws Exception { + + // creation d'un nouveau fichier log + // ouverture en ecriture //maj BD for (DossierRedevableExport dossierRedevable : items) { if (dossierRedevable.getDossierRedevableDto() != null) { - logger.debug("DossierId:" + dossierRedevable.getDossierRedevableDto().getDossierId()); - logger.debug("RedevableId:" + dossierRedevable.getDossierRedevableDto().getRedevableId()); - logger.debug("Adresse:" + dossierRedevable.getDossierRedevableDto().getAdresse()); - logger.debug("SourcePath:" + dossierRedevable.getSourcePath()); +// logger.debug("DossierId:" + dossierRedevable.getDossierRedevableDto().getDossierId()); +// logger.debug("RedevableId:" + dossierRedevable.getDossierRedevableDto().getRedevableId()); +// logger.debug("Adresse:" + dossierRedevable.getDossierRedevableDto().getAdresse()); +//// logger.debug("SourcePath:" + dossierRedevable.getSourcePath()); + logger.info(""); + // Maj dossier update siret + // + dossierRedevableService.updateTemplate(dossierRedevable); } - } // for - + } // fors + //cloture de fichier log } } diff --git a/src/main/java/com/peup/service/impl/TransformRMProcessor.java b/src/main/java/com/peup/service/impl/TransformRMProcessor.java index e574ec4..ffa5ce4 100644 --- a/src/main/java/com/peup/service/impl/TransformRMProcessor.java +++ b/src/main/java/com/peup/service/impl/TransformRMProcessor.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import com.peup.dto.DossierRedevableDto; import com.peup.mappers.mapper.MappingDossierRedevableToDossierRedevableExport; -import com.peup.model.common.DossierRedevableExport; +import com.peup.dto.DossierRedevableExport; import com.peup.service.ITransformRMProcessor; @Service diff --git a/src/main/resources/integ/application.properties b/src/main/resources/integ/application.properties index 1b9afb0..14a4a83 100644 --- a/src/main/resources/integ/application.properties +++ b/src/main/resources/integ/application.properties @@ -1,4 +1,10 @@ -#file +# Global parameters +peup.platFile=platFile.csv +peup.storAdr=storAdr.csv +peup.log=log +peup.seuil=10.0 + +#files file.output=report.csv file.output.log=log_error_export.csv file.output.logResult=log_result_export.csv @@ -21,4 +27,5 @@ commit.interval=1 #Error error.is.blank=%s is Blank error.is.null=%s is null -error.is.exist=%s exist in DB \ No newline at end of file +error.is.exist=%s exist in DB + -- GitLab From 72fb18cc7a40334a9477c969a220ff6f26cdb50b Mon Sep 17 00:00:00 2001 From: "nabil.kadjouh" Date: Tue, 20 Jun 2023 15:34:56 +0200 Subject: [PATCH 2/2] Architecture Updated --- .idea/.gitignore | 3 + .idea/compiler.xml | 13 + .idea/dbnavigator.xml | 414 ++++++++++++++++++ .idea/jarRepositories.xml | 20 + .idea/misc.xml | 12 + .idea/sonarlint/issuestore/index.pb | 0 .idea/sonarlint/securityhotspotstore/index.pb | 0 .idea/vcs.xml | 6 + .../com/peup/dto/DossierRedevableExport.java | 89 ++++ src/main/java/com/peup/dto/SiretXY.java | 65 +++ src/main/java/com/peup/tasks/tasks.java | 186 ++++++++ 11 files changed, 808 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/dbnavigator.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/sonarlint/issuestore/index.pb create mode 100644 .idea/sonarlint/securityhotspotstore/index.pb create mode 100644 .idea/vcs.xml create mode 100644 src/main/java/com/peup/dto/DossierRedevableExport.java create mode 100644 src/main/java/com/peup/dto/SiretXY.java create mode 100644 src/main/java/com/peup/tasks/tasks.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..909106d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 0000000..70f212e --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,414 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..67e1e61 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb new file mode 100644 index 0000000..e69de29 diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/peup/dto/DossierRedevableExport.java b/src/main/java/com/peup/dto/DossierRedevableExport.java new file mode 100644 index 0000000..ae69df9 --- /dev/null +++ b/src/main/java/com/peup/dto/DossierRedevableExport.java @@ -0,0 +1,89 @@ +package com.peup.dto; + +import org.springframework.stereotype.Component; + +import com.peup.dto.DossierRedevableDto; + +@Component +public class DossierRedevableExport { + private DossierRedevableDto dossierRedevableDto; + private String dossierState; + private String siretDossier; + private String xStorAdr; + private String yStorAdr; + private String xFlatFile; + private String yFlatFile; + private String distance; + //............................................................ + // Getters + //............................................................ + + public DossierRedevableDto getDossierRedevableDto() { + return dossierRedevableDto; + } + + public String getDossierState() { + return dossierState; + } + + public String getSiretDossier() { + return siretDossier; + } + + public String getxStorAdr() { + return xStorAdr; + } + + public String getyStorAdr() { + return yStorAdr; + } + + public String getxFlatFile() { + return xFlatFile; + } + + public String getyFlatFile() { + return yFlatFile; + } + + public String getDistance() { + return distance; + } + + //............................................................ + // Setters + //............................................................ + + public void setDossierRedevableDto(DossierRedevableDto dossierRedevableDto) { + this.dossierRedevableDto = dossierRedevableDto; + } + + public void setDossierState(String dossierState) { + this.dossierState = dossierState; + } + + public void setSiretDossier(String siretDossier) { + this.siretDossier = siretDossier; + } + + public void setxStorAdr(String xStorAdr) { + this.xStorAdr = xStorAdr; + } + + public void setyStorAdr(String yStorAdr) { + this.yStorAdr = yStorAdr; + } + + public void setxFlatFile(String xFlatFile) { + this.xFlatFile = xFlatFile; + } + + public void setyFlatFile(String yFlatFile) { + this.yFlatFile = yFlatFile; + } + + public void setDistance(String distance) { + this.distance = distance; + } + +} diff --git a/src/main/java/com/peup/dto/SiretXY.java b/src/main/java/com/peup/dto/SiretXY.java new file mode 100644 index 0000000..9a13d9c --- /dev/null +++ b/src/main/java/com/peup/dto/SiretXY.java @@ -0,0 +1,65 @@ +package com.peup.dto; + +public class SiretXY { + private String siret; + private String x; + private String y; + private double distance; + //................................... + // Constructeurs + //.................................... + public SiretXY(String siret, String x, String y) { + this.siret = siret; + this.x = x; + this.y = y; + } + //.................................. + public SiretXY(){} + //...................................... + // Getters + //...................................... + public String getSiret() { + return siret; + } + + public String getX() { + return x; + } + + public String getY() { + return y; + } + + public double getDistance() { + return distance; + } + //.......................................... + // Setters + //............................................. + public void setSiret(String siret) { + this.siret = siret; + } + + public void setX(String x) { + this.x = x; + } + + public void setY(String y) { + this.y = y; + } + public void setDistance(double distance) { + this.distance = distance; + } + //.................................. + // to string + //.................................. + @Override + public String toString() { + return "SiretXY{" + + "siret='" + siret + '\'' + + ", x='" + x + '\'' + + ", y='" + y + '\'' + + ", distance=" + distance + + '}'; + } +} diff --git a/src/main/java/com/peup/tasks/tasks.java b/src/main/java/com/peup/tasks/tasks.java new file mode 100644 index 0000000..824a259 --- /dev/null +++ b/src/main/java/com/peup/tasks/tasks.java @@ -0,0 +1,186 @@ +package com.peup.tasks; + +import com.peup.dto.SiretXY; + +import java.io.*; + +import java.util.ArrayList; +import java.util.List; + +public class tasks { + + String platFile ="platFile.csv"; + String storAdr = "storAdr.csv"; + + //........................................................................... + // FileFilter + //........................................................................... + + public static void filtred(String inputFile, String outputFile) + { + + String filterColumn = "plg_code_commune"; + int minValue = 75000; + int maxValue = 75999; + BufferedReader reader = null; + BufferedWriter writer = null; + + try{ + reader = new BufferedReader(new FileReader(inputFile)); + writer = new BufferedWriter(new FileWriter(outputFile)); + String line; + while ((line = reader.readLine()) != null) + { + String[] fields = line.split(";"); + String value = fields[10]; + if (isNumeric(value) && isBetween(Integer.parseInt(value), minValue, maxValue)) + { + line=fields[0]+";"+fields[1]+";"+fields[2]; // pour eliminer les champs Inutils + writer.write(line + "\n"); + } + } + System.out.println("Le fichier a été filtré avec succès !"); + } catch (IOException e) { + e.printStackTrace(); + } + } + private static boolean isNumeric(String str) { + return str.matches("-?\\d+"); + } + private static boolean isBetween(int value, int min, int max) { + return value >= min && value <= max; + } + + //........................................................................... + // Les coordonnées XY d'une adresse de dossier sur storAdr + //........................................................................... + public String [] crdnXYLambert93StorAdr(String adresse) + { + + String[] resultXY = new String[2]; + resultXY[0]="-111111111111111"; + resultXY[1]="-111111111111111"; + Boolean tr = false; + BufferedReader reader = null; + try { + reader = new BufferedReader(new FileReader(storAdr)); + + String ligne; + int indexAdresse = 0; + int indexX = 1; + int indexY = 2; + ligne = reader.readLine(); + while (!tr && ((ligne = reader.readLine()) != null)) + { + String[] valeurs = ligne.split(";"); + //................................................ + int nbIndicesDepart = valeurs[0].length()-adresse.length()+1; + for (int i = 0; i getSiretsUsingSiren(String siren, String[] xyStorAdr ) + { + List siretXYs = new ArrayList(); + try + { + BufferedReader reader = new BufferedReader(new FileReader(platFile)); + String ligne; + int indexSiret = 0; + int indexX = 1; + int indexY = 2; + while ((ligne = reader.readLine()) != null) + { + String[] valeurs = ligne.split(";"); + // System.out.println(valeurs[indexSiret].substring(valeurs[0].length() - 9)); + if (valeurs[indexSiret].startsWith(siren)) + { + SiretXY siret = new SiretXY(); + siret.setSiret(valeurs[indexSiret]); + siret.setX(valeurs[indexX]); + siret.setY(valeurs[indexY]); + siret.setDistance( + calculateDistance( + Double.parseDouble(xyStorAdr[0]), + Double.parseDouble(xyStorAdr[1]), + Double.parseDouble(valeurs[indexX]), + Double.parseDouble(valeurs[indexY]))); + siretXYs.add(siret); + } + } + } + catch (IOException e) + { + System.out.println("Filtred File not found"); + e.printStackTrace(); + } + return siretXYs; + } + +} -- GitLab