Home Explore Help
Sign In
peiguo
/
hust-epi
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	whepi-ui/templates/home/home.ftl
#	whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java
guojing 5 years ago
parent
ed609c1f61 0127af339e
commit
86252fd936
20 changed files with 794 additions and 95 deletions
Unified View Show Diff Stats
  1. 2 3
      whepi-doc/login.sql
  2. 53 0
      whepi-ui/templates/home/frag.head.ftl
  3. 3 0
      whepi-ui/templates/home/home.ftl
  4. 158 7
      whepi-ui/templates/home/ribao.ftl
  5. 37 1
      whepi-ui/templates/home/ribao.js
  6. 176 0
      whepi-ui/templates/user/home.ftl
  7. 1 1
      whepi-ui/templates/yeweihui/home.ftl
  8. 48 71
      whepi-ui/templates/yeweihui/ribao.ftl
  9. 6 1
      whepi-ui/templates/yeweihui/ribao.js
  10. 40 0
      whepi-ui/templates/yeweihui/ribaoDy.ftl
  11. 11 0
      whepi-web/src/main/java/com/bofeng/dao/OwnerMapper.java
  12. 11 0
      whepi-web/src/main/java/com/bofeng/dao/UptownHouseMapper.java
  13. 11 0
      whepi-web/src/main/java/com/bofeng/dao/UserRoleMapper.java
  14. 37 0
      whepi-web/src/main/java/com/bofeng/entity/Owner.java
  15. 57 0
      whepi-web/src/main/java/com/bofeng/entity/UptownHouse.java
  16. 37 0
      whepi-web/src/main/java/com/bofeng/entity/UserRole.java
  17. 49 6
      whepi-web/src/main/java/com/bofeng/service/UserOpenService.java
  18. 38 0
      whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java
  19. 14 0
      whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java
  20. 5 5
      whepi-web/src/main/resources/application-prod.yml

+ 2 - 3
whepi-doc/login.sql
View File 

@@ -54,6 +54,8 @@ DROP TABLE IF EXISTS sys_owner;
 
 CREATE TABLE sys_owner  (
 
 CREATE TABLE sys_owner  (
 
   owner_id          bigint(20) NOT NULL DEFAULT 0 COMMENT '业委会ID',
 
   owner_id          bigint(20) NOT NULL DEFAULT 0 COMMENT '业委会ID',
 
   uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID,下拉选ID',
 
   uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID,下拉选ID',
 
+  linkman           varchar(10)  NOT NULL DEFAULT '' COMMENT '联系人名称',
 
+  phone             varchar(20)  NOT NULL DEFAULT '' COMMENT '联系人电话',
 
   user_create       bigint(20) NOT NULL DEFAULT 0 COMMENT '新增人',
 
   user_create       bigint(20) NOT NULL DEFAULT 0 COMMENT '新增人',
 
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
 
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
 
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
 
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
 
@@ -84,9 +86,6 @@ DROP TABLE IF EXISTS sys_uptown_house;
 
 CREATE TABLE sys_uptown_house  (
 
 CREATE TABLE sys_uptown_house  (
 
   house_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '门牌ID',
 
   house_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '门牌ID',
 
   uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID',
 
   uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID',
 
-  ridgepole         int(11) NOT NULL DEFAULT 0 COMMENT '栋',
 
-  unit              int(11) NOT NULL DEFAULT 0 COMMENT '单元',
 
-  doorplate         varchar(20)  NOT NULL DEFAULT '' COMMENT '门牌',
 
   linkman           varchar(10)  NOT NULL DEFAULT '' COMMENT '联系人名称',
 
   linkman           varchar(10)  NOT NULL DEFAULT '' COMMENT '联系人名称',
 
   phone             varchar(20)  NOT NULL DEFAULT '' COMMENT '联系人电话',
 
   phone             varchar(20)  NOT NULL DEFAULT '' COMMENT '联系人电话',
 
   young             int(11) NOT NULL DEFAULT 0 COMMENT '家庭年前人数',
 
   young             int(11) NOT NULL DEFAULT 0 COMMENT '家庭年前人数',

+ 53 - 0
whepi-ui/templates/home/frag.head.ftl
View File 

@@ -20,6 +20,58 @@
 
             font-weight: 300;
 
             font-weight: 300;
 
             margin: 0 15%;
 
             margin: 0 15%;
 
         }
 
         }
 
+
 
+
 
+
 
+        .user-header {
 
+            padding: 15px 0 5px 0;
 
+            /*background-color: #16ae9d;*/
 
+        }
 
+        .user-title {
 
+            text-align: center;
 
+            font-size: 18px;
 
+            color: #999999;
 
+            font-weight: 900;
 
+            margin: 0 15%;
 
+        }
 
+        .user-hr {
 
+            align: center;
 
+            width: 100%;
 
+            color: #999999;
 
+            size: 5px;
 
+        }
 
+
 
+        .user-font {
 
+            color: #999999;
 
+        }
 
+        .user-div-msg {
 
+            display: inline-block;
 
+            width: 40%;
 
+            height: 40%;
 
+        }
 
+
 
+        .maindiv{
 
+            width: 100%;
 
+            overflow: hidden; /*关键*/
 
+            padding: 15px 0 5px 0;
 
+        }
 
+        .leftdiv{
 
+            float: left;
 
+            width: 45%;
 
+        }
 
+        .rightdiv{
 
+            float: right;
 
+            width: 45%;
 
+        }
 
+        .centerdiv{
 
+            float: left;
 
+            width: 5%;
 
+            border-right:1px dashed rgba(0, 0, 0, 0.46);
 
+            padding-bottom:45%;  /*关键*/
 
+            margin-bottom:-45%;  /*关键*/
 
+        }
 
+
 
+
 
         html,body{height: 100%;}
 
         html,body{height: 100%;}
 
         .ri_bao_weui_tab_bd_item_active {
 
         .ri_bao_weui_tab_bd_item_active {
 
             display: block !important;
 
             display: block !important;
 
@@ -29,5 +81,6 @@
 
         }
 
         }
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
+<span hidden="hidden" id="id"></span>
 
 
 
 <body style="height: 100%" ontouchstart>
 
 <body style="height: 100%" ontouchstart>

+ 3 - 0
whepi-ui/templates/home/home.ftl
View File 

@@ -60,6 +60,9 @@
 
         qiuzhu_init();
 
         qiuzhu_init();
 
         help();
 
         help();
 
         family_init();
 
         family_init();
 
+        ribao_add();
 
+        ribao_cancel();
 
+        ribao_commit();
 
         submit_back();
 
         submit_back();
 
     })(jQuery);
 
     })(jQuery);
 
 </script>
 
 </script>

+ 158 - 7
whepi-ui/templates/home/ribao.ftl
View File 

@@ -1,5 +1,3 @@
 
-
 
-
 
 <div class="page__bd">
 
 <div class="page__bd">
 
     <div class="weui-tab">
 
     <div class="weui-tab">
 
         <div class="weui-navbar">
 
         <div class="weui-navbar">
 
@@ -12,15 +10,168 @@
 
         </div>
 
         </div>
 
         <div class="weui-tab__panel">
 
         <div class="weui-tab__panel">
 
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
 
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
 
-                内容一
 
+                <div id="notOpenRibao">
 
+                    <div class="weui-cells weui-cells_form">
 
+                        <div class="weui-cell weui-cell_vcode">
 
+                            <div class="weui-cell__hd">
 
+                                <label class="weui-label">今日居家</label>
 
+                            </div>
 
+                            <div class="weui-cell__bd">
 
+                                <input class="weui-input" type="number" pattern="[0-2]*" placeholder="请输入今日家庭成员数量">
 
+                            </div>
 
+                            <div class="weui-cell__ft">
 
+                                <a id="btnAdd" href="javascript:"
 
+                                   class="weui-btn weui-btn_mini weui-btn_primary">病情描述</a>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                    <div class="weui-cells__title">家人1：咳嗽、发烧、确诊</div>
 
+                    <div class="weui-cells weui-cells_form">
 
+                        <div class="weui-cell">
 
+                            <div class="weui-cell__bd">
 
+                                <textarea class="weui-textarea" placeholder="请输入文本" rows="3"></textarea>
 
+                                <div class="weui-textarea-counter"><span>0</span>/200</div>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                    <div class="weui-cells__title">家人2：咳嗽、发烧、未确诊</div>
 
+                    <div class="weui-cells weui-cells_form">
 
+                        <div class="weui-cell">
 
+                            <div class="weui-cell__bd">
 
+                                <textarea class="weui-textarea" placeholder="请输入文本" rows="3"></textarea>
 
+                                <div class="weui-textarea-counter"><span>0</span>/200</div>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                    <div class="weui-cells__title">家人3：咳嗽、发烧、确诊</div>
 
+                    <div class="weui-cells weui-cells_form">
 
+                        <div class="weui-cell">
 
+                            <div class="weui-cell__bd">
 
+                                <textarea class="weui-textarea" placeholder="请输入文本" rows="3"></textarea>
 
+                                <div class="weui-textarea-counter"><span>0</span>/200</div>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                    <div class="weui-cells__tips"> <span style="color: red">
 
+                        注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！
 
+                    </span></div>
 
+                    <div class="weui-btn-area">
 
+                        <a class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips">全家报平安</a>
 
+                    </div>
 
+                </div>
 
+                <div id="ribao" style="display: none">
 
+                    <div class="weui-form__control-area">
 
+                        <div class="weui-cells__group weui-cells__group_form">
 
+                            <div class="weui-cells weui-cells_form">
 
+                                <div class="weui-cell weui-cell_active" id="js_cell">
 
+                                    <div class="weui-cell__hd"><label class="weui-label">家人</label></div>
 
+                                    <div class="weui-cell__bd weui-flex">
 
+                                        <input id="js_input" class="weui-input" autofocus="" type="text"
 
+                                               placeholder="请输入姓名" maxlength="20">
 
+                                    </div>
 
+                                </div>
 
+                                <div class="weui-cells weui-cells_checkbox">
 
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s11">
 
+                                        <div class="weui-cell__hd">
 
+                                            <input type="checkbox" class="weui-check" name="checkbox1" id="s11">
 
+                                            <i class="weui-icon-checked"></i>
 
+                                        </div>
 
+                                        <div class="weui-cell__bd">
 
+                                            <p>咳嗽</p>
 
+                                        </div>
 
+                                    </label>
 
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s12">
 
+                                        <div class="weui-cell__hd">
 
+                                            <input type="checkbox" name="checkbox2" class="weui-check" id="s12">
 
+                                            <i class="weui-icon-checked"></i>
 
+                                        </div>
 
+                                        <div class="weui-cell__bd">
 
+                                            <p>发烧</p>
 
+                                        </div>
 
+                                    </label>
 
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s13">
 
+                                        <div class="weui-cell__hd">
 
+                                            <input type="checkbox" name="checkbox3" class="weui-check" id="s13">
 
+                                            <i class="weui-icon-checked"></i>
 
+                                        </div>
 
+                                        <div class="weui-cell__bd">
 
+                                            <p>乏力</p>
 
+                                        </div>
 
+                                    </label>
 
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s14">
 
+                                        <div class="weui-cell__hd">
 
+                                            <input type="checkbox" name="checkbox4" class="weui-check" id="s14">
 
+                                            <i class="weui-icon-checked"></i>
 
+                                        </div>
 
+                                        <div class="weui-cell__bd">
 
+                                            <p>其他</p>
 
+                                        </div>
 
+                                    </label>
 
+                                </div>
 
+                                <div class="weui-cell ">
 
+                                    <div class="weui-cell__bd">
 
+                                        <textarea class="weui-textarea" placeholder="请输入病情描述" rows="3"></textarea>
 
+                                        <div class="weui-textarea-counter"><span>0</span>/200</div>
 
+                                    </div>
 
+                                </div>
 
+                                <div class="weui-cell weui-cell_switch">
 
+                                    <div class="weui-cell__bd">是否确诊</div>
 
+                                    <div class="weui-cell__ft">
 
+                                        <input class="weui-switch" type="checkbox"/>
 
+                                    </div>
 
+                                </div>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                    <div class="weui-cells__tips"> <span style="color: red">
 
+                        注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！
 
+                    </span></div>
 
+                    <div class="button-sp-area">
 
+                        <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default">取消</a>
 
+                        <a id="commit" href="javascript:;" class="weui-btn weui-btn_primary">提交</a>
 
+                    </div>
 
+                </div>
 
+                </br>
 
+                </br>
 
             </div>
 
             </div>
 
             <div id="rb_nav2" class="weui-tab__bd-item ">
 
             <div id="rb_nav2" class="weui-tab__bd-item ">
 
-                内容二
 
+                <div class="weui-grids">
 
+                    <a href="javascript:;" class="weui-grid" style="background-color: #0bb20c">
 
+                        <p class="weui-grid__label">
 
+                            01
 
+                        </p>
 
+                    </a>
 
+                    <a href="javascript:;" class="weui-grid"  style="background-color: red">
 
+                        <p class="weui-grid__label">
 
+                            02
 
+                        </p>
 
+                    </a>
 
+                    <a href="javascript:;" class="weui-grid">
 
+                        <p class="weui-grid__label">
 
+                            03
 
+                        </p>
 
+                    </a>
 
+                    <a href="javascript:;" class="weui-grid">
 
+                        <p class="weui-grid__label">
 
+                            04
 
+                        </p>
 
+                    </a>
 
+                </div>
 
+                <div class="weui-panel weui-panel_access">
 
+                    <div class="weui-panel__hd">2020-02-03</div>
 
+                    <div class="weui-panel__bd">
 
+                        <div class="weui-media-box weui-media-box_text">
 
+                            <h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊</h4>
 
+                            <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
 
+                        </div>
 
+                        <div class="weui-media-box weui-media-box_text">
 
+                            <h4 class="weui-media-box__title">家人1：咳嗽、乏力、确诊</h4>
 
+                            <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
-    <div class="weui-btn-area">
 
-        <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">日报</a>
 
-    </div>
 
 </div>
 
 </div>

+ 37 - 1
whepi-ui/templates/home/ribao.js
View File 

@@ -1,7 +1,43 @@
 
 function ribao_init() {
 
 function ribao_init() {
 
   $('#btnRB').on('click', function () {
 
   $('#btnRB').on('click', function () {
 
-    window.location.href="/yeweihui/home.html";
 
+    window.location.href = "/yeweihui/home.html";
 
   });
 
   });
 
 
 
+}
 
+
 
+
 
+function ribao_add() {
 
+  $('#btnAdd').on('click', function () {
 
+    if ($('#ribao')[0].style.display == 'none') {
 
+      $('#notOpenRibao').toggle();
 
+      $('#ribao')[0].style.display = '';
 
+    } else {
 
+      $('#notOpenRibao')[0].style.display = '';
 
+      $('#ribao')[0].style.display = 'none';
 
+    }
 
+  });
 
+}
 
 
 
+function ribao_cancel() {
 
+  $('#cancel').on('click', function () {
 
+    if ($('#ribao')[0].style.display == 'none') {
 
+      $('#notOpenRibao').toggle();
 
+      $('#ribao')[0].style.display = '';
 
+    } else {
 
+      $('#notOpenRibao')[0].style.display = '';
 
+      $('#ribao')[0].style.display = 'none';
 
+    }
 
+  });
 
+}
 
+
 
+function ribao_commit() {
 
+  $('#commit').on('click', function () {
 
+    if ($('#ribao')[0].style.display == 'none') {
 
+      $('#notOpenRibao').toggle();
 
+      $('#ribao')[0].style.display = '';
 
+    } else {
 
+      $('#notOpenRibao')[0].style.display = '';
 
+      $('#ribao')[0].style.display = 'none';
 
+    }
 
+  });
 
 }
 
 }

+ 176 - 0
whepi-ui/templates/user/home.ftl
View File 

@@ -0,0 +1,176 @@
 
+<#assign title="业委会"/>
 
+<#include "/home/frag.head.ftl" />
 
+
 
+<div class="weui-tab">
 
+    <div class="weui-tab__bd">
 
+        <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
 
+            <div class="page__bd">
 
+                <header class="user-header">
 
+                    <br/>
 
+                    <br/>
 
+                    <h1 class="user-title">家园抗击疫情公共服务平台</h1>
 
+                    <br/>
 
+                    <h1 class="user-title">用户登陆</h1>
 
+                </header>
 
+
 
+                <br/>
 
+                <br/>
 
+                <br/>
 
+                <br/>
 
+                <div class="weui-form" id="fromMsg">
 
+                    <div class="weui-cells_radio user-font">
 
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;我是&nbsp;&nbsp;
 
+                        <input name="Fruit" type="radio" value="1"/>家庭用户
 
+                        <input name="Fruit" type="radio" value="2"/>业委会人员
 
+                    </div>
 
+                    <hr class="user-hr">
 
+                    <div class="maindiv">
 
+                        <div class="leftdiv">
 
+                            <br/>
 
+                            <div class="weui-cells__title"><#if user ??>value="${user.username!''}"</#if></div>
 
+                            <div class="weui-cells__title">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;登陆</div>
 
+                            <br/>
 
+                        </div>
 
+                        <div class="centerdiv"></div>
 
+                        <div class="rightdiv">
 
+                            <div class="weui-cells__title">联系人输入</div>
 
+                            <div class="weui-cells">
 
+                                <div class="weui-cell">
 
+                                    <div class="weui-cell__bd">
 
+                                        <input class="weui-input" type="text" id="linkman" placeholder="请输入文本"/>
 
+                                    </div>
 
+                                </div>
 
+                            </div>
 
+                            <div class="weui-cells__title">手机号输入</div>
 
+                            <div class="weui-cells">
 
+                                <div class="weui-cell">
 
+                                    <div class="weui-cell__bd">
 
+                                        <input class="weui-input" type="text" id="phone" placeholder="请输入文本"/>
 
+                                    </div>
 
+                                </div>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                    <br/>
 
+                    <div class="weui-form__opr-area">
 
+                        <a class="weui-btn weui-btn_primary "  href="javascript:;" onclick="save();" id="save">确定</a>
 
+                    </div>
 
+                </div>
 
+
 
+
 
+                <div class="page" id="tpl_msg_warn_userType" hidden="hidden">
 
+                    <div class="weui-msg">
 
+                        <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
 
+                        <div class="weui-msg__text-area">
 
+                            <h2 class="weui-msg__title">操作失败</h2>
 
+                            <p class="weui-msg__desc" id="errorMsg">用户类型不能为空</p>
 
+                        </div>
 
+                        <div class="weui-msg__opr-area">
 
+                            <p class="weui-btn-area">
 
+                                <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
 
+                            </p>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+                <div class="page" id="tpl_msg_warn_linkman" hidden="hidden">
 
+                    <div class="weui-msg">
 
+                        <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
 
+                        <div class="weui-msg__text-area">
 
+                            <h2 class="weui-msg__title">操作失败</h2>
 
+                            <p class="weui-msg__desc" id="errorMsg">联系人不能为空</p>
 
+                        </div>
 
+                        <div class="weui-msg__opr-area">
 
+                            <p class="weui-btn-area">
 
+                                <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
 
+                            </p>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+                <div class="page" id="tpl_msg_warn_phone" hidden="hidden">
 
+                    <div class="weui-msg">
 
+                        <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
 
+                        <div class="weui-msg__text-area">
 
+                            <h2 class="weui-msg__title">操作失败</h2>
 
+                            <p class="weui-msg__desc" id="errorMsg">电话号码校验失败</p>
 
+                        </div>
 
+                        <div class="weui-msg__opr-area">
 
+                            <p class="weui-btn-area">
 
+                                <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
 
+                            </p>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+
 
+            </div>
 
+        </div>
 
+    </div>
 
+</div>
 
+</div>
 
+</body>
 
+<#include "/home/frag.foot.ftl" />
 
+<script>
 
+
 
+    var userId = <#if user ??>value="${user.userId!''}"</#if>
 
+
 
+    function save() {
 
+        var userType = $('input:radio:checked').val();
 
+        if (!userType) {
 
+            $("#tpl_msg_warn_userType").show();
 
+            $("#tpl_msg_warn_linkman").hide();
 
+            $("#tpl_msg_warn_phone").hide();
 
+            $("#fromMsg").hide();
 
+            return false;
 
+        }
 
+        var linkman = $("#linkman").val();
 
+        if (!linkman) {
 
+            $("#tpl_msg_warn_userType").hide();
 
+            $("#tpl_msg_warn_linkman").show();
 
+            $("#tpl_msg_warn_phone").hide();
 
+            $("#fromMsg").hide();
 
+            return false;
 
+        }
 
+        var phone = $("#phone").val();
 
+        if(!(/^1[3456789]\d{9}$/.test(phone))){
 
+            $("#tpl_msg_warn_userType").hide();
 
+            $("#tpl_msg_warn_linkman").hide();
 
+            $("#tpl_msg_warn_phone").show();
 
+            $("#fromMsg").hide();
 
+            return false;
 
+        }
 
+        $("#tpl_msg_warn_userType").hide();
 
+        $("#tpl_msg_warn_linkman").hide();
 
+        $("#tpl_msg_warn_phone").hide();
 
+        console.log(userType)
 
+        console.log(linkman)
 
+        console.log(phone)
 
+
 
+        $.ajax({
 
+            url: '/admin/supplier/createOrderauditMain.json',
 
+            type: "post",
 
+            data: {
 
+                "userId": userId,
 
+                "userType": userType,
 
+                "linkman": linkman,
 
+                "phone": phone,
 
+            },
 
+            beforeSend: function () {
 
+            },
 
+            success: function (result) {
 
+                if (result.success) {
 
+                    layer.msg('添加成功');
 
+                } else {
 
+                    layer.msg(result.message);
 
+                }
 
+                closePageTwo();
 
+            }
 
+        });
 
+    }
 
+
 
+    function back(){
 
+        $("#tpl_msg_warn_userType").hide();
 
+        $("#tpl_msg_warn_linkman").hide();
 
+        $("#tpl_msg_warn_phone").hide();
 
+        $("#fromMsg").show();
 
+    }
 
+
 
+</script>

+ 1 - 1
whepi-ui/templates/yeweihui/home.ftl
View File 

@@ -4,7 +4,7 @@
 
 <div class="weui-tab">
 
 <div class="weui-tab">
 
     <div class="weui-tab__bd">
 
     <div class="weui-tab__bd">
 
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
 
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
 
-            <#include "/yeweihui/ribao.ftl" /></div>
 
+            <#include "/yeweihui/ribaoDy.ftl" /></div>
 
         <div id="tab2" class="weui-tab__bd-item">
 
         <div id="tab2" class="weui-tab__bd-item">
 
             <#include "/yeweihui/qiuzhu.ftl" /></div>
 
             <#include "/yeweihui/qiuzhu.ftl" /></div>
 
         <#--<div id="tab3" class="weui-tab__bd-item">-->
 
         <#--<div id="tab3" class="weui-tab__bd-item">-->

+ 48 - 71
whepi-ui/templates/yeweihui/ribao.ftl
View File 

@@ -1,4 +1,5 @@
 
-
 
+<#assign title="业委会"/>
 
+<#include "/home/frag.head.ftl" />
 
 
 
 <div class="page__bd">
 
 <div class="page__bd">
 
     <header class="demos-header">
 
     <header class="demos-header">
 
@@ -13,30 +14,18 @@
 
             <span style="background-color: #0bb20c">&nbsp;&nbsp;&nbsp</span>异常
 
             <span style="background-color: #0bb20c">&nbsp;&nbsp;&nbsp</span>异常
 
         </div>
 
         </div>
 
         </div>
 
         </div>
 
-        <#--<div class="weui-tab__panel">-->
 
-            <#--<div id="rb_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">-->
 
-                <#--内容一-->
 
-            <#--</div>-->
 
-            <#--<div id="rb_nav2" class="weui-tab__bd-item">-->
 
-                <#--内容二-->
 
-            <#--</div>-->
 
-            <#--<div id="rb_nav3" class="weui-tab__bd-item">-->
 
-                <#--内容二-->
 
-            <#--</div>-->
 
-        <#--</div>-->
 
-
 
     </div>
 
     </div>
 
     <br/>
 
     <br/>
 
     <br/>
 
     <br/>
 
     <br/>
 
     <br/>
 
     <div class="weui-tab" style="height: 400px">
 
     <div class="weui-tab" style="height: 400px">
 
         <div class="weui-navbar">
 
         <div class="weui-navbar">
 
-                <table border="1" cellspacing="0" cellpadding="0">
 
-                    <tbody>
 
-                    <list list as li>
 
+            <table border="1" cellspacing="0" cellpadding="0" style="width: 100%">
 
+                <tbody>
 
+                <list list as li>
 
                     <tr><#--//colspan="2"-->
 
                     <tr><#--//colspan="2"-->
 
-                        <td rowspan="4" style="border-top-color: #75859f" bgcolor="greenyellow" bordercolor =“＃007eff”>2栋</td>
 
-                        <td rowspan="2" style="border-top-color: #75859f" bordercolor =“＃007eff”>1单元</td>
 
+                        <td <#--rowspan="4"--> style="border-top-color: #75859f" bgcolor="greenyellow" bordercolor =“＃007eff”>101</td>
 
+                        <td <#--rowspan="2"--> style="border-top-color: #75859f" bordercolor =“＃007eff”>102</td>
 
                         <td style="border-top-color: #75859f" ><a href="javascript:void(0);">101</a></td>
 
                         <td style="border-top-color: #75859f" ><a href="javascript:void(0);">101</a></td>
 
                         <td style="border-top-color: #75859f"> 102</td>
 
                         <td style="border-top-color: #75859f"> 102</td>
 
                         <td style="border-top-color: #75859f"> 103</td>
 
                         <td style="border-top-color: #75859f"> 103</td>
 
@@ -46,70 +35,58 @@
 
                         <td style="border-top-color: #75859f"> 303</td>
 
                         <td style="border-top-color: #75859f"> 303</td>
 
                         <td style="border-top-color: #75859f"> 304</td>
 
                         <td style="border-top-color: #75859f"> 304</td>
 
                         <td style="border-top-color: #75859f"> 201</td>
 
                         <td style="border-top-color: #75859f"> 201</td>
 
+                    </tr>
 
+                    <tr>
 
+                        <td style="border-top-color: #75859f"> 201</td>
 
+                        <td style="border-top-color: #75859f"> 302</td>
 
+                        <td style="border-top-color: #75859f"> 303</td>
 
+                        <td style="border-top-color: #75859f"> 304</td>
 
+                        <td style="border-top-color: #75859f"> 201</td>
 
                         <td style="border-top-color: #75859f"> 302</td>
 
                         <td style="border-top-color: #75859f"> 302</td>
 
                         <td style="border-top-color: #75859f"> 303</td>
 
                         <td style="border-top-color: #75859f"> 303</td>
 
                         <td style="border-top-color: #75859f"> 304</td>
 
                         <td style="border-top-color: #75859f"> 304</td>
 
+                        <td style="border-top-color: #75859f"> 201</td
 
+                    </tr>
 
+                    <tr>
 
+                        <td <#--rowspan="2" -->style="border-top-color: #75859f"> 202</td>
 
+                        <td style="border-top-color: #75859f"> 101</td>
 
+                        <td style="border-top-color: #75859f"> 102</td>
 
+                        <td style="border-top-color: #75859f"> 103</td>
 
+                        <td style="border-top-color: #75859f"> 104</td>
 
+                        <td style="border-top-color: #75859f"> 104</td>
 
+                        <td style="border-top-color: #75859f"> 304</td>
 
+                        <td style="border-top-color: #75859f"> 201</td>
 
                         <td style="border-top-color: #75859f"> 302</td>
 
                         <td style="border-top-color: #75859f"> 302</td>
 
+                        <td style="border-top-color: #75859f"> 303</td>
 
+                    </tr>
 
+                    <tr>
 
+                        <td style="border-top-color: #75859f"> 101</td>
 
+                        <td style="border-top-color: #75859f"> 102</td>
 
+                        <td style="border-top-color: #75859f"> 103</td>
 
+                        <td style="border-top-color: #75859f"> 104</td>
 
+                        <td style="border-top-color: #75859f"> 104</td>
 
+                        <td style="border-top-color: #75859f"> 304</td>
 
+                        <td style="border-top-color: #75859f"> 201</td>
 
                         <td style="border-top-color: #75859f"> 302</td>
 
                         <td style="border-top-color: #75859f"> 302</td>
 
+                        <td style="border-top-color: #75859f"> 303</td>
 
                     </tr>
 
                     </tr>
 
-                        <tr>
 
-                            <td style="border-top-color: #75859f"> 201</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 303</td>
 
-                            <td style="border-top-color: #75859f"> 304</td>
 
-                            <td style="border-top-color: #75859f"> 201</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 303</td>
 
-                            <td style="border-top-color: #75859f"> 304</td>
 
-                            <td style="border-top-color: #75859f"> 201</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 303</td>
 
-                            <td style="border-top-color: #75859f"> 304</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                        </tr>
 
-                        <tr>
 
-                            <td rowspan="2" style="border-top-color: #75859f"> 2单元</td>
 
-                            <td style="border-top-color: #75859f"> 101</td>
 
-                            <td style="border-top-color: #75859f"> 102</td>
 
-                            <td style="border-top-color: #75859f"> 103</td>
 
-                            <td style="border-top-color: #75859f"> 104</td>
 
-                            <td style="border-top-color: #75859f"> 104</td>
 
-                            <td style="border-top-color: #75859f"> 304</td>
 
-                            <td style="border-top-color: #75859f"> 201</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 303</td>
 
-                            <td style="border-top-color: #75859f"> 304</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                        </tr>
 
-                        <tr>
 
-                            <td style="border-top-color: #75859f"> 101</td>
 
-                            <td style="border-top-color: #75859f"> 102</td>
 
-                            <td style="border-top-color: #75859f"> 103</td>
 
-                            <td style="border-top-color: #75859f"> 104</td>
 
-                            <td style="border-top-color: #75859f"> 104</td>
 
-                            <td style="border-top-color: #75859f"> 304</td>
 
-                            <td style="border-top-color: #75859f"> 201</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 303</td>
 
-                            <td style="border-top-color: #75859f"> 304</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                            <td style="border-top-color: #75859f"> 302</td>
 
-                        </tr>
 
-                    </list>
 
-                    </tbody>
 
-                </table>
 
+                </list>
 
+                </tbody>
 
+            </table>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
     <br/>
 
     <br/>
 
 
 
     <div class="weui-btn-area"  style="display: grid;">
 
     <div class="weui-btn-area"  style="display: grid;">
 
-        <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">一键通知</a>
 
+        <p id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">一键通知</p>
 
+        <p id="return" class="weui-btn weui-btn_primary" href="javascript:">返&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;回</p>
 
     </div>
 
     </div>
 
 </div>
 
 </div>
 
+<#include "/home/frag.foot.ftl" />
 
+<script>
 
+    $('#return').on('click', function () {
 
+        window.location.href = "/yeweihui/home.html#tab2"
 
+        // alert("日报");
 
+    });
 
+</script>

+ 6 - 1
whepi-ui/templates/yeweihui/ribao.js
View File 

@@ -1,6 +1,11 @@
 
 function ribao_init() {
 
 function ribao_init() {
 
   $('#btnRB').on('click', function () {
 
   $('#btnRB').on('click', function () {
 
-    alert("日报");
 
+      window.location.href = "/yeweihui/ribao.html"
 
+    // alert("日报");
 
+  });
 
+  $('#return').on('click', function () {
 
+      window.location.href = "/yeweihui/home.html#tab2"
 
+    // alert("日报");
 
   });
 
   });

+ 40 - 0
whepi-ui/templates/yeweihui/ribaoDy.ftl
View File 

@@ -0,0 +1,40 @@
 
+
 
+
 
+<div class="page__bd">
 
+    <header class="demos-header">
 
+        <h1 class="demos-title">每日上报</h1>
 
+    </header>
 
+
 
+    <div class="weui-btn-area"  style="display: grid;">
 
+        <section style="display: grid;">
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
 
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋9单元</a>
 
+        </section>
 
+
 
+    </div>
 
+
 
+</div>
 
+

+ 11 - 0
whepi-web/src/main/java/com/bofeng/dao/OwnerMapper.java
View File 

@@ -0,0 +1,11 @@
 
+package com.bofeng.dao;
 
+
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import com.bofeng.entity.Owner;
 
+import org.apache.ibatis.annotations.Mapper;
 
+import org.springframework.stereotype.Repository;
 
+
 
+@Mapper
 
+@Repository
 
+public interface OwnerMapper extends BaseMapper<Owner> {
 
+}

+ 11 - 0
whepi-web/src/main/java/com/bofeng/dao/UptownHouseMapper.java
View File 

@@ -0,0 +1,11 @@
 
+package com.bofeng.dao;
 
+
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import com.bofeng.entity.UptownHouse;
 
+import org.apache.ibatis.annotations.Mapper;
 
+import org.springframework.stereotype.Repository;
 
+
 
+@Mapper
 
+@Repository
 
+public interface UptownHouseMapper extends BaseMapper<UptownHouse> {
 
+}

+ 11 - 0
whepi-web/src/main/java/com/bofeng/dao/UserRoleMapper.java
View File 

@@ -0,0 +1,11 @@
 
+package com.bofeng.dao;
 
+
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import com.bofeng.entity.UserRole;
 
+import org.apache.ibatis.annotations.Mapper;
 
+import org.springframework.stereotype.Repository;
 
+
 
+@Mapper
 
+@Repository
 
+public interface UserRoleMapper extends BaseMapper<UserRole> {
 
+}

+ 37 - 0
whepi-web/src/main/java/com/bofeng/entity/Owner.java
View File 

@@ -0,0 +1,37 @@
 
+package com.bofeng.entity;
 
+
 
+import com.baomidou.mybatisplus.annotations.TableField;
 
+import com.baomidou.mybatisplus.annotations.TableName;
 
+import lombok.Getter;
 
+import lombok.Setter;
 
+import org.joda.time.DateTime;
 
+
 
+@Getter
 
+@Setter
 
+@TableName("sys_owner")
 
+public class Owner {
 
+
 
+    @TableField("owner_id")
 
+    private Long ownerId;
 
+
 
+    @TableField("uptown_id")
 
+    private Long uptownId;
 
+
 
+    @TableField("linkman")
 
+    private String linkman;
 
+
 
+    @TableField("phone")
 
+    private String phone;
 
+
 
+    @TableField("user_create")
 
+    private Long userCreate;
 
+
 
+    @TableField(exist = false)
 
+    private DateTime timeCreate;
 
+
 
+    @TableField("user_update")
 
+    private Long userUpdate;
 
+
 
+    @TableField(exist = false)
 
+    private DateTime timeUpdate;
 
+}

+ 57 - 0
whepi-web/src/main/java/com/bofeng/entity/UptownHouse.java
View File 

@@ -0,0 +1,57 @@
 
+package com.bofeng.entity;
 
+
 
+import com.baomidou.mybatisplus.annotations.TableField;
 
+import com.baomidou.mybatisplus.annotations.TableName;
 
+import lombok.Getter;
 
+import lombok.Setter;
 
+import org.joda.time.DateTime;
 
+
 
+import java.util.Date;
 
+
 
+@Getter
 
+@Setter
 
+@TableName("sys_uptown_house")
 
+public class UptownHouse {
 
+
 
+    @TableField("house_id")
 
+    private Long houseId;
 
+
 
+    @TableField("uptown_id")
 
+    private Long uptownId;
 
+
 
+    @TableField("linkman")
 
+    private String linkman;
 
+
 
+    @TableField("phone")
 
+    private String phone;
 
+
 
+    @TableField("young")
 
+    private Integer young;
 
+
 
+    @TableField("middle")
 
+    private Integer middle;
 
+
 
+    @TableField("old")
 
+    private Integer old;
 
+
 
+    @TableField("remark")
 
+    private String remark;
 
+
 
+    /**
 
+     * 状态:1正常,0草稿,-1删除
 
+     */
 
+    @TableField("status")
 
+    private Integer status;
 
+
 
+    @TableField("user_create")
 
+    private Long userCreate;
 
+
 
+    @TableField(exist = false)
 
+    private DateTime timeCreate;
 
+
 
+    @TableField("user_update")
 
+    private Long userUpdate;
 
+
 
+    @TableField(exist = false)
 
+    private DateTime timeUpdate;
 
+}

+ 37 - 0
whepi-web/src/main/java/com/bofeng/entity/UserRole.java
View File 

@@ -0,0 +1,37 @@
 
+package com.bofeng.entity;
 
+
 
+import com.baomidou.mybatisplus.annotations.TableField;
 
+import com.baomidou.mybatisplus.annotations.TableName;
 
+import lombok.Getter;
 
+import lombok.Setter;
 
+import org.joda.time.DateTime;
 
+
 
+@Getter
 
+@Setter
 
+@TableName("sys_user_role")
 
+public class UserRole {
 
+
 
+    @TableField("ur_id")
 
+    private Long urId;
 
+
 
+    @TableField("user_id")
 
+    private Long userId;
 
+
 
+    @TableField("role_id")
 
+    private Integer roleId;
 
+
 
+    @TableField("property_id")
 
+    private Long propertyId;
 
+
 
+    @TableField("user_create")
 
+    private Long userCreate;
 
+
 
+    @TableField(exist = false)
 
+    private DateTime timeCreate;
 
+
 
+    @TableField("user_update")
 
+    private Long userUpdate;
 
+
 
+    @TableField(exist = false)
 
+    private DateTime timeUpdate;
 
+}

+ 49 - 6
whepi-web/src/main/java/com/bofeng/service/UserOpenService.java
View File 

@@ -1,13 +1,13 @@
 
 package com.bofeng.service;
 
 package com.bofeng.service;
 
 
 
-import com.bofeng.dao.UserMapper;
 
-import com.bofeng.dao.UserOpenMapper;
 
-import com.bofeng.dao.UserPlaceMapper;
 
-import com.bofeng.entity.User;
 
-import com.bofeng.entity.UserOpen;
 
-import com.bofeng.entity.UserPlace;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 
+import com.baomidou.mybatisplus.toolkit.IdWorker;
 
+import com.bofeng.dao.*;
 
+import com.bofeng.entity.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.data.annotation.Id;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.stereotype.Service;
 
+import org.springframework.transaction.annotation.Propagation;
 
 import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.transaction.annotation.Transactional;
 
 
 
 @Service
 
 @Service
 
@@ -49,4 +49,47 @@ public class UserOpenService {
 
         return userPlaceMapper.insert(userPlace);
 
         return userPlaceMapper.insert(userPlace);
 
 
 
     }
 
     }
 
+
 
+    @Autowired
 
+    private UptownHouseMapper uptownHouseMapper;
 
+    @Autowired
 
+    private OwnerMapper ownerMapper;
 
+    @Autowired
 
+    private UserRoleMapper userRoleMapper;
 
+
 
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
 
+    public void saveUserInfo(Long userId, Integer userType, String linkman, String phone) {
 
+        UserRole userRole = new UserRole();
 
+        userRole.setUrId(IdWorker.getId());
 
+        userRole.setUserId(userId);
 
+        userRole.setRoleId(userType);
 
+        userRole.setUserCreate(userId);
 
+        userRole.setUserUpdate(userId);
 
+        if (userType == 1) {
 
+            UptownHouse uptownHouse = new UptownHouse();
 
+//            uptownHouse.setHouseId()
 
+            uptownHouse.setLinkman(linkman);
 
+            uptownHouse.setPhone(phone);
 
+//            uptownHouse.setYoung();
 
+//            uptownHouse.setMiddle();
 
+//            uptownHouse.setOld();
 
+//            uptownHouse.setRemark();
 
+            uptownHouse.setStatus(1);
 
+            uptownHouse.setUserCreate(userId);
 
+            uptownHouse.setUserUpdate(userId);
 
+            uptownHouseMapper.insert(uptownHouse);
 
+            userRole.setPropertyId(uptownHouse.getHouseId());
 
+        } else if (userType == 2) {
 
+            Owner owner = new Owner();
 
+            owner.setOwnerId(IdWorker.getId());
 
+//            owner.setUptownId();
 
+            owner.setLinkman(linkman);
 
+            owner.setPhone(phone);
 
+            owner.setUserCreate(userId);
 
+            owner.setUserUpdate(userId);
 
+            ownerMapper.insert(owner);
 
+            userRole.setPropertyId(owner.getOwnerId());
 
+        }
 
+        userRoleMapper.insert(userRole);
 
+    }
 
 }
 
 }

+ 38 - 0
whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java
View File 

@@ -0,0 +1,38 @@
 
+package com.bofeng.wx.controller;
 
+
 
+import com.bofeng.entity.UserOpen;
 
+import com.bofeng.service.HomeService;
 
+import com.bofeng.service.UserOpenService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.ui.ModelMap;
 
+import org.springframework.web.bind.annotation.GetMapping;
 
+import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.servlet.ModelAndView;
 
+
 
+import javax.servlet.http.HttpServletRequest;
 
+
 
+@RestController
 
+public class UserOpenController {
 
+
 
+    @Autowired
 
+    private HomeService homeService;
 
+    @Autowired
 
+    private UserOpenService userOpenService;
 
+
 
+    @GetMapping("/user/home.html")
 
+    public ModelAndView home(ModelMap model) {
 
+        UserOpen userOpen = homeService.getUserOpen();
 
+        model.put("user", userOpen);
 
+        return new ModelAndView("/user/home.ftl", model);
 
+    }
 
+
 
+    @GetMapping("/home/saveUser.json")
 
+    public ModelAndView saveUser(HttpServletRequest request) {
 
+        Long userId = Long.parseLong(request.getParameter("userId"));
 
+        Integer userType = Integer.parseInt(request.getParameter("userType"));
 
+        String linkman = request.getParameter("linkman");
 
+        String phone = request.getParameter("phone");
 
+        userOpenService.saveUserInfo(userId,userType,linkman,phone);
 
+        return new ModelAndView("/home/home.ftl");
 
+    }
 
+}

+ 14 - 0
whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java
View File 

@@ -32,4 +32,18 @@ public class YeWeiHuiController {
 
 
 
         return new ModelAndView("/yeweihui/home.ftl", model);
 
         return new ModelAndView("/yeweihui/home.ftl", model);
 
     }
 
     }
 
+
 
+    @GetMapping("/yeweihui/ribao.html")
 
+    public ModelAndView yeweihuiRibao(ModelMap model) {
 
+
 
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
 
+        queryParam.put("userId", "12345677");
 
+        queryParam.put("statistics", "M");
 
+
 
+        List<QzTask> taskList = qzTaskService.selectAll();
 
+
 
+        model.put("taskList", YvanUtil.toJsonPretty(taskList));
 
+
 
+        return new ModelAndView("/yeweihui/ribao.ftl", model);
 
+    }
 
 }
 
 }

+ 5 - 5
whepi-web/src/main/resources/application-prod.yml
View File 

@@ -21,10 +21,10 @@ yvan:
 
   static_domain: /static
 
   static_domain: /static
 
   upload_domain: /static
 
   upload_domain: /static
 
   wechat:
 
   wechat:
 
-    token: bofeng888
 
-    appID: wx60b839a41373363b
 
-    appsecret: 5e48d7c76dae589b705c5b6b6f9c8294
 
-    EncodingAESKey: B3OzrAWb9QZ1tRbZQ0LgLIGafvvH3PzcsDneuxto4QS
 
+    token: wuhanepi
 
+    appID: wx0b7d70ff931c397d
 
+    appsecret: 7f6af95b5f6ad1f9d45fc57c1b58f7cf
 
+    EncodingAESKey: Wpm1KEBmXvVLjeOyqWbn6PJlkW7tlR7MxXmrm4i9zcg
 
 
 
     #token: slxtoken
 
     #token: slxtoken
 
     #appID: wx79c1af613d5d22dd
 
     #appID: wx79c1af613d5d22dd
 
@@ -41,7 +41,7 @@ yvan:
 
     #qrcode_match_cust_expire_second: 10800
 
     #qrcode_match_cust_expire_second: 10800
 
 
 
     #bofeng9999 / 789456hh
 
     #bofeng9999 / 789456hh
 
-    domain: http://wx.bofeng80.com/
 
+    domain: http://caller.whyxzz.com.cn
 
     tmpTicketExpireSeconds: 10800
 
     tmpTicketExpireSeconds: 10800
 
     templates:
 
     templates:
 
       预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'
 
       预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'