diff --git a/README.md b/README.md index 15b38b2..851da78 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,32 @@ # bf -이유식당 웹 어플리케이션 \ No newline at end of file +-- 쿼리작업중 +SELECT +smc_no, +a.name, +gender, +birthday, +weight_birth, +height_birth, +weight, +height, +allergie, +append_src_img_file, +append_300_img_file, +now(), +'1642860993576' +FROM tbl_bf_family_baby a +INNER JOIN tbl_sync_log b on a.member_id = b.member_id and b.check_num = '1323' and DATE_ADD(b.reg_dt, INTERVAL 180 second) > now() +LIMIT 1; + +select * from tbl_sync_log; +select * from tbl_bf_family; +select * from tbl_bf_family_baby; + +select DATE_ADD(now(), INTERVAL 10 second) from tbl_bf_family_baby; + +select check_num, member_id, reg_dt, DATE_ADD(reg_dt, INTERVAL 10 second) from tbl_sync_log where DATE_ADD(reg_dt, INTERVAL 100 second) > now(); + +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 diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java index 8dc0cda..7382bbe 100644 --- a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java +++ b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java @@ -57,8 +57,7 @@ public class M_Member_envController extends AbstractControllerManager{ M_Util gmUtil = new M_Util(); @RequestMapping(value="setting_nm") - public String setting_nm(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response - , RedirectAttributes ra) { + public String setting_nm(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) { DataMap paramMap = gmUtil.getDataMapFromRequest(request); String view_nm = RenaStringUtil.getData(paramMap, "view_nm"); @@ -381,14 +380,20 @@ public class M_Member_envController extends AbstractControllerManager{ * @param response * @return */ - @RequestMapping(value="ajax_insert_family_baby_sync") + @RequestMapping(value="ajax_sync_baby") @ResponseBody - public HashMap ajax_insert_family_baby_sync(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response) { + public HashMap ajax_sync_baby(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(false); DataMap paramMap = gmUtil.getDataMapFromRequest(request); + DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER); + HashMap result = new HashMap(); result.put("RESULT", ConstantResultCode.RESULT_INIT); + paramMap.put("member_id", rm_mem.get("member_id")); - DataMap rm_mem = new DataMap(); + log.debug("-------------- ajax_sync_baby --------------------"); + log.debug("member_id:" + rm_mem.get("member_id") + ""); + log.debug("sync_num:" + paramMap.get("sync_num") + ""); try { boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap); @@ -411,7 +416,7 @@ public class M_Member_envController extends AbstractControllerManager{ } /** - * 동기화 > 동기화(인증코드 발행) + * 세팅 > 동기화 > 동기화(인증코드 발행) * @param model * @param request * @param response @@ -450,4 +455,32 @@ public class M_Member_envController extends AbstractControllerManager{ return redirect_url; } + + + /** + * 세팅 > 동기화 > 동기화 인증코드 확인 화면 + * @param model + * @param request + * @param response + * @param ra + * @return + */ + @RequestMapping(value="setting_sync_confirm") + public String setting_sync_confirm(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) { + DataMap paramMap = gmUtil.getDataMapFromRequest(request); + String view_nm = RenaStringUtil.getData(paramMap, "view_nm"); + String redirect_url = "m/member_env/" + view_nm; + + try { + boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap); + if(is_login == false) { + ra.addFlashAttribute("call_native_login", "Y"); + redirect_url = "redirect:/m/login/view_login.do"; + } + }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} + + gmUtil.redirectParam(model, paramMap); + + return redirect_url; + } } diff --git a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml index 2c33208..5ec8cdc 100644 --- a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml +++ b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml @@ -96,10 +96,9 @@ append_src_img_file, append_300_img_file, now(), - #ins_member_id# + #member_id# FROM tbl_bf_family_baby a - INNER JOIN tbl_sync_log b on a.member_id = b.member_id and b.check_num = '9656' and DATE_ADD(b.reg_dt, INTERVAL 180 second) > now() - WHERE a.member_id = #member_id# + INNER JOIN tbl_sync_log b on a.member_id = b.member_id and b.check_num = #sync_num# and DATE_ADD(b.reg_dt, INTERVAL 180 second) > now() LIMIT 1 diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync.ftl index ab18eb2..4670836 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync.ftl @@ -20,7 +20,7 @@

동기화 코드

- + 02:59
@@ -38,12 +38,12 @@ + + + +<#include "/m/include/index_bottom.ftl"> \ No newline at end of file