diff --git a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBO.java b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBO.java index 039e933..464b68c 100644 --- a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBO.java +++ b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBO.java @@ -10,31 +10,10 @@ public interface M_Bf_boardBO { public abstract DataMap select_bf_view_board(DataMap paramMap) throws Exception; public abstract List select_list_bf_board(DataMap paramMap) throws Exception; public abstract List select_bf_board_img_by_b_no(DataMap paramMap) throws Exception; + public abstract List select_bf_board_vote_by_b_no(DataMap paramMap) throws Exception; + public abstract int update_bf_board(DataMap paramMap) throws Exception; public abstract Object insert_bf_board(DataMap paramMap) throws Exception; - /* - public abstract List ajax_select_bf_community_comment_list(DataMap paramMap) throws Exception; - public abstract List select_bf_community_tag_by_b_no(DataMap paramMap) throws Exception; - public abstract List select_list_bf_community(DataMap paramMap) throws Exception; - - public abstract List select_bf_community_comment_list(DataMap paramMap) throws Exception; - public abstract List select_bf_community_comment_list_child(DataMap paramMap) throws Exception; - public abstract int select_list_bf_community_count(DataMap paramMap) throws Exception; - public abstract int select_bf_community_by_b_no_comment_count(DataMap paramMap) throws Exception; - public abstract int select_bf_community_by_p_bc_id_comment_count(DataMap paramMap) throws Exception; - - public abstract int update_bf_community(DataMap paramMap) throws Exception; - public abstract int update_bf_community_comment(DataMap paramMap) throws Exception; - - public abstract int delete_bf_community_like_by_b_no(DataMap paramMap) throws Exception; - public abstract int delete_bf_community(DataMap paramMap) throws Exception; - public abstract int delete_bf_community_comment(DataMap paramMap) throws Exception; - - public abstract Object insert_bf_community_like_by_b_no(DataMap paramMap) throws Exception; - public abstract Object insert_bf_community(DataMap paramMap) throws Exception; - public abstract Object insert_bf_community_comment(DataMap paramMap) throws Exception; - */ - } diff --git a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBOImpl.java b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBOImpl.java index 35974ff..5a83a91 100644 --- a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardBOImpl.java @@ -53,6 +53,18 @@ public class M_Bf_boardBOImpl extends AbstractBOManager implements M_Bf_boardBO return lm; } + public List select_bf_board_vote_by_b_no(DataMap paramMap) throws Exception{ + List lm = null; + + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + lm = generalDAO.select_to_list("select_bf_board_vote_by_b_no", paramMap); + } catch (SQLException e) { + throw e; + } + + return lm; + } public Object insert_bf_board(DataMap paramMap) throws Exception{ @@ -68,12 +80,21 @@ public class M_Bf_boardBOImpl extends AbstractBOManager implements M_Bf_boardBO String bd_no = String.valueOf(resultObj); DataMap dm = new DataMap(); dm.put("bd_no", bd_no); - + ArrayList list_file_key = (ArrayList) paramMap.get("list_file_key"); - for(int idx = 0; idx < list_file_key.size(); idx++){ - dm.put("file_seq", list_file_key.get(idx)); - generalDAO.insert("insert_bf_board_img_by_b_no", dm); - } + if(list_file_key !=null) { + for(int idx = 0; idx < list_file_key.size(); idx++){ + dm.put("file_seq", list_file_key.get(idx)); + generalDAO.insert("insert_bf_board_img_by_b_no", dm); + } + } + ArrayList list_vote_content = (ArrayList) paramMap.get("list_vote_content"); + if(list_vote_content !=null) { + for(int idx = 0; idx < list_vote_content.size(); idx++){ + dm.put("v_content", list_vote_content.get(idx)); + generalDAO.insert("insert_bf_board_vote_by_b_no", dm); + } + } generalDAO.commitTransaction(); } catch (SQLException e) { @@ -112,7 +133,15 @@ public class M_Bf_boardBOImpl extends AbstractBOManager implements M_Bf_boardBO generalDAO.update("insert_bf_board_img_by_b_no", map_img); } } - + DataMap dm = new DataMap(); + dm.put("bd_no", bd_no); + generalDAO.delete("delete_bf_board_vote_by_b_no", paramMap); + ArrayList list_vote_content = (ArrayList) paramMap.get("list_vote_content"); + for(int idx = 0; idx < list_vote_content.size(); idx++){ + dm.put("v_content", list_vote_content.get(idx)); + generalDAO.insert("insert_bf_board_vote_by_b_no", dm); + } + generalDAO.commitTransaction(); } catch (SQLException e) { throw e; diff --git a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java index 77d1fe7..e342b8d 100644 --- a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java +++ b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java @@ -71,7 +71,9 @@ public class M_Bf_boardController extends AbstractControllerManager { DataMap.putToModel(model, "lm", lm); } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} - + if(paramMap.get("bd_tp") == null) { + paramMap.put("bd_tp" ,""); + } gmUtil.redirectParam(model, paramMap); @@ -101,11 +103,14 @@ public class M_Bf_boardController extends AbstractControllerManager { List lm_pick_img = bf_boardBo.select_bf_board_img_by_b_no(paramMap); DataMap.putToModel(model, "lm_pick_img", lm_pick_img); + } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} - + if(paramMap.get("bd_tp") == null) { + paramMap.put("bd_tp" ,"BF_CT_TP_1"); + } gmUtil.redirectParam(model, paramMap); return redirect_url; diff --git a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java index ee895fd..a49fb32 100644 --- a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java +++ b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java @@ -46,8 +46,13 @@ import com.renastudio.creative.web.util.model.PageItem; @Controller @RequestMapping(value="m/bf_food/*") public class M_Bf_foodController extends AbstractControllerManager{ - private static Log log = LogFactory.getLog(M_Bf_foodController.class); + public static final String CREDENTIALS_NAME = "Access-Control-Allow-Credentials"; + public static final String ORIGIN_NAME = "Access-Control-Allow-Origin"; + public static final String METHODS_NAME = "Access-Control-Allow-Methods"; + public static final String HEADERS_NAME = "Access-Control-Allow-Headers"; + public static final String MAX_AGE_NAME = "Access-Control-Max-Age"; + private static Log log = LogFactory.getLog(M_Bf_foodController.class); private final String REQUEST_MAPPING = "m/bf_food/"; @Autowired M_Db_nutrientBO db_nutrientBO; @@ -793,7 +798,16 @@ public class M_Bf_foodController extends AbstractControllerManager{ */ @RequestMapping(value="list_bf_homemade_recommend_ajax", method=RequestMethod.GET) @ResponseBody - public DataMap list_bf_homemade_recommend_ajax(HttpServletRequest request) { + public DataMap list_bf_homemade_recommend_ajax(HttpServletRequest request, HttpServletResponse response) { + response.setContentType("application/json"); + response.setHeader("Cache-Control", "no-store"); + + response.setHeader(CREDENTIALS_NAME, "true"); + response.setHeader(ORIGIN_NAME, "*"); + response.setHeader(METHODS_NAME, "GET, OPTIONS, POST, PUT, DELETE"); + response.setHeader(HEADERS_NAME, "Origin, X-Requested-With, Content-Type, Accept"); + response.setHeader(MAX_AGE_NAME, "3600"); + DataMap result = new DataMap(); result.put("RESULT", "200"); DataMap paramMap = gmUtil.getDataMapFromRequest(request); 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 6adfecd..e64b66a 100644 --- a/src/main/java/com/backoffice/m/index/M_IndexController.java +++ b/src/main/java/com/backoffice/m/index/M_IndexController.java @@ -159,6 +159,9 @@ public class M_IndexController extends AbstractControllerManager{ DataMap rm_child = init_child(model, request, paramMap); DataMap.putToModel(model, "rm_child", rm_child); + log.info("아이정보 ----- "); + log.info(rm_child); + if(rm_child != null) { // 선택아이 성장 정보 조회 @@ -180,7 +183,7 @@ public class M_IndexController extends AbstractControllerManager{ List lm_last = bf_daily_nutritionBO.select_bf_last_status(paramMap); DataMap.putToModel(model, "lm_last", lm_last); } - + gmUtil.redirectParam(model, paramMap); } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} 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 94f53e9..c2dbb9c 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 @@ -76,7 +76,9 @@ public class M_Member_envController extends AbstractControllerManager{ HttpSession session = request.getSession(false); DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER); - log.debug("rm_mem : " + rm_mem); +// log.info("사용자 정보 ---------------------"); +// log.info(rm_mem); +// log.debug("rm_mem : " + rm_mem); DataMap.putToModel(model, "rm_mem", rm_mem); } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} @@ -623,34 +625,19 @@ public class M_Member_envController extends AbstractControllerManager{ HttpSession session = request.getSession(false); DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER); - //자주쓰는 표현 삭제 목록이 있다면 - /* - if(delList != null) { - log.info("delList:" + delList); - String delListArr[] = delList.split(","); - - for(int i=0;i record_list = (List) paramMap.get("list_word_list"); - int idx = 0; - for(String word_list:record_list) { - paramMap.put("word", word_list); - int iResult2 = member_envBO.insert_tbl_favorite_word(paramMap); - } - log.info("--------------- 레코드 ---------------"); - log.info(record_list); - + if(record_list != null) { + for(String word_list:record_list) { + paramMap.put("word", word_list); + int iResult2 = member_envBO.insert_tbl_favorite_word(paramMap); + } + } +// log.info("--------------- 레코드 ---------------"); +// log.info(record_list); } } catch (Exception ex1) { 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 c1a4de1..55d0890 100644 --- a/src/main/java/com/backoffice/m/memory/M_MemoryController.java +++ b/src/main/java/com/backoffice/m/memory/M_MemoryController.java @@ -151,7 +151,7 @@ public class M_MemoryController extends AbstractControllerManager{ } } - log.info("today:" + today); +// log.info("today:" + today); //세션에 선택된 아이정보가 있을 경우 if(rm_child != null) { diff --git a/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml b/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml index 6ce33a5..64da513 100644 --- a/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml +++ b/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml @@ -9,6 +9,7 @@ ,m.name ,tmf.mt_file_seq ,tmf.mt_file_local_url + ,v_content FROM ( SELECT x.bd_no @@ -27,14 +28,20 @@ from tbl_bf_board_comment tbc where tbc.bd_no = x.bd_no ) as c_nt ,DATE_FORMAT(x.reg_dt,'%H:%i') reg_tm + ,tbv.v_content FROM tbl_bf_board x INNER JOIN tbl_code_item z on x.bd_tp = z.val_1 and cg_cd ='BF_COMMUNITY_TP' - WHERE DATE_FORMAT(x.reg_dt,'%Y%M%d') = DATE_FORMAT(now(),'%Y%M%d') + LEFT JOIN (select bd_no, group_concat(concat (v_content, '♭⊙♭', nvl(v_nt, 0)) separator '♭§♭') v_content + from tbl_bf_board_vote) tbv ON tbv.bd_no = x.bd_no + WHERE DATE_FORMAT(x.reg_dt,'%Y%M%d') = DATE_FORMAT(now(),'%Y%M%d') and x.use_yn ='Y' AND member_id = #member_id# + + AND x.bd_tp = #bd_tp# + )x INNER JOIN tbl_member m ON m.member_id = x.member_id LEFT JOIN tbl_bf_board_attach tba ON tba.bd_no = x.bd_no @@ -45,7 +52,7 @@ LIMIT 1 ) LEFT JOIN tbl_mt_file tmf ON tmf.mt_file_seq = tba.file_seq - ORDER BY x.bd_no DESC + ORDER BY x.h_nt desc , x.bd_no DESC @@ -57,6 +64,7 @@ ,m.name ,tmf.mt_file_seq ,tmf.mt_file_local_url + ,v_content FROM ( SELECT x.bd_no @@ -75,14 +83,17 @@ from tbl_bf_board_comment tbc where tbc.bd_no = x.bd_no ) as c_nt ,DATE_FORMAT(x.reg_dt,'%H:%i') reg_tm + ,tbv.v_content FROM tbl_bf_board x + LEFT JOIN (select bd_no, group_concat(concat (v_content, '♭⊙♭', nvl(v_nt, 0)) separator '♭§♭') v_content + from tbl_bf_board_vote) tbv ON tbv.bd_no = x.bd_no INNER JOIN tbl_code_item z on x.bd_tp = z.val_1 and cg_cd ='BF_COMMUNITY_TP' WHERE DATE_FORMAT(x.reg_dt,'%Y%M%d') = DATE_FORMAT(now(),'%Y%M%d') and x.use_yn ='Y' and x.bd_no = #bd_no# )x - INNER JOIN tbl_member m ON m.member_id = x.member_id + INNER JOIN tbl_member m ON m.member_id = x.member_id LEFT JOIN tbl_bf_board_attach tba ON tba.bd_no = x.bd_no LEFT JOIN tbl_mt_file tmf ON tmf.mt_file_seq = tba.file_seq @@ -126,10 +137,50 @@ ) + + INSERT tbl_bf_board_vote + ( + bd_no + ,v_content + ,reg_dt + ) VALUES ( + #bd_no# + ,#v_content# + ,NOW() + ) + + DELETE FROM tbl_bf_board_attach WHERE bd_no = #bd_no# + + DELETE FROM tbl_bf_board_vote + WHERE bd_no = #bd_no# + + + + + + \ No newline at end of file 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 5fe281b..147bb77 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 @@ -106,7 +106,6 @@ FROM tbl_bf_family_baby a INNER JOIN tbl_bf_family_match y on a.smc_no = y.smc_no INNER JOIN tbl_sync_log b on y.member_id = b.member_id and b.sync_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/bf_board/list_bf_board.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl index 1cae83e..827b95b 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl @@ -41,24 +41,24 @@ -
    -
  • - 전체 + @@ -88,18 +88,41 @@
    ${item['l_nt']!}
    ${item['c_nt']!}
    - - -
    -
    - ${item['title']!} -
    - <#if item['mt_file_seq']?has_content > -
    - -
    - -
    + + + <#if item['bd_tp']?contains("BF_CT_TP_4")> +
    +
    + ${item['title']!} +
    + <#if item['v_content']?has_content > + <#list item['v_content']?split("♭§♭") as vote> +
    +
    +
      +
    • +

      ${vote?substring(0,vote?index_of("♭⊙♭"))}

      +

      ${vote?substring(vote?index_of("♭⊙♭")+3, vote?length)}개

      +
      • +
    +
    +
    + + +
    + <#else> +
    +
    + ${item['title']!} +
    + <#if item['mt_file_seq']?has_content > +
    + +
    + +
    + +

    ${item['name']!}

    @@ -117,7 +140,7 @@
    diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_write_board.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_write_board.ftl index 97fe063..b5fb144 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_write_board.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_write_board.ftl @@ -23,8 +23,7 @@ -

    카테고리(필수)

    - +

    카테고리(필수)

    ${model['rm']['bd_tp_nm']!}<#else>selectbox">카테고리 선택

    @@ -35,11 +34,8 @@
    -
    - - - - + +

    이미지(선택)

    @@ -83,20 +79,34 @@
    -

    제목(필수)

    - -
    - -

    내용(필수)

    - -
    - - +
    +
    +

    내용(필수)

    + +
    + + +
    +
    + <#if model['bd_tp']! =='BF_CT_TP_4'> +
    +

    추가

    +

    투표내용(필수)

    +
    +
      +
    • + +    +
      • +
    +
    +
    +

    태그입력(선택)

    @@ -117,15 +127,13 @@
-
완료
- - + @@ -145,20 +153,34 @@ alert('제목을 입력해주세요'); return; } + + if(content == ''){ - alert('내용을 입력해주세요'); - return; - }else{ - tag = $(".li_tag").get(); - params = ''; - for(var i = 0 ; i < tag.length ; i++){ - params += tag[i].innerText + ','; - } - $('#frmInsert').children('#list_tag').val(params); - $('#frmInsert').children('#bd_tp').val(bd_tp); - $('#frmInsert').children('#pick_img_index').val(pick_img_index); - $('#frmInsert').submit(); + + + } + <#if model['bd_tp']! =='BF_CT_TP_4'> + $("input[name=vote_content]").each( function(idx,ele) { + if (ele.value =="") { + alert("투표내용을 입력하세요!"); + return; + } + }); + + if( $("input[name=vote_content]").length ==0 ) { + alert("투표내용을 추가 입력하세요!"); + return; + } + + tag = $(".li_tag").get(); + params = ''; + for(var i = 0 ; i < tag.length ; i++){ + params += tag[i].innerText + ','; } + $('#frmInsert').children('#list_tag').val(params); + $('#frmInsert').children('#bd_tp').val(bd_tp); + $('#frmInsert').children('#pick_img_index').val(pick_img_index); + $('#frmInsert').submit(); } var pick_img_index = "${pick_img_index!'0'}"; @@ -250,8 +272,12 @@ $("body").on("click", ".selectlist p", function() { var text = $(this).html(); - var id = $(this).attr('id'); - + var id = $(this).attr('id'); + if(id =="BF_CT_TP_4") { + $("#divVote").show(); + }else{ + $("#divVote").hide(); + } $(this).parent().siblings().html(text); $(this).parent().siblings().attr('id',id); $(this).parent().toggle(); @@ -268,6 +294,16 @@ } }); }) + + // selectbox 초기셑팅 + <#if model['lm_bd_tp_list']?has_content> + <#list model['lm_bd_tp_list'] as item> + <#if item['val_1']! == model['bd_tp'] > + $(".selectbox").attr('id','${item['val_1']!}'); + $(".selectbox").html('${item['title']!}'); + + + var tag_index = ${tag_index}; @@ -283,6 +319,17 @@ function tag_del(tag_index){ $('#li_tag_'+tag_index).remove(); } + + function fncAddVote() { + var tag="
  • "; + tag +=" "; + tag +="   "; + tag +="
    • "; + $("#nutrition_kinds_basic3").append(tag); + } + function fncDelVote(obj) { + $(obj.parentNode).remove(); + } <#include "/m/include/index_bottom_menu.ftl"> diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl index 82d8ee6..48fb95b 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl @@ -28,7 +28,7 @@ - +<#-- -->