收归token解析

src/main/java/fcb/project/manager/core/controller/AuditController.java

@@ -41,7 +41,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("fcb/project/audit")
 @Log4j2
-public class AuditController {
+public class AuditController extends BaseController{
 
 
     @Autowired
@@ -105,25 +105,7 @@ public class AuditController {
         if(StringUtils.isBlank(tmAudit.getVrId())){
             return Result.failure("该审核记录未绑定房源，无需处理");
         }
-        String token = request.getHeader("token");
-        if(StringUtils.isBlank(token)){
-            return Result.failure("token缺失");
-        }
-        JSONObject tokenJson = new JSONObject();
-        try {
-            tokenJson = (JSONObject) redisTemplate.opsForValue().get(token);
-            if(null == tokenJson){
-                return Result.failure("登录失效，需要重新登录");
-            }
-        }catch (Exception e){
-            log.info("json数据转换出现异常:{}" , e);
-        }
-        ContextTokenBean tokenMap = JSON.parseObject(tokenJson.toJSONString() , ContextTokenBean.class);
-        if(null == tokenMap){
-            return Result.failure("解析token失败");
-        }else{
-            log.info("解析token成功");
-        }
+        ContextTokenBean tokenMap = getContextUserInfo();
 
         //这里要先锁定当前审核记录
         tmAudit = null;

src/main/java/fcb/project/manager/core/controller/BaseController.java

@@ -0,0 +1,46 @@
+package fcb.project.manager.core.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import fcb.project.manager.base.entity.ContextTokenBean;
+import fdage.back.sdk.base.entity.Result;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/25 10:19
+ * 4
+ */
+public class BaseController {
+
+    public static final String TOKEN = "token";
+
+    @Autowired
+    protected HttpServletRequest request;
+
+    @Autowired
+    protected RedisTemplate redisTemplate;
+
+    protected String getToken(){
+        return request.getHeader(TOKEN);
+    }
+
+    protected ContextTokenBean getContextUserInfo(){
+        String token = request.getHeader(TOKEN);
+        JSONObject tokenJsonObj = (JSONObject) redisTemplate.opsForValue().get(token);
+        if(null == tokenJsonObj){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "缓存中不存在token信息");
+        }
+        ContextTokenBean contextTokenBean = JSON.parseObject(tokenJsonObj.toJSONString() , ContextTokenBean.class);
+        if(null == contextTokenBean){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "解析token失败");
+        }
+        return contextTokenBean;
+    }
+
+}

src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -45,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("fcb/project/house")
 @Log4j2
-public class HouseManagerController {
+public class HouseManagerController extends BaseController{
 
     @Autowired
     private TmHouseServiceImpl tmHouseService;
@@ -103,23 +103,7 @@ public class HouseManagerController {
 
             return Result.failure("楼盘ID不能为空");
         }
-        String token = request.getHeader("token");
-        if(StringUtils.isBlank(token)){
-            return Result.failure("token缺失");
-        }
-        JSONObject tokenJson = new JSONObject();
-        try {
-            tokenJson = (JSONObject) redisTemplate.opsForValue().get(token);
-            if(null == tokenJson){
-                return Result.failure("登录失效，需要重新登录");
-            }
-        }catch (Exception e){
-            log.info("json数据转换出现异常:{}" , e);
-        }
-        ContextTokenBean tokenMap = JSON.parseObject(tokenJson.toJSONString() , ContextTokenBean.class);
-        if(null == tokenMap){
-            return Result.failure("解析token失败");
-        }
+        ContextTokenBean tokenMap = getContextUserInfo();
         IPage<TmHouse> resultPage = tmHouseService.getListByNameOrBelong(houseTitle , status ,
                 type , estateId , tokenMap, pageNum , pageSize);
         return  Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
@@ -165,7 +149,7 @@ public class HouseManagerController {
             return Result.failure("房源不存在");
         }
         if(StringUtils.isBlank(tmHouse.getSceneNum())){
-            return Result.failure("改房源未生成场景码");
+            return Result.failure("该房源未生成场景码");
         }
         String totalVrUrl = innerSceneVrHost + tmHouse.getSceneNum() + "&prodId=" + tmHouse.getFcbHouseId()
                 + "&houseId=" + tmHouse.getId();
@@ -280,23 +264,7 @@ public class HouseManagerController {
         if(StringUtils.isBlank(estateId)){
             throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘ID不能为空");
         }
-        String token = request.getHeader("token");
-        if(StringUtils.isBlank(token)){
-            return Result.failure("token缺失");
-        }
-        JSONObject tokenJson = new JSONObject();
-        try {
-            tokenJson = (JSONObject) redisTemplate.opsForValue().get(token);
-            if(null == tokenJson){
-                return Result.failure("登录失效，需要重新登录");
-            }
-        }catch (Exception e){
-            log.info("json数据转换出现异常:{}" , e);
-        }
-        ContextTokenBean tokenMap = JSON.parseObject(tokenJson.toJSONString() , ContextTokenBean.class);
-        if(null == tokenMap){
-            return Result.failure("解析token失败");
-        }
+        ContextTokenBean tokenMap = getContextUserInfo();
         TmEstate tmEstate = tmEstateService.getById(estateId);
         if(null == tmEstate){
             return Result.failure("楼盘项目不存在");
@@ -427,25 +395,7 @@ public class HouseManagerController {
         if(StringUtils.isBlank(dbHouse.getEstateId())){
             return Result.failure("房源未分配所属的楼盘不存在");
         }
-        String token = request.getHeader("token");
-        if(StringUtils.isBlank(token)){
-            return Result.failure("token缺失");
-        }
-        JSONObject tokenJson = new JSONObject();
-        try {
-            tokenJson = (JSONObject) redisTemplate.opsForValue().get(token);
-            if(null == tokenJson){
-                return Result.failure("登录失效，需要重新登录");
-            }
-        }catch (Exception e){
-            log.info("json数据转换出现异常:{}" , e);
-        }
-        ContextTokenBean tokenMap = JSON.parseObject(tokenJson.toJSONString() , ContextTokenBean.class);
-        if(null == tokenMap){
-            return Result.failure("解析token失败");
-        }else{
-            log.info("解析token成功");
-        }
+        ContextTokenBean tokenMap =  getContextUserInfo();
         TmEstate tmEstate = tmEstateService.getById(dbHouse.getEstateId());
         if(null == tmEstate){
             return Result.failure("房源所属的楼盘不存在");

src/main/java/fcb/project/manager/core/controller/ProjectController.java

@@ -1,7 +1,5 @@
 package fcb.project.manager.core.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import fcb.project.manager.base.entity.ContextTokenBean;
 import fcb.project.manager.base.entity.TmEstate;
@@ -33,7 +31,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("fcb/project/project")
 @Log4j2
-public class ProjectController {
+public class ProjectController extends BaseController {
 
     @Autowired
     private TmEstateServiceImpl tmEstateService;
@@ -51,74 +49,56 @@ public class ProjectController {
             @ApiImplicitParam(name = "belongCompany", value = "所属公司", paramType = "query", required = true, dataType = "String"),
             @ApiImplicitParam(name = "pageNum", value = "当前页码", paramType = "query", required = true, dataType = "Long"),
             @ApiImplicitParam(name = "pageSize", value = "每页大小", paramType = "query", required = true, dataType = "Long")
-     })
+    })
     public Result<Object> getProjectList(@RequestParam(required = false) String estateName,
                                          @RequestParam(required = false) String belongCompany,
-                                         @RequestParam(name = "pageNum")Long pageNum,
-                                         @RequestParam(name = "pageSize")Long pageSize){
+                                         @RequestParam(name = "pageNum") Long pageNum,
+                                         @RequestParam(name = "pageSize") Long pageSize) {
 
-        IPage<TmEstate> resultPage = tmEstateService.getListByNameOrBelong(estateName , belongCompany , pageNum , pageSize);
-        return  Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
+        IPage<TmEstate> resultPage = tmEstateService.getListByNameOrBelong(estateName, belongCompany, pageNum, pageSize);
+        return Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
                 resultPage.getCurrent(), resultPage.getRecords()));
     }
 
     @PostMapping("/addEstate")
     @ApiOperation(value = "创建楼盘项目")
-    public Result<Object> addNewEstate(@RequestBody TmEstate tmEstate , HttpServletRequest request){
+    public Result<Object> addNewEstate(@RequestBody TmEstate tmEstate, HttpServletRequest request) {
 
-        if(!StringUtils.isNoneBlank(tmEstate.getEstateName() )){
-            throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘名称不能为空");
+        if (!StringUtils.isNoneBlank(tmEstate.getEstateName())) {
+            throw new CommonBaseException(ResultCodeEnum.D101, "楼盘名称不能为空");
         }
-        String token = request.getHeader("token");
-        if(StringUtils.isBlank(token)){
-            return Result.failure("token缺失");
+        ContextTokenBean tokenMap = getContextUserInfo();
+        TmEstate dbEstate = tmEstateService.getOneByNameAndBelong(tmEstate.getEstateName(), tokenMap.getDepartmentName());
+        if (null != dbEstate) {
+            log.info("{}公司下面的楼盘{}已经存在", tmEstate.getBelongCompanyName(), tmEstate.getEstateName());
+            throw new CommonBaseException(ResultCodeEnum.D101, "楼盘已经存在，无需再添加");
         }
-        JSONObject tokenJson = new JSONObject();
-        try {
-            tokenJson = (JSONObject) redisTemplate.opsForValue().get(token);
-            if(null == tokenJson){
-                return Result.failure("登录失效，需要重新登录");
-            }
-        }catch (Exception e){
-            log.info("json数据转换出现异常:{}" , e);
-        }
-        ContextTokenBean tokenMap = JSON.parseObject(tokenJson.toJSONString() , ContextTokenBean.class);
-        if(null == tokenMap){
-            return Result.failure("解析token失败");
-        }else{
-            log.info("解析token成功");
-        }
-        TmEstate dbEstate = tmEstateService.getOneByNameAndBelong(tmEstate.getEstateName() , tokenMap.getDepartmentName());
-        if(null != dbEstate){
-            log.info("{}公司下面的楼盘{}已经存在" , tmEstate.getBelongCompanyName() , tmEstate.getEstateName());
-            throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘已经存在，无需再添加");
-        }
-        if(null != tokenMap){
+        if (null != tokenMap) {
             tmEstate.setBelongCompanyId(tokenMap.getDepartmentId());
             tmEstate.setBelongCompanyName(tokenMap.getDepartmentName());
             tmEstate.setCreateById(tokenMap.getId());
             tmEstate.setCreateByName(tokenMap.getUserName());
         }
-        if(tmEstateService.insertNew(tmEstate)){
-           return Result.success("新增成功");
-        }else{
+        if (tmEstateService.insertNew(tmEstate)) {
+            return Result.success("新增成功");
+        } else {
             return Result.failure("新增失败");
         }
     }
 
     @PostMapping("/deleteEstate")
     @ApiOperation(value = "删除楼盘信息")
-    public Result<Object> deleteEstate(String estateId){
+    public Result<Object> deleteEstate(String estateId) {
 
-        if(StringUtils.isBlank(estateId)){
+        if (StringUtils.isBlank(estateId)) {
             return Result.failure("楼盘ID不能为空");
         }
         IPage<TmHouse> page = tmHouseService.checkEstateCanDelete(estateId);
-        if(null != page && page.getTotal() > 0){
+        if (null != page && page.getTotal() > 0) {
             return Result.failure("楼盘下存在VR项目时不可删除");
         }
         int delete = tmEstateService.deleteEstateById(estateId);
-        if(delete != 1){
+        if (delete != 1) {
             return Result.failure("删除失败");
         }
 
@@ -128,26 +108,25 @@ public class ProjectController {
 
     @PostMapping("/updateEstate")
     @ApiOperation(value = "修改楼盘项目信息")
-    public Result<Object> updateEstate(@RequestBody TmEstate tmEstate){
+    public Result<Object> updateEstate(@RequestBody TmEstate tmEstate) {
 
-        if(null == tmEstate){
+        if (null == tmEstate) {
             return Result.failure("入参为空");
         }
-        if(StringUtils.isBlank(tmEstate.getId())){
+        if (StringUtils.isBlank(tmEstate.getId())) {
             return Result.failure("id不能为空");
         }
         TmEstate dbEstate = tmEstateService.getById(tmEstate.getId());
-        if(tmEstate.getIsDelete().compareTo(1) == 0 && dbEstate.getIsDelete().compareTo(0) == 0){
+        if (tmEstate.getIsDelete().compareTo(1) == 0 && dbEstate.getIsDelete().compareTo(0) == 0) {
             //删除楼盘操作,需要检查楼盘下面是否还有有效房源
 
         }
-        if(tmEstateService.updateEstate(tmEstate)){
+        if (tmEstateService.updateEstate(tmEstate)) {
             return Result.success("修改成功");
-        }else{
+        } else {
             return Result.failure("修改失败");
         }
     }
 
 
-
 }