대시보드 변경.

에디터 플러그인 비활성화.

src/main/java/com/dbnt/faisp/config/BaseController.java

@@ -1,8 +1,14 @@
 package com.dbnt.faisp.config;
 
 import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
+import com.dbnt.faisp.main.faRpt.model.FaRptBoard;
+import com.dbnt.faisp.main.faRpt.service.FaRptService;
+import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard;
+import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService;
 import com.dbnt.faisp.main.menuMgt.service.MenuMgtService;
 import com.dbnt.faisp.main.organMgt.service.OrganConfigService;
+import com.dbnt.faisp.main.publicBoard.model.PublicBoard;
+import com.dbnt.faisp.main.publicBoard.service.PublicBoardService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
 
@@ -25,6 +31,9 @@ public class BaseController {
   private final CodeMgtService codeMgtService;
   private final OrganConfigService organConfigService;
   private final MenuMgtService menuMgtService;
+  private final PublicBoardService publicBoardService;
+  private final FaRptService faRptService;
+  private final AffairService affairService;
 
   @GetMapping("/")
   public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) {
@@ -57,8 +66,27 @@ public class BaseController {
   }
 
   @GetMapping("/dashboard")
-  public ModelAndView dashboard() {
+  public ModelAndView dashboard(@AuthenticationPrincipal UserInfo loginUser) {
     ModelAndView mav = new ModelAndView("login/dashboard");
+    PublicBoard noticeParams = new PublicBoard();
+    noticeParams.setPublicType("PLB001");
+    noticeParams.setRowCnt(5);
+    noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList());
+    noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList());
+    mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams));
+    FaRptBoard faRpt = new FaRptBoard();
+    faRpt.setActiveTab("receive");
+    faRpt.setRowCnt(5);
+    faRpt.setStatus("DST007");
+    faRpt.setReceiveUserSeq(loginUser.getUserSeq());
+    mav.addObject("faRptList", faRptService.selectFaRptList(faRpt));
+    AffairBoard affair = new AffairBoard();
+    affair.setAffairCategory("CAT215");
+    affair.setRatingOrgan(loginUser.getOgCd());
+    affair.setRowCnt(5);
+    mav.addObject("affair1List", affairService.selectAffairBoardList(affair));
+    affair.setAffairCategory("CAT216");
+    mav.addObject("affair2List", affairService.selectAffairBoardList(affair));
     return mav;
   }
 

src/main/resources/static/Crosseditor/config/xmls/Config.xml

@@ -102,7 +102,7 @@
 		<Version>1.0.0.23</Version>
 		<Version_daemon>1.0.0.3</Version_daemon>
 		<Version_com>1.0.0.19</Version_com>
-		<SupportBrowser>1</SupportBrowser>
+		<SupportBrowser>0</SupportBrowser>
 		<AutoInstall></AutoInstall>
 	</Plugins>
 	<Mime>

src/main/resources/static/js/common.js

@@ -194,7 +194,7 @@ function setEditor(divId, editorHeight){
   CrossEditor.params.NewToolbar = true;
   CrossEditor.params.UploadFileExecutePath = "/Crosseditor/uploadImg";
   CrossEditor.params.FullScreen = false;
-  $("#editor").show();
+  $("#"+divId).show();
   CrossEditor.EditorStart();
 }
 

src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html

@@ -4,75 +4,45 @@
   <h5 class="modal-title text-white" id="planEditModalLabel">국제범죄검거 현황</h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
-<div class="modal-body" id="icaEditBody">
+<div class="modal-body">
-  <form action="#" method="post" id="icaEditForm">
-    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
-    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <input type="hidden" name="icaKey" th:value="${internationalCrimeArrest.icaKey}">
-    <input type="hidden" name="wrtOrgan" th:value="${internationalCrimeArrest.wrtOrgan}">
-    <input type="hidden" name="wrtNm" th:value="${internationalCrimeArrest.wrtNm}">
-    <input type="hidden" name="wrtDt" th:value="${#temporals.format(internationalCrimeArrest.wrtDt, 'yyyy-MM-dd HH:mm')}">
-    <input type="hidden" id="contentStatus" name="contentStatus">
   <div class="row mb-1">
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">사건번호</label>
-      <div class="col-sm-2">
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${internationalCrimeArrest.caseNum}"></label>
-        <input type="text" name="caseNum" class="form-control form-control-sm" th:value="${internationalCrimeArrest.caseNum}" readonly>
-      </div>
   </div>
   <div class="row mb-1">
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">지방청</label>
-      <div class="col-sm-2">
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-        <select class="form-select form-select-sm bg-white" name="organ" disabled>
-          <option value=""></option>
       <th:block th:each="organConfig:${organConfigList}">
-            <th:block th:if="${organConfig.parentOrgan eq 'OG001' && organConfig.organType ne 'OGC001'}">
+        <th:block th:if="${organConfig.organCd eq internationalCrimeArrest.organ}" th:text="${organConfig.organNm}"></th:block>
-              <option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq internationalCrimeArrest.organ}"></option>
       </th:block>
-          </th:block>
+    </label>
-        </select>
-      </div>
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">관할서</label>
-      <div class="col-sm-2">
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-        <select class="form-select form-select-sm bg-white" name="department" disabled>
-          <option value="">선택</option>
       <th:block th:each="organConfig:${organConfigList}">
-            <th:block th:if="${organConfig.parentOrgan ne null && organConfig.organType ne 'OGC002'}">
+        <th:block th:if="${organConfig.organCd eq internationalCrimeArrest.department}" th:text="${organConfig.organNm}"></th:block>
-              <option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq internationalCrimeArrest.department}"></option>
       </th:block>
-          </th:block>
+    </label>
-        </select>
-      </div>
   </div>
   <hr class="my-1">
   <div class="row mb-1">
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">범죄테마</label>
-      <div class="col-sm-2">
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-        <select class="form-select form-select-sm bg-white" name="crimeType" id="crimeType" disabled>
+      <th:block th:each="code:${session.commonCode.get('CTH')}">
-          <option value="">선택</option>
+        <th:block th:if="${code.itemCd eq internationalCrimeArrest.crimeType}" th:text="${code.itemValue}"></th:block>
-          <th:block th:each="commonCode:${session.commonCode.get('CTH')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
-                    th:selected="${commonCode.itemCd eq internationalCrimeArrest.crimeType}"></option>
       </th:block>
-        </select>
+    </label>
-      </div>
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">위반유형</label>
-      <div class="col-sm-2">
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-        <select class="form-select form-select-sm bg-white" name="violationType" id="violationType" disabled>
+      <th:block th:each="code:${session.commonCode.get(internationalCrimeArrest.crimeType)}">
-          <option value="">선택</option>
+        <th:block th:if="${code.itemCd eq internationalCrimeArrest.violationType}" th:text="${code.itemValue}"></th:block>
-          <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CTH')))}">
-            <th:block th:if="${'CTH'+num == internationalCrimeArrest.crimeType}" th:each="commonCode:${session.commonCode.get('CTH'+num)}">
-              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${internationalCrimeArrest.violationType eq commonCode.itemCd}"></option>
       </th:block>
-          </th:block>
+    </label>
-        </select>
-      </div>
     <th:block th:if="${internationalCrimeArrest.crimeType ne 'CTH002'}">
       <div class="col-sm-4" id="crimeNameDiv">
         <div class="row">
           <label class="col-sm-6 col-form-label col-form-label-sm text-center">죄명</label>
-            <div class="col-sm-6">
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${internationalCrimeArrest.crimeName}"></label>
-              <input type="text" class="form-control form-control-sm" name="crimeName" th:value="${internationalCrimeArrest.crimeName}" readonly>
-            </div>
         </div>
       </div>
     </th:block>
@@ -80,6 +50,11 @@
   <div class="row mb-1" id="smugglingAmountDiv">
     <th:block th:if="${internationalCrimeArrest.crimeType eq 'CTH002'}">
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">밀수입출 품목</label>
+      <label class="col-sm-2 col-form-label col-form-label-sm text-start">
+        <th:block th:each="commonCode:${session.commonCode.get('SG')}">
+          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
+        </th:block>
+      </label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm bg-white" name="smuggledGoods" id="smugglingAmount" disabled>
           <option>선택</option>
@@ -333,7 +308,6 @@
       <div class="border p-1" name='caseOverview' th:utext="${internationalCrimeArrest.caseOverview}"></div>
     </div>
   </div>
-  </form>
 </div>
 <div class="modal-footer bg-light">
   <th:block th:if="${userSeq eq internationalCrimeArrest.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->

src/main/resources/templates/login/dashboard.html

@@ -3,30 +3,174 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
-  <script type="text/javascript" th:src="@{/js/dashboard.js}"></script>
+  <!--<script type="text/javascript" th:src="@{/js/dashboard.js}"></script>-->
 </th:block>
 <div layout:fragment="content">
   <main>
     <div class="row justify-content-between mx-0">
       <div class="col-auto"><h4>대시보드</h4></div>
       <div class="col-auto mt-2">
-        <a class="link-dark align-bottom" href="/myInfo/myInfoPage?activeTab=dashboard">대시보드 편집</a>
+        <!--<a class="link-dark align-bottom" href="/myInfo/myInfoPage?activeTab=dashboard">대시보드 편집</a>-->
       </div>
     </div>
     <div class="row mx-0">
       <div class="col-12 card bg-light">
         <div class="card-body">
           <div class="row">
-            <div class="col-4 py-1" id="subPage0"></div>
+            <div class="col-6 py-1" id="subPage0">
-            <div class="col-4 py-1" id="subPage1"></div>
+              <script type="text/javascript" th:src="@{/js/publicBoard/publicBoard.js}"></script>
-            <div class="col-4 py-1" id="subPage2"></div>
+              <script type="text/javascript" th:src="@{/js/publicBoard/notice.js}"></script>
-            <div class="col-4 py-1" id="subPage3"></div>
+              <div class="card">
-            <div class="col-4 py-1" id="subPage4"></div>
+                <div class="card-header bg-white">
-            <div class="col-4 py-1" id="subPage5"></div>
+                  <div class="row justify-content-between">
+                    <div class="col-auto">공지사항</div>
+                    <div class="col-auto"><a href="/publicBoard/noticePage" class="link-dark"><i class="bi bi-list"></i></a></div>
+                  </div>
+                </div>
+                <div class="card-body">
+                  <table class="table table-sm table-hover">
+                    <thead>
+                    <tr>
+                      <th>제목</th>
+                      <th>작성자</th>
+                      <th>작성일시</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr class="noticeTr" th:each="notice:${noticeList}">
+                      <input type="hidden" class="publicKey" th:value="${notice.publicKey}">
+                      <td>
+                        <th:block th:if="${#strings.length(notice.title)>35}" th:text="|${#strings.substring(notice.title, 0, 35)}...|"></th:block>
+                        <th:block th:unless="${#strings.length(notice.title)>35}" th:text="${notice.title}"></th:block>
+                      </td>
+                      <td th:text="${notice.wrtUserNm}"></td>
+                      <td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd')}"></td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+
+            <div class="col-6 py-1" id="subPage1">
+              <script type="text/javascript" th:src="@{/js/faRpt/faRpt.js}"></script>
+              <div class="card">
+                <div class="card-header bg-white">
+                  <div class="row justify-content-between">
+                    <div class="col-auto">외사정보보고 수신문서</div>
+                    <div class="col-auto"><a href="/faRpt/faRptBoard?activeTab=receive" class="link-dark"><i class="bi bi-list"></i></a></div>
+                  </div>
+                </div>
+                <div class="card-body">
+                  <table class="table table-hover">
+                    <thead>
+                    <tr>
+                      <th>제목</th>
+                      <th>작성일시</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr class="faRptTr" th:each="faRpt:${faRptList}">
+                      <input type="hidden" class="faRptKey" th:value="${faRpt.faRptKey}">
+                      <td th:text="${faRpt.title}"></td>
+                      <td th:text="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                    </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+            <div class="col-6 py-1" id="subPage2">
+              <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affair/affairMgt.js}"></script>
+              <div class="card">
+                <div class="card-header bg-white">
+                  <div class="row justify-content-between">
+                    <div class="col-auto">외사경찰 견문관리</div>
+                    <div class="col-auto"><a href="/affair/affairMgt?affairCategory=CAT215" class="link-dark"><i class="bi bi-list"></i></a></div>
+                  </div>
+                </div>
+                <div class="card-body">
+                  <table class="table table-sm table-hover">
+                    <thead>
+                    <tr>
+                      <th>제목</th>
+                      <th>작성일시</th>
+                      <th>상태</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr class="affairTr" th:each="affair:${affair1List}">
+                      <input type="hidden" class="affairKey" th:value="${affair.affairKey}">
+                      <td th:text="${affair.title}"></td>
+                      <td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                      <th:block th:each="commonCode:${session.commonCode.get('DST')}">
+                        <td th:if="${affair.affairStatus eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                      </th:block>
+                    </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+            <div class="col-6 py-1" id="subPage3">
+              <div class="card">
+                <div class="card-header bg-white">
+                  <div class="row justify-content-between">
+                    <div class="col-auto">외사첩보망 견문관리</div>
+                    <div class="col-auto"><a href="/affair/affairMgt?affairCategory=CAT216" class="link-dark"><i class="bi bi-list"></i></a></div>
+                  </div>
+                </div>
+                <div class="card-body">
+                  <table class="table table-sm table-hover">
+                    <thead>
+                    <tr>
+                      <th>제목</th>
+                      <th>작성일시</th>
+                      <th>상태</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr class="affairTr" th:each="affair:${affair2List}">
+                      <input type="hidden" class="affairKey" th:value="${affair.affairKey}">
+                      <td th:text="${affair.title}"></td>
+                      <td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                      <th:block th:each="commonCode:${session.commonCode.get('DST')}">
+                        <td th:if="${affair.affairStatus eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                      </th:block>
+                    </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
       </div>
     </div>
   </main>
+
+  <div class="modal fade" id="viewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+      <div class="modal-content" id="viewContent">
+
+      </div>
+    </div>
+  </div>
+
+  <div class="modal fade" id="affairViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="affairViewModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+      <div class="modal-content" id="affairViewBody">
+
+      </div>
+    </div>
+  </div>
+
+  <div class="modal fade" id="faRptViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="faRptViewModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+      <div class="modal-content" id="faRptViewBody">
+
+      </div>
+    </div>
+  </div>
 </div>
 </html>

src/main/resources/templates/user/myInfo.html

@@ -25,7 +25,7 @@
               <button class="nav-link" th:classappend="${activeTab ne 'dashboard'?'active':''}" id="infoTab" data-bs-toggle="tab" data-bs-target="#infoTabPanel" type="button" role="tab" aria-controls="infoTabPanel" th:aria-selected="${activeTab ne 'dashboard'?'true':'false'}">개인정보</button>
             </li>
             <li class="nav-item" role="presentation">
-              <button class="nav-link" th:classappend="${activeTab eq 'dashboard'?'active':''}" id="dashboardTab" data-bs-toggle="tab" data-bs-target="#dashboardTabPanel" type="button" role="tab" aria-controls="dashboardTabPanel" th:aria-selected="${activeTab eq 'dashboard'?'true':'false'}">대시보드</button>
+              <button class="nav-link disabled" th:classappend="${activeTab eq 'dashboard'?'active':''}" id="dashboardTab" data-bs-toggle="tab" data-bs-target="#dashboardTabPanel" type="button" role="tab" aria-controls="dashboardTabPanel" th:aria-selected="${activeTab eq 'dashboard'?'true':'false'}">대시보드</button>
             </li>
           </ul>
           <div class="tab-content bg-white border border-top-0 p-2">