Merge branch 'refs/heads/dev' into xithoon

pull/24/head
xhoon 2 months ago
commit 09b6b2953a

@ -2,9 +2,8 @@ package go.kr.project.biz.minwon.init.controller;
import egovframework.constant.TilesConstants;
import egovframework.util.ApiResponseUtil;
import go.kr.project.biz.minwon.init.model.MinwonInitDto;
import go.kr.project.biz.minwon.init.dto.MinwonInitDto;
import go.kr.project.biz.minwon.init.service.MinwonInitService;
import go.kr.project.template.noticeSample.model.NoticeSampleSearchVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;

@ -1,7 +1,7 @@
package go.kr.project.biz.minwon.init.controller;
import egovframework.constant.TilesConstants;
import go.kr.project.biz.minwon.init.model.SampleDto;
import go.kr.project.biz.minwon.init.dto.SampleDto;
import go.kr.project.biz.minwon.init.service.SampleService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -46,7 +46,7 @@ public class SampleController {
@GetMapping("/minwon/init/sample.do")
public String samplePageReturn() {
// .do로 리턴하는건 jsp페이지를 찾아서 리턴하라는 표시이다
// 꼭 스트링으로 리턴해야한다. 스트링리턴이 아니면 페이지를 찾지 않고 문자열을 리턴해버린다.
// 꼭 스트링으로 jsp 경로 정확히 리턴해야한다. 아니면 페이지를 찾지 않고 문자열을 리턴해버린다.
// webapp/WEB-INF/views 안에있는 jsp 페이지를 찾아준다.
// 타일즈는 화면 레이아웃이다. 기본적으로는 BASE를 붙이면 된다.
// 이렇게 리턴함면 sample.jsp를 찾아서 리턴해준다.
@ -58,6 +58,9 @@ public class SampleController {
// 받아서 비즈니스에 맞춰 로직을 짜면 된다.
// 아래를 보면 위와 다르게 GetMapping 이 아니라 PostMapping이다.
// https://dev-coco.tistory.com/60 아래 블로그를 참고
// get : select / post : insert / put : update / delete : delete 로 보통 하긴 하는데
// 파라미터가 너무 많거나, 숨겨야될때(get은 쿼리스트링에 노출되니까) post를 써서 조회하기도 한다.
// 어쩌피 Restful도 아니니 http header/body에 포함시킬것이냐 만 정해서 쓰자.
@PostMapping("/minwon/init/sample-search-myBatis.ajax")
public ResponseEntity<?> sampleAjaxMybatis(@RequestBody SampleDto.Request.Search testDto) {

@ -1,11 +1,8 @@
package go.kr.project.biz.minwon.init.model;
package go.kr.project.biz.minwon.init.dto;
import go.kr.project.system.common.model.DefaultVO;
import go.kr.project.system.common.model.PagingVO;
import lombok.*;
import javax.validation.Valid;
public class MinwonInitDto {

@ -1,4 +1,4 @@
package go.kr.project.biz.minwon.init.model;
package go.kr.project.biz.minwon.init.dto;
import lombok.Getter;
import lombok.Setter;

@ -1,6 +1,6 @@
package go.kr.project.biz.minwon.init.mapper;
import go.kr.project.biz.minwon.init.model.SampleDto;
import go.kr.project.biz.minwon.init.dto.SampleDto;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

@ -2,7 +2,7 @@ package go.kr.project.biz.minwon.init.repository;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
import go.kr.project.biz.minwon.init.model.MinwonInitDto;
import go.kr.project.biz.minwon.init.dto.MinwonInitDto;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;

@ -2,8 +2,7 @@ package go.kr.project.biz.minwon.init.repository;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
import go.kr.project.biz.minwon.init.model.MinwonInitDto;
import go.kr.project.biz.minwon.init.model.SampleDto;
import go.kr.project.biz.minwon.init.dto.SampleDto;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;

@ -1,7 +1,6 @@
package go.kr.project.biz.minwon.init.service;
import go.kr.project.biz.minwon.init.model.MinwonInitDto;
import org.springframework.stereotype.Service;
import go.kr.project.biz.minwon.init.dto.MinwonInitDto;
import java.util.List;

@ -1,6 +1,6 @@
package go.kr.project.biz.minwon.init.service;
import go.kr.project.biz.minwon.init.model.SampleDto;
import go.kr.project.biz.minwon.init.dto.SampleDto;
import java.util.List;

@ -1,6 +1,6 @@
package go.kr.project.biz.minwon.init.service.impl;
import go.kr.project.biz.minwon.init.model.MinwonInitDto;
import go.kr.project.biz.minwon.init.dto.MinwonInitDto;
import go.kr.project.biz.minwon.init.repository.MinwonInitQueryDslRepository;
import go.kr.project.biz.minwon.init.service.MinwonInitService;
import go.kr.project.domain.repo.cp.CpAnswerRepository;

@ -1,7 +1,7 @@
package go.kr.project.biz.minwon.init.service.impl;
import go.kr.project.biz.minwon.init.mapper.SampleMapper;
import go.kr.project.biz.minwon.init.model.SampleDto;
import go.kr.project.biz.minwon.init.dto.SampleDto;
import go.kr.project.biz.minwon.init.repository.SampleQueryDslRepository;
import go.kr.project.biz.minwon.init.service.SampleService;
import go.kr.project.domain.entity.CpMain;

@ -1,31 +1,30 @@
package go.kr.project.biz.totalInfo.controller;
import egovframework.constant.MessageConstants;
import egovframework.constant.TilesConstants;
import egovframework.util.ApiResponseUtil;
import go.kr.project.biz.minwon.init.model.MinwonInitDto;
import go.kr.project.biz.totalInfo.service.TotalInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Controller
@RequiredArgsConstructor
public class TotalInfoController {
private final TotalInfoService totalInfoService;
@GetMapping("/total/info.do")
public String totalInfoViewPopup(){
return "biz/totalInfo/totalInfo_popup" + TilesConstants.POPUP;
}
@PostMapping("/total/info/info.ajax")
@GetMapping("/total/info/info.ajax/{mmCode}")
@ResponseBody
public ResponseEntity<?> getMinwonInitListAjax() {
public ResponseEntity<?> findTotalInfo(@PathVariable String mmCode) {
totalInfoService.findTotalInfo(mmCode);
return ApiResponseUtil.success("");

@ -0,0 +1,46 @@
package go.kr.project.biz.totalInfo.model;
import lombok.Getter;
import lombok.Setter;
public class TotalInfoDto {
public static class Request {
@Getter
@Setter
public static class Search {
private String mmCode;
}
}
public static class Response {
public static class TotalInfo {
//CP_MAIN
//CP_ANSWER
//CP_OWNER
//CP_INSTRUCT
//CP_INSTRUCT_ANSWER
//CP_VIOLATION
}
}
}

@ -0,0 +1,45 @@
package go.kr.project.biz.totalInfo.repository;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
import go.kr.project.biz.minwon.init.dto.SampleDto;
import go.kr.project.biz.totalInfo.model.TotalInfoDto;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import java.util.List;
import static go.kr.project.domain.entity.QCpMain.cpMain;
@Repository
@RequiredArgsConstructor
@Slf4j
public class TotalInfoQueryDslRepository {
private final JPAQueryFactory queryFactory;
public TotalInfoDto.Response.TotalInfo findTotalInfo(String mmCode) {
//해당 QueryDsl문법이 어렵다면, sql문을 ChatGpt에 붙여넣고 QueryDsl로 바꿔달라고 하면 바꿔준다.
//읽어보고 맞다면 붙여넣으면 된다.
TotalInfoDto.Response.TotalInfo result = queryFactory
.select(
Projections.fields(
TotalInfoDto.Response.TotalInfo.class,
cpMain.mmCode
)
)
.from(cpMain)
.where(
cpMain.mmCode.eq(mmCode)
)
.fetchOne();
return null;
}
}

@ -0,0 +1,7 @@
package go.kr.project.biz.totalInfo.service;
public interface TotalInfoService {
String findTotalInfo(String mmCode);
}

@ -0,0 +1,24 @@
package go.kr.project.biz.totalInfo.service.impl;
import go.kr.project.biz.totalInfo.repository.TotalInfoQueryDslRepository;
import go.kr.project.biz.totalInfo.service.TotalInfoService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
@Slf4j
public class TotalInfoServiceImpl implements TotalInfoService {
private final TotalInfoQueryDslRepository totalInfoQueryDslRepository;
@Override
public String findTotalInfo(String mmCode) {
totalInfoQueryDslRepository.findTotalInfo(mmCode);
return "";
}
}

@ -12,8 +12,8 @@
아래 보면 이너클래스는 $형태로 들어간다.
-->
<select id="selectAllSample"
parameterType="go.kr.project.biz.minwon.init.model.SampleDto$Request$Search"
resultType="go.kr.project.biz.minwon.init.model.SampleDto$Response$cpMain">
parameterType="go.kr.project.biz.minwon.init.dto.SampleDto$Request$Search"
resultType="go.kr.project.biz.minwon.init.dto.SampleDto$Response$cpMain">
select *
from cp_main
where 1=1

@ -0,0 +1,42 @@
package go.kr.project.domain.entity;
import lombok.*;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "cp_seall_one")
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class CpSeallOne {
@EmbeddedId
private CpSeallOneId id; // 복합 PK (SO_SGGCODE, SO_IN_DT)
@Column(name = "SO_IN_GB", length = 1)
private String soInGb;
@Column(name = "SO_JSDATE", length = 8)
private String soJsdate;
@Column(name = "SO_BBS_NO", length = 15)
private String soBbsNo;
@Column(name = "SO_MMCODE", length = 16)
private String soMmcode;
@Column(name = "SO_STATE", length = 1)
private String soState;
@Column(name = "SO_USER")
private Integer soUser;
@Column(name = "SO_PUT_DT", length = 14)
private String soPutDt;
}

@ -0,0 +1,22 @@
package go.kr.project.domain.entity;
import lombok.*;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import java.io.Serializable;
@Embeddable
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class CpSeallOneId implements Serializable {
@Column(name = "SO_SGGCODE", length = 6, nullable = false)
private String soSggcode;
@Column(name = "SO_IN_DT", length = 14, nullable = false)
private String soInDt;
}

@ -0,0 +1,50 @@
package go.kr.project.domain.entity_new;
import lombok.*;
import org.hibernate.annotations.Comment;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "cp_seall_one")
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class CpSeallOne {
@EmbeddedId
private CpSeallOneId id; // 복합 PK (SO_SGGCODE, SO_IN_DT)
@Column(name = "REG_SE", length = 1)
@Comment("등록 구분")
private String soInGb;
@Column(name = "RCPT_YMD", length = 8)
@Comment("접수 일자")
private String soJsdate;
@Column(name = "LIST_NO", length = 15)
@Comment("목록 번호")
private String soBbsNo;
@Column(name = "CRDN_ID", length = 16)
@Comment("단속 ID")
private String soMmcode;
@Column(name = "DATA_STTS", length = 1)
@Comment("자료 상태")
private String soState;
@Column(name = "REG_USER")
@Comment("등록 사용자")
private Integer soUser;
@Column(name = "REG_DT", length = 14)
@Comment("등록 일시")
private String soPutDt;
}

@ -0,0 +1,25 @@
package go.kr.project.domain.entity_new;
import lombok.*;
import org.hibernate.annotations.Comment;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import java.io.Serializable;
@Embeddable
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class CpSeallOneId implements Serializable {
@Column(name = "SGG_CD", length = 6)
@Comment("시군구 코드")
private String soSggcode;
@Column(name = "APLY_DT", length = 14)
@Comment("신청 일시")
private String soInDt;
}

@ -0,0 +1,7 @@
package go.kr.project.domain.repo.cp;
import go.kr.project.domain.entity.CpSeallOne;
import org.springframework.data.jpa.repository.JpaRepository;
public interface CpSeallOneRepository extends JpaRepository<CpSeallOne, Integer> {
}

@ -0,0 +1,7 @@
package go.kr.project.domain.repo.cp;
import go.kr.project.domain.entity.CpSeallOne;
import org.springframework.data.jpa.repository.JpaRepository;
public interface CpSeallOneRepository extends JpaRepository<CpSeallOne, Integer> {
}
Loading…
Cancel
Save