qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

소스 goolge-java-formatter 적용

Browse Source
This commit is contained in:
LAPTOP-L3VE7KK2\USER 2024-09-25 16:41:32 +09:00
parent c2a5ac72b8
commit 9cd928ccb0
12 changed files with 1049 additions and 865 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/interplug/qcast/biz/mainPage/MainPageController.java
View File

@ -5,16 +5,13 @@ import com.interplug.qcast.biz.object.ObjectService;
import com.interplug.qcast.biz.object.dto.ObjectRequest;
import com.interplug.qcast.biz.object.dto.ObjectResponse;
import com.interplug.qcast.biz.object.dto.SaleStoreResponse;
import com.interplug.qcast.config.message.Messages;
import io.swagger.v3.oas.annotations.Operation;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("/api/main-page")

8
src/main/java/com/interplug/qcast/biz/mainPage/dto/MainPageResponse.java
View File

@ -1,13 +1,11 @@
package com.interplug.qcast.biz.mainPage.dto;
import com.interplug.qcast.biz.object.dto.ObjectResponse;
import com.interplug.qcast.biz.object.dto.PlanResponse;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
// @Data
@Getter
@Setter
@ -15,12 +13,16 @@ public class MainPageResponse {
// 판매점정보
@Schema(description = "판매점ID")
private String saleStoreId;
@Schema(description = "판매점명")
private String saleStoreName;
@Schema(description = "영업사원명")
private String businessCharger;
@Schema(description = "영업사원 연락처")
private String businessChargerTel;
@Schema(description = "영업사원 메일주소")
private String businessChargerMail;

13
src/main/java/com/interplug/qcast/biz/object/ObjectController.java
View File

@ -3,13 +3,12 @@ package com.interplug.qcast.biz.object;
import com.interplug.qcast.biz.object.dto.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("/api/object")
@ -19,7 +18,7 @@ public class ObjectController {
// @Autowired private ObjectService objectService;
private final ObjectService objectService;
@Operation(description = "물건정보 도도부현을 조회한다.")
@Operation(description = "물건정보 도도부현을 조회한다.2")
@GetMapping("/prefecture/list")
@ResponseStatus(HttpStatus.OK)
public List<PrefResponse> selectPrefList() throws Exception {
@ -43,11 +42,12 @@ public class ObjectController {
@Operation(description = "판매점 목록을 조회한다.")
@GetMapping("/saleStore/{saleStoreId}/list")
@ResponseStatus(HttpStatus.OK)
public List<SaleStoreResponse> selectSaleStoreList(@PathVariable String saleStoreId) throws Exception {
public List<SaleStoreResponse> selectSaleStoreList(@PathVariable String saleStoreId)
throws Exception {
return objectService.selectSaleStoreList(saleStoreId);
}
@Operation(description = "물건정보 목록을 조회한다.")
@Operation(description = "물건정보 목록을 조회한다.11")
@GetMapping("/list")
@ResponseStatus(HttpStatus.OK)
public List<ObjectResponse> selectObjectList(ObjectRequest objectRequest) throws Exception {
@ -92,7 +92,8 @@ public class ObjectController {
@Operation(description = "물건정보의 플랜정보를 삭제한다.")
@DeleteMapping("/plan/{objectNo}/{planNo}")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void deletePlan(@PathVariable String objectNo, @PathVariable String planNo) throws Exception {
public void deletePlan(@PathVariable String objectNo, @PathVariable String planNo)
throws Exception {
PlanRequest planRequest = new PlanRequest();
planRequest.setObjectNo(objectNo);
planRequest.setPlanNo(planNo);

3
src/main/java/com/interplug/qcast/biz/object/ObjectMapper.java
View File

@ -1,9 +1,8 @@
package com.interplug.qcast.biz.object;
import com.interplug.qcast.biz.object.dto.*;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@Mapper
interface ObjectMapper {

78
src/main/java/com/interplug/qcast/biz/object/ObjectService.java
View File

@ -2,13 +2,6 @@ package com.interplug.qcast.biz.object;
import com.interplug.qcast.biz.object.dto.*;
import io.micrometer.common.util.StringUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.ini4j.Wini;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
@ -16,6 +9,12 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.ini4j.Wini;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@ -23,6 +22,7 @@ import java.util.List;
public class ObjectService {
@Value("${file.ini.root.path}")
private String baseDirPath;
@Value("${file.ini.base.filename}")
private String baseFileName;
@ -57,7 +57,7 @@ public class ObjectService {
}
public ObjectResponse selectObjectDetail(String objectNo) throws Exception {
// object 상세 정보 조회
// object 상세 정보 조회2
ObjectResponse objectResponse = objectMapper.selectObjectDetail(objectNo);
if (objectResponse != null) {
@ -107,8 +107,13 @@ public class ObjectService {
objectRequest.setObjectNo(objectNo);
// 물건정보 등록
objectRequest.setAddress(objectRequest.getPrefName() + ((!StringUtils.isEmpty(objectRequest.getAddress())) ? objectRequest.getAddress() : ""));
objectRequest.setAddresseeCompanyName(objectRequest.getObjectName() + ' ' + objectRequest.getObjectNameOmit());
objectRequest.setAddress(
objectRequest.getPrefName()
+ ((!StringUtils.isEmpty(objectRequest.getAddress()))
? objectRequest.getAddress()
: ""));
objectRequest.setAddresseeCompanyName(
objectRequest.getObjectName() + ' ' + objectRequest.getObjectNameOmit());
objectRequest.setAddresseeCompanyNameOmit(objectRequest.getObjectNameOmit());
objectRequest.setContentsPath(baseDirPath + "\\\\" + objectRequest.getObjectNo());
result += objectMapper.insertObject(objectRequest);
@ -156,10 +161,18 @@ public class ObjectService {
}
// 물건정보 수정
objectRequest.setAddress(objectRequest.getPrefName() + ((!StringUtils.isEmpty(objectRequest.getAddress())) ? objectRequest.getAddress() : ""));
objectRequest.setAddresseeCompanyName(objectRequest.getObjectName() + ' ' + objectRequest.getObjectNameOmit());
objectRequest.setAddress(
objectRequest.getPrefName()
+ ((!StringUtils.isEmpty(objectRequest.getAddress()))
? objectRequest.getAddress()
: ""));
objectRequest.setAddresseeCompanyName(
objectRequest.getObjectName() + ' ' + objectRequest.getObjectNameOmit());
objectRequest.setAddresseeCompanyNameOmit(objectRequest.getObjectNameOmit());
objectRequest.setContentsPath(baseDirPath + "\\\\" + (tempChgFlg ? objectRequest.getNewObjectNo() : objectRequest.getObjectNo()));
objectRequest.setContentsPath(
baseDirPath
+ "\\\\"
+ (tempChgFlg ? objectRequest.getNewObjectNo() : objectRequest.getObjectNo()));
result += objectMapper.updateObject(objectRequest);
// Plan 목록 조회
@ -188,7 +201,9 @@ public class ObjectService {
}
// 모든 변경 완료 후 재호출
objectResponse = objectMapper.selectObjectDetail((tempChgFlg ? objectRequest.getNewObjectNo() : objectRequest.getObjectNo()));
objectResponse =
objectMapper.selectObjectDetail(
(tempChgFlg ? objectRequest.getNewObjectNo() : objectRequest.getObjectNo()));
return objectResponse;
}
@ -207,7 +222,12 @@ public class ObjectService {
try {
// Dir 및 파일 체크하여 없으면 생성해 준다. (물건번호/플랜번호/파일명)
String dirPath = baseDirPath + File.separator + objectRequest.getObjectNo() + File.separator + objectRequest.getPlanNo();
String dirPath =
baseDirPath
+ File.separator
+ objectRequest.getObjectNo()
+ File.separator
+ objectRequest.getPlanNo();
File file = new File(dirPath);
if (!file.exists()) {
file.mkdirs();
@ -272,10 +292,18 @@ public class ObjectService {
// 도도부현 코드
objectFileSetting(iniFile, groupKey, "都道府県コード", objectRequest.getPrefId());
// 물건번호
objectFileSetting(iniFile, groupKey, "物件コード", !StringUtils.isEmpty(objectRequest.getNewObjectNo()) ? objectRequest.getNewObjectNo() : objectRequest.getObjectNo());
objectFileSetting(
iniFile,
groupKey,
"物件コード",
!StringUtils.isEmpty(objectRequest.getNewObjectNo())
? objectRequest.getNewObjectNo()
: objectRequest.getObjectNo());
// 최종 일본어 형식으로 저장
OutputStreamWriter output = new OutputStreamWriter(new FileOutputStream(dirPath + File.separator + baseFileName), "MS932");
OutputStreamWriter output =
new OutputStreamWriter(
new FileOutputStream(dirPath + File.separator + baseFileName), "MS932");
iniFile.store(output);
output.close();
@ -289,7 +317,14 @@ public class ObjectService {
public void objectFileInfo(ObjectResponse objectResponse) throws Exception {
try {
String filePath = baseDirPath + File.separator + objectResponse.getObjectNo() + File.separator + objectResponse.getPlanNo() + File.separator + baseFileName;
String filePath =
baseDirPath
+ File.separator
+ objectResponse.getObjectNo()
+ File.separator
+ objectResponse.getPlanNo()
+ File.separator
+ baseFileName;
System.out.println(filePath);
File file = new File(filePath);
@ -345,7 +380,8 @@ public class ObjectService {
}
}
public void objectFileSetting(Wini wini, String groupOptName, String optName, String val) throws Exception {
public void objectFileSetting(Wini wini, String groupOptName, String optName, String val)
throws Exception {
if (wini.get(groupOptName, optName) != null) {
wini.remove(groupOptName, optName);
}
@ -374,7 +410,9 @@ public class ObjectService {
// ini 파일 복사
File orgFile = new File(dirPath + File.separator + "1" + File.separator + baseFileName);
File copyFile = new File(dirPath + File.separator + planRequest.getPlanNo() + File.separator + baseFileName);
File copyFile =
new File(
dirPath + File.separator + planRequest.getPlanNo() + File.separator + baseFileName);
Files.copy(orgFile.toPath(), copyFile.toPath(), StandardCopyOption.REPLACE_EXISTING);

45
src/main/java/com/interplug/qcast/biz/object/dto/ObjectRequest.java
View File

@ -1,6 +1,5 @@
package com.interplug.qcast.biz.object.dto;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -9,70 +8,101 @@ public class ObjectRequest {
// 물건정보 ini 파일 설정 순서에 맞쳐 셋팅
@Schema(description = "판매점명")
private String saleStoreName;
@Schema(description = "경칭")
private String objectNameOmit;
@Schema(description = "안건명 후리가나")
private String objectNameKana;
@Schema(description = "안건명")
private String objectName;
@Schema(description = "담당자")
private String receiveUser;
@Schema(description = "우편번호")
private String zipNo;
@Schema(description = "도도부현명")
private String prefName;
@Schema(description = "주소")
private String address;
@Schema(description = "발전시뮬레이션 지역")
private String powerSimArea;
@Schema(description = "판매오더명")
private String workName;
@Schema(description = "부동산 분류코드명")
private String objectStatusName;
@Schema(description = "메모")
private String remarks;
@Schema(description = "설치높이")
private String installHeight;
@Schema(description = "기준풍속")
private String windSpeed;
@Schema(description = "수직적설량")
private String snowCover;
@Schema(description = "면조도구분")
private String surfaceType;
@Schema(description = "전력계약구분")
private String powerConTerms;
@Schema(description = "염해지역 아이템사용 여부")
private String saltAreaChk;
@Schema(description = "한랭지 대책여부")
private String coldAreaChk;
@Schema(description = "판매오더코드")
private String workNo;
@Schema(description = "부동산 분류코드")
private String objectStatusId;
@Schema(description = "도도부현코드")
private String prefId;
@Schema(description = "물건번호")
private String objectNo;
@Schema(description = "생성 물건번호")
private String newObjectNo;
// 그외 물건정보
@Schema(description = "판매점ID")
private String saleStoreId;
@Schema(description = "배송회사명")
private String addresseeCompanyName;
@Schema(description = "배송회사 경칭")
private String addresseeCompanyNameOmit;
@Schema(description = "컨텐츠 파일경로")
private String contentsPath;
@Schema(description = "임시저장여부")
private String tempFlg;
@Schema(description = "임시저장 삭제여부")
private String tempDelFlg;
@Schema(description = "임시저장->저장 변경여부")
private String tempChgFlg;
@Schema(description = "삭제여부")
private String delFlg;
@Schema(description = "사용자아이디")
private String userId;
@ -83,34 +113,47 @@ public class ObjectRequest {
// 검색정보
@Schema(description = "검색 - 물건번호")
private String schObjectNo;
@Schema(description = "검색 - 판매점ID")
private String schSaleStoreId;
@Schema(description = "검색 - 선택판매점ID")
private String schSelSaleStoreId;
@Schema(description = "검색 - 주소")
private String schAddress;
@Schema(description = "검색 - 안건명")
private String schObjectName;
@Schema(description = "검색 - 판매점명")
private String schSaleStoreName;
@Schema(description = "검색 - 사양확장일여부")
private String schSpecDateYn;
@Schema(description = "검색 - 담당자")
private String schReceiveUser;
@Schema(description = "검색 - 견적처")
private String schDispCompanyName;
@Schema(description = "검색 - 날짜구분")
private String schDateType;
@Schema(description = "검색 - 시작일")
private String schFromDt;
@Schema(description = "검색 - 종료일")
private String schToDt;
@Schema(description = "검색 - 정렬순서")
private String schSortType;
// 페이징정보
@Schema(description = "시작 Row")
private String startRow;
@Schema(description = "종료 Row")
private String endRow;
}

33
src/main/java/com/interplug/qcast/biz/object/dto/ObjectResponse.java
View File

@ -1,11 +1,10 @@
package com.interplug.qcast.biz.object.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
// @Data
@Getter
@Setter
@ -13,73 +12,102 @@ public class ObjectResponse {
// 물건정보
@Schema(description = "물건번호")
private String objectNo;
@Schema(description = "판매점ID")
private String saleStoreId;
@Schema(description = "판매점명")
private String saleStoreName;
@Schema(description = "판매오더코드")
private String workNo;
@Schema(description = "부동산 분류코드")
private String objectStatusId;
@Schema(description = "안건명")
private String objectName;
@Schema(description = "경칭")
private String objectNameOmit;
@Schema(description = "안건명 후리가나")
private String objectNameKana;
@Schema(description = "우편번호")
private String zipNo;
@Schema(description = "도도부현코드")
private String prefId;
@Schema(description = "주소")
private String address;
@Schema(description = "메모")
private String remarks;
@Schema(description = "동일물건정보")
private String sameObjectInfo;
@Schema(description = "배송회사명")
private String receiveCompanyName;
@Schema(description = "담당자")
private String receiveUser;
@Schema(description = "사양확정일")
private String specificationConfirmDate;
@Schema(description = "컨텐츠 파일경로")
private String contentsPath;
@Schema(description = "견적처")
private String dispCompanyName;
@Schema(description = "임시저장여부")
private String tempFlg;
@Schema(description = "생성일")
private String createDatetime;
@Schema(description = "생성자")
private String createUserName;
@Schema(description = "갱신일")
private String lastEditDatetime;
@Schema(description = "갱신자")
private String lastEditUserName;
// ini 설정정보
@Schema(description = "발전시뮬레이션 지역")
private String powerSimArea;
@Schema(description = "기준풍속")
private String windSpeed;
@Schema(description = "수직적설량")
private String snowCover;
@Schema(description = "면조도구분")
private String surfaceType;
@Schema(description = "설치높이")
private String installHeight;
@Schema(description = "전력계약구분")
private String powerConTerms;
@Schema(description = "한랭지 대책여부")
private String coldAreaChk;
@Schema(description = "염해지역 아이템사용 여부")
private String saltAreaChk;
// 플랜정보
@Schema(description = "플랜번호")
private String planNo;
@Schema(description = "플랜 전체 건수")
private String planTotCnt;
@ -90,6 +118,7 @@ public class ObjectResponse {
// 페이징 정보
@Schema(description = "Row Number")
private Integer rowNumber;
@Schema(description = "전체 건수")
private Integer totCnt;
}

33
src/main/java/com/interplug/qcast/biz/object/dto/PlanRequest.java
View File

@ -7,70 +7,103 @@ import lombok.Data;
public class PlanRequest {
@Schema(description = "물건번호")
private String objectNo;
@Schema(description = "플랜번호")
private String planNo;
@Schema(description = "시공방법")
private String constructSpecification;
@Schema(description = "설치높이")
private String setupHeight;
@Schema(description = "날씨포인트")
private String weatherPoint;
@Schema(description = "날씨포인트")
private String roofKindId;
@Schema(description = "경사")
private String slope;
@Schema(description = "지붕재 아이템 CLASS ID")
private String roofMaterialClassId;
@Schema(description = "지붕재 아이템 ID")
private String roofMaterialId;
@Schema(description = "가대 설치 ID")
private String supportMethodId;
@Schema(description = "모델")
private String moduleModel;
@Schema(description = "담당자")
private String charger;
@Schema(description = "견적서 유효기간")
private String estimateValidityTerm;
@Schema(description = "결정 플랜")
private String decisionPlan;
@Schema(description = "넘버")
private String number;
@Schema(description = "시스템용량")
private String capacity;
@Schema(description = "강설량")
private String snowfall;
@Schema(description = "표준풍속검사")
private String standardWindSpeedCheck;
@Schema(description = "옵션커버")
private String optionCover;
@Schema(description = "한화여부")
private String hanwfaFlg;
@Schema(description = "기준종류ID")
private String standKindId;
@Schema(description = "기준풍속ID")
private String standardWindSpeedId;
@Schema(description = "가대 메이커")
private String supportMeaker;
@Schema(description = "소비세ID")
private String consumptionTaxId;
@Schema(description = "상태코드")
private String status;
@Schema(description = "사용자아이디")
private String userId;
@Schema(description = "삭제여부")
private String delFlg;
@Schema(description = "파워컨디셔너")
private String pcTypeNo;
@Schema(description = "북면설치여부")
private String northArrangement;
@Schema(description = "지붕재")
private String roofMaterialIdMulti;
@Schema(description = "가대")
private String supportMethodIdMulti;
@Schema(description = "가대 메이커")
private String supportMeakerMulti;
@Schema(description = "다른 지붕재여부")
private String diffRoofEnabled;
@Schema(description = "발주여부")
private String orderFlg;
}

33
src/main/java/com/interplug/qcast/biz/object/dto/PlanResponse.java
View File

@ -7,70 +7,103 @@ import lombok.Data;
public class PlanResponse {
@Schema(description = "물건번호")
private String objectNo;
@Schema(description = "플랜번호")
private String planNo;
@Schema(description = "시공방법")
private String constructSpecification;
@Schema(description = "설치높이")
private String setupHeight;
@Schema(description = "날씨포인트")
private String weatherPoint;
@Schema(description = "날씨포인트")
private String roofKindId;
@Schema(description = "경사")
private String slope;
@Schema(description = "지붕재 아이템 CLASS ID")
private String roofMaterialClassId;
@Schema(description = "지붕재 아이템 ID")
private String roofMaterialId;
@Schema(description = "가대 설치 ID")
private String supportMethodId;
@Schema(description = "모델")
private String moduleModel;
@Schema(description = "담당자")
private String charger;
@Schema(description = "견적서 유효기간")
private String estimateValidityTerm;
@Schema(description = "결정 플랜")
private String decisionPlan;
@Schema(description = "넘버")
private String number;
@Schema(description = "시스템용량")
private String capacity;
@Schema(description = "강설량")
private String snowfall;
@Schema(description = "표준풍속검사")
private String standardWindSpeedCheck;
@Schema(description = "옵션커버")
private String optionCover;
@Schema(description = "한화여부")
private String hanwfaFlg;
@Schema(description = "기준종류ID")
private String standKindId;
@Schema(description = "기준풍속ID")
private String standardWindSpeedId;
@Schema(description = "가대 메이커")
private String supportMeaker;
@Schema(description = "소비세ID")
private String consumptionTaxId;
@Schema(description = "상태코드")
private String status;
@Schema(description = "사용자아이디")
private String userId;
@Schema(description = "삭제여부")
private String delFlg;
@Schema(description = "파워컨디셔너")
private String pcTypeNo;
@Schema(description = "북면설치여부")
private String northArrangement;
@Schema(description = "지붕재")
private String roofMaterialIdMulti;
@Schema(description = "가대")
private String supportMethodIdMulti;
@Schema(description = "가대 메이커")
private String supportMeakerMulti;
@Schema(description = "다른 지붕재여부")
private String diffRoofEnabled;
@Schema(description = "발주여부")
private String orderFlg;
}

1
src/main/java/com/interplug/qcast/biz/object/dto/PrefResponse.java
View File

@ -11,6 +11,7 @@ public class PrefResponse {
// 물건정보
@Schema(description = "도도부현ID")
private String prefId;
@Schema(description = "도도부현명/지역명")
private String prefName;
}

6
src/main/java/com/interplug/qcast/biz/object/dto/SaleStoreResponse.java
View File

@ -11,19 +11,25 @@ public class SaleStoreResponse {
// 판매점정보
@Schema(description = "1차점판매점 여부")
private String firstAgentYn;
@Schema(description = "판매점ID")
private String saleStoreId;
@Schema(description = "판매점명")
private String saleStoreName;
@Schema(description = "판매점레벨")
private String saleStoreLevel;
@Schema(description = "1차점판매점ID")
private String firstAgentId;
@Schema(description = "영업사원명")
private String businessCharger;
@Schema(description = "영업사원 연락처")
private String businessChargerTel;
@Schema(description = "영업사원 메일주소")
private String businessChargerMail;
}

2
src/main/java/com/interplug/qcast/biz/object/dto/WindSpeedResponse.java
View File

@ -11,8 +11,10 @@ public class WindSpeedResponse {
// 기준풍속정보
@Schema(description = "도시명")
private String city;
@Schema(description = "풍속")
private String windSpeed;
@Schema(description = "메모")
private String remarks;
}