Commit @bc626aec5ef44ef6401f66203b49a8e108846f66

하관우 02-06

2025-01-14 파일 API 수정 하관우

@bc626aec5ef44ef6401f66203b49a8e108846f66

114b1d0

bc626ae

src/main/java/com/takensoft/taken_bi_manager/department/dao/DeptHostDAO.java

--- src/main/java/com/takensoft/taken_bi_manager/department/dao/DeptHostDAO.java

+++ src/main/java/com/takensoft/taken_bi_manager/department/dao/DeptHostDAO.java

...	...	@@ -39,4 +39,12 @@
39	39	* 부서-호스트 연결 삭제
40	40	*/
41	41	public int deleteDeptHost(DeptHostVO deptHostVO) throws Exception;
	42	+
	43	+ /**
	44	+ * @author 하관우
	45	+ * @since 2025.02.05
	46	+ *
	47	+ * 부서 내 사용자 이동
	48	+ */
	49	+ public int usersMoveDeptHost(HashMap<String,Object> params) throws Exception;
42	50	} (파일 끝에 줄바꿈 문자 없음)

114b1d0

bc626ae

src/main/java/com/takensoft/taken_bi_manager/department/service/DeptHostService.java

--- src/main/java/com/takensoft/taken_bi_manager/department/service/DeptHostService.java

+++ src/main/java/com/takensoft/taken_bi_manager/department/service/DeptHostService.java

...	...	@@ -29,4 +29,12 @@
29	29	* 부서 내 호스트 삭제
30	30	*/
31	31	public HashMap<String, Object> deleteDeptHost(List<DeptHostVO> deptHostList) throws Exception;
	32	+
	33	+ /**
	34	+ * @author 하관우
	35	+ * @since 2025.02.05
	36	+ *
	37	+ * 부서 내 사용자 이동
	38	+ */
	39	+ public HashMap<String, Object> usersMoveDeptHost(HashMap<String,Object> params) throws Exception;
32	40	} (파일 끝에 줄바꿈 문자 없음)

114b1d0

bc626ae

src/main/java/com/takensoft/taken_bi_manager/department/service/Impl/DeptHostServiceImpl.java

--- src/main/java/com/takensoft/taken_bi_manager/department/service/Impl/DeptHostServiceImpl.java

+++ src/main/java/com/takensoft/taken_bi_manager/department/service/Impl/DeptHostServiceImpl.java

...	...	@@ -85,4 +85,33 @@
85	85	result.put("deleteCnt", deleteCnt);
86	86	return result;
87	87	}
	88	+
	89	+ /**
	90	+ * @author 하관우
	91	+ * @since 2025.02.05
	92	+ *
	93	+ * 부서 내 사용자 이동
	94	+ */
	95	+ @Override
	96	+ @Transactional(rollbackFor = Exception.class)
	97	+ public HashMap<String, Object> usersMoveDeptHost(HashMap<String,Object> params) throws Exception{
	98	+ int moveCnt = 0;
	99	+ List<Map<String, Object>> userList = (List<Map<String, Object>>) params.get("user");
	100	+ Map<String, Object> dept = (Map<String, Object>) params.get("dept");
	101	+
	102	+ for(int i=0 ; i < userList.size(); i++){
	103	+ HashMap<String, Object> data = new HashMap<>();
	104	+ data.put("userId", userList.get(i).get("userId"));
	105	+ data.put("deptId", dept.get("id"));
	106	+ moveCnt += deptHostDAO.usersMoveDeptHost(data);
	107	+ }
	108	+
	109	+ if (moveCnt != userList.size()) {
	110	+ throw new RuntimeException("부서 내 사용자 이동 중 오류가 발생했습니다.");
	111	+ }
	112	+
	113	+ HashMap<String, Object> result = new HashMap<>();
	114	+ result.put("moveCnt", moveCnt);
	115	+ return result;
	116	+ }
88	117	} (파일 끝에 줄바꿈 문자 없음)

114b1d0

bc626ae

src/main/java/com/takensoft/taken_bi_manager/department/web/DeptHostController.java

--- src/main/java/com/takensoft/taken_bi_manager/department/web/DeptHostController.java

+++ src/main/java/com/takensoft/taken_bi_manager/department/web/DeptHostController.java

...	...	@@ -79,4 +79,25 @@
79	79
80	80	return resultMap;
81	81	}
	82	+
	83	+ /**
	84	+ * @author 하관우
	85	+ * @since 2025.02.05
	86	+ *
	87	+ * 부서 내 사용자 이동
	88	+ */
	89	+ @PostMapping(value = {"/user/move"})
	90	+ public CustomeResultMap usersMoveDeptHost(@RequestBody HashMap<String,Object> params) {
	91	+ CustomeResultMap resultMap = new CustomeResultMap();
	92	+
	93	+ try {
	94	+ resultMap.setResultData(deptHostService.usersMoveDeptHost(params));
	95	+ } catch (RuntimeException e) {
	96	+ resultMap.setCheckMessage(new CheckMessage(false, e.getMessage(), HttpStatus.BAD_REQUEST.value()));
	97	+ } catch (Exception e) {
	98	+ resultMap.setCheckMessage(new CheckMessage(false, e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR.value()));
	99	+ }
	100	+
	101	+ return resultMap;
	102	+ }
82	103	} (파일 끝에 줄바꿈 문자 없음)

114b1d0

bc626ae

src/main/resources/spring/mapper/department/deptHost-SQL.xml

--- src/main/resources/spring/mapper/department/deptHost-SQL.xml

+++ src/main/resources/spring/mapper/department/deptHost-SQL.xml

...	...	@@ -93,4 +93,12 @@
93	93	WHERE dept_code = #{deptCode}
94	94	AND host_code = #{hostCode}
95	95	</delete>
	96	+
	97	+ <update id="usersMoveDeptHost" parameterType="java.util.HashMap">
	98	+ UPDATE dept_user
	99	+ SET
	100	+ dept_code = #{deptId}
	101	+ WHERE
	102	+ user_id = #{userId}
	103	+ </update>
96	104	</mapper> (파일 끝에 줄바꿈 문자 없음)

114b1d0

bc626ae

src/main/resources/spring/mapper/host/sftp-SQL.xml

--- src/main/resources/spring/mapper/host/sftp-SQL.xml

+++ src/main/resources/spring/mapper/host/sftp-SQL.xml


         </if>
         FROM
         host_info hi
-        JOIN
-        dept_host dh ON hi.host_code = dh.host_code
         <if test="author == 'ROLE_USER'">
+            JOIN dept_host dh ON hi.host_code = dh.host_code
             JOIN dept_drctry dt ON dh.dept_code = dt.dept_code
+        </if>
             WHERE use_yn = 'Y'
+        <if test="author == 'ROLE_USER'">
             AND dh.dept_code = #{dept_code}
         </if>
         ORDER BY

Add a comment

Open 0
Closed 0

List

...	...	@@ -38,11 +38,12 @@
38	38	</if>
39	39	FROM
40	40	host_info hi
41		- JOIN
42		- dept_host dh ON hi.host_code = dh.host_code
43	41	<if test="author == 'ROLE_USER'">
	42	+ JOIN dept_host dh ON hi.host_code = dh.host_code
44	43	JOIN dept_drctry dt ON dh.dept_code = dt.dept_code
	44	+ </if>
45	45	WHERE use_yn = 'Y'
	46	+ <if test="author == 'ROLE_USER'">
46	47	AND dh.dept_code = #{dept_code}
47	48	</if>
48	49	ORDER BY

Delete comment