更新登陆0

whepi-ui/templates/user/home.ftl

@@ -3,7 +3,7 @@
 
 <div class="weui-tab">
     <div class="weui-tab__bd">
-        <div id="first" hidden="hidden">
+        <div id="first">
             <div class="weui-tab__bd-item weui-tab__bd-item--active">
                 <div class="page__bd">
                     <header class="user-header">
@@ -102,7 +102,7 @@
             </div>
         </div>
 
-        <div id="second">
+        <div id="second" hidden="hidden">
             <div class="weui-tab__bd-item weui-tab__bd-item--active">
                 <div class="page__bd">
                     <header class="user-header">
@@ -124,7 +124,7 @@
                     </div>
                     <div class="weui-cell weui-cell_select weui-cell_select-after">
                         <div class="weui-cell__hd">
-                            <label for="" class="weui-label">区</label>
+                            <label for="" class="weui-label">区/县</label>
                         </div>
                         <div class="weui-cell__bd">
                             <select class="weui-select" id="area" name="select2">
@@ -162,32 +162,12 @@
                             </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>
+                    <br/>
+                    <br/>
+                    <br/>
+                    <br/>
+                    <div class="weui-form__opr-area">
+                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="save();" id="save">确定</a>
                     </div>
 
 
@@ -250,7 +230,6 @@
             $("#uptownId").empty();
             $("#houseId").empty();
             getUptownData(area);
-            getUptownHouseData();
         });
         $("#uptownId").on("change", function () {
             getUptownHouseData();
@@ -271,6 +250,8 @@
                         html += '<option value="' + data[i].uptownId + '">' + data[i].uptownName + '</option>';
                     }
                     $('#uptownId').append(html);
+                    $("#uptownId").val(data[0].uptownId);
+                    getUptownHouseData();
                 }
             }
         });
@@ -299,21 +280,60 @@
 
     function save() {
         var city = $("#city").val();
+        if (!city) {
+            alert("请选择城市！")
+            return false;
+        }
         var area = $("#area").val();
+        if (!area) {
+            alert("请选择区/县！")
+            return false;
+        }
+        var uptownId = $("#uptownId").val();
+        if (!uptownId) {
+            alert("请选择小区！")
+            return false;
+        }
+        var houseId = $("#houseId").val();
+        if (!houseId) {
+            alert("请选择门牌信息！")
+            return false;
+        }
         console.log(city)
         console.log(area)
-        // console.log(uptownId)
-    }
+        console.log(uptownId)
+        console.log(houseId)
 
-    // function initBranchCommobox(){
-    //     $("#uptownId").combobox({
-    //         multiple: false,//是否允许多选
-    //         editable: false,
-    //         url: '/admin/supplier/getTheSupBranch.json?supplierId=' + supplierId+'&isAll=1',
-    //         valueField: 'branchId',
-    //         textField: 'shortName'
-    //     });
-    // }
+
+
+        $.ajax({
+            url: '/home/checkHouseId.json',
+            type: "post",
+            data: {
+                "houseId": houseId,
+            },success: function (data) {
+                if (!data.success) {
+                    alert(data.msg);
+                    return false;
+                } else {
+                    $.ajax({
+                        url: '/home/saveUser.json',
+                        type: "post",
+                        data: {
+                            "userId": userId,
+                            "userType": $('input:radio:checked').val(),
+                            "linkman": $("#linkman").val(),
+                            "phone": $("#phone").val(),
+                            "city": city,
+                            "area": area,
+                            "uptownId": uptownId,
+                            "houseId": houseId,
+                        },
+                    });
+                }
+            }
+        });
+    }
 
     function goOn() {
         var userType = $('input:radio:checked').val();
@@ -343,20 +363,12 @@
         $("#tpl_msg_warn_userType").hide();
         $("#tpl_msg_warn_linkman").hide();
         $("#tpl_msg_warn_phone").hide();
+        $("#first").hide();
+        $("#second").show();
         console.log(userType)
         console.log(linkman)
         console.log(phone)
 
-        $.ajax({
-            url: '/home/saveUser.json',
-            type: "post",
-            data: {
-                "userId": 123,
-                "userType": userType,
-                "linkman": linkman,
-                "phone": phone,
-            },
-        });
     }
 
     function back() {

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

@@ -3,9 +3,16 @@ package com.bofeng.dao;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.UptownHome;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface UptownHomeMapper extends BaseMapper<UptownHome> {
-}
+
+    @Select("select * from sys_uptown_home where house_id = #{houseId} and status = 1")
+    List<UptownHome> getUptownHomeBy(@Param("houseId")Long houseId);
+}

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

@@ -3,9 +3,16 @@ package com.bofeng.dao;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.UserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface UserRoleMapper extends BaseMapper<UserRole> {
+
+    @Select("select * from sys_user_role where user_id = #{userId}")
+    List<UserRole> getUserRoleByUserId(@Param("userId") Long userId);
 }

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

@@ -43,15 +43,9 @@ public class UptownHome {
     @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/service/UserOpenService.java

@@ -49,14 +49,14 @@ public class UserOpenService {
     }
 
     @Autowired
-    private UptownHomeMapper uptownHouseMapper;
+    private UptownHomeMapper uptownHomeMapper;
     @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) {
+    public void saveUserInfo(Long userId, Integer userType, String linkman, String phone, Integer area, Long uptownId, Long houseId) {
         UserRole userRole = new UserRole();
         userRole.setUrId(IdWorker.getId());
         userRole.setUserId(userId);
@@ -65,22 +65,20 @@ public class UserOpenService {
         userRole.setUserUpdate(userId);
         if (userType == 1) {
             UptownHome uptownHome = new UptownHome();
-//            uptownHouse.setHouseId()
+            uptownHome.setHouseId(houseId);
             uptownHome.setLinkman(linkman);
             uptownHome.setPhone(phone);
-//            uptownHouse.setYoung();
-//            uptownHouse.setMiddle();
-//            uptownHouse.setOld();
-//            uptownHouse.setRemark();
+            uptownHome.setYoung(0);
+            uptownHome.setMiddle(0);
+            uptownHome.setOld(0);
+            uptownHome.setRemark("");
             uptownHome.setStatus(1);
-            uptownHome.setUserCreate(userId);
-            uptownHome.setUserUpdate(userId);
-            uptownHouseMapper.insert(uptownHome);
+            uptownHomeMapper.insert(uptownHome);
             userRole.setPropertyId(uptownHome.getHouseId());
         } else if (userType == 2) {
             Owner owner = new Owner();
             owner.setOwnerId(IdWorker.getId());
-//            owner.setUptownId();
+            owner.setUptownId(uptownId);
             owner.setLinkman(linkman);
             owner.setPhone(phone);
             owner.setUserCreate(userId);

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

@@ -1,13 +1,13 @@
 package com.bofeng.wx.controller;
 
-import com.bofeng.dao.UptownHouseMapper;
-import com.bofeng.dao.UptownMapper;
-import com.bofeng.entity.Uptown;
-import com.bofeng.entity.UptownHouse;
-import com.bofeng.entity.UserOpen;
+import com.bofeng.dao.*;
+import com.bofeng.entity.*;
 import com.bofeng.service.HomeService;
+import com.bofeng.service.QzTaskService;
 import com.bofeng.service.UserOpenService;
 import com.yvan.Model;
+import com.yvan.platform.YvanUtil;
+import com.yvan.springmvc.ResultModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,15 +27,36 @@ public class UserOpenController {
     @Autowired
     private UserOpenService userOpenService;
     @Autowired
+    private UserOpenMapper userOpenMapper;
+    @Autowired
     private UptownMapper uptownMapper;
     @Autowired
     private UptownHouseMapper uptownHouseMapper;
+    @Autowired
+    private UptownHomeMapper uptownHomeMapper;
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+    @Autowired
+    private QzTaskService qzTaskService;
 
     @GetMapping("/user/home.html")
     public ModelAndView home(ModelMap model) {
-//        UserOpen userOpen = homeService.getUserOpen();
-//        model.put("user", userOpen);
-        return new ModelAndView("/user/home.ftl", model);
+        UserOpen userOpen = homeService.getUserOpen();
+        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
+        model.put("user", userOpen);
+        if (list.size() == 0) {
+            return new ModelAndView("/user/home.ftl", model);
+        } else if (list.size()>0) {
+            if (list.get(0).getRoleId() == 1) {
+                return new ModelAndView("/home/home.ftl", model);
+            } else if(list.get(0).getRoleId() == 2) {
+                List<QzTask> taskList = qzTaskService.selectAll();
+                model.put("taskList", YvanUtil.toJsonPretty(taskList));
+                return new ModelAndView("/yeweihui/home.ftl", model);
+            }
+        }
+        return null;
     }
 
     @GetMapping("/home/getUptownData.json")
@@ -48,13 +69,42 @@ public class UserOpenController {
         return uptownHouseMapper.getAllUptownHouse(uptownId);
     }
 
+    @PostMapping("/home/checkHouseId.json")
+    public ResultModel checkHouseId(HttpServletRequest request) {
+        ResultModel resultModel = new ResultModel();
+        Long houseId = Long.parseLong(request.getParameter("houseId"));
+        List<UptownHome> list = uptownHomeMapper.getUptownHomeBy(houseId);
+        if (list.size() > 0) {
+            resultModel.put("success", false);
+            resultModel.put("msg", "该门牌已有人入住！");
+            return resultModel;
+        }
+        resultModel.put("success", true);
+        resultModel.put("msg", "操作成功");
+        return resultModel;
+    }
+
     @PostMapping("/home/saveUser.json")
-    public ModelAndView saveUser(HttpServletRequest request) {
+    public ModelAndView saveUser(ModelMap model, 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");
+        Integer area = Integer.parseInt(request.getParameter("area"));
+        Long uptownId = Long.parseLong(request.getParameter("uptownId"));
+        Long houseId = Long.parseLong(request.getParameter("houseId"));
+        userOpenService.saveUserInfo(userId,userType,linkman,phone,area,uptownId,houseId);
+        UserOpen userOpen = userOpenMapper.selectByUserId(userId);
+        model.put("user", userOpen);
+        if (userType == 1) {
+            return new ModelAndView("/home/home.ftl", model);
+        } else if (userType == 2) {
+            List<QzTask> taskList = qzTaskService.selectAll();
+            model.put("taskList", YvanUtil.toJsonPretty(taskList));
+            return new ModelAndView("/yeweihui/home.ftl", model);
+        } else {
+            return null;
+        }
+
     }
 }