-
Notifications
You must be signed in to change notification settings - Fork 96
/
Copy patheap72-cp.patch
4536 lines (4175 loc) · 175 KB
/
eap72-cp.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/pom.xml b/pom.xml
index fde7890955..7eff2c8328 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,46 @@
<packagingExcludes>WEB-INF/lib/siga-ext-*.jar</packagingExcludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>siga.versao</property>
+ <message>
+ ${line.separator}
+ ${line.separator}
+ DEFINA A PROPRIEDADE siga.versao !
+ ${line.separator}
+ -Dsiga.versao=a.b.c.d
+ ${line.separator}
+ ${line.separator}
+ </message>
+ <regex>(develop|(release-|hotfix-)?\d{1,}\.\d{1,}\.\d{1,}(\.\d{1,})?)(-alfa|-beta|-teste)?(-\d.*)?</regex>
+ <regexMessage>
+ ${line.separator}
+ ${line.separator}
+ FORMATO INVALIDO DO PARAMETRO siga.versao.
+ ${line.separator}
+ Exemplos: 3.10.0, 3.11.1.5, release-1.0.0, hotfix-1.2.3.4, develop, 4.5.0-beta
+ ${line.separator}
+ ${line.separator}
+ </regexMessage>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/siga-base/src/main/java/br/gov/jfrj/siga/base/Texto.java b/siga-base/src/main/java/br/gov/jfrj/siga/base/Texto.java
index c556de22f6..a3de1dba3f 100644
--- a/siga-base/src/main/java/br/gov/jfrj/siga/base/Texto.java
+++ b/siga-base/src/main/java/br/gov/jfrj/siga/base/Texto.java
@@ -249,4 +249,12 @@ public class Texto {
return string.length() > limit ? (string.substring(0, max) + "...") : string;
}
+ public static boolean equals(String s1, String s2) {
+ if (s1 == null && s2 == null)
+ return true;
+ if (s1 == null || s2 == null)
+ return false;
+ return s1.equals(s2);
+ }
+
}
diff --git a/siga-base/src/main/java/br/gov/jfrj/siga/model/ContextoPersistencia.java b/siga-base/src/main/java/br/gov/jfrj/siga/model/ContextoPersistencia.java
index 722ef1d734..8a3564b296 100644
--- a/siga-base/src/main/java/br/gov/jfrj/siga/model/ContextoPersistencia.java
+++ b/siga-base/src/main/java/br/gov/jfrj/siga/model/ContextoPersistencia.java
@@ -1,11 +1,14 @@
package br.gov.jfrj.siga.model;
+import java.util.Date;
+
import javax.persistence.EntityManager;
public class ContextoPersistencia {
private final static ThreadLocal<EntityManager> emByThread = new ThreadLocal<EntityManager>();
private final static ThreadLocal<String> userPrincipalByThread = new ThreadLocal<String>();
+ private final static ThreadLocal<Date> dataEHoraDoServidor = new ThreadLocal<Date>();
static public void setEntityManager(EntityManager em) {
emByThread.set(em);
@@ -35,4 +38,13 @@ public class ContextoPersistencia {
static public void removeUserPrincipal() {
userPrincipalByThread.remove();
}
+
+ static public void setDt(Date dt) {
+ dataEHoraDoServidor.set(dt);
+ }
+
+ static public Date dt() {
+ return dataEHoraDoServidor.get();
+ }
+
}
\ No newline at end of file
diff --git a/siga-cp/src/main/app/br/gov/jfrj/siga/cp/AbstractCpModelo.java b/siga-cp/src/main/app/br/gov/jfrj/siga/cp/AbstractCpModelo.java
index d763ab8f99..dc8e646a75 100644
--- a/siga-cp/src/main/app/br/gov/jfrj/siga/cp/AbstractCpModelo.java
+++ b/siga-cp/src/main/app/br/gov/jfrj/siga/cp/AbstractCpModelo.java
@@ -21,6 +21,7 @@ package br.gov.jfrj.siga.cp;
import java.sql.Blob;
import javax.persistence.Basic;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
@@ -48,16 +49,14 @@ public abstract class AbstractCpModelo extends HistoricoAuditavelSuporte {
@Desconsiderar
private java.lang.Long idMod;
- /** The value of the simple conteudoBlobMod property. */
- @Lob
- @Basic(fetch = FetchType.LAZY)
- @Column(name = "CONTEUDO_BLOB_MOD")
- private byte[] conteudoBlobMod;
-
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "ID_ORGAO_USU")
private CpOrgaoUsuario cpOrgaoUsuario;
+ @ManyToOne(fetch = FetchType.LAZY, optional = true, cascade = CascadeType.ALL)
+ @JoinColumn(name = "ID_ARQ")
+ private CpArquivo cpArquivo;
+
/**
* Return the value of the primary key column.
*
@@ -67,14 +66,6 @@ public abstract class AbstractCpModelo extends HistoricoAuditavelSuporte {
return idMod;
}
- /**
- * Return the value of the CONTEUDO_BLOB_MOD column.
- *
- * @return java.lang.String
- */
- public byte[] getConteudoBlobMod() {
- return this.conteudoBlobMod;
- }
/**
* /** Set the simple primary key value that identifies this object.
@@ -85,15 +76,6 @@ public abstract class AbstractCpModelo extends HistoricoAuditavelSuporte {
this.idMod = idMod;
}
- /**
- * Set the value of the CONTEUDO_BLOB_MOD column.
- *
- * @param conteudoBlobMod
- */
- public void setConteudoBlobMod(byte[] conteudoBlobMod) {
- this.conteudoBlobMod = conteudoBlobMod;
- }
-
public CpOrgaoUsuario getCpOrgaoUsuario() {
return cpOrgaoUsuario;
}
@@ -102,4 +84,32 @@ public abstract class AbstractCpModelo extends HistoricoAuditavelSuporte {
this.cpOrgaoUsuario = cpOrgaoUsuario;
}
+ public CpArquivo getCpArquivo() {
+ return cpArquivo;
+ }
+
+ public void setCpArquivo(CpArquivo cpArquivo) {
+ this.cpArquivo = cpArquivo;
+ }
+
+ public java.lang.String getConteudoTpBlob() {
+ if (getCpArquivo() == null)
+ return null;
+ return getCpArquivo().getConteudoTpArq();
+ }
+
+ public void setConteudoTpBlob(final java.lang.String conteudoTpMod) {
+ setCpArquivo(CpArquivo.updateConteudoTp(getCpArquivo(), conteudoTpMod));
+ }
+
+ public byte[] getConteudoBlobMod() {
+ if (getCpArquivo() == null)
+ return null;
+ return getCpArquivo().getConteudoBlobArq();
+ }
+
+ public void setConteudoBlobMod(byte[] createBlob) {
+ setCpArquivo(CpArquivo.updateConteudo(getCpArquivo(), createBlob));
+ setConteudoTpBlob("template/freemarker");
+ }
}
diff --git a/siga-cp/src/main/app/br/gov/jfrj/siga/cp/CpArquivo.java b/siga-cp/src/main/app/br/gov/jfrj/siga/cp/CpArquivo.java
new file mode 100644
index 0000000000..359e60a62d
--- /dev/null
+++ b/siga-cp/src/main/app/br/gov/jfrj/siga/cp/CpArquivo.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright (c) 2006 - 2011 SJRJ.
+ *
+ * This file is part of SIGA.
+ *
+ * SIGA is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SIGA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SIGA. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+package br.gov.jfrj.siga.cp;
+
+import java.io.Serializable;
+import java.util.Arrays;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Immutable;
+
+import br.gov.jfrj.siga.base.Texto;
+import br.gov.jfrj.siga.dp.CpOrgaoUsuario;
+import br.gov.jfrj.siga.model.ContextoPersistencia;
+
+/**
+ * A class that represents a row in the CP_ARQUIVO table. You can customize the
+ * behavior of this class by editing the class, {@link CpArquivo()}.
+ */
+@Entity
+@Immutable
+@Table(name = "CP_ARQUIVO", schema = "CORPORATIVO")
+public class CpArquivo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @SequenceGenerator(sequenceName = "CORPORATIVO.CP_ARQUIVO_SEQ", name = "CP_ARQUIVO_SEQ")
+ @GeneratedValue(generator = "CP_ARQUIVO_SEQ")
+ @Column(name = "ID_ARQ")
+ private java.lang.Long idArq;
+
+ @ManyToOne
+ @JoinColumn(name = "ID_ORGAO_USU")
+ private CpOrgaoUsuario orgaoUsuario;
+
+ @Column(name = "CONTEUDO_TP_ARQ", length = 128)
+ private java.lang.String conteudoTpArq;
+
+ @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @PrimaryKeyJoinColumn
+ private CpArquivoBlob arquivoBlob;
+
+ /**
+ * Simple constructor of AbstractExDocumento instances.
+ */
+ public CpArquivo() {
+ }
+
+ public java.lang.Long getIdArq() {
+ return idArq;
+ }
+
+ public void setIdArq(java.lang.Long idArq) {
+ this.idArq = idArq;
+ }
+
+ public java.lang.String getConteudoTpArq() {
+ return conteudoTpArq;
+ }
+
+ private void setConteudoTpArq(java.lang.String conteudoTpArq) {
+ this.conteudoTpArq = conteudoTpArq;
+ }
+
+ public CpOrgaoUsuario getOrgaoUsuario() {
+ return orgaoUsuario;
+ }
+
+ public void setOrgaoUsuario(CpOrgaoUsuario orgaoUsuario) {
+ this.orgaoUsuario = orgaoUsuario;
+ }
+
+ private CpArquivoBlob getArquivoBlob() {
+ return arquivoBlob;
+ }
+
+ private void setArquivoBlob(CpArquivoBlob arquivoBlob) {
+ this.arquivoBlob = arquivoBlob;
+ }
+
+ public byte[] getConteudoBlobArq() {
+ if (this.arquivoBlob == null) {
+ this.arquivoBlob = new CpArquivoBlob();
+ this.arquivoBlob.setArquivo(this);
+ }
+ return this.arquivoBlob.getConteudoBlobArq();
+ }
+
+ private void setConteudoBlobArq(byte[] createBlob) {
+ if (this.arquivoBlob == null) {
+ this.arquivoBlob = new CpArquivoBlob();
+ this.arquivoBlob.setArquivo(this);
+ }
+ this.arquivoBlob.setConteudoBlobArq(createBlob);
+ }
+
+ public static CpArquivo forUpdate(CpArquivo old) {
+ if (old != null) {
+ if (old.getIdArq() != null) {
+ CpArquivo arq = new CpArquivo();
+ arq.setConteudoTpArq(old.getConteudoTpArq());
+ arq.setOrgaoUsuario(old.getOrgaoUsuario());
+ if (old.getArquivoBlob() != null) {
+ arq.setArquivoBlob(new CpArquivoBlob());
+ arq.getArquivoBlob().setArquivo(arq);
+ arq.getArquivoBlob().setConteudoBlobArq(old.getArquivoBlob().getConteudoBlobArq());
+ }
+ ContextoPersistencia.em().remove(old);
+ return arq;
+ } else
+ return old;
+ } else
+ return new CpArquivo();
+ }
+
+ public static CpArquivo updateConteudoTp(CpArquivo old, String conteudoTp) {
+ if (old == null || !Texto.equals(old.getConteudoTpArq(), conteudoTp)) {
+ CpArquivo arq = CpArquivo.forUpdate(old);
+ arq.setConteudoTpArq(conteudoTp);
+ return arq;
+ }
+ return old;
+ }
+
+ public static CpArquivo updateConteudo(CpArquivo old, byte[] conteudo) {
+ if (old == null || !Arrays.equals(old.getConteudoBlobArq(), conteudo)) {
+ CpArquivo arq = CpArquivo.forUpdate(old);
+ arq.setConteudoBlobArq(conteudo);
+ return arq;
+ }
+ return old;
+ }
+}
\ No newline at end of file
diff --git a/siga-cp/src/main/app/br/gov/jfrj/siga/cp/CpArquivoBlob.java b/siga-cp/src/main/app/br/gov/jfrj/siga/cp/CpArquivoBlob.java
new file mode 100644
index 0000000000..857884d13a
--- /dev/null
+++ b/siga-cp/src/main/app/br/gov/jfrj/siga/cp/CpArquivoBlob.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2006 - 2011 SJRJ.
+ *
+ * This file is part of SIGA.
+ *
+ * SIGA is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SIGA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SIGA. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+package br.gov.jfrj.siga.cp;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Immutable;
+
+/**
+ * A class that represents a row in the CP_ARQUIVO_BLOB table. You can customize
+ * the behavior of this class by editing the class, {@link CpArquivoBlob()}.
+ */
+@Entity
+@Immutable
+@Table(name = "CP_ARQUIVO_BLOB", schema = "CORPORATIVO")
+public class CpArquivoBlob implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_ARQ_BLOB")
+ private java.lang.Long idArqBlob;
+
+ @MapsId
+ @OneToOne(mappedBy = "arquivoBlob")
+ @JoinColumn(name = "ID_ARQ_BLOB") // same name as id @Column
+ private CpArquivo arquivo;
+
+ @Lob
+ @Column(name = "CONTEUDO_ARQ_BLOB")
+ private byte[] conteudoBlobArq;
+
+ /**
+ * Simple constructor of AbstractExDocumento instances.
+ */
+ public CpArquivoBlob() {
+ }
+
+ public java.lang.Long getIdArqBlob() {
+ return idArqBlob;
+ }
+
+ public void setIdArqBlob(java.lang.Long idArqBlob) {
+ this.idArqBlob = idArqBlob;
+ }
+
+ public CpArquivo getArquivo() {
+ return arquivo;
+ }
+
+ public void setArquivo(CpArquivo arquivo) {
+ this.arquivo = arquivo;
+ }
+
+ public byte[] getConteudoBlobArq() {
+ return conteudoBlobArq;
+ }
+
+ public void setConteudoBlobArq(byte[] conteudoBlobArq) {
+ this.conteudoBlobArq = conteudoBlobArq;
+ }
+
+}
\ No newline at end of file
diff --git a/siga-cp/src/main/app/br/gov/jfrj/siga/cp/bl/CpBL.java b/siga-cp/src/main/app/br/gov/jfrj/siga/cp/bl/CpBL.java
index dc8c47b029..be1e164d85 100644
--- a/siga-cp/src/main/app/br/gov/jfrj/siga/cp/bl/CpBL.java
+++ b/siga-cp/src/main/app/br/gov/jfrj/siga/cp/bl/CpBL.java
@@ -229,6 +229,8 @@ public class CpBL {
new int[] { 0 }, null);
if (confOld != null && !confOld.isEspecifica(confFiltro))
confOld = null;
+ if (confOld != null)
+ confOld = dao().consultar(confOld.getIdConfiguracao(), CpConfiguracao.class, false);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/siga-cp/src/main/app/br/gov/jfrj/siga/dp/dao/CpDao.java b/siga-cp/src/main/app/br/gov/jfrj/siga/dp/dao/CpDao.java
index fa6bb2ad91..3e0c446920 100644
--- a/siga-cp/src/main/app/br/gov/jfrj/siga/dp/dao/CpDao.java
+++ b/siga-cp/src/main/app/br/gov/jfrj/siga/dp/dao/CpDao.java
@@ -1447,6 +1447,9 @@ public class CpDao extends ModeloDao {
}
public Date consultarDataEHoraDoServidor() throws AplicacaoException {
+ if (ContextoPersistencia.dt() != null)
+ return ContextoPersistencia.dt();
+
Query sql = em().createNamedQuery(
"consultarDataEHoraDoServidor");
@@ -1455,7 +1458,9 @@ public class CpDao extends ModeloDao {
throw new AplicacaoException(
"Nao foi possivel obter a data e a hora atuais do servidor.");
- return (Date) ((result.get(0)));
+ Date dt = (Date) ((result.get(0)));
+ ContextoPersistencia.setDt(dt);
+ return dt;
}
public List<CpConfiguracao> consultarConfiguracoesDesde(Date desde) {
diff --git a/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V47_0__acrescenta_configuracao_para_juntar_automaticamente.sql b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V47_0__acrescenta_configuracao_para_juntar_automaticamente.sql
index 3f9b69319e..658217a88d 100644
--- a/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V47_0__acrescenta_configuracao_para_juntar_automaticamente.sql
+++ b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V47_0__acrescenta_configuracao_para_juntar_automaticamente.sql
@@ -3,6 +3,4 @@
----------------------------------------------------------------------
ALTER SESSION SET CURRENT_SCHEMA=corporativo;
-Insert into CORPORATIVO.CP_TIPO_CONFIGURACAO (ID_TP_CONFIGURACAO,DSC_TP_CONFIGURACAO,ID_SIT_CONFIGURACAO) values (40,'Definição Automática de Perfil', 1);
-
Insert into CORPORATIVO.CP_TIPO_CONFIGURACAO (ID_TP_CONFIGURACAO,DSC_TP_CONFIGURACAO,ID_SIT_CONFIGURACAO) values (41,'Juntada Automática', 1);
\ No newline at end of file
diff --git a/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V47_0__orgao_cinco.sql b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V47_1__orgao_cinco.sql
similarity index 100%
rename from siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V47_0__orgao_cinco.sql
rename to siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V47_1__orgao_cinco.sql
diff --git a/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V49_0__cp_arquivo.sql b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V49_0__cp_arquivo.sql
new file mode 100644
index 0000000000..1590c23793
--- /dev/null
+++ b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V49_0__cp_arquivo.sql
@@ -0,0 +1,79 @@
+CREATE SEQUENCE "CORPORATIVO"."CP_ARQUIVO_SEQ"
+ MINVALUE 1
+ MAXVALUE 999999999999999999999999999
+ INCREMENT BY 1
+ START WITH 1
+ CACHE 20
+ NOORDER
+ NOCYCLE;
+
+CREATE TABLE "CORPORATIVO"."CP_ARQUIVO"
+ (
+ "ID_ARQ" NUMBER,
+ "ID_ORGAO_USU" NUMBER,
+ "CONTEUDO_TP_ARQ" VARCHAR2(128)
+ );
+
+COMMENT ON COLUMN "CORPORATIVO"."CP_ARQUIVO"."ID_ARQ" IS 'Identificador do arquivo';
+COMMENT ON COLUMN "CORPORATIVO"."CP_ARQUIVO"."ID_ORGAO_USU" IS 'Identificador do órgão usuário dono deste arquivo';
+COMMENT ON COLUMN "CORPORATIVO"."CP_ARQUIVO"."CONTEUDO_TP_ARQ" IS 'Content-Type do arquivo';
+
+ALTER TABLE "CORPORATIVO"."CP_ARQUIVO"
+ ADD CONSTRAINT "ARQUIVO_PK" PRIMARY KEY ("ID_ARQ") ENABLE;
+
+GRANT SELECT ON "CORPORATIVO"."CP_ARQUIVO_SEQ" TO "SIGA";
+
+GRANT ALTER ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT DELETE ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT INDEX ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT INSERT ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT SELECT ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT UPDATE ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT REFERENCES ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT ON COMMIT refresh ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT query rewrite ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT debug ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+GRANT flashback ON "CORPORATIVO"."CP_ARQUIVO" TO "SIGA";
+
+
+CREATE TABLE "CORPORATIVO"."CP_ARQUIVO_BLOB"
+ (
+ "ID_ARQ_BLOB" NUMBER,
+ "CONTEUDO_ARQ_BLOB" BLOB
+ );
+
+COMMENT ON COLUMN "CORPORATIVO"."CP_ARQUIVO_BLOB"."ID_ARQ_BLOB" IS 'Identificador do arquivo';
+COMMENT ON COLUMN "CORPORATIVO"."CP_ARQUIVO_BLOB"."CONTEUDO_ARQ_BLOB" IS 'Bytes do arquivo';
+
+GRANT ALTER ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT DELETE ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT INDEX ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT INSERT ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT SELECT ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT UPDATE ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT REFERENCES ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT ON COMMIT refresh ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT query rewrite ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT debug ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
+GRANT flashback ON "CORPORATIVO"."CP_ARQUIVO_BLOB" TO "SIGA";
+
diff --git a/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_0__Acrescentando_referencias_para_Cp_Arquivo.sql b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_0__Acrescentando_referencias_para_Cp_Arquivo.sql
new file mode 100644
index 0000000000..c86e07fb28
--- /dev/null
+++ b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_0__Acrescentando_referencias_para_Cp_Arquivo.sql
@@ -0,0 +1,3 @@
+ALTER TABLE CORPORATIVO.CP_MODELO ADD (ID_ARQ number(19,0) NULL);
+COMMENT ON COLUMN "CORPORATIVO"."CP_MODELO"."ID_ARQ" IS 'Identificador do arquivo';
+ALTER TABLE CORPORATIVO.CP_MODELO ADD FOREIGN KEY (ID_ARQ) REFERENCES CORPORATIVO.CP_ARQUIVO (ID_ARQ) ENABLE;
diff --git a/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_1__Transferindo_blobs_de_Cp_Modelo.sql b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_1__Transferindo_blobs_de_Cp_Modelo.sql
new file mode 100644
index 0000000000..7697a65ddc
--- /dev/null
+++ b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_1__Transferindo_blobs_de_Cp_Modelo.sql
@@ -0,0 +1,42 @@
+declare
+ cursor c1(
+ p_rows_to_process in number) is
+ select *
+ from cp_modelo
+ where id_arq is null
+ and conteudo_blob_mod is not null;
+ l_moretodo boolean := true;
+ l_rows_processed pls_integer := 0;
+ l_chunk number := 1000;
+begin
+ while l_moretodo loop
+ l_rows_processed := 0;
+
+ for r1 in c1(l_chunk) loop
+ insert into corporativo.cp_arquivo_blob
+ (id_arq_blob,conteudo_arq_blob)
+ values (corporativo.cp_arquivo_seq.nextval,r1.conteudo_blob_mod);
+
+ insert into corporativo.cp_arquivo
+ (id_arq,id_orgao_usu,conteudo_tp_arq)
+ values (corporativo.cp_arquivo_seq.currval,null,'template/freemarker');
+
+ update cp_modelo
+ set id_arq = corporativo.cp_arquivo_seq.currval
+ where id_modelo = r1.id_modelo;
+
+ l_rows_processed := l_rows_processed + 1;
+ end loop;
+
+ commit;
+
+ dbms_output.Put_line('Processed: '
+ ||l_rows_processed);
+
+ if l_rows_processed < l_chunk then
+ dbms_output.Put_line('Exiting loop...');
+
+ l_moretodo := false;
+ end if;
+ end loop;
+end;
\ No newline at end of file
diff --git a/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_2__Removendo_blobs_antigos.sql b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_2__Removendo_blobs_antigos.sql
new file mode 100644
index 0000000000..d066e1807a
--- /dev/null
+++ b/siga-cp/src/main/resources/db/migration/CORPORATIVO_UTF8_V50_2__Removendo_blobs_antigos.sql
@@ -0,0 +1 @@
+-- alter table cp_modelo drop (conteudo_blob_mod);
diff --git a/siga-ex/pom.xml b/siga-ex/pom.xml
index bfc89d1147..0c1cba5f44 100644
--- a/siga-ex/pom.xml
+++ b/siga-ex/pom.xml
@@ -32,73 +32,6 @@
</execution>
</executions>
</plugin>
- <!-- <plugin> <groupId>org.hibernate.orm.tooling</groupId> <artifactId>hibernate-enhance-maven-plugin</artifactId>
- <executions> <execution> <phase>compile</phase> <goals> <goal>enhance</goal>
- </goals> </execution> </executions> <dependencies> <dependency> <groupId>siga</groupId>
- <artifactId>siga-ex</artifactId> <version>${project.version}</version> </dependency>
- </dependencies> </plugin> -->
-
-<!--
- <plugin>
- <groupId>org.hibernate.orm.tooling</groupId>
- <artifactId>hibernate-enhance-maven-plugin</artifactId>
- <version>4.2.21.Final</version>
- <executions>
- <execution>
- <configuration>
- <enableLazyInitialization>true</enableLazyInitialization>
- </configuration>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <tasks>
- <taskdef name="instrument"
- classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
- <classpath path="maven.compile.classpath" />
- <classpath path="maven.runtime.classpath" />
- <classpath path="maven.plugin.classpath" />
- </taskdef>
- <instrument>
-<!-- <fileset dir="${project.build.outputDirectory}/br/gov/jfrj/siga/ex">
- <include name="*.class" />
- </fileset>
- --> </instrument>
- </tasks>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.18.1-GA</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>siga</groupId>
- <artifactId>siga-ex</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
diff --git a/siga-ex/src/main/java/br/gov/jfrj/siga/ex/AbstractExDocumento.java b/siga-ex/src/main/java/br/gov/jfrj/siga/ex/AbstractExDocumento.java
index 4b017c3689..fd3d2b8bfa 100644
--- a/siga-ex/src/main/java/br/gov/jfrj/siga/ex/AbstractExDocumento.java
+++ b/siga-ex/src/main/java/br/gov/jfrj/siga/ex/AbstractExDocumento.java
@@ -19,17 +19,15 @@
package br.gov.jfrj.siga.ex;
import java.io.Serializable;
-import java.sql.Blob;
import java.util.Date;
import java.util.TreeSet;
-import javax.persistence.Basic;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
import javax.persistence.NamedQueries;
@@ -43,6 +41,8 @@ import org.hibernate.annotations.BatchSize;
import org.hibernate.annotations.Sort;
import org.hibernate.annotations.SortType;
+import br.gov.jfrj.siga.base.Texto;
+import br.gov.jfrj.siga.cp.CpArquivo;
import br.gov.jfrj.siga.dp.CpOrgao;
import br.gov.jfrj.siga.dp.CpOrgaoUsuario;
import br.gov.jfrj.siga.dp.DpLotacao;
@@ -56,43 +56,30 @@ import br.gov.jfrj.siga.ex.BIE.ExBoletimDoc;
@MappedSuperclass
@NamedQueries({
@NamedQuery(name = "obterProximoNumeroSub", query = "select max(doc.numExpediente)+1"
- + " from ExDocumento doc"
- + " inner join doc.subscritor sub "
- + " inner join doc.exFormaDocumento frm "
- + " where doc.anoEmissao = :anoEmissao"
- + " and sub.sesbPessoa = :sesb"
- + " and frm.idFormaDoc = :idFormaDoc"),
+ + " from ExDocumento doc" + " inner join doc.subscritor sub "
+ + " inner join doc.exFormaDocumento frm " + " where doc.anoEmissao = :anoEmissao"
+ + " and sub.sesbPessoa = :sesb" + " and frm.idFormaDoc = :idFormaDoc"),
@NamedQuery(name = "obterProximoNumeroCad", query = "select max(doc.numExpediente)+1 "
- + " from ExDocumento doc"
- + " inner join doc.cadastrante sub "
- + " inner join doc.exFormaDocumento frm "
- + " where doc.anoEmissao = :anoEmissao"
- + " and sub.sesbPessoa = :sesb"
- + " and frm.idFormaDoc = :idFormaDoc"),
+ + " from ExDocumento doc" + " inner join doc.cadastrante sub "
+ + " inner join doc.exFormaDocumento frm " + " where doc.anoEmissao = :anoEmissao"
+ + " and sub.sesbPessoa = :sesb" + " and frm.idFormaDoc = :idFormaDoc"),
@NamedQuery(name = "obterProximoNumero", query = "select max(doc.numExpediente)+1"
- + " from ExDocumento doc"
- + " inner join doc.exFormaDocumento frm"
- + " inner join doc.orgaoUsuario org"
- + " where org.idOrgaoUsu = :idOrgaoUsu"
- + " and frm.idFormaDoc = :idFormaDoc"
- + " and doc.anoEmissao = :anoEmissao"),
- @NamedQuery(name = "consultarPorSiglaDocumento", query = "from ExDocumento doc"
- + " where ("
+ + " from ExDocumento doc" + " inner join doc.exFormaDocumento frm"
+ + " inner join doc.orgaoUsuario org" + " where org.idOrgaoUsu = :idOrgaoUsu"
+ + " and frm.idFormaDoc = :idFormaDoc" + " and doc.anoEmissao = :anoEmissao"),
+ @NamedQuery(name = "consultarPorSiglaDocumento", query = "from ExDocumento doc" + " where ("
+ " doc.anoEmissao=:anoEmissao"
+ " and (:idOrgaoUsu = null or :idOrgaoUsu = 0L or doc.orgaoUsuario.idOrgaoUsu = :idOrgaoUsu)"
+ " and doc.exFormaDocumento.idFormaDoc=:idFormaDoc"
+ " and doc.numExpediente=:numExpediente" + " )"),
@NamedQuery(name = "consultarPorModeloEAssinatura", query = "from ExDocumento d where d.idDoc in (select doc.idDoc from ExDocumento as doc join doc.exMobilSet as mob join mob.exMovimentacaoSet as mov"
+ " where (mov.exTipoMovimentacao.idTpMov = 11 or mov.exTipoMovimentacao.idTpMov = 25)"
- + " and mov.exMovimentacaoCanceladora = null"
- + " and doc.exModelo.idMod = :idMod"
- + " and doc.orgaoUsuario.idOrgaoUsu = :idOrgaoUsu"
- + " group by doc.idDoc"
+ + " and mov.exMovimentacaoCanceladora = null" + " and doc.exModelo.idMod = :idMod"
+ + " and doc.orgaoUsuario.idOrgaoUsu = :idOrgaoUsu" + " group by doc.idDoc"
+ " having min(mov.dtIniMov) between :dataIni and :dataFim)"),
@NamedQuery(name = "consultarPorFiltro", query = "select doc, mob, label "
+ " from ExMarca label inner join label.exMobil mob inner join label.exMobil.exDocumento doc"
- + " "
- + " where ("
+ + " " + " where ("
+ " :descrDocumento = null or :descrDocumento = '' or ("
+ " doc.exNivelAcesso.grauNivelAcesso < 21 and label.cpMarcador.idMarcador != 1 and label.cpMarcador.idMarcador != 10"
+ " ) or ( "
@@ -102,11 +89,7 @@ import br.gov.jfrj.siga.ex.BIE.ExBoletimDoc;
+ " or (:lotaTitular!=null and :lotaTitular!=0 and doc.destinatario = null and doc.lotaDestinatario in (select l.idLotacao from DpLotacao as l where l.idLotacaoIni = :lotaTitular))"
+ " or (:lotaTitular!=null and :lotaTitular!=0 and label.dpLotacaoIni in (select l.idLotacao from DpLotacao as l where l.idLotacaoIni = :lotaTitular))"
+ " or (:titular!=null and :titular!=0 and label.dpPessoaIni in (select p.idPessoa from DpPessoa as p where p.idPessoaIni = :titular))"
- + " )"
- + " )"
- + " "
- + " and ("
- + " ("
+ + " )" + " )" + " " + " and (" + " ("
+ " (:ultMovIdEstadoDoc = null or :ultMovIdEstadoDoc = 0L) and not (label.cpMarcador.idMarcador in (3, 14, 25))"
+ " ) or label.cpMarcador.idMarcador = :ultMovIdEstadoDoc"
+ " ) and (:ultMovRespSelId = null or :ultMovRespSelId = 0L or label.dpPessoaIni.idPessoa = :ultMovRespSelId)"
@@ -122,10 +105,8 @@ import br.gov.jfrj.siga.ex.BIE.ExBoletimDoc;
+ " and (:idTipoFormaDoc = null or :idTipoFormaDoc = 0L or doc.exFormaDocumento.exTipoFormaDoc.idTipoFormaDoc = :idTipoFormaDoc)"
+ " and (:classificacaoSelId = null or :classificacaoSelId = 0L or doc.exClassificacao.idClassificacao = :classificacaoSelId)"
+ " and (:descrDocumento = null or :descrDocumento = '' or upper(doc.descrDocumentoAI) like upper('%' || :descrDocumento || '%'))"
- + " "
- + " and (:dtDoc = null or doc.dtDoc >= :dtDoc)"
- + " and (:dtDocFinal = null or doc.dtDoc <= :dtDocFinal)"
- + " "
+ + " " + " and (:dtDoc = null or doc.dtDoc >= :dtDoc)"
+ + " and (:dtDocFinal = null or doc.dtDoc <= :dtDocFinal)" + " "
+ " and (:numAntigoDoc = null or :numAntigoDoc = '' or upper (doc.numAntigoDoc) like upper('%' || :numAntigoDoc || '%')) "
+ " "
+ " and (:destinatarioSelId = null or :destinatarioSelId = 0L or doc.destinatario.idPessoa in (select p.idPessoa from DpPessoa as p where p.idPessoaIni = :destinatarioSelId))"
@@ -142,8 +123,7 @@ import br.gov.jfrj.siga.ex.BIE.ExBoletimDoc;
+ " " + " order by doc.dtDoc desc"),
@NamedQuery(name = "consultarQuantidadePorFiltro", query = "select count(doc) "
+ " from ExMarca label inner join label.exMobil mob inner join label.exMobil.exDocumento doc"
- + " "
- + " where ("
+ + " " + " where ("
+ " :descrDocumento = null or :descrDocumento = '' or ("
+ " doc.exNivelAcesso.grauNivelAcesso < 21 and label.cpMarcador.idMarcador != 1 and label.cpMarcador.idMarcador != 10"
+ " ) or ( "
@@ -153,10 +133,7 @@ import br.gov.jfrj.siga.ex.BIE.ExBoletimDoc;
+ " or (:lotaTitular!=null and :lotaTitular!=0 and doc.destinatario = null and doc.lotaDestinatario in (select l.idLotacao from DpLotacao as l where l.idLotacaoIni = :lotaTitular))"
+ " or (:lotaTitular!=null and :lotaTitular!=0 and label.dpLotacaoIni in (select l.idLotacao from DpLotacao as l where l.idLotacaoIni = :lotaTitular))"
+ " or (:titular!=null and :titular!=0 and label.dpPessoaIni in (select p.idPessoa from DpPessoa as p where p.idPessoaIni = :titular))"
- + " )"
- + " )"
- + " "
- + " and ("
+ + " )" + " )" + " " + " and ("
+ " ("
+ " (:ultMovIdEstadoDoc = null or :ultMovIdEstadoDoc = 0L) and not (label.cpMarcador.idMarcador in (3, 14, 25))"
+ " ) or label.cpMarcador.idMarcador = :ultMovIdEstadoDoc"
@@ -173,10 +150,8 @@ import br.gov.jfrj.siga.ex.BIE.ExBoletimDoc;
+ " and (:idFormaDoc = null or :idFormaDoc = 0L or doc.exFormaDocumento.idFormaDoc = :idFormaDoc)"
+ " and (:classificacaoSelId = null or :classificacaoSelId = 0L or doc.exClassificacao.idClassificacao = :classificacaoSelId)"
+ " and (:descrDocumento = null or :descrDocumento = '' or upper(doc.descrDocumentoAI) like upper('%' || :descrDocumento || '%'))"
- + " "
- + " and (:dtDoc = null or doc.dtDoc >= :dtDoc)"
- + " and (:dtDocFinal = null or doc.dtDoc <= :dtDocFinal)"
- + " "
+ + " " + " and (:dtDoc = null or doc.dtDoc >= :dtDoc)"
+ + " and (:dtDocFinal = null or doc.dtDoc <= :dtDocFinal)" + " "
+ " and (:numAntigoDoc = null or :numAntigoDoc = '' or upper (doc.numAntigoDoc) like upper('%' || :numAntigoDoc || '%')) "
+ " "
+ " and (:destinatarioSelId = null or :destinatarioSelId = 0L or doc.destinatario.idPessoa in (select p.idPessoa from DpPessoa as p where p.idPessoaIni = :destinatarioSelId))"
@@ -207,8 +182,7 @@ import br.gov.jfrj.siga.ex.BIE.ExBoletimDoc;
+ " (select exMobil.idMobil from ExMarca label where label.cpMarcador.idMarcador = 71 and label.dpPessoaIni=:idPessoaIni)) order by doc.dtDoc desc"),
@NamedQuery(name = "consultarExDocumentoClassificados", query = "select doc from ExDocumento doc left join fetch doc.exClassificacao"
+ " where doc.exClassificacao.codificacao like :mascara"
- + " and doc.orgaoUsuario.idOrgaoUsu = :idOrgaoUsuario"
- + " and doc.dtFinalizacao is not null"),
+ + " and doc.orgaoUsuario.idOrgaoUsu = :idOrgaoUsuario" + " and doc.dtFinalizacao is not null"),
@NamedQuery(name = "consultarExDocumentoClassificadosPorLotacao", query = "select doc from ExDocumento doc left join fetch doc.exClassificacao"
+ " where doc.exClassificacao.codificacao like :mascara"
+ " and (doc.lotaTitular.id = :idLotacao)"
@@ -220,8 +194,7 @@ import br.gov.jfrj.siga.ex.BIE.ExBoletimDoc;
+ " and doc.dtFinalizacao is not null"
+ " and doc.dtFinalizacao between :dataInicial and :dataFinal"
+ " order by doc.dtFinalizacao") })
-public abstract class AbstractExDocumento extends ExArquivo implements
- Serializable {
+public abstract class AbstractExDocumento extends ExArquivo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -241,9 +214,6 @@ public abstract class AbstractExDocumento extends ExArquivo implements
@Column(name = "NUM_EXPEDIENTE")
private java.lang.Long numExpediente;
- @Column(name = "CONTEUDO_TP_DOC", length = 128)
- private java.lang.String conteudoTpDoc;
-
@Column(name = "DESCR_DOCUMENTO", length = 4000)
private java.lang.String descrDocumento;
@@ -297,11 +267,6 @@ public abstract class AbstractExDocumento extends ExArquivo implements
@Column(name = "FG_ELETRONICO", nullable = false, length = 1)
private String fgEletronico;
- @Lob
- @Column(name = "CONTEUDO_BLOB_DOC")
- @Basic(fetch = FetchType.LAZY)
- private byte[] conteudoBlobDoc;
-
@Column(name = "NUM_SEQUENCIA")
private Integer numSequencia;
@@ -380,12 +345,12 @@ public abstract class AbstractExDocumento extends ExArquivo implements
@JoinColumn(name = "ID_ORGAO_DESTINATARIO")
private CpOrgao orgaoExternoDestinatario;
- @BatchSize(size=1)
+ @BatchSize(size = 1)
@OneToMany(fetch = FetchType.LAZY, mappedBy = "exDocumento")
@Sort(type = SortType.NATURAL)
private java.util.SortedSet<ExMobil> exMobilSet = new TreeSet<ExMobil>();
- @BatchSize(size=1)
+ @BatchSize(size = 1)
@OneToMany(fetch = FetchType.LAZY, mappedBy = "exDocumento")
private java.util.Set<ExBoletimDoc> exBoletimDocSet;
@@ -397,6 +362,10 @@ public abstract class AbstractExDocumento extends ExArquivo implements
@JoinColumn(name = "ID_MOB_AUTUADO")
private ExMobil exMobilAutuado;
+ @ManyToOne(fetch = FetchType.LAZY, optional = true, cascade = CascadeType.ALL)
+ @JoinColumn(name = "ID_ARQ")
+ private CpArquivo cpArquivo;
+
/**
* Simple constructor of AbstractExDocumento instances.
*/
@@ -442,20 +411,6 @@ public abstract class AbstractExDocumento extends ExArquivo implements
return cadastrante;
}
- /**
- * COMPLETAR
- */
- public byte[] getConteudoBlobDoc() {
- return this.conteudoBlobDoc;
- }
-
- /**
- * COMPLETAR
- */
- public java.lang.String getConteudoTpDoc() {
- return this.conteudoTpDoc;
- }
-
/**
* COMPLETAR
*
@@ -507,8 +462,8 @@ public abstract class AbstractExDocumento extends ExArquivo implements
}
/**
- * Retorna o objeto de relacionamento boletim x documentos relacionado a
- * este documento
+ * Retorna o objeto de relacionamento boletim x documentos relacionado a este
+ * documento
*
* @return
*/
@@ -612,14 +567,14 @@ public abstract class AbstractExDocumento extends ExArquivo implements
/**
* Retorna a lotação destinatária do documento
- * */
+ */