diff --git a/src/main/java/com/backoffice/constants/ConstantSystem.java b/src/main/java/com/backoffice/constants/ConstantSystem.java index ec86973..298a496 100644 --- a/src/main/java/com/backoffice/constants/ConstantSystem.java +++ b/src/main/java/com/backoffice/constants/ConstantSystem.java @@ -95,7 +95,7 @@ public class ConstantSystem { public static String API_KEY = ""; public static String API_SENDNUM = ""; -// public static String MUSIC_PATH = ""; + public static String MUSIC_PATH = ""; public static final String M_KEY = "376d69737379787568616e6765a65a61"; @@ -134,7 +134,7 @@ public class ConstantSystem { API_KEY = PropertyUtil.getProperty(PROPERTIES_FILE, "sms.api_key"); API_SENDNUM = PropertyUtil.getProperty(PROPERTIES_FILE, "sms.api_sendnum"); -// MUSIC_PATH = PropertyUtil.getProperty(PROPERTIES_FILE, "file.music_path"); + MUSIC_PATH = PropertyUtil.getProperty(PROPERTIES_FILE, "file.music_path"); SERVER_NAME_SHORT_URL = SERVER_NAME + "/c/"; // } 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 4f0b8a1..94f53e9 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 @@ -674,8 +674,8 @@ public class M_Member_envController extends AbstractControllerManager{ String delList = request.getParameter("delList"); //삭제 음악파일 목록(콤마구분) List fileList = request.getFiles("file"); //파일 목록 -// String path = ConstantSystem.MUSIC_PATH; //업로드 경로 -> 추후 프로퍼티로 빼야함. - String path = request.getSession().getServletContext().getRealPath("/music"); //업로드 경로 -> 컨텍스트의 music path로 설정 + String path = ConstantSystem.MUSIC_PATH; //업로드 경로 -> 추후 프로퍼티로 빼야함. +// String path = request.getSession().getServletContext().getRealPath("/music"); //업로드 경로 -> 컨텍스트의 music path로 설정 String nFileName = gmUtil.getUniqueNumber(); //업로드 파일명 int idx = 0; diff --git a/src/main/java/com/backoffice/m/memory/M_MemoryController.java b/src/main/java/com/backoffice/m/memory/M_MemoryController.java index 33b93ec..3a7dd66 100644 --- a/src/main/java/com/backoffice/m/memory/M_MemoryController.java +++ b/src/main/java/com/backoffice/m/memory/M_MemoryController.java @@ -118,10 +118,17 @@ public class M_MemoryController extends AbstractControllerManager{ @RequestMapping(value="memory_daily") public String memory_daily(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) { DataMap paramMap = gmUtil.getDataMapFromRequest(request); + String dayFlag = paramMap.getString("dayFlag"); + String currDate = paramMap.getString("currDate"); String view_nm = RenaStringUtil.getData(paramMap, "view_nm"); String redirect_url = "m/memory/memory_daily"; + String today = ""; //날짜선택 화면 표시용 날짜형식 + String day = ""; //해당날짜 요일 + + log.info("currDate:" + currDate); + try { boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap); if(is_login == false) { @@ -130,8 +137,20 @@ public class M_MemoryController extends AbstractControllerManager{ }else{ HttpSession session = request.getSession(false); DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER); - DataMap rm_child = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_CHILD); + + if(currDate.equals("")) { + today = DateUtil.getTodayAddDate(0,"yyyy-MM-dd"); + } else { + if(dayFlag.equals("plus")) { + today = DateUtil.getTodayAddDateWithBaseDate(1, currDate,"yyyy-MM-dd"); + } else { + today = DateUtil.getTodayAddDateWithBaseDate(-1, currDate,"yyyy-MM-dd"); + } + } + + log.info("today:" + today); + //세션에 선택된 아이정보가 있을 경우 if(rm_child != null) { paramMap.put("smc_no", rm_child.get("smc_no")); @@ -142,7 +161,17 @@ public class M_MemoryController extends AbstractControllerManager{ return redirect_url; } - List time_list = memoryBO.select_timeline(paramMap); +// log.info("rm_child:" + rm_child); + int afterbirthday = DateUtil.compareDateWithFormat(rm_child.getString("birthday").substring(0,10), today, DateUtil.F_YYYYMMDDDash); + log.info("a_birth:" + afterbirthday); + + rm_mem.put("past_day", afterbirthday); + rm_mem.put("today", today); + rm_mem.put("day", DateUtil.getDay(today, "yyyy-MM-dd")); + paramMap.put("startDate", today + " 00:00:00"); + paramMap.put("endDate", today + " 23:59:59"); + + List time_list = memoryBO.select_day(paramMap); DataMap.putToModel(model, "time_list", time_list); DataMap.putToModel(model, "rm_mem", rm_mem); } @@ -184,7 +213,7 @@ public class M_MemoryController extends AbstractControllerManager{ log.info("currDate:" + currDate); - if(currDate == null) { + if(currDate.equals("")) { today = DateUtil.getTodayAddDate(-7,"yyyy-MM-dd"); } else { if(dayFlag.equals("plus")) { @@ -200,6 +229,7 @@ public class M_MemoryController extends AbstractControllerManager{ DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER); DataMap rm_child = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_CHILD); + //세션에 선택된 아이정보가 있을 경우 if(rm_child != null) { paramMap.put("smc_no", rm_child.get("smc_no")); diff --git a/src/main/resources/bf.properties b/src/main/resources/bf.properties index d7c6ead..c074f58 100644 --- a/src/main/resources/bf.properties +++ b/src/main/resources/bf.properties @@ -52,7 +52,7 @@ sms.api_id=gaonn0509 sms.api_key=040ec316ad13c59031b5c4c30cdec923 sms.api_sendnum=02-363-5123 -#file.music_path=e:/bf/music/ +file.music_path=c:/bf/music/ mysql_driver=net.sf.log4jdbc.DriverSpy mysql_url=jdbc:log4jdbc:mysql://devops.lookylooks.ai:14236/babyfeed diff --git a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml index bb1153e..2dbf5b4 100644 --- a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml +++ b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml @@ -20,16 +20,114 @@ +
${item['music_name']!}
@@ -96,7 +96,7 @@ function fncRemove(e) { delList += $(e).attr("key") + ","; - $(e).parent().remove(); + $(e).parent().parent().remove(); $("#delList").val(delList); } @@ -140,9 +140,9 @@ "
") } - function fncRemove(e) { - $(e).parent().parent().remove(); - } + // function fncRemove(e) { + // $(e).parent().parent().remove(); + // } <#include "/m/member_env/include_return_url.ftl"> diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl index e2231f1..93ee466 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl @@ -2,64 +2,75 @@ <#include "/m/include/index_top.ftl"> - - -
+ +
- -
- -

메모리

- -
- + +
+ +

메모리

+ +
+ - - + - -
- - 2022.01.02(일) - + +
+ + + + + + +
+ + + +
+ + ${model['rm_mem']['today']!}(${model['rm_mem']['day']!}) + +
+ + + +
+ +
+ + <#list model['time_list'] as item> +
+ +
- - -
-

DAY 173d

-
    +

    DAY + ${model['rm_mem']['past_day']!}d +

    + +
    • 0
    • 2
    • 4
      • @@ -72,74 +83,29 @@
    • 18
    • 20
    • 22
      • -
    -
- - + +
+ -
- - -
+
+ +
- - - - - - - - - - - <#include "/m/include/index_bottom_menu.ftl"> - - <#include "/m/member_env/include_return_url.ftl"> +
+ + + + +<#include "/m/include/index_bottom_menu.ftl"> + +<#include "/m/member_env/include_return_url.ftl"> + + + <#include "/m/include/index_bottom.ftl"> diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily_20220314.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily_20220314.ftl new file mode 100644 index 0000000..e2231f1 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily_20220314.ftl @@ -0,0 +1,145 @@ + + + +<#include "/m/include/index_top.ftl"> + + + + +
+ + +
+ +

메모리

+ +
+ + + + + + + +
+ + + + + + +
+ + + +
+ + 2022.01.02(일) + +
+ + + +
+

DAY 173d

+ +
    +
  • 0
    • +
  • 2
    • +
  • 4
    • +
  • 6
    • +
  • 8
    • +
  • 10
    • +
  • 12
    • +
  • 14
    • +
  • 16
    • +
  • 18
    • +
  • 20
    • +
  • 22
    • +
+
+ + + +
+ + +
+
+ + + + + + + + + + + <#include "/m/include/index_bottom_menu.ftl"> + + <#include "/m/member_env/include_return_url.ftl"> + +<#include "/m/include/index_bottom.ftl"> + diff --git a/src/main/webapp/music/1.mp3 b/src/main/webapp/music/1.mp3 new file mode 100644 index 0000000..da43fe7 Binary files /dev/null and b/src/main/webapp/music/1.mp3 differ diff --git a/src/main/webapp/music/2.mp3 b/src/main/webapp/music/2.mp3 new file mode 100644 index 0000000..31614bb Binary files /dev/null and b/src/main/webapp/music/2.mp3 differ diff --git a/src/main/webapp/music/3.mp3 b/src/main/webapp/music/3.mp3 new file mode 100644 index 0000000..a825125 Binary files /dev/null and b/src/main/webapp/music/3.mp3 differ