Index: web-module/Dockerfile
===================================================================
diff -u -rcb8ea8e421da25007df5e77def97a271c992da5c -r1fcb21c2a4e52e2917e512cabcf8eb04180742a2
--- web-module/Dockerfile (.../Dockerfile) (revision cb8ea8e421da25007df5e77def97a271c992da5c)
+++ web-module/Dockerfile (.../Dockerfile) (revision 1fcb21c2a4e52e2917e512cabcf8eb04180742a2)
@@ -5,7 +5,7 @@
ARG JAR_FILE
ADD target/${JAR_FILE} /usr/local/tomcat/webapps/ROOT.war
-RUN apt-get update
+RUN apt-get update && apt-get install -y apt-transport-https
RUN apt-get -y -q install libpcap0.8 wget procps
RUN wget http://www.313.co.kr/nexus/content/repositories/StandardProject/313devgrp/packetbeat/7.4.2-linux/packetbeat-7.4.2-linux-x86_64.tar.gz
Index: web-module/pom.xml
===================================================================
diff -u -r958104b3bc9bd5b60b9094a961d780cdbe806546 -r1fcb21c2a4e52e2917e512cabcf8eb04180742a2
--- web-module/pom.xml (.../pom.xml) (revision 958104b3bc9bd5b60b9094a961d780cdbe806546)
+++ web-module/pom.xml (.../pom.xml) (revision 1fcb21c2a4e52e2917e512cabcf8eb04180742a2)
@@ -17,7 +17,7 @@
Web Project by 313 DEV GRP
- 23.01.09
+ 23.01.11
Index: web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java
===================================================================
diff -u -r20b0cc3cd592dec9c7a737b7d8f1484623c555cd -r1fcb21c2a4e52e2917e512cabcf8eb04180742a2
--- web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java (.../UserReqAddController.java) (revision 20b0cc3cd592dec9c7a737b7d8f1484623c555cd)
+++ web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java (.../UserReqAddController.java) (revision 1fcb21c2a4e52e2917e512cabcf8eb04180742a2)
@@ -14,12 +14,9 @@
import egovframework.api.arms.module_filerepository.service.FileRepository;
import egovframework.api.arms.module_filerepositorylog.model.FileRepositoryLogDTO;
import egovframework.api.arms.module_filerepositorylog.service.FileRepositoryLog;
-import egovframework.api.arms.module_pdserviceconnectlog.model.PdServiceConnectLogDTO;
import egovframework.api.arms.module_pdserviceconnectlog.service.PdServiceConnectLog;
import egovframework.api.arms.module_pdservicejiralog.service.PdServiceJiraLog;
-import egovframework.api.arms.module_pdservicelog.model.PdServiceLogDTO;
import egovframework.api.arms.module_pdservicelog.service.PdServiceLog;
-import egovframework.api.arms.module_pdserviceversionlog.model.PdServiceVersionLogDTO;
import egovframework.api.arms.module_pdserviceversionlog.service.PdServiceVersionLog;
import egovframework.api.arms.module_reqadd.model.JsTreeHibernateLogDTO;
import egovframework.api.arms.module_reqadd.model.ReqAddDTO;
@@ -210,11 +207,6 @@
SessionUtil.setAttribute("addNode",changeReqTableName);
- ReqAddDTO refReqAddDTO = new ReqAddDTO();
- refReqAddDTO.setC_id(reqAddDTO.getRef());
- //ReqAddDTO nodeByRef = reqAdd.getNode(refReqAddDTO);
-
- //ReqAddDTO returnNode = reqAdd.addNodeToSwitchTable(reqAddDTO, nodeByRef);
ReqAddDTO returnNode = reqAdd.addNode(reqAddDTO);
SessionUtil.removeAttribute("addNode");
@@ -359,32 +351,32 @@
FileRepositoryLogDTO fileRepositoryLogDTO = new FileRepositoryLogDTO();
fileRepositoryLogDTO.setWhereBetween("c_date", startDate, endDate);
fileRepositoryLogDTO.setOrder(Order.asc("c_left"));
- fileRepositoryLogDTO.setWhere("c_title", "pdService");
+ fileRepositoryLogDTO.setWhere("c_title", changeReqTableName);
fileRepositoryLogDTO.setWhere("fileIdLink", parser.getLong("fileIdLink"));
fileRepositoryLogDTO.getCriterions().add(criterion);
List fileRepositoryLogList = fileRepositoryLog.getChildNode(fileRepositoryLogDTO);
- PdServiceConnectLogDTO pdServiceConnectLogDTO = new PdServiceConnectLogDTO();
- pdServiceConnectLogDTO.setWhereBetween("c_date", startTimestamp, endTimestamp);
- pdServiceConnectLogDTO.setOrder(Order.asc("c_left"));
- pdServiceConnectLogDTO.setWhere("c_pdservice_id", parser.get("c_id"));
- pdServiceConnectLogDTO.getCriterions().add(criterion);
- List pdServiceConnectLogDTOList = this.pdServiceConnectLog.getChildNode(pdServiceConnectLogDTO);
+// PdServiceConnectLogDTO pdServiceConnectLogDTO = new PdServiceConnectLogDTO();
+// pdServiceConnectLogDTO.setWhereBetween("c_date", startTimestamp, endTimestamp);
+// pdServiceConnectLogDTO.setOrder(Order.asc("c_left"));
+// pdServiceConnectLogDTO.setWhere("c_pdservice_id", parser.get("c_id"));
+// pdServiceConnectLogDTO.getCriterions().add(criterion);
+// List pdServiceConnectLogDTOList = this.pdServiceConnectLog.getChildNode(pdServiceConnectLogDTO);
+//
+// PdServiceVersionLogDTO pdServiceVersionLogDTO = new PdServiceVersionLogDTO();
+// pdServiceVersionLogDTO.setWhereBetween("c_date", startTimestamp, endTimestamp);
+// pdServiceVersionLogDTO.setOrder(Order.asc("c_left"));
+// pdServiceVersionLogDTO.setWhere("c_pdservice_link", parser.get("c_id"));
+// pdServiceVersionLogDTO.getCriterions().add(criterion);
+// List pdServiceVersionLogDTOList = this.pdServiceVersionLog.getChildNode(pdServiceVersionLogDTO);
+//
+// PdServiceLogDTO pdServiceLogDTO = new PdServiceLogDTO();
+// pdServiceLogDTO.setWhereBetween("c_date", startTimestamp, endTimestamp);
+// pdServiceLogDTO.setOrder(Order.asc("c_left"));
+// pdServiceLogDTO.setWhere("c_id", parser.getLong("c_id"));
+// pdServiceLogDTO.getCriterions().add(criterion);
+// List pdServiceLogDTOList = this.pdServiceLog.getChildNode(pdServiceLogDTO);
- PdServiceVersionLogDTO pdServiceVersionLogDTO = new PdServiceVersionLogDTO();
- pdServiceVersionLogDTO.setWhereBetween("c_date", startTimestamp, endTimestamp);
- pdServiceVersionLogDTO.setOrder(Order.asc("c_left"));
- pdServiceVersionLogDTO.setWhere("c_pdservice_link", parser.get("c_id"));
- pdServiceVersionLogDTO.getCriterions().add(criterion);
- List pdServiceVersionLogDTOList = this.pdServiceVersionLog.getChildNode(pdServiceVersionLogDTO);
-
- PdServiceLogDTO pdServiceLogDTO = new PdServiceLogDTO();
- pdServiceLogDTO.setWhereBetween("c_date", startTimestamp, endTimestamp);
- pdServiceLogDTO.setOrder(Order.asc("c_left"));
- pdServiceLogDTO.setWhere("c_id", parser.getLong("c_id"));
- pdServiceLogDTO.getCriterions().add(criterion);
- List pdServiceLogDTOList = this.pdServiceLog.getChildNode(pdServiceLogDTO);
-
SessionUtil.setAttribute("getHistory",changeReqTableName);
ReqAddLogDTO reqAddLogDTO = new ReqAddLogDTO();
reqAddLogDTO.setWhereBetween("c_date", startTimestamp, endTimestamp);
@@ -395,9 +387,9 @@
List mergeList = new ArrayList<>();
mergeList.addAll(fileRepositoryLogList);
- mergeList.addAll(pdServiceLogDTOList);
- mergeList.addAll(pdServiceConnectLogDTOList);
- mergeList.addAll(pdServiceVersionLogDTOList);
+// mergeList.addAll(pdServiceLogDTOList);
+// mergeList.addAll(pdServiceConnectLogDTOList);
+// mergeList.addAll(pdServiceVersionLogDTOList);
mergeList.addAll(reqAddLogDTOList);
List ascTD = mergeList.stream() // Sort Order By asc - Comparator의 comparing 사용, ::를 활용한 참조 방식 사용, stream을 활용한 List의 sorted사용 및 collect를 활용한 Collectors.toList() 사용