Merge remote-tracking branch 'origin/master'

whepi-ui/templates/user/home.ftl

@@ -153,15 +153,25 @@
                             </select>
                         </div>
                     </div>
-                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                    <div class="weui-cell weui-cell_select weui-cell_select-after" id="unitMsg">
                         <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="houseId" name="select4">
+                            <select class="weui-select" id="unitId" name="select4">
                             </select>
                         </div>
                     </div>
+                    <div id="doorplateMsg">
+                        <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="doorplate" placeholder="请输入文本"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <br/>
                     <br/>
                     <br/>
@@ -170,49 +180,6 @@
                         <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">
-                        <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>
@@ -232,7 +199,7 @@
             getUptownData(area);
         });
         $("#uptownId").on("change", function () {
-            getUptownHouseData();
+            getUptownUnitData();
             $("#houseId").empty();
         })
     })
@@ -251,26 +218,27 @@
                     }
                     $('#uptownId').append(html);
                     $("#uptownId").val(data[0].uptownId);
-                    getUptownHouseData();
+                    getUptownUnitData();
                 }
             }
         });
     }
 
-    function getUptownHouseData() {
+    function getUptownUnitData() {
         $.ajax({
             type: "GET",
-            url: "/home/getUptownHouseData.json?uptownId=" + $("#uptownId").val(),
+            url: "/home/getUptownUnitData.json?uptownId=" + $("#uptownId").val(),
             data: {},
             dataType: "json",
             success: function (data) {
                 if (data.length > 0) {
-                    $("#houseId").empty();
+                    $("#unitId").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>';
+                        html += '<option value="' + data[i].unitId + '">'+data[i].ridgepole+'栋'+data[i].unit+'单元' + '</option>';
                     }
-                    $('#houseId').append(html);
+                    $('#unitId').append(html);
+                    $("#unitId").val(data[0].unitId);
                 }
             }
         });
@@ -279,6 +247,7 @@
         <#if user ??>var userId = ${user.userId!''}</#if>;
 
     function save() {
+        var userType = $('input:radio:checked').val();
         var city = $("#city").val();
         if (!city) {
             alert("请选择城市！")
@@ -294,45 +263,70 @@
             alert("请选择小区！")
             return false;
         }
-        var houseId = $("#houseId").val();
-        if (!houseId) {
-            alert("请选择门牌信息！")
-            return false;
+        var unitId = $("#unitId").val();
+        var doorplate = $("#doorplate").val();
+        if(userType == 1) {
+            if (!unitId) {
+                alert("栋/单元！")
+                return false;
+            }
+            if (!doorplate) {
+                alert("请选择门牌信息！")
+                return false;
+            }
         }
         console.log(city)
         console.log(area)
         console.log(uptownId)
-        console.log(houseId)
-
-
-
-        $.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,
-                        },
-                    });
+        console.log(unitId)
+        console.log(doorplate)
+        if (userType == 1) {
+            $.ajax({
+                url: '/home/checkHouseId.json',
+                type: "post",
+                data: {
+                    "unitId": unitId,
+                    "doorplate": doorplate,
+                },success: function (data) {
+                    if (!data.success) {
+                        alert(data.msg);
+                        return false;
+                    } else {
+                        $.ajax({
+                            url: '/home/saveUser.json',
+                            type: "post",
+                            data: {
+                                "userId": 111,
+                                "userType": $('input:radio:checked').val(),
+                                "linkman": $("#linkman").val(),
+                                "phone": $("#phone").val(),
+                                "city": city,
+                                "area": area,
+                                "unitId": unitId,
+                                "uptownId": uptownId,
+                                "doorplate": doorplate,
+                            },
+                        });
+                    }
                 }
-            }
-        });
+            });
+        } else {
+            $.ajax({
+                url: '/home/saveUser.json',
+                type: "post",
+                data: {
+                    "userId": 111,
+                    "userType": $('input:radio:checked').val(),
+                    "linkman": $("#linkman").val(),
+                    "phone": $("#phone").val(),
+                    "city": city,
+                    "area": area,
+                    "unitId": unitId,
+                    "uptownId": uptownId,
+                    "doorplate": doorplate,
+                },
+            });
+        }
     }
 
     function goOn() {
@@ -368,7 +362,10 @@
         console.log(userType)
         console.log(linkman)
         console.log(phone)
-
+        if (userType == 2) {
+            $("#unitMsg").hide();
+            $("#doorplateMsg").hide();
+        }
     }
 
     function back() {

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

@@ -14,5 +14,5 @@ import java.util.List;
 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);
+    List<UptownHome> getUptownHomeBy(@Param("houseId")Long houseId, @Param("doorplate")String doorplate);
 }

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

@@ -1,6 +1,7 @@
 package com.bofeng.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.UptownHome;
 import com.bofeng.entity.UptownHouse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,4 +16,7 @@ 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);
+
+    @Select("select * from sys_uptown_house where status = 1 and unit_id = #{unitId} and doorplate = #{doorplate}")
+    List<UptownHome> getUptownHouseBy(@Param("unitId") Long unitId, @Param("doorplate") String doorplate);
 }

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

@@ -0,0 +1,18 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.UptownUnit;
+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 UptownUnitMapper extends BaseMapper<UptownUnit> {
+
+    @Select("select * from sys_uptown_unit where status = 1 and uptown_id = #{uptownId}")
+    List<UptownUnit> getUptownUnitData(@Param("uptownId") Long uptownId);
+}

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

@@ -19,14 +19,8 @@ public class UptownHouse {
     @TableField("house_id")
     private Long houseId;
 
-    @TableField("uptown_id")
-    private Long uptownId;
-
-    @TableField("ridgepole")
-    private String ridgepole;
-
-    @TableField("unit")
-    private String unit;
+    @TableField("unit_id")
+    private Long unitId;
 
     @TableField("doorplate")
     private String doorplate;
@@ -37,15 +31,9 @@ public class UptownHouse {
     @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/UptownUnit.java

@@ -0,0 +1,46 @@
+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_unit")
+public class UptownUnit {
+
+    @TableField("unit_id")
+    private Long unitId;
+
+    @TableField("uptown_id")
+    private Long uptown_id;
+
+    @TableField("ridgepole")
+    private String ridgepole;
+
+    @TableField("unit")
+    private String unit;
+
+    /**
+     * 状态: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/service/UserOpenService.java

@@ -54,9 +54,11 @@ public class UserOpenService {
     private OwnerMapper ownerMapper;
     @Autowired
     private UserRoleMapper userRoleMapper;
+    @Autowired
+    private UptownHouseMapper uptownHouseMapper;
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void saveUserInfo(Long userId, Integer userType, String linkman, String phone, Integer area, Long uptownId, Long houseId) {
+    public void saveUserInfo(Long userId, Integer userType, String linkman, String phone, Integer area, Long uptownId, Long unitId, String doorplate) {
         UserRole userRole = new UserRole();
         userRole.setUrId(IdWorker.getId());
         userRole.setUserId(userId);
@@ -64,8 +66,14 @@ public class UserOpenService {
         userRole.setUserCreate(userId);
         userRole.setUserUpdate(userId);
         if (userType == 1) {
+            UptownHouse uptownHouse = new UptownHouse();
+            uptownHouse.setHouseId(IdWorker.getId());
+            uptownHouse.setUnitId(unitId);
+            uptownHouse.setDoorplate(doorplate);
+            uptownHouse.setStatus(1);
+            uptownHouseMapper.insert(uptownHouse);
             UptownHome uptownHome = new UptownHome();
-            uptownHome.setHouseId(houseId);
+            uptownHome.setHouseId(uptownHouse.getHouseId());
             uptownHome.setLinkman(linkman);
             uptownHome.setPhone(phone);
             uptownHome.setYoung(0);

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

@@ -37,14 +37,16 @@ public class UserOpenController {
     @Autowired
     private UserRoleMapper userRoleMapper;
     @Autowired
+    private UptownUnitMapper uptownUnitMapper;
+    @Autowired
     private QzTaskService qzTaskService;
 
     @GetMapping("/user/home.html")
     public ModelAndView home(ModelMap model) {
         UserOpen userOpen = homeService.getUserOpen();
         List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
         model.put("user", userOpen);
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
         if (list.size() == 0) {
             return new ModelAndView("/user/home.ftl", model);
         } else if (list.size()>0) {
@@ -64,16 +66,17 @@ public class UserOpenController {
         return uptownMapper.getAllUptown(area);
     }
 
-    @GetMapping("/home/getUptownHouseData.json")
-    public List<UptownHouse> getUptownHouseData(HttpServletRequest request, @RequestParam(value = "uptownId") Long uptownId) {
-        return uptownHouseMapper.getAllUptownHouse(uptownId);
+    @GetMapping("/home/getUptownUnitData.json")
+    public List<UptownUnit> getUptownUnitData(HttpServletRequest request, @RequestParam(value = "uptownId") Long uptownId) {
+        return uptownUnitMapper.getUptownUnitData(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);
+        Long unitId = Long.parseLong(request.getParameter("unitId"));
+        String doorplate = request.getParameter("doorplate");
+        List<UptownHome> list = uptownHouseMapper.getUptownHouseBy(unitId, doorplate);
         if (list.size() > 0) {
             resultModel.put("success", false);
             resultModel.put("msg", "该门牌已有人入住！");
@@ -92,8 +95,13 @@ public class UserOpenController {
         String phone = request.getParameter("phone");
         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);
+        Long unitId = 0L;
+        String doorplate = "";
+        if (userType == 1) {
+            unitId = Long.parseLong(request.getParameter("unitId"));
+            doorplate = request.getParameter("doorplate");
+        }
+        userOpenService.saveUserInfo(userId,userType,linkman,phone,area,uptownId,unitId,doorplate);
         UserOpen userOpen = userOpenMapper.selectByUserId(userId);
         model.put("user", userOpen);
         if (userType == 1) {