Merge remote-tracking branch 'origin/master'

whepi-doc/login.sql

@@ -122,7 +122,7 @@ CREATE TABLE sys_uptown  (
   uptown_addr       varchar(100)  NOT NULL DEFAULT '' COMMENT '小区地址',
   longitude         varchar(20)  NOT NULL DEFAULT '' COMMENT '经度',
   latitude          varchar(20)  NOT NULL DEFAULT '' COMMENT '纬度',
-  area              varchar(20)  NOT NULL DEFAULT '' COMMENT '区',
+  area              int(11)  NOT NULL DEFAULT '0' COMMENT '区',
   status            int(11) NOT NULL DEFAULT 0 COMMENT '状态:1正常,0草稿,-1删除',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',

whepi-ui/templates/user/home.ftl

@@ -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">
@@ -149,41 +149,26 @@
                             <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 class="weui-select" id="uptownId" name="select3">
                             </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 class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">栋/单元/门牌</label>
                         </div>
-                        <br/>
-                        <div class="weui-form__opr-area">
-                            <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="save();" id="save">确定</a>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="houseId" name="select4">
+                            </select>
                         </div>
                     </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>
 
 
                     <div class="page" id="tpl_msg_warn_userType" hidden="hidden">
@@ -239,40 +224,116 @@
 <#include "/home/frag.foot.ftl" />
 <script>
 
-    $(document).ready(function() {
+    $(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'
-            });
+            $("#uptownId").empty();
+            $("#houseId").empty();
+            getUptownData(area);
+        });
+        $("#uptownId").on("change", function () {
+            getUptownHouseData();
+            $("#houseId").empty();
         })
     })
 
-    <#if user ??>var userId = ${user.userId!''}</#if>;
+    function getUptownData(area) {
+        $.ajax({
+            type: "GET",
+            url: "/home/getUptownData.json?area=" + area,
+            dataType: "json",
+            success: function (data) {
+                if (data.length > 0) {
+                    $("#uptownId").empty();
+                    var html = "";
+                    for (var i = 0; i < data.length; i++) {
+                        html += '<option value="' + data[i].uptownId + '">' + data[i].uptownName + '</option>';
+                    }
+                    $('#uptownId').append(html);
+                    $("#uptownId").val(data[0].uptownId);
+                    getUptownHouseData();
+                }
+            }
+        });
+    }
+
+    function getUptownHouseData() {
+        $.ajax({
+            type: "GET",
+            url: "/home/getUptownHouseData.json?uptownId=" + $("#uptownId").val(),
+            data: {},
+            dataType: "json",
+            success: function (data) {
+                if (data.length > 0) {
+                    $("#houseId").empty();
+                    var html = "";
+                    for (var i = 0; i < data.length; i++) {
+                        html += '<option value="' + data[i].houseId + '">'+data[i].ridgepole+'栋'+data[i].unit+'单元'+data[i].doorplate+'号' + '</option>';
+                    }
+                    $('#houseId').append(html);
+                }
+            }
+        });
+    }
+
+        <#if user ??>var userId = ${user.userId!''}</#if>;
 
     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(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();
@@ -302,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-ui/templates/yeweihui/qiuzhu.js

@@ -28,9 +28,9 @@ function makeUI(tasks) {
   $('#qz_list2').empty();
   $('#qz_list3').empty();
 
-  for (let i = 0; i < tasks.length; i++) {
+  for (var i = 0; i < tasks.length; i++) {
 
-    let task = tasks[i];
+    var task = tasks[i];
     if (task.taskStatus == 1) {
 
       $('#qz_list1').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +

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/UptownHouseMapper.java

@@ -2,6 +2,17 @@ package com.bofeng.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.UptownHouse;
+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 UptownHouseMapper extends BaseMapper<UptownHouse> {
+
+    @Select("select * from sys_uptown_house where status = 1 and uptown_id = #{uptownId}")
+    List<UptownHouse> getAllUptownHouse(@Param("uptownId") Long uptownId);
 }

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

@@ -0,0 +1,18 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.Uptown;
+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 UptownMapper extends BaseMapper<Uptown> {
+
+    @Select("select * from sys_uptown where status = 1 and area = #{area}")
+    List<Uptown> getAllUptown(@Param("area") Integer area);
+}

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/Uptown.java

@@ -0,0 +1,52 @@
+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_uptown")
+public class Uptown {
+
+    @TableField("uptown_id")
+    private Long uptownId;
+
+    @TableField("uptown_name")
+    private String uptownName;
+
+    @TableField("uptown_addr")
+    private String uptownAddr;
+
+    @TableField("longitude")
+    private String longitude;
+
+    @TableField("latitude")
+    private String latitude;
+
+    @TableField("area")
+    private Integer area;
+
+    /**
+     * 状态: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/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/entity/UptownHouse.java

@@ -22,9 +22,6 @@ public class UptownHouse {
     @TableField("uptown_id")
     private Long uptownId;
 
-    @TableField("linkman")
-    private String linkman;
-
     @TableField("ridgepole")
     private String ridgepole;
 

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/WxController.java

@@ -118,7 +118,7 @@ public class WxController {
         btn1.setType(WxConsts.MenuButtonType.VIEW);
         btn1.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
-                                "/home/home.html",
+                                "/user/home.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
 

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

@@ -1,16 +1,23 @@
 package com.bofeng.wx.controller;
 
-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;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @RestController
 public class UserOpenController {
@@ -19,31 +26,85 @@ public class UserOpenController {
     private HomeService homeService;
     @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/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");
-//    }
+    @GetMapping("/home/getUptownData.json")
+    public List<Uptown> getUptownData(HttpServletRequest request, @RequestParam(value = "area") Integer area) {
+        return uptownMapper.getAllUptown(area);
+    }
+
+    @GetMapping("/home/getUptownHouseData.json")
+    public List<UptownHouse> getUptownHouseData(HttpServletRequest request, @RequestParam(value = "uptownId") Long uptownId) {
+        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;
+        }
+
     }
 }