adição de totalizador por tipo feat #AL-2883
Fabio Faria
parent
238bf0b8d3
commit
ca04f0bd64
|
|
@ -0,0 +1,23 @@
|
|||
FROM jboss/wildfly:22.0.1.Final
|
||||
|
||||
#set do diretorio de trabalho
|
||||
WORKDIR /opt/jboss/wildfly
|
||||
|
||||
#copy do driver
|
||||
#ADD target/ventaboletosadm/WEB-INF/lib/ojdbc8.jar /target/ojdbc8-21.7.0.0.jar
|
||||
|
||||
# adicionando usuario adm
|
||||
#CMD ["/opt/jboss/wildfly/bin/add-user.sh", "-a", "admin", "rjmaster09@"]
|
||||
|
||||
ENV SCO_URL jdbc:oracle:thin:@138.219.88.188:1524/ORCLCDB
|
||||
ENV SCO_USER vtabol
|
||||
ENV SCO_PWD dev_rj_20
|
||||
|
||||
ENV READ_URL jdbc:oracle:thin:@138.219.88.188:1524/ORCLCDB
|
||||
ENV READ_USER vtabol
|
||||
ENV READ_PWD dev_rj_20
|
||||
|
||||
#ADD ./conf /opt/jboss/wildfly/standalone/configuration
|
||||
|
||||
#ADD target/*.war /opt/jboss/wildfly/standalone/deployments/
|
||||
EXPOSE 8080 9990
|
||||
|
|
@ -0,0 +1,379 @@
|
|||
pipeline {
|
||||
agent any
|
||||
|
||||
stages {
|
||||
stage('Publicação') {
|
||||
steps {
|
||||
script{
|
||||
dir("/var/jenkins_home/jobs/Adm/jobs/Adm-Project-Build/builds/$Adm_Build_NUMBER/archive/target") {
|
||||
|
||||
if(! fileExists('ventaboletosadm.war')){
|
||||
currentBuild.result = 'FAILURE'
|
||||
error('Artefato não encontrado, favor reconstruir a versão')
|
||||
}
|
||||
|
||||
switch( Empresa ){
|
||||
case "Local RJ - Qualidade":
|
||||
atualizarQa()
|
||||
break
|
||||
case "Local RJ - Dev":
|
||||
atualizarDev()
|
||||
break
|
||||
case "Ouro e Prata - Homolog":
|
||||
atualizarOuroPrata()
|
||||
break
|
||||
case "Garcia - Homolog":
|
||||
atualizarGarcia()
|
||||
break
|
||||
case "Andorinha - Homolog":
|
||||
atualizarAndorinha()
|
||||
break
|
||||
case "Planalto - Homolog":
|
||||
atualizarPlanalto()
|
||||
break
|
||||
case "Passaro Marron - Homolog":
|
||||
atualizarPMarron()
|
||||
break
|
||||
case "Ambiente QA 2":
|
||||
atualizarAmbienteQA2()
|
||||
break
|
||||
case "Unica Facil - Homolog":
|
||||
atualizarUnicaFacil()
|
||||
break
|
||||
default:
|
||||
echo "Empresa não configurada"
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
always {
|
||||
script {
|
||||
//resolvendo o card
|
||||
// step([$class: 'JiraIssueUpdateBuilder', comment: '', jqlSearch: "issue = ${Ticket}", workflowActionName: 'Em Testes'])
|
||||
currentBuild.displayName = "${Adm_Build_NAME} em ${Empresa}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarQa(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Local RJ - QA',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /home/rjconsultores/dist
|
||||
|
||||
echo "Iniciando atualização ADM QUALIDADE"
|
||||
|
||||
/dados/wildfly_qualidade_adm/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:10390 --commands="deployment deploy-file --replace /home/rjconsultores/dist/ventaboletosadm.war"
|
||||
|
||||
echo "Reiniciando ADM"
|
||||
|
||||
sudo systemctl restart wildfly_qualidade_adm
|
||||
|
||||
echo "*******************************Finalizando Atualização ADM ${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: false,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/home/rjconsultores/dist',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarDev(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Local RJ - DEV',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /tmp/adm
|
||||
|
||||
echo "Iniciando atualização ADM DEV"
|
||||
|
||||
export JAVA_HOME=/dados/jdk-11.0.5
|
||||
|
||||
/dados/wildfly_adm_dev/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9990 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
|
||||
|
||||
/usr/bin/sleep 15
|
||||
|
||||
echo "Reiniciando ADM"
|
||||
|
||||
sudo systemctl restart wildfly_adm_dev
|
||||
|
||||
echo "*******************************Finalizando Atualização ADM ${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: true,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/tmp/adm',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarOuroPrata(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Ouro e Prata - Homolog',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /tmp/adm
|
||||
|
||||
echo "**********Iniciando atualização ADM Ouro e Prata ${BUILD_NUMBER}**********"
|
||||
|
||||
/dados/wildfly_ouroeprata_adm_hml/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9990 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
|
||||
|
||||
echo "Reiniciando ADM"
|
||||
|
||||
sudo systemctl restart wildfly_ouroeprata_adm_hml
|
||||
|
||||
echo "*******************************Finalizando Atualização Ouro e Prata ADM ${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: false,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/tmp/adm',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarGarcia(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Garcia - Homolog',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /tmp/adm
|
||||
|
||||
echo "**********Iniciando atualização ADM Garcia - Homolog #${Adm_Build_NUMBER}**********"
|
||||
|
||||
/dados/wildfly_garcia_homolog/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:16990 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
|
||||
|
||||
echo "Reiniciando ADM"
|
||||
|
||||
sudo systemctl restart wildfly_garcia_homolog
|
||||
|
||||
echo "*******************************Finalizando Atualização ADM Garcia - Homolog #${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: false,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/tmp/adm',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarAndorinha(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Andorinha - Homolog',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /tmp/adm
|
||||
|
||||
echo "**********Iniciando atualização ADM Andorinha - Homolog #${Adm_Build_NUMBER}**********"
|
||||
|
||||
/dados/wildfly_andorinha_homolog/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:16590 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
|
||||
|
||||
echo "Reiniciando ADM"
|
||||
|
||||
sudo systemctl restart wildfly_andorinha_homolog
|
||||
|
||||
echo "*******************************Finalizando Atualização ADM Andorinha - Homolog #${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: false,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/tmp/adm',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarPlanalto(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Planalto - Homolog',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /tmp/adm
|
||||
|
||||
echo "**********Iniciando atualização ADM Planalto ${Adm_Build_NUMBER}**********"
|
||||
|
||||
export JAVA_HOME=/dados/jdk-11.0.5
|
||||
|
||||
/dados/wildfly_adm_planalto_homolog/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9991 --commands="deployment deploy-file --replace /home/gleimar/ventaboletosadm.war"
|
||||
|
||||
echo "Reiniciando ADM"
|
||||
|
||||
sudo systemctl restart wildfly_adm_planalto_homolog
|
||||
|
||||
echo "*******************************Finalizando Atualização Planalto ADM ${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: false,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/tmp/adm',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarPMarron(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Passaro Marron - Homolog',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /tmp/adm
|
||||
|
||||
echo "**********Iniciando atualização ADM Passaro Marron - Homolog #${Adm_Build_NUMBER}******************""
|
||||
|
||||
export JAVA_HOME=/dados/jdk-11.0.5
|
||||
|
||||
/dados/wildfly_pmarron_homolog/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9990 --commands="deployment deploy-file --replace /home/gleimar/ventaboletosadm.war"
|
||||
|
||||
/bin/sleep 15
|
||||
|
||||
echo "Reiniciando ADM"
|
||||
|
||||
systemctl restart wildfly_pmarron_homolog
|
||||
|
||||
echo "*******************************Finalizando Atualização ADM Passaro Marron - Homolog #${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: false,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/tmp/adm',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarAmbienteQA2(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Ambiente QA 2',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /tmp/adm
|
||||
|
||||
|
||||
echo "**********Iniciando atualização ADM Ambiente QA 2 ${BUILD_NUMBER}******************""
|
||||
|
||||
export JAVA_HOME=/dados/jdk-11.0.5
|
||||
|
||||
sudo /dados/wildfly_testefailover/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9990 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
|
||||
|
||||
|
||||
|
||||
/bin/sleep 15
|
||||
|
||||
sudo systemctl restart wildfly_testefailover
|
||||
|
||||
echo "*******************************Finalizando AtualizaçãoADM ${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: false,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/tmp/adm',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
||||
def atualizarUnicaFacil(){
|
||||
sshPublisher(publishers:
|
||||
[sshPublisherDesc(configName: 'Unica Facil - Homolog',
|
||||
transfers:
|
||||
[sshTransfer(cleanRemote: true,
|
||||
excludes: '',
|
||||
execCommand: '''ls -la /tmp/adm
|
||||
|
||||
|
||||
echo "**********Iniciando atualização ADM Unica Facil Homolog ${BUILD_NUMBER}******************""
|
||||
|
||||
export JAVA_HOME=/dados/jdk-11.0.5
|
||||
|
||||
/dados/wildfly_unicafacilhomolog_adm/bin/jboss-cli.sh --user=admin --password=rjmaster09 --connect controller=localhost:9992 --commands="deployment deploy-file --replace /tmp/adm/ventaboletosadm.war"
|
||||
|
||||
/bin/sleep 15
|
||||
|
||||
systemctl restart wildfly_unicafacilhomolog_adm.service
|
||||
|
||||
echo "*******************************Finalizando AtualizaçãoADM ${Adm_Build_NUMBER}*******************************"''',
|
||||
execTimeout: 120000,
|
||||
flatten: false,
|
||||
makeEmptyDirs: false,
|
||||
noDefaultExcludes: false,
|
||||
patternSeparator: '[, ]+',
|
||||
remoteDirectory: '/tmp/adm',
|
||||
remoteDirectorySDF: false,
|
||||
removePrefix: '',
|
||||
sourceFiles: '**/*.war')],
|
||||
usePromotionTimestamp: false,
|
||||
useWorkspaceInPromotion: false,
|
||||
verbose: false)])
|
||||
}
|
||||
|
||||
//=======================================================================================================================
|
||||
|
|
@ -0,0 +1,591 @@
|
|||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
|
||||
<server xmlns="urn:jboss:domain:15.0">
|
||||
<extensions>
|
||||
<extension module="org.jboss.as.clustering.infinispan"/>
|
||||
<extension module="org.jboss.as.connector"/>
|
||||
<extension module="org.jboss.as.deployment-scanner"/>
|
||||
<extension module="org.jboss.as.ee"/>
|
||||
<extension module="org.jboss.as.ejb3"/>
|
||||
<extension module="org.jboss.as.jaxrs"/>
|
||||
<extension module="org.jboss.as.jdr"/>
|
||||
<extension module="org.jboss.as.jmx"/>
|
||||
<extension module="org.jboss.as.jpa"/>
|
||||
<extension module="org.jboss.as.jsf"/>
|
||||
<extension module="org.jboss.as.logging"/>
|
||||
<extension module="org.jboss.as.mail"/>
|
||||
<extension module="org.jboss.as.naming"/>
|
||||
<extension module="org.jboss.as.pojo"/>
|
||||
<extension module="org.jboss.as.remoting"/>
|
||||
<extension module="org.jboss.as.sar"/>
|
||||
<extension module="org.jboss.as.security"/>
|
||||
<extension module="org.jboss.as.transactions"/>
|
||||
<extension module="org.jboss.as.webservices"/>
|
||||
<extension module="org.jboss.as.weld"/>
|
||||
<extension module="org.wildfly.extension.batch.jberet"/>
|
||||
<extension module="org.wildfly.extension.bean-validation"/>
|
||||
<extension module="org.wildfly.extension.clustering.web"/>
|
||||
<extension module="org.wildfly.extension.core-management"/>
|
||||
<extension module="org.wildfly.extension.discovery"/>
|
||||
<extension module="org.wildfly.extension.ee-security"/>
|
||||
<extension module="org.wildfly.extension.elytron"/>
|
||||
<extension module="org.wildfly.extension.health"/>
|
||||
<extension module="org.wildfly.extension.io"/>
|
||||
<extension module="org.wildfly.extension.metrics"/>
|
||||
<extension module="org.wildfly.extension.microprofile.config-smallrye"/>
|
||||
<extension module="org.wildfly.extension.microprofile.jwt-smallrye"/>
|
||||
<extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
|
||||
<extension module="org.wildfly.extension.request-controller"/>
|
||||
<extension module="org.wildfly.extension.security.manager"/>
|
||||
<extension module="org.wildfly.extension.undertow"/>
|
||||
</extensions>
|
||||
<management>
|
||||
<security-realms>
|
||||
<security-realm name="ManagementRealm">
|
||||
<authentication>
|
||||
<local default-user="$local" skip-group-loading="true"/>
|
||||
<properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
|
||||
</authentication>
|
||||
<authorization map-groups-to-roles="false">
|
||||
<properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
|
||||
</authorization>
|
||||
</security-realm>
|
||||
<security-realm name="ApplicationRealm">
|
||||
<server-identities>
|
||||
<ssl>
|
||||
<keystore path="application.keystore" relative-to="jboss.server.config.dir" keystore-password="password" alias="server" key-password="password" generate-self-signed-certificate-host="localhost"/>
|
||||
</ssl>
|
||||
</server-identities>
|
||||
<authentication>
|
||||
<local default-user="$local" allowed-users="*" skip-group-loading="true"/>
|
||||
<properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
|
||||
</authentication>
|
||||
<authorization>
|
||||
<properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
|
||||
</authorization>
|
||||
</security-realm>
|
||||
</security-realms>
|
||||
<audit-log>
|
||||
<formatters>
|
||||
<json-formatter name="json-formatter"/>
|
||||
</formatters>
|
||||
<handlers>
|
||||
<file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
|
||||
</handlers>
|
||||
<logger log-boot="true" log-read-only="false" enabled="false">
|
||||
<handlers>
|
||||
<handler name="file"/>
|
||||
</handlers>
|
||||
</logger>
|
||||
</audit-log>
|
||||
<management-interfaces>
|
||||
<http-interface security-realm="ManagementRealm">
|
||||
<http-upgrade enabled="true"/>
|
||||
<socket-binding http="management-http"/>
|
||||
</http-interface>
|
||||
</management-interfaces>
|
||||
<access-control provider="simple">
|
||||
<role-mapping>
|
||||
<role name="SuperUser">
|
||||
<include>
|
||||
<user name="$local"/>
|
||||
</include>
|
||||
</role>
|
||||
</role-mapping>
|
||||
</access-control>
|
||||
</management>
|
||||
<profile>
|
||||
<subsystem xmlns="urn:jboss:domain:logging:8.0">
|
||||
<console-handler name="CONSOLE">
|
||||
<level name="DEBUG"/>
|
||||
<formatter>
|
||||
<named-formatter name="COLOR-PATTERN"/>
|
||||
</formatter>
|
||||
</console-handler>
|
||||
<periodic-rotating-file-handler name="FILE" autoflush="true">
|
||||
<formatter>
|
||||
<named-formatter name="PATTERN"/>
|
||||
</formatter>
|
||||
<file relative-to="jboss.server.log.dir" path="server.log"/>
|
||||
<suffix value=".yyyy-MM-dd"/>
|
||||
<append value="true"/>
|
||||
</periodic-rotating-file-handler>
|
||||
<logger category="com.arjuna">
|
||||
<level name="DEBUG"/>
|
||||
</logger>
|
||||
<logger category="io.jaegertracing.Configuration">
|
||||
<level name="DEBUG"/>
|
||||
</logger>
|
||||
<logger category="org.jboss.as.config">
|
||||
<level name="DEBUG"/>
|
||||
</logger>
|
||||
<logger category="sun.rmi">
|
||||
<level name="DEBUG"/>
|
||||
</logger>
|
||||
<root-logger>
|
||||
<level name="DEBUG"/>
|
||||
<handlers>
|
||||
<handler name="CONSOLE"/>
|
||||
<handler name="FILE"/>
|
||||
</handlers>
|
||||
</root-logger>
|
||||
<formatter name="PATTERN">
|
||||
<pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
|
||||
</formatter>
|
||||
<formatter name="COLOR-PATTERN">
|
||||
<pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
|
||||
</formatter>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:batch-jberet:2.0">
|
||||
<default-job-repository name="in-memory"/>
|
||||
<default-thread-pool name="batch"/>
|
||||
<job-repository name="in-memory">
|
||||
<in-memory/>
|
||||
</job-repository>
|
||||
<thread-pool name="batch">
|
||||
<max-threads count="10"/>
|
||||
<keepalive-time time="30" unit="seconds"/>
|
||||
</thread-pool>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:datasources:6.0">
|
||||
<datasources>
|
||||
<datasource jndi-name="java:/sco" pool-name="sco">
|
||||
<connection-url>${SCO_URL}</connection-url>
|
||||
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
|
||||
<driver>ojdbc8.jar</driver>
|
||||
<security>
|
||||
<user-name>${SCO_USER}</user-name>
|
||||
<password>${SCO_PWD}</password>
|
||||
</security>
|
||||
<pool>
|
||||
<min-pool-size>1</min-pool-size>
|
||||
<max-pool-size>10</max-pool-size>
|
||||
<prefill>false</prefill>
|
||||
</pool>
|
||||
<validation>
|
||||
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"/>
|
||||
<background-validation>true</background-validation>
|
||||
<stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker"/>
|
||||
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"/>
|
||||
</validation>
|
||||
</datasource>
|
||||
<datasource jndi-name="java:/sco_read" pool-name="sco_read">
|
||||
<connection-url>${READ_URL}</connection-url>
|
||||
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
|
||||
<driver>ojdbc8.jar</driver>
|
||||
<security>
|
||||
<user-name>${READ_USER}</user-name>
|
||||
<password>${READ_PWD}</password>
|
||||
</security>
|
||||
<pool>
|
||||
<min-pool-size>1</min-pool-size>
|
||||
<max-pool-size>10</max-pool-size>
|
||||
<prefill>false</prefill>
|
||||
</pool>
|
||||
<validation>
|
||||
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"/>
|
||||
<background-validation>true</background-validation>
|
||||
<stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker"/>
|
||||
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"/>
|
||||
</validation>
|
||||
</datasource>
|
||||
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
|
||||
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
|
||||
<driver>h2</driver>
|
||||
<security>
|
||||
<user-name>sa</user-name>
|
||||
<password>sa</password>
|
||||
</security>
|
||||
</datasource>
|
||||
<drivers>
|
||||
<driver name="h2" module="com.h2database.h2">
|
||||
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
|
||||
</driver>
|
||||
</drivers>
|
||||
</datasources>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
|
||||
<deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:distributable-web:2.0" default-session-management="default" default-single-sign-on-management="default">
|
||||
<infinispan-session-management name="default" cache-container="web" granularity="SESSION">
|
||||
<local-affinity/>
|
||||
</infinispan-session-management>
|
||||
<infinispan-single-sign-on-management name="default" cache-container="web" cache="sso"/>
|
||||
<local-routing/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:ee:5.0">
|
||||
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
|
||||
<concurrent>
|
||||
<context-services>
|
||||
<context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
|
||||
</context-services>
|
||||
<managed-thread-factories>
|
||||
<managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
|
||||
</managed-thread-factories>
|
||||
<managed-executor-services>
|
||||
<managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/>
|
||||
</managed-executor-services>
|
||||
<managed-scheduled-executor-services>
|
||||
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
|
||||
</managed-scheduled-executor-services>
|
||||
</concurrent>
|
||||
<default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:ejb3:8.0">
|
||||
<session-bean>
|
||||
<stateless>
|
||||
<bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
|
||||
</stateless>
|
||||
<stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
|
||||
<singleton default-access-timeout="5000"/>
|
||||
</session-bean>
|
||||
<pools>
|
||||
<bean-instance-pools>
|
||||
<strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
|
||||
<strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
|
||||
</bean-instance-pools>
|
||||
</pools>
|
||||
<caches>
|
||||
<cache name="simple"/>
|
||||
<cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
|
||||
</caches>
|
||||
<passivation-stores>
|
||||
<passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
|
||||
</passivation-stores>
|
||||
<async thread-pool-name="default"/>
|
||||
<timer-service thread-pool-name="default" default-data-store="default-file-store">
|
||||
<data-stores>
|
||||
<file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
|
||||
</data-stores>
|
||||
</timer-service>
|
||||
<remote cluster="ejb" connectors="http-remoting-connector" thread-pool-name="default">
|
||||
<channel-creation-options>
|
||||
<option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
|
||||
</channel-creation-options>
|
||||
</remote>
|
||||
<thread-pools>
|
||||
<thread-pool name="default">
|
||||
<max-threads count="10"/>
|
||||
<keepalive-time time="60" unit="seconds"/>
|
||||
</thread-pool>
|
||||
</thread-pools>
|
||||
<default-security-domain value="other"/>
|
||||
<default-missing-method-permissions-deny-access value="true"/>
|
||||
<statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
|
||||
<log-system-exceptions value="true"/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:wildfly:elytron:12.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
|
||||
<providers>
|
||||
<aggregate-providers name="combined-providers">
|
||||
<providers name="elytron"/>
|
||||
<providers name="openssl"/>
|
||||
</aggregate-providers>
|
||||
<provider-loader name="elytron" module="org.wildfly.security.elytron"/>
|
||||
<provider-loader name="openssl" module="org.wildfly.openssl"/>
|
||||
</providers>
|
||||
<audit-logging>
|
||||
<file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir" format="JSON"/>
|
||||
</audit-logging>
|
||||
<security-domains>
|
||||
<security-domain name="ApplicationDomain" default-realm="ApplicationRealm" permission-mapper="default-permission-mapper">
|
||||
<realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
|
||||
<realm name="local"/>
|
||||
</security-domain>
|
||||
<security-domain name="ManagementDomain" default-realm="ManagementRealm" permission-mapper="default-permission-mapper">
|
||||
<realm name="ManagementRealm" role-decoder="groups-to-roles"/>
|
||||
<realm name="local" role-mapper="super-user-mapper"/>
|
||||
</security-domain>
|
||||
</security-domains>
|
||||
<security-realms>
|
||||
<identity-realm name="local" identity="$local"/>
|
||||
<properties-realm name="ApplicationRealm">
|
||||
<users-properties path="application-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ApplicationRealm"/>
|
||||
<groups-properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
|
||||
</properties-realm>
|
||||
<properties-realm name="ManagementRealm">
|
||||
<users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ManagementRealm"/>
|
||||
<groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
|
||||
</properties-realm>
|
||||
</security-realms>
|
||||
<mappers>
|
||||
<simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
|
||||
<permission-mapping>
|
||||
<principal name="anonymous"/>
|
||||
<permission-set name="default-permissions"/>
|
||||
</permission-mapping>
|
||||
<permission-mapping match-all="true">
|
||||
<permission-set name="login-permission"/>
|
||||
<permission-set name="default-permissions"/>
|
||||
</permission-mapping>
|
||||
</simple-permission-mapper>
|
||||
<constant-realm-mapper name="local" realm-name="local"/>
|
||||
<simple-role-decoder name="groups-to-roles" attribute="groups"/>
|
||||
<constant-role-mapper name="super-user-mapper">
|
||||
<role name="SuperUser"/>
|
||||
</constant-role-mapper>
|
||||
</mappers>
|
||||
<permission-sets>
|
||||
<permission-set name="login-permission">
|
||||
<permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
|
||||
</permission-set>
|
||||
<permission-set name="default-permissions">
|
||||
<permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
|
||||
<permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission" module="org.wildfly.transaction.client"/>
|
||||
<permission class-name="org.jboss.ejb.client.RemoteEJBPermission" module="org.jboss.ejb-client"/>
|
||||
</permission-set>
|
||||
</permission-sets>
|
||||
<http>
|
||||
<http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
|
||||
<mechanism-configuration>
|
||||
<mechanism mechanism-name="DIGEST">
|
||||
<mechanism-realm realm-name="ManagementRealm"/>
|
||||
</mechanism>
|
||||
</mechanism-configuration>
|
||||
</http-authentication-factory>
|
||||
<provider-http-server-mechanism-factory name="global"/>
|
||||
</http>
|
||||
<sasl>
|
||||
<sasl-authentication-factory name="application-sasl-authentication" sasl-server-factory="configured" security-domain="ApplicationDomain">
|
||||
<mechanism-configuration>
|
||||
<mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
|
||||
<mechanism mechanism-name="DIGEST-MD5">
|
||||
<mechanism-realm realm-name="ApplicationRealm"/>
|
||||
</mechanism>
|
||||
</mechanism-configuration>
|
||||
</sasl-authentication-factory>
|
||||
<sasl-authentication-factory name="management-sasl-authentication" sasl-server-factory="configured" security-domain="ManagementDomain">
|
||||
<mechanism-configuration>
|
||||
<mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
|
||||
<mechanism mechanism-name="DIGEST-MD5">
|
||||
<mechanism-realm realm-name="ManagementRealm"/>
|
||||
</mechanism>
|
||||
</mechanism-configuration>
|
||||
</sasl-authentication-factory>
|
||||
<configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
|
||||
<properties>
|
||||
<property name="wildfly.sasl.local-user.default-user" value="$local"/>
|
||||
</properties>
|
||||
</configurable-sasl-server-factory>
|
||||
<mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
|
||||
<filters>
|
||||
<filter provider-name="WildFlyElytron"/>
|
||||
</filters>
|
||||
</mechanism-provider-filtering-sasl-server-factory>
|
||||
<provider-sasl-server-factory name="global"/>
|
||||
</sasl>
|
||||
<tls>
|
||||
<key-stores>
|
||||
<key-store name="applicationKS">
|
||||
<credential-reference clear-text="password"/>
|
||||
<implementation type="JKS"/>
|
||||
<file path="application.keystore" relative-to="jboss.server.config.dir"/>
|
||||
</key-store>
|
||||
</key-stores>
|
||||
<key-managers>
|
||||
<key-manager name="applicationKM" key-store="applicationKS" generate-self-signed-certificate-host="localhost">
|
||||
<credential-reference clear-text="password"/>
|
||||
</key-manager>
|
||||
</key-managers>
|
||||
<server-ssl-contexts>
|
||||
<server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
|
||||
</server-ssl-contexts>
|
||||
</tls>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
|
||||
<subsystem xmlns="urn:jboss:domain:infinispan:11.0">
|
||||
<cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
|
||||
<local-cache name="passivation">
|
||||
<file-store passivation="true" purge="false"/>
|
||||
</local-cache>
|
||||
</cache-container>
|
||||
<cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
|
||||
<local-cache name="passivation">
|
||||
<file-store passivation="true" purge="false"/>
|
||||
</local-cache>
|
||||
<local-cache name="sso"/>
|
||||
</cache-container>
|
||||
<cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
|
||||
<local-cache name="default"/>
|
||||
</cache-container>
|
||||
<cache-container name="hibernate" module="org.infinispan.hibernate-cache">
|
||||
<local-cache name="entity">
|
||||
<heap-memory size="10000"/>
|
||||
<expiration max-idle="100000"/>
|
||||
</local-cache>
|
||||
<local-cache name="local-query">
|
||||
<heap-memory size="10000"/>
|
||||
<expiration max-idle="100000"/>
|
||||
</local-cache>
|
||||
<local-cache name="timestamps"/>
|
||||
<local-cache name="pending-puts">
|
||||
<expiration max-idle="60000"/>
|
||||
</local-cache>
|
||||
</cache-container>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:io:3.0">
|
||||
<worker name="default"/>
|
||||
<buffer-pool name="default"/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:jaxrs:2.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:jca:5.0">
|
||||
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
|
||||
<bean-validation enabled="true"/>
|
||||
<default-workmanager>
|
||||
<short-running-threads>
|
||||
<core-threads count="50"/>
|
||||
<queue-length count="50"/>
|
||||
<max-threads count="50"/>
|
||||
<keepalive-time time="10" unit="seconds"/>
|
||||
</short-running-threads>
|
||||
<long-running-threads>
|
||||
<core-threads count="50"/>
|
||||
<queue-length count="50"/>
|
||||
<max-threads count="50"/>
|
||||
<keepalive-time time="10" unit="seconds"/>
|
||||
</long-running-threads>
|
||||
</default-workmanager>
|
||||
<cached-connection-manager/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:jmx:1.3">
|
||||
<expose-resolved-model/>
|
||||
<expose-expression-model/>
|
||||
<remoting-connector/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:jpa:1.1">
|
||||
<jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
|
||||
<subsystem xmlns="urn:jboss:domain:mail:4.0">
|
||||
<mail-session name="default" jndi-name="java:jboss/mail/Default">
|
||||
<smtp-server outbound-socket-binding-ref="mail-smtp"/>
|
||||
</mail-session>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:wildfly:metrics:1.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:wildfly}"/>
|
||||
<subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
|
||||
<subsystem xmlns="urn:wildfly:microprofile-jwt-smallrye:1.0"/>
|
||||
<subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:3.0" default-tracer="jaeger">
|
||||
<jaeger-tracer name="jaeger">
|
||||
<sampler-configuration sampler-type="const" sampler-param="1.0"/>
|
||||
</jaeger-tracer>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:naming:2.0">
|
||||
<remote-naming/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:remoting:4.0">
|
||||
<http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:resource-adapters:6.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:sar:1.0"/>
|
||||
<subsystem xmlns="urn:jboss:domain:security:2.0">
|
||||
<security-domains>
|
||||
<security-domain name="other" cache-type="default">
|
||||
<authentication>
|
||||
<login-module code="Remoting" flag="optional">
|
||||
<module-option name="password-stacking" value="useFirstPass"/>
|
||||
</login-module>
|
||||
<login-module code="RealmDirect" flag="required">
|
||||
<module-option name="password-stacking" value="useFirstPass"/>
|
||||
</login-module>
|
||||
</authentication>
|
||||
</security-domain>
|
||||
<security-domain name="jboss-web-policy" cache-type="default">
|
||||
<authorization>
|
||||
<policy-module code="Delegating" flag="required"/>
|
||||
</authorization>
|
||||
</security-domain>
|
||||
<security-domain name="jaspitest" cache-type="default">
|
||||
<authentication-jaspi>
|
||||
<login-module-stack name="dummy">
|
||||
<login-module code="Dummy" flag="optional"/>
|
||||
</login-module-stack>
|
||||
<auth-module code="Dummy"/>
|
||||
</authentication-jaspi>
|
||||
</security-domain>
|
||||
<security-domain name="jboss-ejb-policy" cache-type="default">
|
||||
<authorization>
|
||||
<policy-module code="Delegating" flag="required"/>
|
||||
</authorization>
|
||||
</security-domain>
|
||||
</security-domains>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:security-manager:1.0">
|
||||
<deployment-permissions>
|
||||
<maximum-set>
|
||||
<permission class="java.security.AllPermission"/>
|
||||
</maximum-set>
|
||||
</deployment-permissions>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:transactions:5.0">
|
||||
<core-environment node-identifier="${jboss.tx.node.id:1}">
|
||||
<process-id>
|
||||
<uuid/>
|
||||
</process-id>
|
||||
</core-environment>
|
||||
<recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
|
||||
<coordinator-environment statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
|
||||
<object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:undertow:11.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
|
||||
<buffer-cache name="default"/>
|
||||
<server name="default-server">
|
||||
<http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true"/>
|
||||
<https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/>
|
||||
<host name="default-host" alias="localhost">
|
||||
<location name="/" handler="welcome-content"/>
|
||||
<http-invoker security-realm="ApplicationRealm"/>
|
||||
</host>
|
||||
</server>
|
||||
<servlet-container name="default">
|
||||
<jsp-config/>
|
||||
<websockets/>
|
||||
</servlet-container>
|
||||
<handlers>
|
||||
<file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
|
||||
</handlers>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:webservices:2.0" statistics-enabled="${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}}">
|
||||
<wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
|
||||
<endpoint-config name="Standard-Endpoint-Config"/>
|
||||
<endpoint-config name="Recording-Endpoint-Config">
|
||||
<pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
|
||||
<handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
|
||||
</pre-handler-chain>
|
||||
</endpoint-config>
|
||||
<client-config name="Standard-Client-Config"/>
|
||||
</subsystem>
|
||||
<subsystem xmlns="urn:jboss:domain:weld:4.0"/>
|
||||
</profile>
|
||||
<interfaces>
|
||||
<interface name="management">
|
||||
<inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
|
||||
</interface>
|
||||
<interface name="public">
|
||||
<inet-address value="${jboss.bind.address:127.0.0.1}"/>
|
||||
</interface>
|
||||
</interfaces>
|
||||
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
|
||||
<socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
|
||||
<socket-binding name="http" port="${jboss.http.port:8080}"/>
|
||||
<socket-binding name="https" port="${jboss.https.port:8443}"/>
|
||||
<socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
|
||||
<socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
|
||||
<socket-binding name="txn-recovery-environment" port="4712"/>
|
||||
<socket-binding name="txn-status-manager" port="4713"/>
|
||||
<outbound-socket-binding name="mail-smtp">
|
||||
<remote-destination host="${jboss.mail.server.host:localhost}" port="${jboss.mail.server.port:25}"/>
|
||||
</outbound-socket-binding>
|
||||
</socket-binding-group>
|
||||
<deployments>
|
||||
<deployment name="ojdbc8-21.7.0.0.jar" runtime-name="ojdbc8-21.7.0.0.jar">
|
||||
<content sha1="76f2f84c383ef45832b3eea6b5fb3a6edb873b93"/>
|
||||
</deployment>
|
||||
</deployments>
|
||||
</server>
|
||||
2
pom.xml
2
pom.xml
|
|
@ -4,7 +4,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>br.com.rjconsultores</groupId>
|
||||
<artifactId>ventaboletosadm</artifactId>
|
||||
<version>1.19.2</version>
|
||||
<version>1.20.0</version>
|
||||
<packaging>war</packaging>
|
||||
|
||||
<properties>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,12 @@ package com.rjconsultores.ventaboletos.relatorios.impl;
|
|||
|
||||
import java.sql.Connection;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.Timestamp;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
|
||||
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
|
||||
|
||||
public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
|
||||
|
|
@ -27,13 +24,9 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
|
|||
Map<String, Object> parametros = this.relatorio.getParametros();
|
||||
|
||||
Date dataIncial = (Date) parametros.get("DATA_INICIAL");
|
||||
|
||||
Date dataFinal = (Date) parametros.get("DATA_FINAL");
|
||||
|
||||
Integer empresa = (Integer) parametros.get("EMPRESA");
|
||||
|
||||
Integer agencia = (Integer) parametros.get("AGENCIA");
|
||||
|
||||
Short formaPagoId = (Short) parametros.get("FORMA_PAGO");
|
||||
|
||||
StringBuilder where = new StringBuilder();
|
||||
|
|
@ -54,6 +47,7 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
|
|||
if (agencia != null) {
|
||||
where.append(" AND pv.PUNTOVENTA_ID = " + agencia + " ");
|
||||
}
|
||||
|
||||
if (formaPagoId != null) {
|
||||
where.append(" AND cfp.FORMAPAGO_ID = " + formaPagoId + " ");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,19 @@ FORMA_PAG = FORMA DE PAG.
|
|||
VALOR = TARIFA
|
||||
PEDAGIO = PEDÁGIO
|
||||
SEGURO = SEGURO
|
||||
SEGURO_OPCIONAL = SEGURO OPCIONAL
|
||||
SEGURO_OPCIONAL = SEG. OPCION.
|
||||
TAXAS = TAXAS
|
||||
TOTAL = TOTAL
|
||||
QTDE = QTDE
|
||||
|
||||
#Labels cabeçalho
|
||||
cabecalho.relatorio=Relatório:
|
||||
cabecalho.periodo=Período:
|
||||
cabecalho.periodoA=à
|
||||
cabecalho.dataHora=Data/Hora:
|
||||
cabecalho.impressorPor=Impresso por:
|
||||
cabecalho.pagina=Página
|
||||
cabecalho.de=de
|
||||
cabecalho.filtros=Filtros:
|
||||
|
||||
msg.noData=Não foi possivel obter dados com os parâmetros informados.
|
||||
|
|
@ -14,4 +14,14 @@ TAXAS = TAXAS
|
|||
TOTAL = TOTAL
|
||||
QTDE = QTDE
|
||||
|
||||
#Labels cabeçalho
|
||||
cabecalho.relatorio=Relatório:
|
||||
cabecalho.periodo=Período:
|
||||
cabecalho.periodoA=à
|
||||
cabecalho.dataHora=Data/Hora:
|
||||
cabecalho.impressorPor=Impresso por:
|
||||
cabecalho.pagina=Página
|
||||
cabecalho.de=de
|
||||
cabecalho.filtros=Filtros:
|
||||
|
||||
msg.noData=Não foi possivel obter dados com os parâmetros informados.
|
||||
Binary file not shown.
|
|
@ -1,12 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioFormaPagamentoAgencia" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283">
|
||||
<property name="ireport.zoom" value="2.143588810000011"/>
|
||||
<property name="ireport.zoom" value="1.0000000000000004"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/>
|
||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/>
|
||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
|
||||
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
|
||||
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
|
||||
<style name="Crosstab Data Text" hAlign="Center"/>
|
||||
<parameter name="DATA_INICIAL" class="java.util.Date"/>
|
||||
<parameter name="DATA_FINAL" class="java.util.Date"/>
|
||||
<parameter name="NOME_USUARIO" class="java.lang.String"/>
|
||||
<parameter name="USUARIO" class="java.lang.String"/>
|
||||
<parameter name="USUARIO_ID" class="java.lang.String"/>
|
||||
<parameter name="FILTROS" class="java.lang.String"/>
|
||||
<queryString language="SQL">
|
||||
<![CDATA[]]>
|
||||
</queryString>
|
||||
|
|
@ -45,133 +52,172 @@
|
|||
<band splitType="Stretch"/>
|
||||
</background>
|
||||
<pageHeader>
|
||||
<band height="45">
|
||||
<band height="43">
|
||||
<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.FreeLayout"/>
|
||||
<textField>
|
||||
<reportElement uuid="3152d9c0-592e-4136-b3d8-2a674e779468" mode="Opaque" x="0" y="20" width="66" height="20" backcolor="#CCCCCC"/>
|
||||
<textElement markup="none">
|
||||
<font isBold="true"/>
|
||||
<reportElement uuid="3152d9c0-592e-4136-b3d8-2a674e779468" mode="Opaque" x="0" y="16" width="59" height="16" backcolor="#FFFFFF">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Left" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{PERIODO}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$R{cabecalho.filtros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="50b8071e-9e65-49d2-bd12-b9354502caf3" mode="Opaque" x="0" y="0" width="613" height="20" backcolor="#CCCCCC"/>
|
||||
<reportElement uuid="50b8071e-9e65-49d2-bd12-b9354502caf3" mode="Opaque" x="0" y="0" width="500" height="16" backcolor="#FFFFFF">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement markup="none">
|
||||
<font size="14" isBold="true"/>
|
||||
<font size="12" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{TITULO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement uuid="c45a1ecd-8b5e-4bd7-9139-56e0844cea7e" mode="Opaque" x="144" y="20" width="54" height="20" backcolor="#CCCCCC"/>
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement uuid="07dfa225-148c-4de6-a428-3c91f83c4081" stretchType="RelativeToTallestObject" mode="Opaque" x="59" y="16" width="614" height="15" backcolor="#FFFFFF">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement>
|
||||
<font isBold="true"/>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<text><![CDATA[ - ]]></text>
|
||||
</staticText>
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement uuid="07dfa225-148c-4de6-a428-3c91f83c4081" mode="Opaque" x="66" y="20" width="79" height="20" backcolor="#CCCCCC"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement uuid="3948e59f-21d8-47c8-8077-a57af30605c5" mode="Opaque" x="198" y="20" width="415" height="20" backcolor="#CCCCCC"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="7e62b5c0-9626-4774-b650-1dc0906be19d" x="1" y="40" width="801" height="1"/>
|
||||
</line>
|
||||
<textField pattern="dd/MM/yyyy HH:mm">
|
||||
<reportElement uuid="eeee2daa-07e2-427c-9b9a-9fdb48f7a4ea" mode="Opaque" x="700" y="0" width="102" height="20" backcolor="#CDCDCD"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
|
||||
<reportElement uuid="ca2c2d81-3bdc-4351-b3c5-3c8e492a9251" mode="Transparent" x="673" y="0" width="129" height="16" forecolor="#000000" backcolor="#FFFFFF">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="dd78670d-f524-42f3-b915-eec9faf69a27" mode="Opaque" x="613" y="20" width="72" height="20" backcolor="#CDCDCD"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}]]></textFieldExpression>
|
||||
<reportElement uuid="eb7f6343-8d88-47bc-ad23-92998f284670" x="486" y="0" width="187" height="16">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="10" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="d7f6f595-b82b-4a05-9433-9313538db864" mode="Opaque" x="685" y="20" width="117" height="20" backcolor="#CDCDCD"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$P{USUARIO_ID}+"-"+$P{NOME_USUARIO}]]></textFieldExpression>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="20f88429-9716-45bb-8c22-b5c85b175bdf" mode="Transparent" x="673" y="16" width="98" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="d219b329-181b-4ef6-b4f6-b624acb75988" mode="Opaque" x="613" y="0" width="87" height="20" backcolor="#CDCDCD"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
|
||||
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="5e1ad619-ea2d-41b4-ac61-1f3d750d4560" mode="Transparent" x="772" y="16" width="30" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||
<box leftPadding="2"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="3e7f1b34-a254-4931-a7d0-2a99f113d73f" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="31" width="801" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.5"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</pageHeader>
|
||||
<columnHeader>
|
||||
<band height="37">
|
||||
<band height="15">
|
||||
<textField>
|
||||
<reportElement uuid="333a50a8-5d67-42b5-b3c6-2d70ceabfe25" x="0" y="0" width="66" height="36"/>
|
||||
<reportElement uuid="333a50a8-5d67-42b5-b3c6-2d70ceabfe25" x="0" y="0" width="77" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box leftPadding="0"/>
|
||||
<textElement markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{DATA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4" x="66" y="0" width="132" height="36"/>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<reportElement uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4" x="77" y="0" width="118" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Left" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{AGENCIA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="9457e696-5c75-4983-98c3-9dc4fc54e976" x="198" y="0" width="87" height="36"/>
|
||||
<reportElement uuid="9457e696-5c75-4983-98c3-9dc4fc54e976" x="195" y="0" width="87" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{FORMA_PAG}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="ab54d7e9-29fd-42da-9721-07fe99bb8874" x="285" y="0" width="69" height="36"/>
|
||||
<reportElement uuid="ab54d7e9-29fd-42da-9721-07fe99bb8874" x="282" y="0" width="70" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{VALOR}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="fafe4849-b6d5-4a20-ab2c-bb3551337bbd" x="354" y="0" width="70" height="36"/>
|
||||
<reportElement uuid="fafe4849-b6d5-4a20-ab2c-bb3551337bbd" x="352" y="0" width="70" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{PEDAGIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="52cf4306-6208-414e-8892-3085a69fa84a" x="424" y="0" width="77" height="36"/>
|
||||
<reportElement uuid="52cf4306-6208-414e-8892-3085a69fa84a" x="422" y="0" width="70" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{SEGURO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="be9f28a6-e16c-49af-a1ae-a806a4a835d8" x="613" y="0" width="60" height="36"/>
|
||||
<reportElement uuid="be9f28a6-e16c-49af-a1ae-a806a4a835d8" x="562" y="0" width="70" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{TAXAS}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="218e15c9-18bd-4ec5-9ff1-36b5e016569e" x="673" y="0" width="67" height="36"/>
|
||||
<reportElement uuid="218e15c9-18bd-4ec5-9ff1-36b5e016569e" x="632" y="0" width="100" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{TOTAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="33fdc3c8-28af-450b-9afb-bffbe50ff8b8" x="0" y="36" width="801" height="1"/>
|
||||
</line>
|
||||
<textField>
|
||||
<reportElement uuid="478182fa-9c5c-4e61-8719-e4b056b80585" x="740" y="0" width="62" height="36"/>
|
||||
<reportElement uuid="478182fa-9c5c-4e61-8719-e4b056b80585" x="732" y="0" width="69" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{QTDE}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="fd782db0-7497-4596-8ace-8adbd28b895a" x="501" y="0" width="112" height="36"/>
|
||||
<reportElement uuid="fd782db0-7497-4596-8ace-8adbd28b895a" x="492" y="0" width="70" height="15">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -180,59 +226,109 @@
|
|||
</band>
|
||||
</columnHeader>
|
||||
<detail>
|
||||
<band height="34" splitType="Stretch">
|
||||
<band height="15" splitType="Stretch">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="66455995-be07-4062-8234-ade8ccfd79c0" x="0" y="0" width="66" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="66455995-be07-4062-8234-ade8ccfd79c0" x="0" y="0" width="77" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$F{DATA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="151a46f2-5c54-4a0e-91c2-a49986a08cff" x="198" y="0" width="87" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="151a46f2-5c54-4a0e-91c2-a49986a08cff" stretchType="RelativeToTallestObject" x="195" y="0" width="87" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$F{FORMA_PAGAMENTO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab" x="66" y="0" width="132" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{AGENCIA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="d2f490c1-e807-4243-a3e0-b86229a83c6b" x="285" y="0" width="69" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="d2f490c1-e807-4243-a3e0-b86229a83c6b" x="282" y="0" width="70" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$F{TARIFA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="dcb305f9-8649-4440-a485-4ada6876b066" x="673" y="0" width="67" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="dcb305f9-8649-4440-a485-4ada6876b066" x="632" y="0" width="100" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$F{TOTAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="acacd737-9c59-4893-ac3a-ab43c1909a69" x="740" y="0" width="62" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="acacd737-9c59-4893-ac3a-ab43c1909a69" x="732" y="0" width="69" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$F{QTDE}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="a3119d26-2d10-40c5-98dc-bf0f6be3fc25" x="354" y="0" width="70" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="a3119d26-2d10-40c5-98dc-bf0f6be3fc25" x="352" y="0" width="70" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$F{PEDAGIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="ccad4f84-243a-47cf-904a-15c4ba7feee4" x="424" y="0" width="77" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="ccad4f84-243a-47cf-904a-15c4ba7feee4" x="422" y="0" width="70" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$F{SEGURO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="d098d054-0eef-474a-91d3-c7ea9090ab74" x="613" y="0" width="60" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="d098d054-0eef-474a-91d3-c7ea9090ab74" x="562" y="0" width="70" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$F{TAXA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="48f4dece-76dc-4445-89f3-73c0537c8bf9" x="501" y="0" width="112" height="34" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="48f4dece-76dc-4445-89f3-73c0537c8bf9" x="492" y="0" width="70" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{SEGURO_OPCIONAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab" stretchType="RelativeToTallestObject" x="77" y="0" width="118" height="15" isPrintWhenDetailOverflows="true">
|
||||
<property name="com.jaspersoft.studio.unit.height" value="px"/>
|
||||
</reportElement>
|
||||
<box>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Left">
|
||||
<font size="9"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{AGENCIA}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</detail>
|
||||
<columnFooter>
|
||||
|
|
@ -242,72 +338,133 @@
|
|||
<band/>
|
||||
</lastPageFooter>
|
||||
<summary>
|
||||
<band height="50">
|
||||
<band height="89">
|
||||
<staticText>
|
||||
<reportElement uuid="23836f01-2215-4ba5-8d68-59a493e7f45a" x="198" y="8" width="87" height="20"/>
|
||||
<reportElement uuid="23836f01-2215-4ba5-8d68-59a493e7f45a" x="0" y="8" width="282" height="15"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<text><![CDATA[Total]]></text>
|
||||
<text><![CDATA[Total Geral:]]></text>
|
||||
</staticText>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="26a2768f-98c4-40d6-8437-a3431e29767d" x="424" y="8" width="77" height="20"/>
|
||||
<reportElement uuid="26a2768f-98c4-40d6-8437-a3431e29767d" x="422" y="8" width="70" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{SEGURO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="c3d56b38-e963-4eb8-8c1d-631bc26d3c68" x="354" y="8" width="70" height="20"/>
|
||||
<reportElement uuid="c3d56b38-e963-4eb8-8c1d-631bc26d3c68" x="352" y="8" width="70" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{PEDAGIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="0fa428cd-c4aa-434a-801a-4c7e78182391" x="613" y="8" width="60" height="20"/>
|
||||
<reportElement uuid="0fa428cd-c4aa-434a-801a-4c7e78182391" x="562" y="8" width="70" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{TAXA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="2e8ebe5a-ea49-4132-8b8b-2620bfbd0f60" x="673" y="8" width="67" height="20"/>
|
||||
<reportElement uuid="2e8ebe5a-ea49-4132-8b8b-2620bfbd0f60" x="632" y="8" width="100" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{TOTAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="###0" isBlankWhenNull="true">
|
||||
<reportElement uuid="bdbb35f4-3d9d-4dcb-a849-30bb1ce38361" x="740" y="8" width="62" height="20"/>
|
||||
<reportElement uuid="bdbb35f4-3d9d-4dcb-a849-30bb1ce38361" x="732" y="8" width="69" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{QTDE}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="29cf051d-d1b2-4744-932b-9e8adb6b254d" x="1" y="5" width="801" height="1"/>
|
||||
</line>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="6b7dcb42-1af8-4243-89d7-50d6bf0d9ba5" x="285" y="8" width="69" height="20"/>
|
||||
<reportElement uuid="6b7dcb42-1af8-4243-89d7-50d6bf0d9ba5" x="282" y="8" width="70" height="15"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{TARIFA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="993c02bc-fc54-4efc-bd4a-5fd5f3226937" x="501" y="8" width="112" height="20"/>
|
||||
<reportElement uuid="993c02bc-fc54-4efc-bd4a-5fd5f3226937" x="492" y="8" width="70" height="15"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{SEGURO_OPCIONAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<crosstab isRepeatColumnHeaders="false" isRepeatRowHeaders="false">
|
||||
<reportElement uuid="e0606f96-28f5-4064-8e92-ece9376a82f0" x="282" y="55" width="340" height="25"/>
|
||||
<rowGroup name="FORMA_PAGAMENTO" width="210">
|
||||
<bucket class="java.lang.String">
|
||||
<bucketExpression><![CDATA[$F{FORMA_PAGAMENTO}]]></bucketExpression>
|
||||
</bucket>
|
||||
<crosstabRowHeader>
|
||||
<cellContents backcolor="#FFFFFF" mode="Opaque">
|
||||
<textField>
|
||||
<reportElement uuid="15f4cc70-6b11-4b98-b618-672fbe59aba3" style="Crosstab Data Text" x="0" y="0" width="210" height="20"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA["Total "+$V{FORMA_PAGAMENTO}]]></textFieldExpression>
|
||||
</textField>
|
||||
</cellContents>
|
||||
</crosstabRowHeader>
|
||||
<crosstabTotalRowHeader>
|
||||
<cellContents/>
|
||||
</crosstabTotalRowHeader>
|
||||
</rowGroup>
|
||||
<columnGroup name="TOTAL" height="5" totalPosition="End">
|
||||
<bucket class="java.lang.Double">
|
||||
<bucketExpression><![CDATA[$F{TOTAL}]]></bucketExpression>
|
||||
</bucket>
|
||||
<crosstabColumnHeader>
|
||||
<cellContents backcolor="#F0F8FF" mode="Transparent"/>
|
||||
</crosstabColumnHeader>
|
||||
<crosstabTotalColumnHeader>
|
||||
<cellContents backcolor="#FFFFFF" mode="Opaque"/>
|
||||
</crosstabTotalColumnHeader>
|
||||
</columnGroup>
|
||||
<measure name="TOTALMeasure" class="java.lang.Double" calculation="Sum">
|
||||
<measureExpression><![CDATA[$F{TOTAL}]]></measureExpression>
|
||||
</measure>
|
||||
<crosstabCell width="0" height="20">
|
||||
<cellContents style="Crosstab Data Text"/>
|
||||
</crosstabCell>
|
||||
<crosstabCell height="25" rowTotalGroup="FORMA_PAGAMENTO">
|
||||
<cellContents backcolor="#BFE1FF" mode="Opaque">
|
||||
<textField>
|
||||
<reportElement uuid="2ea76f60-8961-49b5-a689-9a49cafd4731" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$V{TOTALMeasure}]]></textFieldExpression>
|
||||
</textField>
|
||||
</cellContents>
|
||||
</crosstabCell>
|
||||
<crosstabCell width="120" height="20" columnTotalGroup="TOTAL">
|
||||
<cellContents backcolor="#FFFFFF" mode="Opaque" style="Crosstab Data Text">
|
||||
<textField>
|
||||
<reportElement uuid="d946453b-6412-4485-b2f8-cf74cebafaa3" style="Crosstab Data Text" x="0" y="0" width="120" height="20"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$V{TOTALMeasure}]]></textFieldExpression>
|
||||
</textField>
|
||||
</cellContents>
|
||||
</crosstabCell>
|
||||
<crosstabCell rowTotalGroup="FORMA_PAGAMENTO" columnTotalGroup="TOTAL">
|
||||
<cellContents backcolor="#BFE1FF" mode="Opaque">
|
||||
<textField>
|
||||
<reportElement uuid="6961a0e3-e27f-45d8-b6ec-5d4bf93a9862" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$V{TOTALMeasure}]]></textFieldExpression>
|
||||
</textField>
|
||||
</cellContents>
|
||||
</crosstabCell>
|
||||
</crosstab>
|
||||
</band>
|
||||
</summary>
|
||||
<noData>
|
||||
<band height="45">
|
||||
<textField>
|
||||
<reportElement uuid="6c28de84-ceae-409b-bde5-04f66cb9a805" x="198" y="12" width="530" height="20"/>
|
||||
<reportElement uuid="6c28de84-ceae-409b-bde5-04f66cb9a805" x="0" y="0" width="802" height="45"/>
|
||||
<textElement markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
|
|||
@Scope("prototype")
|
||||
public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
|
||||
|
||||
private static final String TODAS = "Todas; ";
|
||||
/**
|
||||
*
|
||||
*/
|
||||
|
|
@ -146,14 +147,15 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
|
|||
this.fecInicio = fecInicio;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public void onClick$btnInforme(Event e) throws Exception {
|
||||
StringBuilder filtro = new StringBuilder();
|
||||
|
||||
Date dataInicio = fecInicio.getValue();
|
||||
Date dataFinal = fecFinal.getValue();
|
||||
|
||||
SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy");
|
||||
|
||||
Map argsInforme = new HashMap();
|
||||
Map<String, Object> argsInforme = new HashMap<>();
|
||||
|
||||
if(!considerarRuta.isChecked()){
|
||||
argsInforme.put("DATA_INICIAL", dataInicio);
|
||||
|
|
@ -163,35 +165,58 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
|
|||
argsInforme.put("DATA_FINAL", dt.format(dataFinal));
|
||||
}
|
||||
|
||||
filtro.append("Periodo: ");
|
||||
filtro.append(dt.format(dataInicio)).append(" a ");
|
||||
filtro.append(dt.format(dataFinal)).append("; ");
|
||||
|
||||
argsInforme.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
|
||||
argsInforme.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario().toString());
|
||||
argsInforme.put("USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario());
|
||||
|
||||
filtro.append("Empresa: ");
|
||||
if (cmbEmpresa.isValid() && cmbEmpresa.getSelectedItem() != null) {
|
||||
Integer empresaId = ((Empresa)cmbEmpresa.getSelectedItem().getValue()).getEmpresaId();
|
||||
argsInforme.put("EMPRESA", empresaId);
|
||||
Empresa empresa = ((Empresa)cmbEmpresa.getSelectedItem().getValue());
|
||||
argsInforme.put("EMPRESA", empresa.getEmpresaId());
|
||||
filtro.append(empresa.getNombempresa()).append("; ");
|
||||
}else {
|
||||
filtro.append(TODAS);
|
||||
}
|
||||
|
||||
filtro.append("Agência: ");
|
||||
if (cmbAgencia.getSelectedItem() != null) {
|
||||
Integer agencia = ((PuntoVenta) cmbAgencia.getSelectedItem().getValue()).getPuntoventaId();
|
||||
argsInforme.put("AGENCIA", agencia);
|
||||
PuntoVenta agencia = ((PuntoVenta) cmbAgencia.getSelectedItem().getValue());
|
||||
argsInforme.put("AGENCIA", agencia.getPuntoventaId());
|
||||
filtro.append(agencia.getNombpuntoventa()).append("; ");
|
||||
}else {
|
||||
filtro.append(TODAS);
|
||||
}
|
||||
|
||||
filtro.append("Linha: ");
|
||||
if (considerarRuta.isChecked() && listSelectedRutas != null && !listSelectedRutas.isEmpty()) {
|
||||
String idsRutas = "";
|
||||
StringBuilder idsRutas = new StringBuilder();
|
||||
StringBuilder linhas = new StringBuilder();
|
||||
for(Ruta r : listSelectedRutas){
|
||||
idsRutas = idsRutas + r.getRutaId()+",";
|
||||
idsRutas.append(r.getRutaId()).append(", ");
|
||||
linhas.append(r.getDescruta()).append(", ");
|
||||
}
|
||||
|
||||
argsInforme.put("RUTAS_IDS", idsRutas.substring(0, idsRutas.length()-1));
|
||||
argsInforme.put("RUTAS_IDS", idsRutas.substring(0, idsRutas.length()-2));
|
||||
filtro.append(linhas.substring(0, idsRutas.length()-2));
|
||||
}else {
|
||||
filtro.append(TODAS);
|
||||
}
|
||||
|
||||
filtro.append("Forma de Pagamento: ");
|
||||
if (cmbFormaPago.getSelectedItem() != null) {
|
||||
Short formaPagoId = ((FormaPago) cmbFormaPago.getSelectedItem().getValue()).getFormapagoId();
|
||||
argsInforme.put("FORMA_PAGO", formaPagoId);
|
||||
FormaPago formaPago= ((FormaPago) cmbFormaPago.getSelectedItem().getValue());
|
||||
argsInforme.put("FORMA_PAGO", formaPago.getFormapagoId());
|
||||
filtro.append(formaPago.getDescpago()).append("; ");
|
||||
}else {
|
||||
filtro.append(TODAS);
|
||||
}
|
||||
|
||||
RelatorioFormaPagamentoAgencia relatorio =null;
|
||||
RelatorioFormaPagamentoAgenciaRutaTramo relatorioRutaTramo =null;
|
||||
argsInforme.put("FILTROS", filtro.toString());
|
||||
if(!considerarRuta.isChecked()){
|
||||
relatorio = new RelatorioFormaPagamentoAgencia(argsInforme, dataSourceRead.getConnection());
|
||||
}else{
|
||||
|
|
@ -199,20 +224,19 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
|
|||
}
|
||||
|
||||
|
||||
Map args = new HashMap();
|
||||
Map<String, Object> args = new HashMap<>();
|
||||
if(!considerarRuta.isChecked()){
|
||||
args.put("relatorio", relatorio);
|
||||
}else{
|
||||
args.put("relatorio", relatorioRutaTramo);
|
||||
}
|
||||
|
||||
|
||||
openWindow("/component/reportView.zul",
|
||||
Labels.getLabel("formaPagamentoAgenciaController.window.title"), args, MODAL);
|
||||
|
||||
}
|
||||
|
||||
public void onClick$btnAddRuta(Event ev) throws InterruptedException {
|
||||
public void onClick$btnAddRuta(Event ev) {
|
||||
if (cmbRuta.getSelectedItem() != null) {
|
||||
listSelectedRutas.add((Ruta) cmbRuta.getSelectedItem().getValue());
|
||||
selectedRutasList.setData(listSelectedRutas);
|
||||
|
|
@ -220,7 +244,7 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer {
|
|||
}
|
||||
}
|
||||
|
||||
public void onClick$btnRemoveRuta(Event ev) throws InterruptedException {
|
||||
public void onClick$btnRemoveRuta(Event ev) {
|
||||
Ruta ruta = (Ruta) selectedRutasList.getSelected();
|
||||
listSelectedRutas.remove(ruta);
|
||||
selectedRutasList.setData(listSelectedRutas);
|
||||
|
|
|
|||
Loading…
Reference in New Issue