xiugai

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

@@ -56,27 +56,27 @@ public class UserOpenController {
     private RbMapper rbMapper;
 
     @ApiOperation("登陆首页")
-    @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long",paramType="query"),
-            @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer",paramType="query")
+    @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
+            @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")
     })
     @GetMapping("/user/home.html")
-    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId,
-                             @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
+    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
+                             @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-           /* UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());*/
-            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
-            model.put("user_id", "\""+userOpen.getUserId()+"\"");
+            model.put("user_id", "\"" + userOpen.getUserId() + "\"");
 
             List<Uptown> uptowns = rbMapper.selectUptown(userId);
-            if (uptowns!=null && uptowns.size()>0) {
+            if (uptowns != null && uptowns.size() > 0) {
                 Long uptown_id = uptowns.get(0).getUptownId();
                 String uptown_name = uptowns.get(0).getUptownName();
-                model.put("uptown_id", "\""+uptown_id+"\"");
+                model.put("uptown_id", "\"" + uptown_id + "\"");
                 model.put("uptown_name", uptown_name);
             }
 
@@ -85,7 +85,7 @@ public class UserOpenController {
                 return new ModelAndView("/user/home.ftl", model);
             }
             if (list.size() == 1) {
-                MsReport msReport =msReportService.getReportByDateNow(userId);
+                MsReport msReport = msReportService.getReportByDateNow(userId);
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
             }
@@ -94,9 +94,9 @@ public class UserOpenController {
             }
         } else {
             model.put("user", userOpenMapper.selectByUserId(userId));
-            model.put("user_id", "\""+userId+"\"");
+            model.put("user_id", "\"" + userId + "\"");
             if (userType == 1) {
-                MsReport msReport =msReportService.getReportByDateNow(userId);
+                MsReport msReport = msReportService.getReportByDateNow(userId);
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
             } else if (userType == 2) {
@@ -107,15 +107,15 @@ public class UserOpenController {
     }
 
     @GetMapping("/user/homeIndex.html")
-    public ModelAndView homeIndex(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId,
-                             @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
+    public ModelAndView homeIndex(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
+                                  @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         if (userId != 0 && userType != 0) {
             model.put("user_id", "\"" + userId + "\"");
             List<Uptown> uptowns = rbMapper.selectUptown(userId);
-            if (uptowns!=null && uptowns.size()>0) {
+            if (uptowns != null && uptowns.size() > 0) {
                 Long uptown_id = uptowns.get(0).getUptownId();
                 String uptown_name = uptowns.get(0).getUptownName();
-                model.put("uptown_id", "\""+uptown_id+"\"");
+                model.put("uptown_id", "\"" + uptown_id + "\"");
                 model.put("uptown_name", uptown_name);
             }
             if (userType == 1) {
@@ -170,7 +170,7 @@ public class UserOpenController {
         Long uptownId = Long.parseLong(request.getParameter("uptownId"));
         Long unitId = Long.parseLong(request.getParameter("unitId"));
         String doorplate = request.getParameter("doorplate");
-        userOpenService.saveUserInfo(userId,1,linkman,phone,area,uptownId,unitId,doorplate);
+        userOpenService.saveUserInfo(userId, 1, linkman, phone, area, uptownId, unitId, doorplate);
     }
 
     @ApiOperation("客户档案信息错误数据导出")