Merge branch 'master' of ssh://200.18.67.61:4731/home/git/simdecs.git

diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml
index b68dbce..0bc84c1 100644 (file)
--- a/src/conf/persistence.xml
+++ b/src/conf/persistence.xml
@@ -6,6 +6,7 @@
     <class>org.ufcspa.simdecs.entidade.Log</class>
     <class>org.ufcspa.simdecs.entidade.Usuario</class>
     <class>org.ufcspa.simdecs.entidade.ArquivoCaso</class>
+    <class>org.ufcspa.simdecs.entidade.RespostaMediador</class>
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <properties>
       <property name="hibernate.hbm2ddl.auto" value="update"/>

diff --git a/src/java/org/ufcspa/simdecs/comunicacao/MetodoParaGravarLog.java b/src/java/org/ufcspa/simdecs/comunicacao/MetodoParaGravarLog.java
index dfe2200..0101ca6 100644 (file)
--- a/src/java/org/ufcspa/simdecs/comunicacao/MetodoParaGravarLog.java
+++ b/src/java/org/ufcspa/simdecs/comunicacao/MetodoParaGravarLog.java
@@ -6,6 +6,7 @@ package org.ufcspa.simdecs.comunicacao;
 \r
 \r
 import java.io.IOException;\r
+import java.io.PrintWriter;\r
 import java.text.ParseException;\r
 import java.text.SimpleDateFormat;\r
 import java.util.Date;\r
@@ -13,6 +14,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;\r
 import javax.persistence.EntityManager;\r
 import javax.persistence.EntityManagerFactory;\r
+import javax.persistence.NoResultException;\r
 import javax.persistence.Persistence;\r
 import javax.servlet.ServletException;\r
 import javax.servlet.http.HttpServlet;\r
@@ -20,6 +22,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;\r
 import javax.servlet.http.HttpSession;\r
 import org.ufcspa.simdecs.entidade.Log;\r
+import org.ufcspa.simdecs.entidade.RespostaMediador;\r
+import org.ufcspa.simdecs.entidade.Usuario;\r
+import org.ufcspa.simdecs.util.UtilitarioSql;\r
 \r
 /**\r
  *\r
@@ -37,24 +42,7 @@ public class MetodoParaGravarLog extends HttpServlet {
      * @throws ServletException if a servlet-specific error occurs\r
      * @throws IOException if an I/O error occurs\r
      */\r
-    public java.sql.Date converteDataUtilToSql(Date data) {  \r
   \r
-       SimpleDateFormat df = new SimpleDateFormat("dd/MM/yyyy");  \r
-  \r
-       Date dataUtil = data;  \r
-       java.sql.Date dataSql = null;  \r
-  \r
-       try {  \r
-           dataUtil = new java.sql.Date(dataUtil.getTime());  \r
-           dataSql = (java.sql.Date) dataUtil;  \r
-  \r
-       } catch (Exception e) {  \r
-           //JOptionPane.showMessageDialog(null, "Erro ao converte data para sql: " + e.getMessage());  \r
-       }  \r
-  \r
-  \r
-       return dataSql;  \r
-   }  \r
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)\r
             throws ServletException, IOException, ParseException {\r
        HttpSession session = request.getSession(true);\r
@@ -62,19 +50,64 @@ public class MetodoParaGravarLog extends HttpServlet {
 \r
         Date dt = new Date();\r
         Long idLong = new Long(request.getParameter("id"));\r
-\r
+        UtilitarioSql util = new UtilitarioSql();\r
+        PrintWriter out = response.getWriter();\r
+        // alteracao solicitado mosmmann \r
+        //response.setContentType("text/html;charset=UTF-8");\r
+        \r
+        response.setContentType( "text/xml" );\r
+        response.setHeader( "Cache-Control", "no-cache" );\r
+        out.println( "<xml>" );\r
         \r
         \r
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("simdecsPU");\r
         EntityManager em = emf.createEntityManager();\r
         em.getTransaction().begin();\r
         Log lg =new Log();\r
-        lg.setDatalog(converteDataUtilToSql(dt));        \r
+        lg.setDatalog(util.converteDataUtilToSql(dt));        \r
         lg.setDescricaolog(request.getParameter("log"));\r
         lg.setHoralog(dt);\r
         lg.setUsuid(idLong);\r
         em.persist(lg);\r
         em.getTransaction().commit();\r
+        \r
+        RespostaMediador resp;\r
+\r
+        try {\r
+                em.getTransaction().begin();\r
+               resp = (RespostaMediador) em.createQuery("select resposta from RespostaMediador as resposta where resposta.idUsuario=:id and resposta.dataResposta is null" )\r
+                                                                               .setParameter("id", idLong)\r
+                                                                               //.setParameter("data",dtNull )\r
+                                                                               .getSingleResult();\r
+                if(resp.getId()>0)\r
+                {\r
+                    out.println( "<id>" + String.valueOf(resp.getId()) + "</id>" );\r
+                    out.println("<resposta>" + resp.getNome() + "</resposta>");\r
+                    out.println("<arquivo>" + resp.getEndArquivo() + "</arquivo>");\r
+                    resp.setDataResposta(util.converteDataUtilToSql(dt));\r
+                }\r
+                else \r
+                {\r
+                    out.println( "<id>0</id>" );\r
+                    out.println("<resposta></resposta>");\r
+                    out.println("<arquivo></arquivo>");\r
+                }\r
+                \r
+//                out.println("OK "+ user.getId());\r
+//                out.close();\r
+       } catch (NoResultException ne) {\r
+            \r
+//             request.setAttribute("id","0");         \r
+//             out.println("Usuario ou senha Inválido ");\r
+                out.println( "<id>" + "0" + "</id>" );\r
+                \r
+       } finally {         \r
+            em.persist(lg);\r
+            em.getTransaction().commit();\r
+            out.println( "</xml>" );\r
+            out.close();\r
+        }\r
+        \r
 \r
     }\r
 \r

diff --git a/src/java/org/ufcspa/simdecs/entidade/RespostaMediador.java b/src/java/org/ufcspa/simdecs/entidade/RespostaMediador.java
new file mode 100644 (file)
index 0000000..0322dc8
--- /dev/null
+++ b/src/java/org/ufcspa/simdecs/entidade/RespostaMediador.java
@@ -0,0 +1,80 @@
+/*\r
+ * To change this template, choose Tools | Templates\r
+ * and open the template in the editor.\r
+ */\r
+package org.ufcspa.simdecs.entidade;\r
+\r
+import java.io.Serializable;\r
+import java.util.Date;\r
+import javax.persistence.*;\r
+import javax.validation.constraints.NotNull;\r
+import javax.validation.constraints.Size;\r
+\r
+/**\r
+ *\r
+ * @author pbarros\r
+ */\r
+@Entity\r
+@Table(name="RespostaMediador")\r
+public class RespostaMediador implements Serializable {\r
+    private static final long serialVersionUID = 1L;\r
+    \r
+    @SequenceGenerator(name="seqRespMediador", sequenceName="SQRESPM")\r
+    @GeneratedValue(strategy=GenerationType.AUTO, generator="seqRespMediador")\r
+    @Id\r
+    private Long id;\r
+    \r
+    @Column(length=255)\r
+    private String resposta;\r
+    \r
+    \r
+    @Column(length=255)\r
+    private String endArquivo;\r
+    \r
+    @Column \r
+    private Long idUsuario;\r
+    \r
+    @Column (nullable=true)\r
+    @Temporal(TemporalType.DATE)\r
+    private Date dataResposta;\r
+    \r
+    \r
+\r
+    public Long getId() { return this.id;  }\r
+    public void setId(Long id) { this.id = id; }\r
+    public String getNome() { return this.resposta;    }\r
+    public void setNome(String name) { this.resposta = resposta; }\r
+    public String getEndArquivo() { return this.endArquivo; }\r
+    public void setEndArquivo(String endArquivo) { this.endArquivo = endArquivo; }\r
+    public Long getIdUsuario() { return this.idUsuario;  }\r
+    public void setIdUsuario(Long idUsuario) { this.idUsuario = idUsuario; }\r
+    public Date getDataResposta() { return this.dataResposta; }\r
+    public void setDataResposta(Date dataResposta) { this.dataResposta = dataResposta; }\r
+    \r
+    \r
+    @Override\r
+    public int hashCode() {\r
+        int hash = 0;\r
+        hash += (id != null ? id.hashCode() : 0);\r
+        return hash;\r
+    }\r
+\r
+    @Override\r
+    public boolean equals(Object object) {\r
+        // TODO: Warning - this method won't work in the case the id fields are not set\r
+        if (!(object instanceof RespostaMediador)) {\r
+            return false;\r
+        }\r
+        RespostaMediador other = (RespostaMediador) object;\r
+        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {\r
+            return false;\r
+        }\r
+        return true;\r
+    }\r
+\r
+    @Override\r
+    public String toString() {\r
+        return "org.ufcspa.simdecs.entidade.RespostaMediador[ id=" + id + " ]";\r
+    }\r
+    \r
+}\r

diff --git a/src/java/org/ufcspa/simdecs/util/UtilitarioSql.java b/src/java/org/ufcspa/simdecs/util/UtilitarioSql.java
new file mode 100644 (file)
index 0000000..bb4d35c
--- /dev/null
+++ b/src/java/org/ufcspa/simdecs/util/UtilitarioSql.java
@@ -0,0 +1,35 @@
+/*\r
+ * To change this template, choose Tools | Templates\r
+ * and open the template in the editor.\r
+ */\r
+package org.ufcspa.simdecs.util;\r
+\r
+import java.text.SimpleDateFormat;\r
+import java.util.Date;\r
+\r
+/**\r
+ *\r
+ * @author pbarros\r
+ */\r
+public class UtilitarioSql {\r
+    \r
+    \r
+    public void UtilitarioSql()\r
+    {\r
+    }\r
+    \r
+    public java.sql.Date converteDataUtilToSql(Date data) {\r
+       SimpleDateFormat df = new SimpleDateFormat("dd/MM/yyyy");\r
+       Date dataUtil = data;  \r
+       java.sql.Date dataSql = null;\r
+       try {  \r
+           dataUtil = new java.sql.Date(dataUtil.getTime());  \r
+           dataSql = (java.sql.Date) dataUtil;  \r
+  \r
+       } catch (Exception e) {  \r
+           //JOptionPane.showMessageDialog(null, "Erro ao converte data para sql: " + e.getMessage());  \r
+       }\r
+       return dataSql;  \r
+   }\r
+    \r
+}\r