Merge remote-tracking branch 'origin/master'

whepi-ui/templates/user/home.ftl

@@ -3,106 +3,235 @@
 
 <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">
+        <div id="first">
+            <div 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/>
-                    <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="请输入文本"/>
+                    <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" style="font-weight: 300;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<#if user ??>${user.nickName!''}</#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>
-                            <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 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="goOn();" id="goOn">下一步</a>
+                        </div>
                     </div>
-                    <br/>
-                    <div class="weui-form__opr-area">
-                        <a class="weui-btn weui-btn_primary "  href="javascript:;" onclick="save();" id="save">确定</a>
+                    <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 id="second">
+            <div class="weui-tab__bd-item weui-tab__bd-item--active">
+                <div class="page__bd">
+                    <header class="user-header">
+                        <br/>
+                        <h1 class="user-title"><#if user ??>${user.nickName!''}</#if>，请完善住址信息</h1>
+                        <br/>
+                    </header>
+                    <br/>
+                    <br/>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">城市</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="city" name="select1">
+                                <option value="1">武汉</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">区</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="area" name="select2">
+                                <option value="420102">江岸区</option>
+                                <option value="420103">江汉区</option>
+                                <option value="420104">硚口区</option>
+                                <option value="420105">汉阳区</option>
+                                <option value="420106">武昌区</option>
+                                <option value="420107">青山区</option>
+                                <option value="420111">洪山区</option>
+                                <option value="420112">东西湖区</option>
+                                <option value="420113">汉南区</option>
+                                <option value="420114">蔡甸区</option>
+                                <option value="420115">江夏区</option>
+                                <option value="420116">黄陂区</option>
+                                <option value="420117">新洲区</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">小区</label>
+                        </div>
+                        <div class="weui-cell__bd">
+<#--                            <select class="weui-select" name="select3">-->
+<#--                                <option value="1">武汉</option>-->
+<#--                            </select>-->
 
+                            <select class="weui-select combobox" id="uptownId" name="select3" data-options="editable:false">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-form" id="fromMsg">
+                        <hr class="user-hr">
+                        <div class="maindiv">
+                            <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 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>
-                <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 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>
-                <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 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>
 </div>
@@ -110,9 +239,42 @@
 <#include "/home/frag.foot.ftl" />
 <script>
 
-    var userId = <#if user ??>value="${user.userId!''}"</#if>
+    $(document).ready(function() {
+        $("#area").on("change", function () {
+            var area = $("#area").val();
+            console.log(area)
+
+            $("#uptownId").combobox({
+                multiple: false,//是否允许多选
+                editable: false,
+                url: '/admin/supplier/getTheSupBranch.json?supplierId=' + supplierId+'&isAll=1',
+                valueField: 'branchId',
+                textField: 'shortName'
+            });
+        })
+    })
+
+    <#if user ??>var userId = ${user.userId!''}</#if>;
 
     function save() {
+        var city = $("#city").val();
+        var area = $("#area").val();
+        console.log(city)
+        console.log(area)
+        console.log(uptownId)
+    }
+
+    // function initBranchCommobox(){
+    //     $("#uptownId").combobox({
+    //         multiple: false,//是否允许多选
+    //         editable: false,
+    //         url: '/admin/supplier/getTheSupBranch.json?supplierId=' + supplierId+'&isAll=1',
+    //         valueField: 'branchId',
+    //         textField: 'shortName'
+    //     });
+    // }
+
+    function goOn() {
         var userType = $('input:radio:checked').val();
         if (!userType) {
             $("#tpl_msg_warn_userType").show();
@@ -130,7 +292,7 @@
             return false;
         }
         var phone = $("#phone").val();
-        if(!(/^1[3456789]\d{9}$/.test(phone))){
+        if (!(/^1[3456789]\d{9}$/.test(phone))) {
             $("#tpl_msg_warn_userType").hide();
             $("#tpl_msg_warn_linkman").hide();
             $("#tpl_msg_warn_phone").show();
@@ -145,28 +307,18 @@
         console.log(phone)
 
         $.ajax({
-            url: '/admin/supplier/createOrderauditMain.json',
+            url: '/home/saveUser.json',
             type: "post",
             data: {
-                "userId": userId,
+                "userId": 123,
                 "userType": userType,
                 "linkman": linkman,
                 "phone": phone,
             },
-            beforeSend: function () {
-            },
-            success: function (result) {
-                if (result.success) {
-                    layer.msg('添加成功');
-                } else {
-                    layer.msg(result.message);
-                }
-                closePageTwo();
-            }
         });
     }
 
-    function back(){
+    function back() {
         $("#tpl_msg_warn_userType").hide();
         $("#tpl_msg_warn_linkman").hide();
         $("#tpl_msg_warn_phone").hide();

whepi-web/src/main/java/com/bofeng/dao/UptownHomeMapper.java

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

whepi-web/src/main/java/com/bofeng/dao/UptownHouseMapper.java

@@ -2,10 +2,6 @@ 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> {
 }

whepi-web/src/main/java/com/bofeng/entity/UptownHome.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_home")
+public class UptownHome {
+
+    @TableField("house_id")
+    private Long houseId;
+
+    @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;
+}

whepi-web/src/main/java/com/bofeng/entity/UptownHouse.java

@@ -8,6 +8,9 @@ import org.joda.time.DateTime;
 
 import java.util.Date;
 
+/**
+ * 门牌信息表
+ */
 @Getter
 @Setter
 @TableName("sys_uptown_house")
@@ -22,20 +25,14 @@ public class UptownHouse {
     @TableField("linkman")
     private String linkman;
 
-    @TableField("phone")
-    private String phone;
+    @TableField("ridgepole")
+    private String ridgepole;
 
-    @TableField("young")
-    private Integer young;
+    @TableField("unit")
+    private String unit;
 
-    @TableField("middle")
-    private Integer middle;
-
-    @TableField("old")
-    private Integer old;
-
-    @TableField("remark")
-    private String remark;
+    @TableField("doorplate")
+    private String doorplate;
 
     /**
      * 状态:1正常,0草稿,-1删除

whepi-web/src/main/java/com/bofeng/service/UserOpenService.java

@@ -1,11 +1,9 @@
 package com.bofeng.service;
 
-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;
@@ -51,7 +49,7 @@ public class UserOpenService {
     }
 
     @Autowired
-    private UptownHouseMapper uptownHouseMapper;
+    private UptownHomeMapper uptownHouseMapper;
     @Autowired
     private OwnerMapper ownerMapper;
     @Autowired
@@ -66,19 +64,19 @@ public class UserOpenService {
         userRole.setUserCreate(userId);
         userRole.setUserUpdate(userId);
         if (userType == 1) {
-            UptownHouse uptownHouse = new UptownHouse();
+            UptownHome uptownHome = new UptownHome();
 //            uptownHouse.setHouseId()
-            uptownHouse.setLinkman(linkman);
-            uptownHouse.setPhone(phone);
+            uptownHome.setLinkman(linkman);
+            uptownHome.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());
+            uptownHome.setStatus(1);
+            uptownHome.setUserCreate(userId);
+            uptownHome.setUserUpdate(userId);
+            uptownHouseMapper.insert(uptownHome);
+            userRole.setPropertyId(uptownHome.getHouseId());
         } else if (userType == 2) {
             Owner owner = new Owner();
             owner.setOwnerId(IdWorker.getId());

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -6,6 +6,7 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -21,12 +22,22 @@ public class UserOpenController {
 
     @GetMapping("/user/home.html")
     public ModelAndView home(ModelMap model) {
-        UserOpen userOpen = homeService.getUserOpen();
-        model.put("user", userOpen);
+//        UserOpen userOpen = homeService.getUserOpen();
+//        model.put("user", userOpen);
         return new ModelAndView("/user/home.ftl", model);
     }
 
-    @GetMapping("/home/saveUser.json")
+//    @GetMapping("/home/getUptown.json")
+//    public Model<List<Map<>>> getUptown(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");
+//    }
+
+    @PostMapping("/home/saveUser.json")
     public ModelAndView saveUser(HttpServletRequest request) {
         Long userId = Long.parseLong(request.getParameter("userId"));
         Integer userType = Integer.parseInt(request.getParameter("userType"));