Merge branch 'susu' into dev
This commit is contained in:
@@ -27,7 +27,7 @@ public class InitAdminData implements ApplicationRunner {
|
||||
return;
|
||||
}
|
||||
|
||||
// 관리자
|
||||
/* // 관리자
|
||||
saveAdminPortIn.connect(
|
||||
null,
|
||||
"test-admin",
|
||||
@@ -52,6 +52,6 @@ public class InitAdminData implements ApplicationRunner {
|
||||
"researcher1@#$",
|
||||
"code.region.main.1",
|
||||
false,
|
||||
List.of("ROLE_RESEARCHER"));
|
||||
List.of("ROLE_RESEARCHER"));*/
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.core.usecase.admin.checkAdminId.persistence;
|
||||
|
||||
import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortOut;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
class CheckAdminIdDao implements CheckAdminIdPortOut {
|
||||
|
||||
private final CheckAdminIdMapper mapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Integer connect(String id) {
|
||||
return mapper.checkAdminId(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package app.module.core.usecase.admin.checkAdminId.persistence;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface CheckAdminIdMapper {
|
||||
Integer checkAdminId(String id);
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.core.usecase.admin.checkAdminId.persistence.model;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class DeleteAdminHasRoleParam extends AuditCommand {
|
||||
private Long adminSeq;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package app.module.core.usecase.admin.checkAdminId.persistence.model;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class SaveAdminHasRoleParam extends AuditCommand {
|
||||
private Long adminSeq;
|
||||
private List<String> roleIds;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.core.usecase.admin.checkAdminId.ports;
|
||||
|
||||
|
||||
public interface CheckAdminIdPortIn {
|
||||
|
||||
Integer connect(String id);
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package app.module.core.usecase.admin.checkAdminId.ports;
|
||||
|
||||
public interface CheckAdminIdPortOut {
|
||||
Integer connect(String id);
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package app.module.core.usecase.admin.checkAdminId.ports.application;
|
||||
|
||||
import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortIn;
|
||||
import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortOut;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class CheckAdminIdService implements CheckAdminIdPortIn {
|
||||
|
||||
private final CheckAdminIdPortOut checkAdminIdPortOut;
|
||||
@Override
|
||||
public Integer connect(String id) {
|
||||
return checkAdminIdPortOut.connect(id);
|
||||
}
|
||||
}
|
||||
@@ -29,10 +29,14 @@ class GetAdminsDao implements GetAdminsPortOut {
|
||||
public Page<GetAdmins> connect(Pageable pageable, GetAdminsCmd filterCommand) {
|
||||
// 관리자 목록 조회
|
||||
List<GetAdminsDto> admins = getAdminsMapper.findAll(filterCommand, pageable);
|
||||
|
||||
// 관리자의 역할 목록 조회
|
||||
List<GetAdminsRole> roles = getAdminsMapper.findRolesWithPrivilegesByAdminIds(
|
||||
admins.stream().map(GetAdminsDto::getSeq).toList());
|
||||
List<GetAdminsRole> roles;
|
||||
if(!admins.isEmpty()){
|
||||
roles = getAdminsMapper.findRolesWithPrivilegesByAdminIds(
|
||||
admins.stream().map(GetAdminsDto::getSeq).toList());
|
||||
} else {
|
||||
roles = null;
|
||||
}
|
||||
|
||||
|
||||
return new PageImpl<>(
|
||||
admins.stream()
|
||||
@@ -46,9 +50,9 @@ class GetAdminsDao implements GetAdminsPortOut {
|
||||
admin.getAccountDisabled(),
|
||||
admin.getAccountLocked(),
|
||||
admin.getTotal(),
|
||||
roles.stream()
|
||||
roles != null ? roles.stream()
|
||||
.filter(r -> r.getAdminSeq().equals(admin.getSeq()))
|
||||
.collect(Collectors.toList())
|
||||
.collect(Collectors.toList()):null
|
||||
)).toList(),
|
||||
pageable,
|
||||
admins.isEmpty() ? 0 : admins.get(0).getTotal());
|
||||
|
||||
@@ -9,6 +9,9 @@ import lombok.Setter;
|
||||
public class GetAdminsDto {
|
||||
private Long seq;
|
||||
private String id;
|
||||
private String name;
|
||||
private String phone;
|
||||
private String regionMainCodeName;
|
||||
private String createdBy;
|
||||
private LocalDateTime createdAt;
|
||||
private String updatedBy;
|
||||
|
||||
@@ -10,4 +10,6 @@ public class GetAdminsCmd {
|
||||
private final String searchField;
|
||||
private final String searchValue;
|
||||
private final String searchRole;
|
||||
private final String searchArea;
|
||||
private final String searchDisabled;
|
||||
}
|
||||
|
||||
@@ -28,17 +28,17 @@ class SaveAdminDao implements SaveAdminPortOut {
|
||||
mapper.deleteAdminRolesByAdminId(
|
||||
AuditUtil.delete(new DeleteAdminHasRoleParam(cmd.getSeq())));
|
||||
|
||||
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
||||
if (!cmd.getRoleId().isEmpty()) {
|
||||
mapper.insertAdminHasRoles(
|
||||
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds())));
|
||||
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleId())));
|
||||
}
|
||||
} else {
|
||||
// create
|
||||
mapper.insertAdmin(AuditUtil.create(cmd));
|
||||
|
||||
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
||||
if (!cmd.getRoleId().isEmpty()) {
|
||||
mapper.insertAdminHasRoles(
|
||||
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds())));
|
||||
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleId())));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -12,5 +12,5 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
public class SaveAdminHasRoleParam extends AuditCommand {
|
||||
private Long adminSeq;
|
||||
private List<String> roleIds;
|
||||
private String roleId;
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package app.module.core.usecase.admin.saveAdmin.ports;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface SaveAdminPortIn {
|
||||
|
||||
String connect(
|
||||
Long seq,
|
||||
String id,
|
||||
String password,
|
||||
String regionMainCode,
|
||||
Boolean accountDisabled,
|
||||
List<String> roleIds);
|
||||
String apiConnect(
|
||||
Long seq,
|
||||
String id,
|
||||
String password,
|
||||
String name,
|
||||
String phone,
|
||||
String regionMainCode,
|
||||
Boolean accountDisabled,
|
||||
String roleId);
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdmi
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -20,14 +19,10 @@ public class SaveAdminService implements SaveAdminPortIn {
|
||||
private final BCryptPasswordEncoder passwordEncoder;
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
|
||||
|
||||
@Override
|
||||
public String connect(
|
||||
Long seq,
|
||||
String id,
|
||||
String password,
|
||||
String regionMainCode,
|
||||
Boolean accountDisabled,
|
||||
List<String> roleIds) {
|
||||
public String apiConnect(Long seq, String id, String password, String name, String phone, String regionMainCode, Boolean accountDisabled, String roleId) {
|
||||
|
||||
|
||||
LocalDateTime passwordUpdatedAt;
|
||||
Integer loginFailCnt;
|
||||
@@ -51,15 +46,19 @@ public class SaveAdminService implements SaveAdminPortIn {
|
||||
}
|
||||
|
||||
return saveAdminPortOut.connect(
|
||||
new SaveAdminCmd(
|
||||
seq,
|
||||
id,
|
||||
password,
|
||||
passwordUpdatedAt,
|
||||
regionMainCode,
|
||||
accountDisabled,
|
||||
loginFailCnt,
|
||||
roleIds
|
||||
));
|
||||
new SaveAdminCmd(
|
||||
seq,
|
||||
id,
|
||||
password,
|
||||
passwordUpdatedAt,
|
||||
name,
|
||||
phone,
|
||||
regionMainCode,
|
||||
accountDisabled,
|
||||
loginFailCnt,
|
||||
roleId
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -16,9 +16,11 @@ public class SaveAdminCmd extends AuditCommand {
|
||||
private String encodedPassword;
|
||||
private LocalDateTime passwordUpdatedAt;
|
||||
/* private String email;*/
|
||||
private String name;
|
||||
private String phone;
|
||||
private String regionMainCode;
|
||||
private Boolean accountDisabled;
|
||||
private Integer loginFailCnt;
|
||||
/* private Boolean accountLocked;*/
|
||||
private List<String> roleIds;
|
||||
private String roleId;
|
||||
}
|
||||
|
||||
13
core/src/main/resources/mappers/admin/CheckAdminIdMapper.xml
Normal file
13
core/src/main/resources/mappers/admin/CheckAdminIdMapper.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="app.module.core.usecase.admin.checkAdminId.persistence.CheckAdminIdMapper">
|
||||
|
||||
<select id="checkAdminId" >
|
||||
select count(*)
|
||||
from admin
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -7,6 +7,10 @@
|
||||
SELECT
|
||||
a.seq,
|
||||
a.id AS id,
|
||||
a.name,
|
||||
a.region_main_code,
|
||||
u.code_text as region_main_code_name,
|
||||
a.phone,
|
||||
a.created_by,
|
||||
a.created_at,
|
||||
a.updated_by,
|
||||
@@ -16,15 +20,24 @@
|
||||
a.account_locked,
|
||||
COUNT(*) OVER() AS total
|
||||
FROM admin a
|
||||
LEFT JOIN uicode u ON u.parent_id = 'code.region.main' AND u.id = a.region_main_code
|
||||
WHERE a.is_deleted = false
|
||||
|
||||
<if test="cmd.searchField != null and cmd.searchValue != null and cmd.searchValue != ''">
|
||||
<choose>
|
||||
<when test="cmd.searchField == 'email'">AND a.email ILIKE '%' || #{cmd.searchValue} || '%'</when>
|
||||
<when test="cmd.searchField == 'id'">AND a.id ILIKE '%' || #{cmd.searchValue} || '%'</when>
|
||||
<when test="cmd.searchField == 'name'">AND a.name LIKE '%' || #{cmd.searchValue} || '%'</when>
|
||||
<when test="cmd.searchField == 'id'">AND a.id LIKE '%' || #{cmd.searchValue} || '%'</when>
|
||||
</choose>
|
||||
</if>
|
||||
|
||||
<if test="cmd.searchArea != null and cmd.searchArea != '' ">
|
||||
AND a.region_main_code = #{cmd.searchArea}
|
||||
</if>
|
||||
|
||||
<if test="cmd.searchDisabled != null and cmd.searchDisabled != '' ">
|
||||
AND a.account_disabled = CAST(#{cmd.searchDisabled} AS BOOLEAN)
|
||||
</if>
|
||||
|
||||
<if test="cmd.searchRole != null and cmd.searchRole != ''">
|
||||
AND EXISTS (
|
||||
SELECT 1
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
INSERT INTO admin (seq,
|
||||
id,
|
||||
password,
|
||||
name,
|
||||
phone,
|
||||
region_main_code,
|
||||
password_updated_at,
|
||||
account_disabled,
|
||||
@@ -20,6 +22,8 @@
|
||||
VALUES (#{seq},
|
||||
#{id},
|
||||
#{encodedPassword},
|
||||
#{name},
|
||||
#{phone},
|
||||
#{regionMainCode},
|
||||
#{passwordUpdatedAt},
|
||||
#{accountDisabled},
|
||||
@@ -32,6 +36,8 @@
|
||||
UPDATE admin
|
||||
SET
|
||||
password = #{encodedPassword},
|
||||
name = #{name},
|
||||
phone = #{phone},
|
||||
region_main_code = #{regionMainCode},
|
||||
password_updated_at = #{passwordUpdatedAt},
|
||||
account_disabled = #{accountDisabled},
|
||||
@@ -48,14 +54,12 @@
|
||||
role_id,
|
||||
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
) VALUES
|
||||
<foreach collection="roleIds" item="roleId" separator=",">
|
||||
(
|
||||
nextval('admin_has_role_seq'),
|
||||
#{adminSeq},
|
||||
#{roleId},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<update id="deleteAdminRolesByAdminId">
|
||||
|
||||
Reference in New Issue
Block a user