优化代码, 修复 bug, 放开Token过期校验

CODE/smart-community/operate-api/src/main/java/com/community/huiju/common/base/BaseController.java

@@ -0,0 +1,51 @@
+package com.community.huiju.common.base;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.session.UserElement;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.vo.ToUserVO;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author FXF
+ * @date 2018-12-18
+ */
+@Slf4j
+public class BaseController {
+    
+    /**
+     * 获取 UserElement
+     * @param session
+     * @return
+     */
+    protected UserElement getUserElement(HttpSession session){
+        log.info("获取sessionId: {}", session.getId());
+        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
+        if (null == userElement) {
+            throw new WisdomException("用户凭证不存在!");
+        }
+        return userElement;
+    }
+
+    /**
+     * 获取 UserElement
+     * @param session
+     * @return
+     */
+    protected void setUserElement(HttpSession session, ToUserVO userVO){
+        log.info("获取sessionId: {}", session.getId());
+        UserElement userElement = new UserElement();
+        userElement.setId(userVO.getId());
+        userElement.setCommunityId(userVO.getCommunityId());
+        userElement.setEmail(userVO.getEmail());
+        userElement.setLoginName(userVO.getLoginName());
+        userElement.setUserName(userVO.getUserName());
+        userElement.setStatus(userVO.getStatus());
+        userElement.setLoginType(Constant.WEB_LOGIN_TYPE);
+
+        session.setAttribute(Constant.WEB_USER_SESSION, userElement);
+    }
+
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/AppUserController.java

@@ -1,6 +1,7 @@
 package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
 import com.community.huiju.service.ITaUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = " App 用户 控制器")
-public class AppUserController {
+public class AppUserController extends BaseController {
 
     @Autowired
     private ITaUserService iTaUserService;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/BannerController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
 import com.community.huiju.model.ToBanner;
 import com.community.huiju.service.IToBannerService;
 import io.swagger.annotations.Api;
@@ -25,7 +26,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "Banner 控制器")
-public class BannerController {
+public class BannerController extends BaseController {
 
     @Autowired
     private IToBannerService iToBannerService;
@@ -42,7 +43,7 @@ public class BannerController {
     public ResponseBean addBanner(@RequestBody @Valid ToBanner banner,
                                   HttpSession session){
 
-        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
+        UserElement userElement = getUserElement(session);
         ResponseBean response = new ResponseBean();
         response = iToBannerService.addBanner(banner,userElement.getId());
         return response;
@@ -60,7 +61,7 @@ public class BannerController {
     public ResponseBean updateBanner(@RequestBody @Valid ToBanner banner,
                                   HttpSession session){
 
-        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
+        UserElement userElement = getUserElement(session);
         ResponseBean response = new ResponseBean();
         response = iToBannerService.modifyBanner(banner,userElement.getId());
         return response;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/CodeController.java

@@ -2,6 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.base.BaseController;
 import com.community.huiju.common.code.ICode;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import io.swagger.annotations.Api;
@@ -27,7 +28,7 @@ import javax.servlet.http.HttpSession;
 @RefreshScope
 @Api(value = "获取验证码的API", description = "获取验证码的API")
 @Slf4j
-public class CodeController {
+public class CodeController extends BaseController {
 
     @Autowired
     @Qualifier("phoneCodeImpl")

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/CommonController.java

@@ -1,6 +1,7 @@
 package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
 import com.community.huiju.model.Communities;
 import com.community.huiju.model.SysNation;
 import com.community.huiju.service.CommonServiceI;
@@ -26,7 +27,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "运营端公共API", description = "运营端公共API")
-public class CommonController {
+public class CommonController extends BaseController {
 	@Autowired
 	private CommunitiesServiceI communitiesServiceI;
 	

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/CommunityController.java

@@ -2,6 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.service.CommunityServiceI;
 import io.swagger.annotations.Api;
@@ -29,7 +30,7 @@ import java.util.Map;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "运营端社区API", description = "运营端社区API")
-public class CommunityController {
+public class CommunityController extends BaseController {
 	
 	@Autowired
 	private CommunityServiceI communityService;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/ImageController.java

@@ -1,6 +1,7 @@
 package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
 import com.community.huiju.service.ImageServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,7 +26,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "图片操作API", description = "图片操作API")
-public class ImageController {
+public class ImageController extends BaseController {
 
     @Autowired
     private ImageServiceI imageService;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/MqMessageController.java

@@ -1,6 +1,7 @@
 package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
 import com.community.huiju.service.IMqMessageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "订阅事件",description = "订阅事件")
-public class MqMessageController {
+public class MqMessageController extends BaseController {
 
     @Autowired
     private IMqMessageService iMqMessageService;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
 import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
@@ -27,7 +28,7 @@ import javax.servlet.http.HttpSession;
 @RequestMapping("/")
 @RefreshScope
 @Api(value = "运营web用户API",description = "运营web用户API")
-public class UserController {
+public class UserController extends BaseController {
 
     @Autowired
     private IToUserService iToUserService;
@@ -46,11 +47,7 @@ public class UserController {
         ToUserVO userVO = (ToUserVO) response.getData();
 
         if (null != userVO) {
-            UserElement userElement = new UserElement();
-            BeanUtils.copyProperties(userVO,userElement);
-            userElement.setLoginType(Constant.WEB_LOGIN_TYPE);
-            session.setAttribute(Constant.WEB_USER_SESSION,userElement);
-            userVO.setToken(session.getId());
+            setUserElement(session, userVO);
         }
 
         return response;
@@ -65,7 +62,7 @@ public class UserController {
     public ResponseBean getInfo(HttpSession session) {
         ResponseBean response = new ResponseBean();
 
-        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
+        UserElement userElement = getUserElement(session);
         if (null == userElement) {
             response.addError("请登录!");
             return response;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/vo/ToUserVO.java

@@ -18,6 +18,9 @@ public class ToUserVO {
 
     private Integer id;
 
+    /** 小区Id **/
+    private Integer communityId;
+
     /** 用户名称 **/
     private String userName;
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/BaseController.java

@@ -22,7 +22,7 @@ public class BaseController {
      */
     protected UserElement getUserElement(HttpSession session){
         log.info("获取sessionId: {}", session.getId());
-        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_PROPERTY_USER_SESSION);
+        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
         if (null == userElement) {
             throw new WisdomException("用户凭证不存在!");
         }
@@ -45,7 +45,7 @@ public class BaseController {
         userElement.setStatus(userVO.getStatus());
         userElement.setLoginType(Constant.WEB_LOGIN_TYPE);
 
-        session.setAttribute(Constant.WEB_PROPERTY_USER_SESSION, userElement);
+        session.setAttribute(Constant.WEB_USER_SESSION, userElement);
     }
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -154,7 +154,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         boolean phoneBool = false;
 
         // 校验楼栋信息表
-        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, user.getId());
+        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, user.getCommunityId());
         // 如果数据查询到了, 并且手机号和传上来的手机号是一样的是, 代表就是原数据, 直接返回操作成功
         if (null != selectBuild && selectBuild.getOwnerTel().equals(tpBuildingOwnerInfo.getOwnerTel())) {
             tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
@@ -167,7 +167,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             // 校验楼栋信息表里面的业主手机号
             QueryWrapper<TpBuildingOwnerInfo> queryWrapperPhone = new QueryWrapper<>();
             queryWrapperPhone.eq("owner_tel", tpBuildingOwnerInfo.getOwnerTel());
-            TpBuildingOwnerInfo selectBuildPhone = getBuildingInfo(tpBuildingOwnerInfo, user.getId());
+            TpBuildingOwnerInfo selectBuildPhone = getBuildingInfo(tpBuildingOwnerInfo, user.getCommunityId());
 
             // 如果 通过手机号查询出来的楼栋信息数据的 id 和 传上来的 楼栋,单元,楼层,单元,户号 查询出来的数据的id 匹配, 那么就表示这个手机号已经绑定了其他的楼栋信息
             if (selectBuildPhone.getId().intValue() != selectBuild.getId().intValue()){
@@ -199,11 +199,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 修改 APP 端业主用户的手机号信息!
         // 开始匹配 APP 端用户表
-        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-        taUserQueryWrapper.eq("login_name", tpBuildingOwnerInfo.getOwnerTel());
-        taUserQueryWrapper.eq("community_id", tpBuildingOwnerInfo.getCommunityId());
         // 查询 APP 端业主
-        TaUser appOwnerUser = taUserMapper.selectOne(taUserQueryWrapper);
+        TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
         if (null != appOwnerUser) {
             // 修改手机号
             appOwnerUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
@@ -247,7 +244,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 校验楼栋信息表
-        selectBuild = getBuildingInfo(tpBuildingOwnerInfo, user.getId());
+        selectBuild = getBuildingInfo(tpBuildingOwnerInfo, user.getCommunityId());
         if (null != selectBuild) {
             responseBean.addError("该楼层的户号,已存在!");
             return responseBean;
@@ -574,6 +571,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             tpBuildingOwnerInfo.setId(e);
             tpBuildingOwnerInfo.setVerifyStatus("2");
             tpBuildingOwnerInfo.setUpdateUser(propertyUserId);
+            tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
             return tpBuildingOwnerInfo;
         }).collect(Collectors.toList());
         boolean result = updateBatchById(infoList);
@@ -583,15 +581,22 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         ids.forEach(e-> {
             TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
-            if (null == tpBuildingOwnerInfo) {
+            if (null != tpBuildingOwnerInfo) {
                 // 查询 APP 端业主
                 TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
-                appOwnerUser.setVerifyStatus(2+"");
-                taUserList.add(appOwnerUser);
+                if (null != appOwnerUser) {
+                    appOwnerUser.setVerifyStatus(2+"");
+                    appOwnerUser.setUpdateDate(LocalDateTime.now());
+                    taUserList.add(appOwnerUser);
+                }
+
             }
         });
 
-        result = iTaUserService.updateBatchById(taUserList);
+        if (null != taUserList && taUserList.size() > 0) {
+            result = iTaUserService.updateBatchById(taUserList);
+        }
+
 
         if (result) {
             responseBean.addSuccess("操作成功!");

CODE/smart-community/zuul/src/main/java/com/community/huiju/filter/DomainZuulPostFilter.java

@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
  * 拦截Token
  * @author weiximei
  */
-//@Component
+@Component
 public class DomainZuulPostFilter extends ZuulFilter {
 
     @Override
@@ -51,20 +51,29 @@ public class DomainZuulPostFilter extends ZuulFilter {
         HttpServletResponse response = ctx.getResponse();
         HttpServletRequest request = ctx.getRequest();
         String token = request.getHeader(Header.REQUEST_X_AUTH_TOKEN.getValue());
+        String loginType = request.getHeader(Header.LOGIN_TYPE.getValue());
         if (StringUtils.isBlank(token)) {
 
         }else {
             ResponseBean responseBean = new ResponseBean();
-            UserElement appElement = (UserElement) request.getSession().getAttribute(Constant.APP_USER_SESSION);
-            if (null == appElement) {
-                responseBean.addError("803","Token已过期!");
-                ctx.setResponseBody(JSONObject.toJSONString(responseBean));
-            }
-            UserElement webElement = (UserElement) request.getSession().getAttribute(Constant.WEB_USER_SESSION);
-            if (null == webElement) {
-                responseBean.addError("803","Token已过期!");
-                ctx.setResponseBody(JSONObject.toJSONString(responseBean));
+            // APP 端
+            if (Constant.APP_LOGIN_TYPE.equals(loginType.trim())){
+                UserElement appElement = (UserElement) request.getSession().getAttribute(Constant.APP_USER_SESSION);
+                if (null == appElement) {
+                    responseBean.addError("803","Token已过期!");
+                    ctx.setResponseBody(JSONObject.toJSONString(responseBean));
+                }
+
+                // WEB 端
+            } else {
+                UserElement webOperateElement = (UserElement) request.getSession().getAttribute(Constant.WEB_LOGIN_TYPE);
+                if (null == webOperateElement) {
+                    responseBean.addError("803","Token已过期!");
+                    ctx.setResponseBody(JSONObject.toJSONString(responseBean));
+                }
             }
+
+
         }
 
         return null;

VUECODE/smart-operate-manage/src/utils/request.js

@@ -14,6 +14,7 @@ service.interceptors.request.use(
   config => {
     if (store.getters.token) {
       config.headers['X-Auth-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers['Login-Type'] = 'web'
     }
     return config
   },

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -4,7 +4,7 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item label="楼盘库">
         <el-select v-model="listQuery.building" placeholder="栋" @change="buildSelectChange(1)">
-          <el-option label="选择楼栋" value="-1" />
+          <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
             v-for="item in buildingList"
             :key="item.id"
@@ -12,7 +12,7 @@
             :value="item.building"/>
         </el-select>
         <el-select v-model="listQuery.unit" placeholder="单元" @change="buildSelectChange(2)">
-          <el-option label="选择单元" value="-1" />
+          <!--<el-option label="选择单元" value="-1" />-->
           <el-option
             v-for="item in unitList"
             :key="item.id"
@@ -20,7 +20,7 @@
             :value="item.unit"/>
         </el-select>
         <el-select v-model="listQuery.level" placeholder="楼层" @change="buildSelectChange(3)">
-          <el-option label="选择楼层" value="-1" />
+          <!--<el-option label="选择楼层" value="-1" />-->
           <el-option
             v-for="item in levelList"
             :key="item.id"
@@ -28,7 +28,7 @@
             :value="item.level"/>
         </el-select>
         <el-select v-model="listQuery.roomNo" placeholder="户号">
-          <el-option label="选择户号" value="-1" />
+          <!--<el-option label="选择户号" value="-1" />-->
           <el-option
             v-for="item in roomNoList"
             :key="item.id"
@@ -62,17 +62,19 @@
       tooltip-effect="dark"
       style="width: 100%; margin-top: 20px;"
       @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55"/>
-      <el-table-column prop="building" label="栋" />
-      <el-table-column prop="unit" label="单元" />
-      <el-table-column prop="level" label="楼层" />
-      <el-table-column prop="roomNo" label="户号" />
-      <el-table-column prop="ownerName" label="业主姓名"/>
-      <el-table-column prop="ownerTel" label="手机号码" />
-      <el-table-column prop="pairStatus" label="关联业主状态" >
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column prop="building" label="栋" align="center" />
+      <el-table-column prop="unit" label="单元" align="center" />
+      <el-table-column prop="level" label="楼层" align="center" />
+      <el-table-column prop="roomNo" label="户号" align="center" />
+      <el-table-column prop="ownerName" label="业主姓名" align="center"/>
+      <el-table-column prop="ownerTel" label="手机号码" align="center" />
+      <el-table-column prop="pairStatus" label="关联业主状态" align="center" >
         <template slot-scope="scope">{{ scope.row.pairStatus === '1' ? '已关联':'未关联' }}</template>
       </el-table-column>
-      <el-table-column prop="createDate" label="创建时间" />
+      <el-table-column prop="createDate" label="创建时间" align="center" >
+        <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
+      </el-table-column>
     </el-table>
     <div class="block">
       <el-pagination
@@ -201,12 +203,24 @@ export default {
     buildSelectChange(value) { // select 的 change
       switch (value) {
         case 1: // 查询 单元
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.unit = ''
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
           this.getUnit()
           break
         case 2: // 查询 楼层
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
           this.getLevel()
           break
         case 3: // 查询 户号
+          this.roomNoList = []
+          this.listQuery.roomNo = ''
           this.getRoomNo()
           break
       }
@@ -272,6 +286,17 @@ export default {
         return
       }
       this.$router.push({ name: 'building-edi', params: { id: ids[0], listQuery: this.listQuery }})
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
     }
   }
 }