修改bug

src/main/java/fcb/project/manager/base/enums/SysUserRoleEnums.java

@@ -0,0 +1,32 @@
+package fcb.project.manager.base.enums;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/22 16:20
+ * 4
+ */
+public enum  SysUserRoleEnums {
+
+
+    ADMIN("admin", "超级管理员"),
+    GROUP("group", "集团总部管理员"),
+    REGION("region", "地区公司管理员"),
+    ;
+
+    private String roleKey;
+    private String desc;
+
+
+    SysUserRoleEnums(String roleKey, String desc) {
+        this.roleKey = roleKey;
+        this.desc = desc;
+    }
+
+    public String getRoleKey() {
+        return roleKey;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

src/main/java/fcb/project/manager/base/service/impl/TmAuditServiceImpl.java

@@ -50,6 +50,8 @@ public class TmAuditServiceImpl extends ServiceImpl<TmAuditDao, TmAudit> impleme
         }
         if(null != auditStatus){
             lambdaQueryWrapper.eq(TmAudit::getAuditStatus , auditStatus);
+        }else{
+            lambdaQueryWrapper.ne(TmAudit::getAuditStatus , AuditStatus.WAITING_AUDIT.getCode());
         }
         if(StringUtils.isNotBlank(houseId)){
             lambdaQueryWrapper.eq(TmAudit::getVrId , houseId);

src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -3,16 +3,16 @@ package fcb.project.manager.base.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import fcb.project.manager.base.entity.TmEstate;
-import fcb.project.manager.base.entity.TmHouse;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import fcb.project.manager.base.dao.TmHouseDao;
+import fcb.project.manager.base.entity.ContextTokenBean;
+import fcb.project.manager.base.entity.TmHouse;
 import fcb.project.manager.base.enums.DeleteStatus;
 import fcb.project.manager.base.enums.HouseStatus;
+import fcb.project.manager.base.enums.SysUserRoleEnums;
 import fcb.project.manager.base.enums.UuidPreEnum;
 import fcb.project.manager.base.service.ITmHouseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
-import io.swagger.models.auth.In;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author abner
@@ -32,94 +32,105 @@ import java.time.LocalDateTime;
 @Log4j2
 public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> implements ITmHouseService {
 
-    public IPage<TmHouse> getListByNameOrBelong(String houseTitle , Integer status, Integer type,
-                                               String estateId , Long pageNum , Long pageSize){
+    public IPage<TmHouse> getListByNameOrBelong(String houseTitle,
+                                                Integer status, Integer type,
+                                                String estateId, ContextTokenBean contextTokenBean,
+                                                Long pageNum, Long pageSize) {
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(TmHouse::getEstateId , estateId);
-        lambdaQueryWrapper.eq(TmHouse::getIsShow , 1);
-        if(StringUtils.isNotBlank(houseTitle)){
-            lambdaQueryWrapper.like(TmHouse::getHouseTitle , houseTitle);
+        lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);
+        lambdaQueryWrapper.eq(TmHouse::getIsShow, 1);
+        if (StringUtils.isNotBlank(houseTitle)) {
+            lambdaQueryWrapper.like(TmHouse::getHouseTitle, houseTitle);
+        }
+        if (null != contextTokenBean) {
+            if (StringUtils.equals(contextTokenBean.getRoleKey(), SysUserRoleEnums.ADMIN.getRoleKey())
+                    || StringUtils.equals(contextTokenBean.getRoleKey(), SysUserRoleEnums.GROUP.getRoleKey())) {
+                //超级管理员和集团管理员可以看到所有数据
+
+            } else {
+                //非超级管理员，只能看到自己部门的
+
+            }
         }
-        if(null != status){
-            lambdaQueryWrapper.eq(TmHouse::getStatus , status);
+        if (null != status) {
+            lambdaQueryWrapper.eq(TmHouse::getStatus, status);
         }
-        if(null != type){
-            lambdaQueryWrapper.eq(TmHouse::getType , type);
+        if (null != type) {
+            lambdaQueryWrapper.eq(TmHouse::getType, type);
         }
         lambdaQueryWrapper.orderByDesc(TmHouse::getCreateTime);
-        IPage<TmHouse> page = new Page<>(pageNum , pageSize , true);
-        return  getBaseMapper().selectPage(page , lambdaQueryWrapper);
+        IPage<TmHouse> page = new Page<>(pageNum, pageSize, true);
+        return getBaseMapper().selectPage(page, lambdaQueryWrapper);
     }
 
-    public IPage<TmHouse> checkEstateCanDelete(String estateId){
+    public IPage<TmHouse> checkEstateCanDelete(String estateId) {
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(TmHouse::getEstateId , estateId);
-        lambdaQueryWrapper.eq(TmHouse::getStatus , HouseStatus.AUDITED.getCode())
-                .or().eq(TmHouse::getStatus , HouseStatus.WAITING_AUDIT.getCode());
-        IPage<TmHouse> page = new Page<>(1 , 10 , true);
-        return  getBaseMapper().selectPage(page , lambdaQueryWrapper);
+        lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);
+        lambdaQueryWrapper.eq(TmHouse::getStatus, HouseStatus.AUDITED.getCode())
+                .or().eq(TmHouse::getStatus, HouseStatus.WAITING_AUDIT.getCode());
+        IPage<TmHouse> page = new Page<>(1, 10, true);
+        return getBaseMapper().selectPage(page, lambdaQueryWrapper);
     }
 
-    public IPage<TmHouse> getAuditHouseList(String houseTitle , Integer status, Integer type,
-                                                String belongCompany , String estateName , Long pageNum , Long pageSize){
+    public IPage<TmHouse> getAuditHouseList(String houseTitle, Integer status, Integer type,
+                                            String belongCompany, String estateName, Long pageNum, Long pageSize) {
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(TmHouse::getIsShow , 1);
-        if(StringUtils.isNotBlank(houseTitle)){
-            lambdaQueryWrapper.like(TmHouse::getHouseTitle , houseTitle);
-        }
-        if(null != status){
-            if(HouseStatus.ALL.getCode().compareTo(status) != 0){
-                lambdaQueryWrapper.eq(TmHouse::getStatus , status);
-            }else{
-                lambdaQueryWrapper.ne(TmHouse::getStatus , HouseStatus.DRAFT.getCode());
+        lambdaQueryWrapper.eq(TmHouse::getIsShow, 1);
+        if (StringUtils.isNotBlank(houseTitle)) {
+            lambdaQueryWrapper.like(TmHouse::getHouseTitle, houseTitle);
+        }
+        if (null != status) {
+            if (HouseStatus.ALL.getCode().compareTo(status) != 0) {
+                lambdaQueryWrapper.eq(TmHouse::getStatus, status);
+            } else {
+                lambdaQueryWrapper.ne(TmHouse::getStatus, HouseStatus.DRAFT.getCode());
             }
             //捞取所有状态，默认不设置status的过滤条件
-        }else{
-            lambdaQueryWrapper.eq(TmHouse::getStatus , HouseStatus.WAITING_AUDIT.getCode());
+        } else {
+            lambdaQueryWrapper.eq(TmHouse::getStatus, HouseStatus.WAITING_AUDIT.getCode());
         }
-        if(StringUtils.isNotBlank(estateName)){
-            lambdaQueryWrapper.like(TmHouse::getEstateName , estateName);
+        if (StringUtils.isNotBlank(estateName)) {
+            lambdaQueryWrapper.like(TmHouse::getEstateName, estateName);
         }
-        if(StringUtils.isNotBlank(belongCompany)){
-            lambdaQueryWrapper.eq(TmHouse::getBelongCompanyId , belongCompany);
+        if (StringUtils.isNotBlank(belongCompany)) {
+            lambdaQueryWrapper.eq(TmHouse::getBelongCompanyId, belongCompany);
         }
-        if(null != type){
-            lambdaQueryWrapper.eq(TmHouse::getType , type);
+        if (null != type) {
+            lambdaQueryWrapper.eq(TmHouse::getType, type);
         }
-        IPage<TmHouse> page = new Page<>(pageNum , pageSize , true);
-        return  getBaseMapper().selectPage(page , lambdaQueryWrapper);
+        IPage<TmHouse> page = new Page<>(pageNum, pageSize, true);
+        return getBaseMapper().selectPage(page, lambdaQueryWrapper);
     }
 
-    public int deleteHouseById(String houseId){
-        if(StringUtils.isBlank(houseId)){
+    public int deleteHouseById(String houseId) {
+        if (StringUtils.isBlank(houseId)) {
             return -1;
         }
         return getBaseMapper().deleteById(houseId);
     }
 
 
-    public TmHouse getOneByNameAndEstate(String houseTitle , String estateId , int type){
+    public TmHouse getOneByNameAndEstate(String houseTitle, String estateId, int type) {
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotBlank(houseTitle)){
-            lambdaQueryWrapper.eq(TmHouse::getHouseTitle , houseTitle);
+        if (StringUtils.isNotBlank(houseTitle)) {
+            lambdaQueryWrapper.eq(TmHouse::getHouseTitle, houseTitle);
         }
-        if(StringUtils.isNotBlank(estateId)){
-            lambdaQueryWrapper.eq(TmHouse::getEstateId , estateId);
+        if (StringUtils.isNotBlank(estateId)) {
+            lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);
         }
-        lambdaQueryWrapper.eq(TmHouse::getType , type);
-        lambdaQueryWrapper.eq(TmHouse::getIsDelete , DeleteStatus.NOT_DELETE.getCode());
+        lambdaQueryWrapper.eq(TmHouse::getType, type);
+        lambdaQueryWrapper.eq(TmHouse::getIsDelete, DeleteStatus.NOT_DELETE.getCode());
         lambdaQueryWrapper.last("limit 1");
         return getBaseMapper().selectOne(lambdaQueryWrapper);
     }
 
 
-
-    @Transactional(rollbackFor =  Exception.class)
-    public boolean updateHouse(TmHouse tmHouse){
-        if(null == tmHouse){
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateHouse(TmHouse tmHouse) {
+        if (null == tmHouse) {
             return false;
         }
-        if(null == tmHouse.getId()){
+        if (null == tmHouse.getId()) {
             log.info("主键ID为空，无法更房源信息");
             return false;
         }
@@ -127,17 +138,17 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         return 1 == getBaseMapper().updateById(tmHouse);
     }
 
-    public TmHouse selectForUpdate(String id){
+    public TmHouse selectForUpdate(String id) {
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(TmHouse::getId , id);
+        lambdaQueryWrapper.eq(TmHouse::getId, id);
         lambdaQueryWrapper.last("for update");
         return getBaseMapper().selectOne(lambdaQueryWrapper);
     }
 
 
-    public boolean insertNew(TmHouse tmHouse){
-        if(StringUtils.isBlank(tmHouse.getId())){
-            tmHouse.setId(SnowFlakeUUidUtils.generaUUid(null , null , UuidPreEnum.HOUSE_ID_PRE.getPre()));
+    public boolean insertNew(TmHouse tmHouse) {
+        if (StringUtils.isBlank(tmHouse.getId())) {
+            tmHouse.setId(SnowFlakeUUidUtils.generaUUid(null, null, UuidPreEnum.HOUSE_ID_PRE.getPre()));
         }
         tmHouse.setCreateTime(LocalDateTime.now());
         tmHouse.setUpdateTime(LocalDateTime.now());
@@ -146,9 +157,9 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     }
 
 
-    public TmHouse insertNewWithRsp(TmHouse tmHouse){
-        if(StringUtils.isBlank(tmHouse.getId())){
-            tmHouse.setId(SnowFlakeUUidUtils.generaUUid(null , null , UuidPreEnum.HOUSE_ID_PRE.getPre()));
+    public TmHouse insertNewWithRsp(TmHouse tmHouse) {
+        if (StringUtils.isBlank(tmHouse.getId())) {
+            tmHouse.setId(SnowFlakeUUidUtils.generaUUid(null, null, UuidPreEnum.HOUSE_ID_PRE.getPre()));
         }
         tmHouse.setCreateTime(LocalDateTime.now());
         tmHouse.setUpdateTime(LocalDateTime.now());
@@ -156,14 +167,15 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         getBaseMapper().insert(tmHouse);
         return tmHouse;
     }
-    public TmHouse getBySceneNumAndHouseId(String sceneNum , String projectId , String houseId){
-        if(!StringUtils.isNoneBlank(sceneNum , projectId , houseId)){
+
+    public TmHouse getBySceneNumAndHouseId(String sceneNum, String projectId, String houseId) {
+        if (!StringUtils.isNoneBlank(sceneNum, projectId, houseId)) {
             return null;
         }
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(TmHouse::getSceneNum , sceneNum);
-        lambdaQueryWrapper.eq(TmHouse::getEstateId  , projectId);
-        lambdaQueryWrapper.eq(TmHouse::getFcbHouseId , houseId);
+        lambdaQueryWrapper.eq(TmHouse::getSceneNum, sceneNum);
+        lambdaQueryWrapper.eq(TmHouse::getEstateId, projectId);
+        lambdaQueryWrapper.eq(TmHouse::getFcbHouseId, houseId);
         return getBaseMapper().selectOne(lambdaQueryWrapper);
     }
 

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

@@ -135,6 +135,7 @@ public class AuditController {
         tmAudit.setAuditStatus(auditStatus);
         tmAudit.setAuditRemark(auditRemark);
         tmAudit.setAuditorId(tokenMap.getId());
+        tmAudit.setAuditTime(LocalDateTime.now());
         tmAudit.setAuditorName(tokenMap.getUserName());
         int update = tmAuditService.updateAudit(tmAudit);
         if(update != 1){

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

@@ -120,7 +120,8 @@ public class HouseManagerController {
         if(null == tokenMap){
             return Result.failure("解析token失败");
         }
-        IPage<TmHouse> resultPage = tmHouseService.getListByNameOrBelong(houseTitle , status , type , estateId , pageNum , pageSize);
+        IPage<TmHouse> resultPage = tmHouseService.getListByNameOrBelong(houseTitle , status ,
+                type , estateId , tokenMap, pageNum , pageSize);
         return  Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
                 resultPage.getCurrent(), resultPage.getRecords()));
     }
@@ -166,7 +167,8 @@ public class HouseManagerController {
         if(StringUtils.isBlank(tmHouse.getSceneNum())){
             return Result.failure("改房源未生成场景码");
         }
-        String totalVrUrl = innerSceneVrHost + sceneVrLink + tmHouse.getId() + "&s=" + tmHouse.getSceneNum();
+        String totalVrUrl = innerSceneVrHost + sceneVrLink + tmHouse.getId()
+                + "&s=" + tmHouse.getSceneNum() + "&h=" + tmHouse.getFcbHouseId();
         String localPath = imageLocalPath + "logo.png";
         String outPutImageName = System.currentTimeMillis() + ".jpg";
         String outPutImageResultPath = imageLocalPath + outPutImageName;
@@ -215,7 +217,8 @@ public class HouseManagerController {
         String downLoanVideoPath = FileUtils.parseFile(file, imageLocalPath  , newFileName);
         log.info("照片文件已经下载到本地:{}", downLoanVideoPath);
 
-        String totalVrUrl = innerSceneVrHost + sceneVrLink + tmHouse.getId() + "&s=" + tmHouse.getSceneNum();
+        String totalVrUrl = outerSceneVrHost + sceneVrLink + tmHouse.getId() + "&s="
+                + tmHouse.getSceneNum() + "&h=" + tmHouse.getFcbHouseId();
         String outPutImageName = System.currentTimeMillis() + ".jpg";
         String outPutImageResultPath = imageLocalPath + outPutImageName;
         try {