메모리 > 일간 적용

설정하기 > 음악설정 업로드 디렉토리 수정 - context.xml 수정
dev_bert
jonghwan76 3 years ago
parent 9e5e70f60e
commit f74179966e

@ -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/"; //
}

@ -674,8 +674,8 @@ public class M_Member_envController extends AbstractControllerManager{
String delList = request.getParameter("delList"); //삭제 음악파일 목록(콤마구분)
List<MultipartFile> 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;

@ -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<DataMap> 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<DataMap> 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"));

@ -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

@ -20,16 +20,114 @@
</select>
<select id="select_day" resultClass="dataMap" parameterClass="dataMap">
SELECT
DATE_FORMAT(a.reg_dt, '%H') as hour,
count(*) as cnt
SELECT start_degree,
category,
title,
CASE WHEN add_degree = '0' then '1' else add_degree END as add_degree
FROM (
SELECT DATE_FORMAT(b.reg_dt, '%H:%i') as hour_min,
(DATE_FORMAT(b.reg_dt, '%H') * 60 + DATE_FORMAT(a.reg_dt, '%i')) * 0.25 as start_degree,
case
when c.val_1 = '1' then 'C4459D'
when c.val_1 = '2' then '45C4A7'
when c.val_1 = '3' then 'C49845'
when c.val_1 = '4' then 'BAC445'
when c.val_1 = '5' then 'C44545'
when c.val_1 = '6' then '4593C4'
when c.val_1 = '7' then 'red'
when c.val_1 = '8' then 'yellow'
when c.val_1 = '9' then 'gray'
when c.val_1 = '10' then 'darkblue'
when c.val_1 = '11' then 'red'
when c.val_1 = '12' then 'darkgreen'
when c.val_1 = '13' then 'darkcyan'
when c.val_1 = '14' then 'darkred'
when c.val_1 = '15' then 'darkorange'
end category,
c.title,
ifnull(
CASE
when c.cd_no = 'BF_NU_TP_1' THEN
(select blm + brm
from tbl_bf_daily_nutrition_1 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_2' THEN
(select bm + bs
from tbl_bf_daily_nutrition_2 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_3' THEN
(select bm + bs
from tbl_bf_daily_nutrition_3 tn1
left outer join tbl_db_nutrient tn on tn1.db_dn_no = tn.dn_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_5' THEN
(select sleep_h * 60 + sleep_m
from tbl_bf_daily_nutrition_5 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_6' THEN
(select 1
from tbl_bf_daily_nutrition_6 tn1
inner join tbl_code_item_str tn2
on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_7' THEN
(select 1
from tbl_bf_daily_nutrition_7 tn1
inner join tbl_db_vac tv on tn1.db_dvs_no = tv.dv_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_9' THEN
(select bm + bs
from tbl_bf_daily_nutrition_9 tn1
left outer join tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_10' THEN
(select bm * 60 + bs
from tbl_bf_daily_nutrition_10 tn1
left outer join tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_11' THEN
(select 1
from tbl_bf_daily_nutrition_11 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_12' THEN
(select disturb_min + disturb_sec
from tbl_bf_daily_nutrition_12 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_13' THEN
(select 1
from tbl_bf_daily_nutrition_13 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_14' THEN
(select 1
from tbl_bf_daily_nutrition_14 tn1
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_15' THEN
(select 1
from tbl_bf_daily_nutrition_15 tn1
where tn1.dn_no = b.dn_no
)
END, 1) AS add_degree
FROM tbl_bf_family_match a
INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
WHERE
a.smc_no = #smc_no#
and DATE_FORMAT(b.reg_dt, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')
GROUP BY DATE_FORMAT(b.reg_dt, '%H')
INNER JOIN tbl_bf_family_baby d on a.smc_no = d.smc_no
WHERE a.smc_no = #smc_no#
and b.reg_dt between STR_TO_DATE(#startDate#, '%Y-%m-%d %H:%i:%s') and STR_TO_DATE(#endDate#, '%Y-%m-%d %H:%i:%s')
GROUP BY DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H:%i:')
ORDER BY b.reg_dt
) XA
</select>
<select id="select_day_week" resultClass="dataMap" parameterClass="dataMap">

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context path="/">
<Resources>
<!-- <PostResources base="d:\bf\music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>-->
<PostResources base="c:\bf\music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>
</Resources>
</Context>

@ -29,8 +29,7 @@
</a>
</li>
<li class="nav_list04">
<#-- <a href="${URL_ROOT}/m/bf_food_info/index.do?return_url=index">-->
<a href="${URL_ROOT}/m/memory/memory_timeline.do?return_url=index">
<a href="${URL_ROOT}/m/memory/memory_daily.do?return_url=index">
<div class="icon">메모리</div>
<div class="tit">메모리</div>
</a>

@ -17,7 +17,7 @@
<div class="set_list_wrap">
<#list model['music_list'] as item>
<div class="list_item item_order">
<input type="hidden" name="music_list" value="${URL_ROOT}/music/${item['music_file_path']!}">
<input type="hidden" name="music_list" value="/bf/upload/${item['music_file_path']!}">
<div>${item['music_name']!}</div>
<div class="order_button">
<div key="${item['idx']!}" onclick="fncRemove(this)">
@ -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 @@
"</div>")
}
function fncRemove(e) {
$(e).parent().parent().remove();
}
// function fncRemove(e) {
// $(e).parent().parent().remove();
// }
</script>
<#include "/m/member_env/include_return_url.ftl">
</body>

@ -2,11 +2,10 @@
<html lang="ko">
<#include "/m/include/index_top.ftl">
<script src="../js/jquery.easypiechart.min.js"></script>
<body>
<!-- wrap -->
<div class="wrap">
<!-- wrap -->
<div class="wrap">
<!-- header_sub -->
<header class="header_wrapper">
@ -49,15 +48,27 @@
<!-- 날짜 -->
<div class="memory_date">
<button type="button"><img src="../img/xxxx_sprites/arrow_01_left02.png" alt=""></button>
2022.01.02(일)
<button type="button"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></button>
<a href="javascript:fncMoveDay('minus')"><img src="../img/xxxx_sprites/arrow_01_left.png" alt=""></a>
${model['rm_mem']['today']!}(${model['rm_mem']['day']!})
<a href="javascript:fncMoveDay('plus')"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></a>
</div>
<!-- //날짜 -->
<!-- pie chart -->
<div class="chart memory_daily_chart" data-percent="60.5">
<p class="title"><span>DAY</span> 173d</p>
<div class="chart memory_daily_chart" data-percent="62.5">
<div class="container">
<!-- conic-gradient(from 시작각도deg, 색상, 범위각도deg, 배경색(투명) 0) -->
<#list model['time_list'] as item>
<div class="data" title="${item.title}" style="background: conic-gradient(from ${item['start_degree']!}deg, #${item['category']!} ${item['add_degree']!}deg, #00ff0000 0)"></div>
</#list>
<span class="center"></span>
</div>
<p class="title1"><span>DAY</span>
${model['rm_mem']['past_day']!}d
</p>
<ul class="hour">
<li>0</li>
@ -76,70 +87,25 @@
</div>
<!-- //pie chart -->
<div class="fix_icon">
<button type="button"><img src="../../img/ico_image_grey_24.png" alt=""></button>
<button type="button"><img src="../../img/ico_share_grey_24.png" alt=""></button>
</div>
</div>
<!-- //wrap -->
<!-- 하단 네비 iyu_nav -->
<nav class="iyu_nav">
<ul>
<li class="nav_list01">
<a href="../sn_nutrition/view_sn_nutrition_main.html">
<div class="icon">영양</div>
<div class="tit">영양</div>
</a>
</li>
<li class="nav_list02">
<a href="../sn_growth_body/view_sn_growth_main.html">
<div class="icon">성장</div>
<div class="tit">성장</div>
</a>
</li>
<li class="nav_list03">
<a href="../sn_index/index.html">
<div class="icon">홈</div>
<div class="tit">홈</div>
</a>
</li>
<li class="nav_list04">
<a href="../sn_food_information/view_sn_food_information_main.html">
<div class="icon">식품정보</div>
<div class="tit">식품정보</div>
</a>
</li>
<li class="nav_list05">
<a href="../sn_community/list_sn_community.html">
<div class="icon">커뮤니티</div>
<div class="tit">커뮤니티</div>
</a>
</li>
</ul>
</nav>
<!-- //iyu_nav -->
<script>
$('.memory_daily_chart').easyPieChart({
barColor: '#FF9C01',
trackColor: '#E5E5E5',
scaleColor: '#ccc',
lineCap: 'butt',
lineWidth: 55,
size: 200,
animate: 1000,
onStart: $.noop,
onStop: $.noop
});
</script>
<!-- 하단 네비 iyu_nav -->
<#include "/m/include/index_bottom_menu.ftl">
<!-- //iyu_nav -->
<#include "/m/member_env/include_return_url.ftl">
</div>
<!-- //wrap -->
<!-- 하단 네비 iyu_nav -->
<#include "/m/include/index_bottom_menu.ftl">
<!-- //iyu_nav -->
<#include "/m/member_env/include_return_url.ftl">
<script>
function fncMoveDay(dayFlag) {
location.href = "${URL_ROOT}/m/memory/memory_daily.do?dayFlag=" + dayFlag + "&currDate=" + "${model['rm_mem']['today']!}";
}
</script>
</body>
<#include "/m/include/index_bottom.ftl">
</html>

@ -0,0 +1,145 @@
<!DOCTYPE html>
<html lang="ko">
<#include "/m/include/index_top.ftl">
<script src="../js/jquery.easypiechart.min.js"></script>
<body>
<!-- wrap -->
<div class="wrap">
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">메모리</h1>
<a href="#" class="side_Rbtn hidden"></a>
</header>
<!-- //header_sub -->
<!-- 메모리 카테고리 -->
<ul class="memory_ca">
<li class="current">
<a href="${URL_ROOT}/m/memory/memory_daily.do?return_url=index">
일간
</a>
</li>
<li>
<a href="${URL_ROOT}/m/memory/memory_week.do?return_url=index">
주간
</a>
</li>
<li>
<a href="${URL_ROOT}/m/memory/memory_timeline.do?return_url=index">
타임라인
</a>
</li>
</ul>
<!-- //메모리 카테고리 -->
<!-- 컬러 박스 -->
<div class="color_box">
<button type="button" class="m_color01"></button>
<button type="button" class="m_color02"></button>
<button type="button" class="m_color03"></button>
<button type="button" class="m_color04"></button>
<button type="button" class="m_color05"></button>
<button type="button" class="m_color06"></button>
</div>
<!-- //컬러 박스 -->
<!-- 날짜 -->
<div class="memory_date">
<button type="button"><img src="../img/xxxx_sprites/arrow_01_left02.png" alt=""></button>
2022.01.02(일)
<button type="button"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></button>
</div>
<!-- //날짜 -->
<!-- pie chart -->
<div class="chart memory_daily_chart" data-percent="60.5">
<p class="title"><span>DAY</span> 173d</p>
<ul class="hour">
<li>0</li>
<li>2</li>
<li>4</li>
<li>6</li>
<li>8</li>
<li>10</li>
<li>12</li>
<li>14</li>
<li>16</li>
<li>18</li>
<li>20</li>
<li>22</li>
</ul>
</div>
<!-- //pie chart -->
<div class="fix_icon">
<button type="button"><img src="../../img/ico_image_grey_24.png" alt=""></button>
<button type="button"><img src="../../img/ico_share_grey_24.png" alt=""></button>
</div>
</div>
<!-- //wrap -->
<!-- 하단 네비 iyu_nav -->
<nav class="iyu_nav">
<ul>
<li class="nav_list01">
<a href="../sn_nutrition/view_sn_nutrition_main.html">
<div class="icon">영양</div>
<div class="tit">영양</div>
</a>
</li>
<li class="nav_list02">
<a href="../sn_growth_body/view_sn_growth_main.html">
<div class="icon">성장</div>
<div class="tit">성장</div>
</a>
</li>
<li class="nav_list03">
<a href="../sn_index/index.html">
<div class="icon">홈</div>
<div class="tit">홈</div>
</a>
</li>
<li class="nav_list04">
<a href="../sn_food_information/view_sn_food_information_main.html">
<div class="icon">식품정보</div>
<div class="tit">식품정보</div>
</a>
</li>
<li class="nav_list05">
<a href="../sn_community/list_sn_community.html">
<div class="icon">커뮤니티</div>
<div class="tit">커뮤니티</div>
</a>
</li>
</ul>
</nav>
<!-- //iyu_nav -->
<script>
$('.memory_daily_chart').easyPieChart({
barColor: '#FF9C01',
trackColor: '#E5E5E5',
scaleColor: '#ccc',
lineCap: 'butt',
lineWidth: 55,
size: 200,
animate: 1000,
onStart: $.noop,
onStop: $.noop
});
</script>
<!-- 하단 네비 iyu_nav -->
<#include "/m/include/index_bottom_menu.ftl">
<!-- //iyu_nav -->
<#include "/m/member_env/include_return_url.ftl">
</body>
<#include "/m/include/index_bottom.ftl">
</html>

Binary file not shown.

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save