4월 28일 2차 QA

src/main/java/com/kh/samdado/admin/controller/AdminController.java

@@ -20,7 +20,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.SessionAttributes;
 
-import com.google.gson.Gson;
 import com.kh.samdado.admin.model.exception.AdminException;
 import com.kh.samdado.admin.model.service.AdminService;
 import com.kh.samdado.admin.model.vo.A_board;
@@ -471,7 +470,6 @@ public String rejectBannerAd(@ModelAttribute Alliance alliance,
 
 		if (alliance.getAmassage().equals("이미지 불일치")) {
 			result = aService.updateRejectBannerAdStatusRI(alliance); // RI
-			//int insertNews = mService.insertAlliNews(usno);
 			alert.setAlstatus("RI");
 			insertNew = mService.insertNewApprove(alert);
 		} else { // 포인트 미충전
@@ -491,39 +489,26 @@ public String sendSMS() {
 		return "admin/sendSMSForm";
 	}
 
-	@GetMapping("/selectGetProfit")
-	public @ResponseBody String selectGetProfit() {
+	@PostMapping("/selectGetUserData")
+	public @ResponseBody List<User> selectGetUserData(@RequestBody User userType) {
 
-		List<Integer> profits = aService.selectGetProfit();
-
-		return new Gson().toJson(profits);
+		List<User> userData = aService.selectGetUserData(userType);
+		return userData;
 	}
 
 	@PostMapping("/selectGetAllProfit")
 	public @ResponseBody List<Income> selectGetAllProfit(@RequestBody Income profitType) {
 
 		List<Income> profitRequestResult = aService.selectGetAllProfit(profitType); 
-
-		//System.out.println("profitRequestResult : " + profitRequestResult);
-
 		return profitRequestResult;
 	}
 
 	@PostMapping("/sendAboard")
 	public String sendAboard(A_board aboard, Model model) {
-
-		//System.out.println("aboard : " + aboard);
-
 		int insertAboard = aService.insertAboard(aboard);
-
-		// -- 은솔 : news에 새로운 공지사항 넣기
-		// 1. bno 찾아오기
-		int findBno = mService.findNewBno(aboard);
-
-		aboard.setBno(findBno);
-		int insertNews = mService.insertNewBoard(aboard);
-
-		if (insertAboard > 0 && insertNews > 0) {
+		int insertNewsUser = mService.updateNewUserNews(aboard);
+
+		if (insertAboard > 0 && insertNewsUser > 0) {
 			//System.out.println("insertAboard 결과 : " + insertAboard);
 			model.addAttribute("msg", "공지글 등록에 성공하였습니다.");
 			return "redirect:/admin/home";

src/main/java/com/kh/samdado/admin/model/dao/AdminDao.java

@@ -11,6 +11,7 @@
 import com.kh.samdado.common.model.vo.Report;
 import com.kh.samdado.mypage.model.vo.Point;
 import com.kh.samdado.mypage.model.vo.QnA;
+import com.kh.samdado.user.model.vo.User;
 
 public interface AdminDao {
 
@@ -58,7 +59,8 @@ public interface AdminDao {
 
 	List<Point> getPointList();
 
-	List<Integer> selectGetProfit();
+	//List<Integer> selectGetProfit();
+	List<User> selectGetUserData(User userType);
 
 	Report selectReport(Report report);
 
@@ -80,4 +82,6 @@ public interface AdminDao {
 
 
 
+
+
 }

src/main/java/com/kh/samdado/admin/model/dao/AdminDaoImpl.java

@@ -16,6 +16,7 @@
 import com.kh.samdado.common.model.vo.Report;
 import com.kh.samdado.mypage.model.vo.Point;
 import com.kh.samdado.mypage.model.vo.QnA;
+import com.kh.samdado.user.model.vo.User;
 
 @Repository 
 public class AdminDaoImpl implements AdminDao {
@@ -161,10 +162,16 @@ public List<Point> getPointList() {
 		return sqlSession.selectList("adminMapper.getPointList");
 	}
 
+//	@Override
+//	public List<Integer> selectGetProfit() {
+//		// TODO Auto-generated method stub
+//		return sqlSession.selectList("adminMapper.selectGetProfit");
+//	}
+
 	@Override
-	public List<Integer> selectGetProfit() {
+	public List<User> selectGetUserData(User userType) {
 		// TODO Auto-generated method stub
-		return sqlSession.selectList("adminMapper.selectGetProfit");
+		return sqlSession.selectList("adminMapper.selectGetUserData", userType);
 	}
 
 	@Override
@@ -209,6 +216,8 @@ public List<Income> selectGetAllProfit(Income profitRequestDto) {
 		return sqlSession.selectList("adminMapper.selectGetAllProfit", profitRequestDto);
 	}
 
+
+
 
 
 

src/main/java/com/kh/samdado/admin/model/service/AdminService.java

@@ -12,6 +12,7 @@
 import com.kh.samdado.common.model.vo.Report;
 import com.kh.samdado.mypage.model.vo.Point;
 import com.kh.samdado.mypage.model.vo.QnA;
+import com.kh.samdado.user.model.vo.User;
 
 public interface AdminService {
 
@@ -64,7 +65,8 @@ public interface AdminService {
 
 	List<Point> getPointList();
 
-	List<Integer> selectGetProfit();
+	//List<Integer> selectGetProfit();
+	List<User> selectGetUserData(User userType);
 
 	Report selectReport(Report report);
 
@@ -81,4 +83,6 @@ public interface AdminService {
 	List<Income> selectGetAllProfit(Income profitRequestDto);
 
 
+
+
 }

src/main/java/com/kh/samdado/admin/model/service/AdminServiceImpl.java

@@ -15,6 +15,7 @@
 import com.kh.samdado.common.model.vo.Report;
 import com.kh.samdado.mypage.model.vo.Point;
 import com.kh.samdado.mypage.model.vo.QnA;
+import com.kh.samdado.user.model.vo.User;
 
 @Service
 public class AdminServiceImpl implements AdminService {
@@ -154,10 +155,16 @@ public List<Point> getPointList() {
 		return aDao.getPointList();
 	}
 
+//	@Override
+//	public List<Integer> selectGetProfit() {
+//		// TODO Auto-generated method stub
+//		return aDao.selectGetProfit();
+//	}
+
 	@Override
-	public List<Integer> selectGetProfit() {
+	public List<User> selectGetUserData(User userType) {
 		// TODO Auto-generated method stub
-		return aDao.selectGetProfit();
+		return aDao.selectGetUserData(userType);
 	}
 
 	@Override
@@ -202,6 +209,8 @@ public List<Income> selectGetAllProfit(Income profitRequestDto) {
 		return aDao.selectGetAllProfit(profitRequestDto);
 	}
 
+
+
 
 
 

src/main/java/com/kh/samdado/admin/model/vo/A_board.java

@@ -30,5 +30,5 @@ public class A_board {
 	private String bstatus;
 	private String usno;
 	private String uspart;
-
+	private int usnews;
 }