Merge pull request #75 from AI-SIP/develop

Develop
AI-SIP · Nov 17, 2024 · 2c6e1a1 · 2c6e1a1
2 parents 771d6ed + 22a0886
commit 2c6e1a1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/com/aisip/OnO/backend/Dto/Process/ImageProcessRegisterDto.java b/src/main/java/com/aisip/OnO/backend/Dto/Process/ImageProcessRegisterDto.java
@@ -16,5 +16,6 @@ public class ImageProcessRegisterDto {
     private String fullUrl;
     private List<Map<String, Integer>> colorsList;
     private List<List<Double>> points;
+    private List<Long> labels;
     private int intensity;
 }
diff --git a/src/main/java/com/aisip/OnO/backend/service/FileUploadServiceImpl.java b/src/main/java/com/aisip/OnO/backend/service/FileUploadServiceImpl.java
@@ -84,7 +84,8 @@ public String getProcessImage(ImageProcessRegisterDto imageProcessRegisterDto) {
         String url = fastApiUrl;
 
         if(imageProcessRegisterDto.getColorsList() != null){
-            log.info("color list: " + imageProcessRegisterDto.getColorsList());
+            log.info("intensity: " + imageProcessRegisterDto.getIntensity());
+            log.info("remove colors on problemImage by colors: " + imageProcessRegisterDto.getColorsList());
             url += "/process-color";
         } else if (imageProcessRegisterDto.getPoints() != null){
             log.info("point list: " + imageProcessRegisterDto.getPoints().toString());
@@ -98,9 +99,6 @@ public String getProcessImage(ImageProcessRegisterDto imageProcessRegisterDto) {
 
         HttpEntity<ImageProcessRegisterDto> request = new HttpEntity<>(imageProcessRegisterDto, headers);
 
-        log.info("intensity: " + imageProcessRegisterDto.getIntensity());
-        log.info("remove colors on problemImage by colors: " + imageProcessRegisterDto.getColorsList());
-
         try {
             ResponseEntity<String> response = restTemplate.postForEntity(url, request, String.class);
 

diff --git a/src/main/resources/templates/problems.html b/src/main/resources/templates/problems.html
@@ -38,7 +38,9 @@ <h1>전체 문제 목록</h1>
           <thead>
           <tr>
             <th style="width:5%">ID</th>
+            <!--
             <th style="width:10%">작성 유저</th>
+            -->
             <th style="width:10%">템플릿 타입</th>
             <th style="width:5%">폴더 ID</th>
             <th style="width:10%">출처</th>
@@ -57,7 +59,7 @@ <h1>전체 문제 목록</h1>
           <tbody>
           <tr th:each="problem : ${problems}">
             <td th:text="${problem.problemId}">problemId</td>
-            <td th:text="${problem.userName}">userName</td>
+            <!--<td th:text="${problem.userName}">userName</td>-->
             <td th:text="${problem.templateType}">templateType</td>
             <td th:text="${problem.folderId}">folderId</td>
             <td th:text="${problem.reference}">Reference</td>

diff --git a/src/main/resources/templates/user.html b/src/main/resources/templates/user.html
@@ -41,9 +41,10 @@ <h1 class="mb-4">유저 상세 정보</h1>
     <div class="card-body">
       <table class="table user-details-table">
         <tr>
-          <th>ID</th>
+          <th>User ID</th>
           <td th:text="${user.userId}">1</td>
         </tr>
+        <!--
         <tr>
           <th>이름</th>
           <td th:text="${user.userName}">User Name</td>
@@ -52,6 +53,7 @@ <h1 class="mb-4">유저 상세 정보</h1>
           <th>이메일</th>
           <td th:text="${user.userEmail}">[email protected]</td>
         </tr>
+        -->
         <tr>
           <th>식별자</th>
           <td th:text="${user.userIdentifier}">identifier</td>

diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html
@@ -17,9 +17,11 @@ <h1>전체 유저 목록</h1>
   <table class="table table-striped">
     <thead>
     <tr>
-      <th scope="col">ID</th>
+      <th scope="col">User ID</th>
+      <!--
       <th scope="col">이름</th>
       <th scope="col">이메일</th>
+      -->
       <th scope="col">식별자</th>
       <th scope="col">유저 유형</th>
       <th scope="col">문제 수</th>
@@ -30,8 +32,10 @@ <h1>전체 유저 목록</h1>
     <tbody>
     <tr th:each="user, stat : ${users}">
       <td><a th:href="@{/admin/user/{userId}(userId=${user.userId})}" th:text="${user.userId}">1</a></td>
+      <!--
       <td th:text="${user.userName}">User Name</td>
       <td th:text="${user.userEmail}">[email protected]</td>
+      -->
       <td th:text="${user.userIdentifier}">identifier</td>
       <td th:text="${user.userType}">GUEST</td>
       <td th:text="${problemCounts[stat.index]}"></td>