修改

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

@@ -1,6 +1,7 @@
 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.TmAudit;
@@ -103,13 +104,20 @@ public class AuditController {
         if(StringUtils.isBlank(token)){
             return Result.failure("token缺失");
         }
-        String tokenValueStr = (String) redisTemplate.opsForValue().get(token);
-        if(StringUtils.isBlank(tokenValueStr)){
-            return Result.failure("登录失效，需要重新登录");
+        JSONObject tokenJson = new JSONObject();
+        try {
+            tokenJson = (JSONObject) redisTemplate.opsForValue().get(token);
+            if(null == tokenJson){
+                return Result.failure("登录失效，需要重新登录");
+            }
+        }catch (Exception e){
+            log.info("json数据转换出现异常:{}" , e);
         }
-        Map<String , Object> tokenMap = JSON.parseObject(tokenValueStr);
+        ContextTokenBean tokenMap = JSON.parseObject(tokenJson.toJSONString() , ContextTokenBean.class);
         if(null == tokenMap){
             return Result.failure("解析token失败");
+        }else{
+            log.info("解析token成功");
         }
 
         //这里要先锁定当前审核记录
@@ -126,6 +134,8 @@ public class AuditController {
         }
         tmAudit.setAuditStatus(auditStatus);
         tmAudit.setAuditRemark(auditRemark);
+        tmAudit.setAuditorId(tokenMap.getId());
+        tmAudit.setAuditorName(tokenMap.getUserName());
         int update = tmAuditService.updateAudit(tmAudit);
         if(update != 1){
            throw new CommonBaseException(ResultCodeEnum.D101 , "更新审核记录失败");
@@ -133,10 +143,11 @@ public class AuditController {
         dbHouse.setStatus(HouseStatus.AUDITED.getCode());
         dbHouse.setAuditId(tmAudit.getId());
         dbHouse.setAuditTime(LocalDateTime.now());
-        String userId = (String) tokenMap.get("id");
-        String userName = (String) tokenMap.get("userName");
-        dbHouse.setAuditorName(userName);
-        dbHouse.setAuditorId(userId);
+        if(null != tokenMap){
+            dbHouse.setAuditorName(tokenMap.getUserName());
+            dbHouse.setAuditorId(tokenMap.getId());
+        }
+
         if(!tmHouseService.updateHouse(dbHouse)){
             throw new CommonBaseException(ResultCodeEnum.D101 , "更新房源记录失败");
         }

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

@@ -306,6 +306,8 @@ public class HouseManagerController {
             tmHouse.setCreateById(tokenMap.getId());
             tmHouse.setCreateByName(tokenMap.getUserName());
         }
+        tmHouse.setBelongCompanyId(tmEstate.getBelongCompanyId());
+        tmHouse.setBelongCompanyName(tmEstate.getBelongCompanyName());
         tmHouse.setEstateName(tmEstate.getEstateName());
         tmHouse.setStatus(0);
         TmHouse latestHouse = tmHouseService.insertNewWithRsp(tmHouse);
@@ -438,6 +440,8 @@ public class HouseManagerController {
         ContextTokenBean tokenMap = JSON.parseObject(tokenJson.toJSONString() , ContextTokenBean.class);
         if(null == tokenMap){
             return Result.failure("解析token失败");
+        }else{
+            log.info("解析token成功");
         }
         TmEstate tmEstate = tmEstateService.getById(dbHouse.getEstateId());
         if(null == tmEstate){
@@ -482,8 +486,8 @@ public class HouseManagerController {
         if(null == dbHouse || null == dbHouse.getAuditId()){
             return Result.failure("房源不存在或者未提交审核");
         }
-        if(HouseStatus.AUDITED.getCode().compareTo(dbHouse.getStatus()) != 0){
-            return Result.failure("房源状态非已审核");
+        if(HouseStatus.WAITING_AUDIT.getCode().compareTo(dbHouse.getStatus()) != 0){
+            return Result.failure("房源状态非待审核");
         }
 //        dbHouse = null;
         //抢房源的锁，去掉原来审核的
@@ -496,8 +500,8 @@ public class HouseManagerController {
         if(null == tmAudit){
             return Result.failure("该房源未提交审核");
         }
-        if(AuditStatus.AUDITED.getCode().compareTo(tmAudit.getAuditStatus()) != 0){
-            return Result.failure("审核记录处于非审核通过的状态，无法撤销");
+        if(null != tmAudit.getAuditStatus()){
+            return Result.failure("该房源已经审核过，无法撤回");
         }
         //开启事务，抢审批记录的锁
         tmAudit = null;

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

@@ -1,6 +1,7 @@
 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;
@@ -72,19 +73,32 @@ public class ProjectController {
         if(StringUtils.isBlank(token)){
             return Result.failure("token缺失");
         }
-        String tokenValueStr = (String) redisTemplate.opsForValue().get(token);
-        if(StringUtils.isBlank(tokenValueStr)){
-            return Result.failure("登录失效，需要重新登录");
+        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(tokenValueStr , ContextTokenBean.class);
+        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){
+            tmEstate.setBelongCompanyId(tokenMap.getDepartmentId());
+            tmEstate.setBelongCompanyName(tokenMap.getDepartmentName());
+            tmEstate.setCreateById(tokenMap.getId());
+            tmEstate.setCreateByName(tokenMap.getUserName());
+        }
         if(tmEstateService.insertNew(tmEstate)){
            return Result.success("新增成功");
         }else{

src/main/resources/application.properties

@@ -8,7 +8,7 @@ spring.profiles.active=test
 spring.application.name=fbc-project-manager
 
 
-#nacos.config.server-addr=127.0.0.1:8848
+#nacos.config.server-addr=127.0.0.1:AuditController8848
 
 
 rocketmq.name-server=8.135.107.23:9876