修改注册跳转

whepi-ui/templates/user/home.ftl

@@ -264,7 +264,7 @@
             return false;
         }
         var unitId = $("#unitId").val();
-        var doorplate = $("#doorplate").val();
+        var doorplate = $("#doorplate").val().trim();
         if(userType == 1) {
             if (!unitId) {
                 alert("栋/单元！")
@@ -305,7 +305,9 @@
                                 "unitId": unitId,
                                 "uptownId": uptownId,
                                 "doorplate": doorplate,
-                            },
+                            },success: function (date) {
+                                window.location.href = "/user/home.html?userId=" + userId;
+                            }
                         });
                     }
                 }
@@ -324,7 +326,9 @@
                     "unitId": unitId,
                     "uptownId": uptownId,
                     "doorplate": doorplate,
-                },
+                },success: function (date) {
+                    window.location.href = "/user/home.html?userId=" + userId;
+                }
             });
         }
     }

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

@@ -6,7 +6,6 @@ import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
 import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -42,11 +43,16 @@ public class UserOpenController {
     private QzTaskService qzTaskService;
 
     @GetMapping("/user/home.html")
-    public ModelAndView home(ModelMap model) {
-        UserOpen userOpen = homeService.getUserOpen();
-        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-        model.put("user", userOpen);
-//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
+    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
+        List<UserRole> list = new ArrayList<>();
+        if (userId == 0) {
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            model.put("user", userOpen);
+        } else {
+            model.put("user", userOpenMapper.selectByUserId(userId));
+            list = userRoleMapper.getUserRoleByUserId(userId);
+        }
         if (list.size() == 0) {
             return new ModelAndView("/user/home.ftl", model);
         } else if (list.size()>0) {
@@ -88,7 +94,7 @@ public class UserOpenController {
     }
 
     @PostMapping("/home/saveUser.json")
-    public ModelAndView saveUser(ModelMap model, HttpServletRequest request) {
+    public void saveUser(ModelMap model, HttpServletRequest request) {
         Long userId = Long.parseLong(request.getParameter("userId"));
         Integer userType = Integer.parseInt(request.getParameter("userType"));
         String linkman = request.getParameter("linkman");
@@ -102,17 +108,17 @@ public class UserOpenController {
             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) {
-            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;
-        }
+//        UserOpen userOpen = userOpenMapper.selectByUserId(userId);
+//        model.put("user", userOpen);
+//        if (userType == 1) {
+//            return new ModelAndView("redirect:/home/home.html");
+//        } else if (userType == 2) {
+//            List<QzTask> taskList = qzTaskService.selectAll();
+//            model.put("taskList", YvanUtil.toJsonPretty(taskList));
+//            return new ModelAndView("redirect:/yeweihui/home.html");
+//        } else {
+//            return null;
+//        }
 
     }
 }