Merge remote-tracking branch 'origin/dev' into bo_daily
This commit is contained in:
@@ -0,0 +1,110 @@
|
||||
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.util.AuditUtil;
|
||||
import app.module.core.usecase.admin.checkAdminId.persistence.CheckAdminIdMapper;
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelAdminCreateVO;
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortOut;
|
||||
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.SaveAdminMapper;
|
||||
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.SaveAdminHasRoleParam;
|
||||
import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd;
|
||||
import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper;
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
|
||||
|
||||
private final CheckAdminIdMapper checkAdminIdMapper;
|
||||
private final SaveAdminMapper saveAdminMapper;
|
||||
private final BCryptPasswordEncoder passwordEncoder;
|
||||
private final UICodeListMapper uiCodeListMapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public ExcelResultVO operate(MultipartFile file) throws IOException {
|
||||
// 엑셀 파일 읽기
|
||||
Workbook workbook = WorkbookFactory.create(file.getInputStream());
|
||||
Sheet sheet = workbook.getSheetAt(0);
|
||||
Integer success = 0;
|
||||
List<UICodeElement> uiCodeElementList = uiCodeListMapper.findByParentId("code.region.main");
|
||||
// 첫 번째 행은 헤더로 간주하고 스킵
|
||||
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
|
||||
Row row = sheet.getRow(i);
|
||||
if (row == null) continue;
|
||||
|
||||
ExcelAdminCreateVO admin = new ExcelAdminCreateVO();
|
||||
admin.setRoleId(getRoleId(row.getCell(0))); // 권한
|
||||
admin.setRegionMainCode(getRegionMainCode(row.getCell(1),uiCodeElementList)); // 실사
|
||||
admin.setId(getCellValue(row.getCell(2))); // ID
|
||||
admin.setPassword(getCellValue(row.getCell(3))); // 비밀번호
|
||||
admin.setName(getCellValue(row.getCell(4))); // 이름
|
||||
admin.setPhone(getCellValue(row.getCell(5))); // 전화번호
|
||||
|
||||
Integer duplicate = checkAdminIdMapper.checkAdminId(admin.getId());
|
||||
|
||||
if(duplicate == 0) {
|
||||
SaveAdminCmd cmd = new SaveAdminCmd(
|
||||
null,
|
||||
admin.getId(),
|
||||
passwordEncoder.encode(admin.getPassword()),
|
||||
LocalDateTime.now(),
|
||||
admin.getName(),
|
||||
admin.getPhone(),
|
||||
admin.getRegionMainCode(),
|
||||
false,
|
||||
0,
|
||||
admin.getRoleId()
|
||||
);
|
||||
success += saveAdminMapper.insertAdmin(AuditUtil.create(cmd));
|
||||
|
||||
if (!admin.getRoleId().isEmpty()) {
|
||||
saveAdminMapper.insertAdminHasRoles(
|
||||
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), admin.getRoleId())));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
workbook.close();
|
||||
return new ExcelResultVO(sheet.getLastRowNum()-1 , success);
|
||||
}
|
||||
|
||||
// 셀 값을 문자열로 변환
|
||||
private String getCellValue(Cell cell) {
|
||||
if (cell == null) return "";
|
||||
return switch (cell.getCellType()) {
|
||||
case STRING -> cell.getStringCellValue();
|
||||
case NUMERIC -> String.valueOf((long) cell.getNumericCellValue());
|
||||
default -> "";
|
||||
};
|
||||
}
|
||||
|
||||
private String getRoleId(Cell cell){
|
||||
if (cell == null) return "";
|
||||
return switch (cell.getStringCellValue().trim()) {
|
||||
case "관리자" -> "ROLE_ADMIN";
|
||||
case "지방실사" -> "ROLE_LOCAL_INSPECTOR";
|
||||
case "조사원" -> "ROLE_RESEARCHER";
|
||||
default -> "";
|
||||
};
|
||||
}
|
||||
|
||||
private String getRegionMainCode(Cell cell,List<UICodeElement> uiCodeElementList){
|
||||
if (cell == null) return "";
|
||||
|
||||
return uiCodeElementList.stream().filter(code -> code.getCodeText().equals(cell.getStringCellValue().trim()))
|
||||
.findFirst()
|
||||
.map(UICodeElement::getId).orElse("");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ExcelAdminCreateVO {
|
||||
private Long seq;
|
||||
private String id;
|
||||
private String password;
|
||||
private String name;
|
||||
private String phone;
|
||||
private String regionMainCode;
|
||||
private String roleId;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ExcelResultVO {
|
||||
private Integer total;
|
||||
private Integer success;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.core.usecase.admin.excelSaveAdmin.ports;
|
||||
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import java.io.IOException;
|
||||
|
||||
public interface ExcelSaveAdminPortIn {
|
||||
ExcelResultVO operate(MultipartFile file) throws IOException;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.core.usecase.admin.excelSaveAdmin.ports;
|
||||
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public interface ExcelSaveAdminPortOut {
|
||||
|
||||
ExcelResultVO operate(MultipartFile file) throws IOException;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package app.module.core.usecase.admin.excelSaveAdmin.ports.application;
|
||||
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortIn;
|
||||
import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortOut;
|
||||
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class ExcelSaveAdminService implements ExcelSaveAdminPortIn {
|
||||
|
||||
private final ExcelSaveAdminPortOut excelSaveAdminPortOut;
|
||||
|
||||
@Override
|
||||
public ExcelResultVO operate(MultipartFile file) throws IOException {
|
||||
|
||||
return excelSaveAdminPortOut.operate(file);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaveAdminMapper {
|
||||
void insertAdmin(SaveAdminCmd cmd);
|
||||
Integer insertAdmin(SaveAdminCmd cmd);
|
||||
void updateAdmin(SaveAdminCmd cmd);
|
||||
void insertAdminHasRoles(SaveAdminHasRoleParam param);
|
||||
void deleteAdminRolesByAdminId(DeleteAdminHasRoleParam param);
|
||||
|
||||
@@ -4,6 +4,7 @@ import app.module.core.config.adapters.persistence.entity.UploadFile;
|
||||
import app.module.core.config.application.annotation.DeleteCommand;
|
||||
import app.module.core.config.application.annotation.UpdateCommand;
|
||||
import app.module.core.config.application.enums.FileUploadType;
|
||||
import app.module.core.config.application.util.AuditUtil;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.config.application.util.SftpFileDeleteUtil;
|
||||
import app.module.core.usecase.file.createFile.ports.CreateFilePortOut;
|
||||
@@ -34,11 +35,11 @@ class UpdateFileDao implements UpdateFilePortOut {
|
||||
@DeleteCommand
|
||||
public void operate(UpdateFileCmd command) {
|
||||
|
||||
List<UploadFileDto> deletedFileList = mapper.findDeleteFileList(new UpdateUploadFileParam(
|
||||
List<UploadFileDto> deletedFileList = mapper.findDeleteFileList(AuditUtil.update(new UpdateUploadFileParam(
|
||||
command.getId(),
|
||||
command.getFileMappingIds(),
|
||||
command.getType().getName()
|
||||
));
|
||||
)));
|
||||
|
||||
for (UploadFileDto file : deletedFileList) {
|
||||
try {
|
||||
@@ -54,13 +55,13 @@ class UpdateFileDao implements UpdateFilePortOut {
|
||||
|
||||
if (!deletedFileList.isEmpty()) {
|
||||
mapper.deleteFile(
|
||||
new UpdateUploadFileParam(
|
||||
AuditUtil.delete(new UpdateUploadFileParam(
|
||||
command.getId(),
|
||||
deletedFileList.stream().map(UploadFileDto::getId).toList(),
|
||||
command.getType().getName()));
|
||||
command.getType().getName())));
|
||||
}
|
||||
|
||||
command.getFileMappingIds().forEach(fileId -> mapper.updateFile(new UploadFileDto(fileId, command.getId(),command.getType().getName())));
|
||||
command.getFileMappingIds().forEach(fileId -> mapper.updateFile(AuditUtil.update(new UploadFileDto(fileId, command.getId(),command.getType().getName()))));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -8,4 +8,5 @@ import org.apache.ibatis.annotations.Param;
|
||||
@Mapper
|
||||
public interface UICodeListMapper {
|
||||
List<UICodeElement> findByParentId(@Param("parentId") String parentId);
|
||||
List<UICodeElement> findByLikeId(@Param("id") String id);
|
||||
}
|
||||
|
||||
@@ -23,6 +23,13 @@ class UICodeTopTierDao implements UICodeTopTierPortOut {
|
||||
return recursiveMapping(topTier);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public UICodeTopTier connect(String id) {
|
||||
UICode topTier = mapper.findTopTierId(id);
|
||||
return recursiveMapping(topTier);
|
||||
}
|
||||
|
||||
private UICodeTopTier recursiveMapping(UICode topTier) {
|
||||
List<UICode> children = mapper.findChildren(topTier.getId());
|
||||
|
||||
|
||||
@@ -7,5 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
@Mapper
|
||||
public interface UICodeTopTierMapper {
|
||||
UICode findTopTier(); // parent_id IS NULL 인 UICode 조회
|
||||
UICode findTopTierId(String id); // UICode id 조회
|
||||
List<UICode> findChildren(String parentId); // 재귀 하위 코드
|
||||
}
|
||||
|
||||
@@ -5,4 +5,5 @@ import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTop
|
||||
public interface UICodeTopTierPortIn {
|
||||
|
||||
UICodeTopTier connect();
|
||||
UICodeTopTier connect(String id);
|
||||
}
|
||||
|
||||
@@ -5,4 +5,5 @@ import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTop
|
||||
public interface UICodeTopTierPortOut {
|
||||
|
||||
UICodeTopTier connect();
|
||||
UICodeTopTier connect(String id);
|
||||
}
|
||||
|
||||
@@ -16,4 +16,10 @@ public class UICodeTopTierService implements UICodeTopTierPortIn {
|
||||
public UICodeTopTier connect() {
|
||||
return portOut.connect();
|
||||
}
|
||||
|
||||
@Override
|
||||
public UICodeTopTier connect(String parentId) {
|
||||
return portOut.connect(parentId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="app.module.core.usecase.admin.saveAdmin.adapters.persistence.SaveAdminMapper">
|
||||
|
||||
<insert id="insertAdmin">
|
||||
<update id="insertAdmin">
|
||||
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
|
||||
SELECT nextval('admin_seq')
|
||||
</selectKey>
|
||||
@@ -29,7 +29,7 @@
|
||||
#{accountDisabled},
|
||||
#{loginFailCnt},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>)
|
||||
</insert>
|
||||
</update>
|
||||
|
||||
<update id="updateAdmin">
|
||||
/* updateAdmin : 관리자 정보 수정 */
|
||||
|
||||
@@ -19,4 +19,20 @@
|
||||
ORDER BY order_no ASC
|
||||
</select>
|
||||
|
||||
|
||||
<select id="findByLikeId" resultType="app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement">
|
||||
SELECT
|
||||
id,
|
||||
parent_id,
|
||||
order_no,
|
||||
code_text,
|
||||
code_value,
|
||||
code_type,
|
||||
msg_code,
|
||||
in_use
|
||||
FROM uicode
|
||||
WHERE id LIKE '%' || #{id} || '%'
|
||||
AND is_deleted = false
|
||||
ORDER BY order_no ASC
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -19,4 +19,12 @@
|
||||
AND is_deleted = false
|
||||
ORDER BY order_no ASC
|
||||
</select>
|
||||
|
||||
<select id="findTopTierId"
|
||||
resultType="app.module.core.config.adapters.persistence.entity.UICode">
|
||||
SELECT id, code_text, order_no, parent_id
|
||||
FROM uicode
|
||||
WHERE id = #{id}
|
||||
AND is_deleted = false
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user