From 3a7fc3255bbd9463ad25bbbdd3ff584c4b449e60 Mon Sep 17 00:00:00 2001 From: jonghwan76 Date: Sat, 29 Jan 2022 02:47:40 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=ED=9A=8C=EC=9B=90=20=EC=9E=90=EB=85=80?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=A7=A4=EC=B9=AD=EA=B5=AC=EC=A1=B0=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A4=EB=A7=88=20=EC=88=98=EC=A0=95,=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95=202.=20=EB=8F=99=EA=B8=B0?= =?UTF-8?q?=ED=99=94=20=EA=B4=80=EB=A0=A8=20=EC=BF=BC=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++- .../M_Bf_family_babyBOImpl.java | 15 ++++- .../M_Bf_growth_bodyController.java | 23 +++++--- .../backoffice/m/index/M_IndexController.java | 23 ++++++-- .../backoffice/m/login/M_LoginController.java | 18 ++++-- src/main/resources/log4j2.xml | 8 +-- ...com.backoffice.admin.bf.bf_family_baby.xml | 6 +- .../com.backoffice.admin.bf.bf_recommend.xml | 3 +- .../bf/com.backoffice.admin.bf.bf_score.xml | 18 ++++-- .../m/bf_coach/com.backoffice.m.bf_coach.xml | 2 +- .../com.backoffice.m.bf_family_baby.xml | 57 ++++++++++++++++--- .../com.backoffice.m.bf_growth_body.xml | 22 ++++--- 12 files changed, 152 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 851da78..3197e9c 100644 --- a/README.md +++ b/README.md @@ -29,4 +29,10 @@ select check_num, member_id, reg_dt, DATE_ADD(reg_dt, INTERVAL 10 second) from t select * from tbl_bf_family_baby_order; select * from tbl_member where name = '김엄마'; -select * from tbl_member where name = '김종환'; \ No newline at end of file +select * from tbl_member where name = '김종환'; + + +-- 세션 회원아이디 GET +HttpSession session = request.getSession(false); +DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER); +paramMap.put("member_id", RenaStringUtil.getData(rm_mem, "member_id")); \ No newline at end of file diff --git a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java index f1600c2..682eb2c 100644 --- a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java @@ -2,13 +2,17 @@ package com.backoffice.m.bf_family_baby; import java.sql.SQLException; import java.util.List; - +import com.backoffice.constants.ConstantSystem; +import com.renastudio.creative.web.util.RenaStringUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.renastudio.creative.web.util.AbstractBOManager; import com.renastudio.creative.web.util.DataMap; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + /** * @author renamaestro */ @@ -76,10 +80,15 @@ public class M_Bf_family_babyBOImpl extends AbstractBOManager implements M_Bf_fa return lm; } + /** + * 자녀 수정 페이지 이동 - snut97 + * @param paramMap + * @return + * @throws Exception + */ public DataMap select_bf_family_baby(DataMap paramMap) throws Exception{ DataMap rm = null; - - try { + try { generalDAO.setNamespace(SQLMAP_NAMESPACE); rm = generalDAO.select_item_to_datamap("select_bf_family_baby", paramMap); } catch (SQLException e) { diff --git a/src/main/java/com/backoffice/m/bf_growth_body/M_Bf_growth_bodyController.java b/src/main/java/com/backoffice/m/bf_growth_body/M_Bf_growth_bodyController.java index 0b827fa..a2a1db5 100644 --- a/src/main/java/com/backoffice/m/bf_growth_body/M_Bf_growth_bodyController.java +++ b/src/main/java/com/backoffice/m/bf_growth_body/M_Bf_growth_bodyController.java @@ -63,8 +63,7 @@ public class M_Bf_growth_bodyController extends AbstractControllerManager{ M_Util gmUtil = new M_Util(); @RequestMapping(value="view_bf_growth_body_input") - public String view_bf_growth_body_input(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response - , RedirectAttributes ra) { + public String view_bf_growth_body_input(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) { DataMap paramMap = gmUtil.getDataMapFromRequest(request); @@ -349,14 +348,21 @@ public class M_Bf_growth_bodyController extends AbstractControllerManager{ return redirect_url; } - - - - + + + /** + * 자녀 성장 기록 등록 - snut97 + * @param model + * @param request + * @param response + * @param redirectAttributes + * @return + */ @RequestMapping(value="ajax_insert_bf_growth_body", method=RequestMethod.POST) @ResponseBody - public HashMap ajax_insert_bf_growth_body(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response - , RedirectAttributes redirectAttributes) { + public HashMap ajax_insert_bf_growth_body(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) { + HttpSession session = request.getSession(false); + DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER); DataMap paramMap = gmUtil.getDataMapFromRequest(request); HashMap result = new HashMap(); @@ -371,6 +377,7 @@ public class M_Bf_growth_bodyController extends AbstractControllerManager{ if(RenaStringUtil.isNullOrEmpty(base_dt)) paramMap.put("base_dt", DateUtil.getDateString(DateUtil.F_YYYYMMDDDash)); paramMap.put("weight", 0); + paramMap.put("member_id", RenaStringUtil.getData(rm_mem, "member_id")); if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "data_from")) == true) paramMap.put("data_from", "1"); // 0 자동, 1 수기 입력 bf_growth_bodyBO.insert_bf_growth_body(paramMap); diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java index d3f38fc..35e10d0 100644 --- a/src/main/java/com/backoffice/m/index/M_IndexController.java +++ b/src/main/java/com/backoffice/m/index/M_IndexController.java @@ -181,7 +181,15 @@ public class M_IndexController extends AbstractControllerManager{ return rm_mem; } - + + /** + * 자녀 기본정보 조회 - snut97 + * @param model + * @param request + * @param paramMap + * @return + * @throws Exception + */ @Override public DataMap init_child(ModelMap model, HttpServletRequest request, DataMap paramMap) throws Exception{ HttpSession session = request.getSession(false); @@ -256,7 +264,15 @@ public class M_IndexController extends AbstractControllerManager{ return rm_last; } - + + /** + * 자녀정보 - views/ftl/m/index/index.ftl - snut97 + * @param model + * @param request + * @param response + * @param redirectAttributes + * @return + */ @RequestMapping(value="ajax_child_info", method=RequestMethod.GET) @ResponseBody public DataMap ajax_child_info(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response @@ -279,12 +295,11 @@ public class M_IndexController extends AbstractControllerManager{ String base_dt = DateUtil.getDateString(DateUtil.F_YYYYMMDDDash); paramMap.put("base_dt", base_dt); - // 디폴트 아이 선택 + // 디폴트 아이정보 선택 DataMap rm_child = init_child(model, request, paramMap); result.put("rm_child", rm_child); if(rm_child != null) { - // 선택아이 성장 정보 조회 // 선택아이 성장 정보 조회 DataMap rm_last_h = init_child_info(model, request, paramMap, "Y", "N"); result.put("rm_last_h", rm_last_h); diff --git a/src/main/java/com/backoffice/m/login/M_LoginController.java b/src/main/java/com/backoffice/m/login/M_LoginController.java index e8b1b1e..98589ac 100644 --- a/src/main/java/com/backoffice/m/login/M_LoginController.java +++ b/src/main/java/com/backoffice/m/login/M_LoginController.java @@ -221,8 +221,16 @@ public class M_LoginController extends AbstractControllerManager{ }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} return redirect_url; - } - + } + + /** + * 로그인 처리 view_login.ftl - snut97 + * @param model + * @param request + * @param response + * @param ra + * @return + */ @RequestMapping(value="loginByMemberId") public String loginByMemberId(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response , RedirectAttributes ra) { @@ -338,7 +346,7 @@ public class M_LoginController extends AbstractControllerManager{ /** - * 소셜회원 이유식당 가입여부 체크 + * 소셜회원 이유식당 가입여부 체크 - snut97 * @param request * @param model * @return @@ -376,7 +384,7 @@ public class M_LoginController extends AbstractControllerManager{ } /** - * 소셜로그인 + * 소셜로그인 - snut97 * @param request * @param model * @return @@ -446,7 +454,7 @@ public class M_LoginController extends AbstractControllerManager{ } /** - * 회원가입1단계 - 실명인증 완료 + * 회원가입1단계 - 실명인증 완료 - snut97 * @param request * @param model * @return diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index e6c1e8d..85f8b5c 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -17,12 +17,12 @@ - + - + @@ -44,12 +44,12 @@ - + - + diff --git a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_family_baby.xml b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_family_baby.xml index 3370386..5634b76 100644 --- a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_family_baby.xml +++ b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_family_baby.xml @@ -53,8 +53,9 @@ ,x.append_300_img_file ,x.reg_dt ,x.mod_dt - ,x.member_id + ,y.member_id FROM tbl_bf_family_baby x + INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no WHERE 1 =1 @@ -113,6 +114,7 @@ SELECT x.* ,REPLACE(append_src_img_file.mt_file_local_url, '/cdn001/', '') AS append_src_img_file_url @@ -59,7 +96,7 @@ ,REPLACE(append_300_img_file.mt_file_nm, '/cdn001/', '') AS append_300_img_file_nm FROM ( - SELECT + SELECT x.smc_no ,x.name ,x.gender @@ -73,17 +110,18 @@ ,x.append_300_img_file ,x.reg_dt ,x.mod_dt - ,x.member_id + ,y.member_id FROM tbl_bf_family_baby x + INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no WHERE 1 =1 - AND x.member_id = #member_id# + AND y.member_id = #member_id# ) x LEFT JOIN tbl_mt_file append_src_img_file ON x.append_src_img_file = append_src_img_file.mt_file_seq LEFT JOIN tbl_mt_file append_300_img_file ON x.append_300_img_file = append_300_img_file.mt_file_seq - + LEFT JOIN tbl_bf_family_baby_order smco ON x.smc_no = smco.smc_no ORDER BY smco.smc_order ASC @@ -92,8 +130,9 @@ SELECT - member_id + y.member_id , #base_dt# AS base_dt ,#weight# AS weight ,#height# AS height , #data_from# AS data_from - , smc_no - FROM tbl_bf_family_baby - WHERE smc_no = #smc_no# + , x.smc_no + FROM tbl_bf_family_baby x + INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no + and y.member_id = #member_id# + WHERE x.smc_no = #smc_no# SELECT COUNT(*) FROM tbl_bf_growth_body x + INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no WHERE 1 =1 - AND x.member_id = #member_id# - + AND y.member_id = #member_id# AND x.smc_no = #smc_no#