Merge branch 'master' into feature/auth

src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java

@@ -143,8 +143,8 @@ public class CtrCntrlController {
 	 * @param id - 관제 ID
 	 * @return
 	 */
-	@GetMapping(value = "/warn/list/{id}")
+	@GetMapping(value = "/warn/detail/{id}")
-	public ResponseEntity<? extends BasicResponse> warnLog(@PathVariable String id){
+	public ResponseEntity<? extends BasicResponse> warnDetail(@PathVariable String id){
 		List<CtrCntrlWarnLogModel> warnLog;
 		
 		try {
@@ -164,7 +164,7 @@ public class CtrCntrlController {
 	 * @return
 	 */
 	@GetMapping(value = "/arcrft/warn/list")
-	public ResponseEntity<? extends BasicResponse> arcrftWarn(@RequestParam("id") String id){
+	public ResponseEntity<? extends BasicResponse> arcrftWarnList(@RequestParam("id") String id){
 		List<CtrCntrlArcrftWarnModel> arcrftWarnList;
 		Map<String, CtrCntrlArcrftWarnModel> result = new HashMap<>();
 

src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWarnLogModel.java

@@ -9,6 +9,7 @@ import com.palnet.biz.jpa.entity.CtrCntrlWarnLog;
 @Data
 public class CtrCntrlWarnLogModel {
 	private Integer warnLogSno;
+	private String idntfNum;
 	private String warnType;
 	private String cntrlId;
 	private Date createDt;

src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java

@@ -189,6 +189,7 @@ public class CtrCntrlService {
 			model.setCreateDt(log.getCreateDt());
 			model.setWarnLogSno(log.getWarnLogSno());
 			model.setWarnType(log.getWarnType());
+			model.setIdntfNum(log.getIdntfNum());
 			
 			warnLog.add(model);
 		}

src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -170,6 +170,10 @@ public class CtrCntrlQueryRepository{
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
 		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
 
+		if(!StringUtils.isEmpty(rq.getSearch1())) {
+			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
+		}
+
 		long count = query
 				.select(qCntrlBasEntity)
 				.from(qCntrlBasEntity)