صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
peiguo
/
hust-epi
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

maoyunfeng 5 سال پیش
والد
070062009a f81f8a1ec9
کامیت
0127af339e
16فایلهای تغییر یافته به همراه685 افزوده شده و 95 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  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. 11 0
      whepi-web/src/main/java/com/bofeng/dao/OwnerMapper.java
  8. 11 0
      whepi-web/src/main/java/com/bofeng/dao/UptownHouseMapper.java
  9. 11 0
      whepi-web/src/main/java/com/bofeng/dao/UserRoleMapper.java
  10. 37 0
      whepi-web/src/main/java/com/bofeng/entity/Owner.java
  11. 57 0
      whepi-web/src/main/java/com/bofeng/entity/UptownHouse.java
  12. 37 0
      whepi-web/src/main/java/com/bofeng/entity/UserRole.java
  13. 49 6
      whepi-web/src/main/java/com/bofeng/service/UserOpenService.java
  14. 38 0
      whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java
  15. 0 73
      whepi-web/src/main/resources/application-hudingbo.yml
  16. 5 5
      whepi-web/src/main/resources/application-prod.yml

+ 2 - 3
whepi-doc/login.sql
مشاهده فایل 

@@ -54,6 +54,8 @@ DROP TABLE IF EXISTS sys_owner;
 
 CREATE TABLE sys_owner  (
 
   owner_id          bigint(20) NOT NULL DEFAULT 0 COMMENT '业委会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 '新增人',
 
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(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  (
 
   house_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 '联系人名称',
 
   phone             varchar(20)  NOT NULL DEFAULT '' COMMENT '联系人电话',
 
   young             int(11) NOT NULL DEFAULT 0 COMMENT '家庭年前人数',

+ 53 - 0
whepi-ui/templates/home/frag.head.ftl
مشاهده فایل 

@@ -20,6 +20,58 @@
 
             font-weight: 300;
 
             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%;}
 
         .ri_bao_weui_tab_bd_item_active {
 
             display: block !important;
 
@@ -29,5 +81,6 @@
 
         }
 
     </style>
 
 </head>
 
+<span hidden="hidden" id="id"></span>
 
 
 <body style="height: 100%" ontouchstart>

+ 3 - 0
whepi-ui/templates/home/home.ftl
مشاهده فایل 

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

+ 158 - 7
whepi-ui/templates/home/ribao.ftl
مشاهده فایل 

@@ -1,5 +1,3 @@
 
-
 
-
 
 <div class="page__bd">
 
     <div class="weui-tab">
 
         <div class="weui-navbar">
 
@@ -12,15 +10,168 @@
 
         </div>
 
         <div class="weui-tab__panel">
 
             <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 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 class="weui-btn-area">
 
-        <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">日报</a>
 
-    </div>
 
 </div>

+ 37 - 1
whepi-ui/templates/home/ribao.js
مشاهده فایل 

@@ -1,7 +1,43 @@
 
 function ribao_init() {
 
   $('#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
مشاهده فایل 

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

+ 11 - 0
whepi-web/src/main/java/com/bofeng/dao/OwnerMapper.java
مشاهده فایل 

@@ -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
مشاهده فایل 

@@ -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
مشاهده فایل 

@@ -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
مشاهده فایل 

@@ -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
مشاهده فایل 

@@ -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
مشاهده فایل 

@@ -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
مشاهده فایل 

@@ -1,13 +1,13 @@
 
 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.data.annotation.Id;
 
 import org.springframework.stereotype.Service;
 
+import org.springframework.transaction.annotation.Propagation;
 
 import org.springframework.transaction.annotation.Transactional;
 
 
 @Service
 
@@ -49,4 +49,47 @@ public class UserOpenService {
 
         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
مشاهده فایل 

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

+ 0 - 73
whepi-web/src/main/resources/application-hudingbo.yml
مشاهده فایل 

@@ -1,73 +0,0 @@
 
-logging:
 
-  level:
 
-    root: INFO
 
-    jdbc.sqltiming: INFO
 
-  pattern:
 
-    console: '%d %-5level %logger{32} - %msg%n'
 
-
 
-debug: false
 
-ui-path: file:whepi-ui
 
-secret: 456 # jwt私钥
 
-salt: 123 #密码加盐
 
-token_time_minutes: 720 #12小时有效期
 
-token_time_minutes_mobile: 525600 #1年有效
 
-
 
-server:
 
-  port: 8086
 
-
 
-yvan:
 
-  debug: false
 
-  static_version: v20170728
 
-  static_domain: /static
 
-  upload_domain: /static
 
-  wechat:
 
-    #测试帐号
 
-    token: hudingbo
 
-    appID: wx39b9602905ed3b75
 
-    appsecret: 2ad7a715bed0cd8672a0d577492dd259
 
-
 
-#    token: yuliang
 
-#    appID: wx1b020f76b18f0294
 
-#    appsecret: 69f06d671d445dc14b04a097fe50f4cc
 
-
 
-    #token: slxtoken
 
-    #appID: wx79c1af613d5d22dd
 
-    #appsecret: 2de3b4abfe30ff7523f464ace8322b44
 
-    #EncodingAESKey: wb4IyoD7FZa0yB2BMU8HWQ0inWJuAfJSiRR6jlfivo2
 
-    ## 商户编号
 
-    #pay_mch_id: 1499356522
 
-    ## 回调地址
 
-    #notify_url: http://central.good5you.com/pay/wx/notify
 
-
 
-    ## 绑定客户的二维码有效时间
 
-    #qrcode_bind_expire_second: 10800
 
-    ## 找到用户的二维码有效时间
 
-    #qrcode_match_cust_expire_second: 10800
 
-
 
-    ##domain: http://wx.good5you.com/
 
-#    domain: http://bofeng.ng.good5you.com
 
-    domain: http://hudingbo.ng.yvanui.com
 
-#    domain: http://yyc21fmd42.hkhttp.cn
 
-#    tmpTicketExpireSeconds: 10800
 
-    templates:
 
-      预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'
 
-      修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
 
-      结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
 
-      结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
 
-    #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
 
-    #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
 
-
 
-spring:
 
-  datasource:
 
-    type: com.alibaba.druid.pool.DruidDataSource
 
-    #driverClassName: com.mysql.jdbc.Driver
 
-    #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
 
-    driverClassName: net.sf.log4jdbc.DriverSpy
 
-    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
 
-    username: whepi_test
 
-    password: 123456
 
-
 
-  redis:
 
-    database: 4
 
-    host: localhost
 
-    port: 6379

+ 5 - 5
whepi-web/src/main/resources/application-prod.yml
مشاهده فایل 

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