修改配置文件，

fcb-project-application/src/main/resources/application-dev.properties

@@ -16,13 +16,16 @@ swagger.page.desc=设计到房源api、楼盘项目管理、审核流程业务
 swagger.page.packagePath=fcb.project.manager
 
 #redis
-spring.redis.host=120.25.146.52
-spring.redis.database=15
-spring.redis.timeout=3000ms
+#spring.redis.cluster.max-redirects=3
+spring.redis.host=8.135.107.23
+spring.redis.port=30064
+spring.redis.timeout=5000ms
+spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.min-idle=0
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1ms
+spring.redis.database=0
+spring.redis.password=
 
 
 

fcb-project-application/src/test/java/fcb/project/manager/feignApi/SceneFeignTest.java

@@ -0,0 +1,28 @@
+package fcb.project.manager.feignApi;
+
+import fcb.project.manager.FcbProjectManagerApplication;
+import lombok.SneakyThrows;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = FcbProjectManagerApplication.class)
+@AutoConfigureMockMvc
+public class SceneFeignTest {
+
+
+    /**
+     * 单元测试
+     */
+    @Test
+    @SneakyThrows
+    public void test() {
+        String a = null;
+        Assert.assertTrue("a为空",a != null);
+    }
+
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/param/house/QueryHouseParam.java

@@ -17,11 +17,11 @@ import java.util.List;
 @ApiModel("vr项目查询入参")
 public class QueryHouseParam extends PageParam {
 
-    @ApiModelProperty(name = "fcb_estate_id", value = "楼盘编码",  dataType = "String")
+    @ApiModelProperty(name = "fcbEstateId", value = "楼盘编码",  dataType = "String")
     private String fcbEstateId;
 
-    @ApiModelProperty(name = "houseTitle", value = "房源名称",  dataType = "String")
-    private String houseTitle;
+    @ApiModelProperty(name = "estateName", value = "楼盘名称",  dataType = "String")
+    private String estateName;
 
     @ApiModelProperty(name = "status", value = "状态: 0->草稿;1->待审核;2->已审核;3->未通过", dataType = "Integer")
     private Integer status;

fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmEstateServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.Gson;
 import fcb.project.manager.base.config.FcbConfig;
 import fcb.project.manager.base.dao.TmEstateDao;
 import fcb.project.manager.base.dto.scene.SceneProEntity;
@@ -27,6 +28,7 @@ import fcb.project.manager.core.feignInterfaces.SceneFeign;
 import fdage.back.sdk.base.enums.ResultCodeEnum;
 import fdage.back.sdk.base.exception.CommonBaseException;
 import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -52,43 +54,40 @@ import java.util.stream.Collectors;
  */
 @Service
 @Log4j2
+@RequiredArgsConstructor
 public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> implements ITmEstateService {
 
-    @Autowired
-    private PanoService panoService;
-    @Autowired
-    private FcbConfig fcbConfig;
-    @Autowired
-    private TmAuditServiceImpl tmAuditService;
-    @Autowired
-    private SceneFeign sceneFeign;
-    @Autowired
-    private TmOperationServiceImpl tmOperationService;
-    @Autowired
+    private final PanoService panoService;
+    private final FcbConfig fcbConfig;
+    private final TmAuditServiceImpl tmAuditService;
+    private final SceneFeign sceneFeign;
+    private final TmOperationServiceImpl tmOperationService;
     private TmHouseServiceImpl tmHouseService;
 
-//    @Autowired
-//    public void setTmHouseService(TmHouseServiceImpl tmHouseService) {
-//        this.tmHouseService = tmHouseService;
-//    }
+    @Autowired
+    public void setTmHouseService(TmHouseServiceImpl tmHouseService) {
+        this.tmHouseService = tmHouseService;
+    }
 
     public IPage<HouseVO> listProject(QueryHouseParam queryHouseParam, ContextTokenBean contextUserInfo, String token) {
         produceQuery(queryHouseParam, contextUserInfo);
 
         Page page = new Page().setCurrent(queryHouseParam.getPageNum()).setSize(queryHouseParam.getPageSize());
         IPage<HouseVO> vos = getBaseMapper().listProject(page, queryHouseParam);
+        log.info("输出结果-{}", new Gson().toJson(vos.getRecords()));
 
-        produceRes(vos, token);
+        produceRes(vos.getRecords(), token);
         return vos;
     }
 
     public String exportProjectList(QueryHouseParam queryHouseParam, ContextTokenBean contextUserInfo, String token) {
         produceQuery(queryHouseParam, contextUserInfo);
         List<HouseVO> houseList = getBaseMapper().exportProject(queryHouseParam);
+        produceRes(houseList, token);
+
         //导出的数据
-        Map<String, String> item = null;
-        List<Map> dataList = new ArrayList<Map>();
-        String outType = "";
+        Map<String, String> item;
+        List<Map> dataList = new ArrayList<>();
         int num = 0;
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         List<String> cols = Arrays.asList("序号", "楼盘编码", "楼盘名称", "航拍数量", "景观图数量", "售楼处数量", "样板间数量", "讲房售楼处数量", "讲房样板间数量", "讲房点位数量",
@@ -102,13 +101,13 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
             item.put(excelUtil.getColeNames().get(index++), String.valueOf(num));
             item.put(excelUtil.getColeNames().get(index++), house.getFcbEstateId());
             item.put(excelUtil.getColeNames().get(index++), house.getEstateName());
-            item.put(excelUtil.getColeNames().get(index++), house.getBuilding().toString());
-            item.put(excelUtil.getColeNames().get(index++), house.getGarden().toString());
-            item.put(excelUtil.getColeNames().get(index++), house.getSales().toString());
-            item.put(excelUtil.getColeNames().get(index++), house.getHouse().toString());
+            item.put(excelUtil.getColeNames().get(index++), house.getBuilding() != null ? house.getBuilding().toString() : "0");
+            item.put(excelUtil.getColeNames().get(index++), house.getGarden() != null ? house.getGarden().toString() : "0");
+            item.put(excelUtil.getColeNames().get(index++), house.getSales() != null ? house.getSales().toString() : "0");
+            item.put(excelUtil.getColeNames().get(index++), house.getHouse() != null ? house.getHouse().toString() : "0");
             item.put(excelUtil.getColeNames().get(index++), house.getSaleVideos().toString());
             item.put(excelUtil.getColeNames().get(index++), house.getHouseVideos().toString());
-            item.put(excelUtil.getColeNames().get(index++), house.getPoints().toString());
+            item.put(excelUtil.getColeNames().get(index++), house.getPoints() != null ? house.getPoints().toString() : "0");
             item.put(excelUtil.getColeNames().get(index++), house.getCreateTime().format(df));
             item.put(excelUtil.getColeNames().get(index++), house.getUpdateTime().format(df));
             item.put(excelUtil.getColeNames().get(index++), HouseStatus.get(house.getStatus()).getDesc());
@@ -122,11 +121,7 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
         if (queryHouseParam.getStatus() == null) {
             queryHouseParam.setStatus(HouseStatus.ALL.getCode());
         }
-        String aduitName = HouseStatus.get(queryHouseParam.getStatus()).getDesc();
-        if(queryHouseParam.getStatus().compareTo(HouseStatus.REJECT.getCode()) == 0){
-            aduitName = "未通过";
-        }
-        String dateStr = "VR楼盘项目-" + aduitName + "-" + date;
+        String dateStr = "VR看房楼盘项目-"  + "-" + date;
         String fileName = dateStr + ".xls";
         File file = new File(fcbConfig.getExcelLocalPath() + fileName);
         if(!file.getParentFile().exists()){
@@ -151,11 +146,11 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
 
 
     // todo
-    private void produceRes(IPage<HouseVO> resultPage, String token) {
-        if(null != resultPage && resultPage.getTotal() > 0){
+    private void produceRes(List<HouseVO> houseVOS, String token) {
+        if(null != houseVOS && houseVOS.size() > 0){
             List<String> getAllHouseIds = new ArrayList<>();
-            for (int i = 0; i < resultPage.getRecords().size(); i++) {
-                getAllHouseIds.add(resultPage.getRecords().get(i).getHouseId());
+            for (int i = 0; i < houseVOS.size(); i++) {
+                getAllHouseIds.add(houseVOS.get(i).getHouseId());
             }
             //从720获取最新的预览路径，重新封装给前端展示
             TreeMap<String , Object> treeMap =  panoService.getHouseVrlinks(getAllHouseIds , token);
@@ -172,37 +167,39 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
             //四维看看获取统计结果
             SceneRspBean sceneRspBean;
 
-            for (int i = 0; i < resultPage.getRecords().size(); i++) {
-                String vrId = resultPage.getRecords().get(i).getHouseId();
+            for (int i = 0; i < houseVOS.size(); i++) {
+                String vrId = houseVOS.get(i).getHouseId();
                 //获取当前房源的审核记录数，用于前端判决是否展示审核历史图标
-                resultPage.getRecords().get(i).setCountNum(tmAuditService.countAuditNum(vrId));
+                houseVOS.get(i).setCountNum(tmAuditService.countAuditNum(vrId));
                 if(!CollectionUtils.isEmpty(treeMap)){
                     String path = (String) treeMap.get(vrId);
                     if(StringUtils.isNotBlank(path)){
                         String outerHost = fcbConfig.getOuterSceneVrHost().substring(0 , fcbConfig.getOuterSceneVrHost().length() - 1);
                         String innerHost = fcbConfig.getInnerSceneVrHost().substring(0 , fcbConfig.getInnerSceneVrHost().length() - 1);
-                        resultPage.getRecords().get(i).setInnerVrLink(innerHost + path);
-                        resultPage.getRecords().get(i).setVrLink(outerHost + path);
+                        houseVOS.get(i).setInnerVrLink(innerHost + path);
+                        houseVOS.get(i).setVrLink(outerHost + path);
                     }
                 }
                 //调用720云接口，获取统计数据map
                 statistics = panoService.getStatistics(vrId, token);
                 if(statistics != null) {
-                    resultPage.getRecords().get(i).setGarden(statistics.get("garden"));
-                    resultPage.getRecords().get(i).setHouse(statistics.get("house"));
-                    resultPage.getRecords().get(i).setBuilding(statistics.get("building"));
-                    resultPage.getRecords().get(i).setSales(statistics.get("sales"));
+                    houseVOS.get(i).setGarden(statistics.get("garden"));
+                    houseVOS.get(i).setHouse(statistics.get("house"));
+                    houseVOS.get(i).setBuilding(statistics.get("building"));
+                    houseVOS.get(i).setSales(statistics.get("sales"));
                 }
 
                 int salesVideos = 0;
                 int houseVideos = 0;
-                panoSceneWithTypesMap = panoService.listPanoSceneWithTypes(resultPage.getRecords().get(i).getHouseId(), token);
+                panoSceneWithTypesMap = panoService.listPanoSceneWithTypes(houseVOS.get(i).getHouseId(), token);
 
                 if (MapUtils.isNotEmpty(panoSceneWithTypesMap)) {
                     List<String> nums = panoSceneWithTypesMap.entrySet().stream().map(e -> e.getValue().toString()).collect(Collectors.toList());
 
                     sceneRspBean = sceneFeign.listScenesInNums(nums, token);
                     List<SceneProEntity> scenes = (List<SceneProEntity>) sceneRspBean.getData();
+                    log.info("远程调用listScenesInNums接口，入参-{}", nums);
+                    log.info("远程调用listScenesInNums接口,返回数据-{}", new Gson().toJson(scenes));
                     for (SceneProEntity scene : scenes) {
                         String videoStr = scene.getVideos();
                         JSONObject scenejson = new JSONObject();
@@ -227,8 +224,8 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
                             }
                         }
                     }
-                    resultPage.getRecords().get(i).setSaleVideos(salesVideos);
-                    resultPage.getRecords().get(i).setHouseVideos(houseVideos);
+                    houseVOS.get(i).setSaleVideos(salesVideos);
+                    houseVOS.get(i).setHouseVideos(houseVideos);
                 }
 
                 allSceneNums = panoService.getAllSceneNums(vrId, token);
@@ -239,7 +236,7 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
                     if(null == sceneRspBean || sceneRspBean.getCode() != 0){
                         log.info("调用四维看看获取所有场景点位数失败,场景码是：" + param.get("sceneNum"));
                     }else {
-                        resultPage.getRecords().get(i).setPoints(sceneRspBean.getData());
+                        houseVOS.get(i).setPoints(sceneRspBean.getData());
                     }
                 }
             }
@@ -322,8 +319,8 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
         tmHouse.setBelongCompanyId(tmEstate.getBelongCompanyId());
         tmHouse.setBelongCompanyName(tmEstate.getBelongCompanyName());
         tmHouse.setEstateName(tmEstate.getEstateName());
+        tmHouse.setIsShow("1");
         tmHouse.setStatus(0);
-        TmHouse latestHouse = tmHouseService.insertNewWithRsp(tmHouse);
         Map<String , Object> resultMap = new HashMap<>();
         resultMap.put("houseId" , tmHouse.getId());
         return resultMap;

fcb-project-manager-core/src/main/java/fcb/project/manager/base/vo/house/HouseVO.java

@@ -1,6 +1,6 @@
 package fcb.project.manager.base.vo.house;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,11 +27,11 @@ public class HouseVO {
     private String estateName;
 
     @ApiModelProperty(name = "createTime", value = "创建时间",  dataType = "String")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     @ApiModelProperty(name = "updateTime", value = "更新时间",  dataType = "String")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     @ApiModelProperty(name = "status", value = "状态: 0 -> 草稿;1->待集团审核;2->已审核;-1->未通过;3->待地区审核", dataType = "Integer")
@@ -41,7 +41,7 @@ public class HouseVO {
     private String auditorName;
 
     @ApiModelProperty(name = "auditTime", value = "审核时间",  dataType = "String")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime auditTime;
 
     @ApiModelProperty(name = "coverImagUrl", value = "封面",  dataType = "String")
@@ -54,7 +54,7 @@ public class HouseVO {
     private String houseTitle;
 
     @ApiModelProperty(name = "submitAuditTime", value = "提审时间",  dataType = "String")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime submitAuditTime;
 
     @ApiModelProperty(name = "vrLink", value = "vrLink",  dataType = "String")
@@ -84,12 +84,12 @@ public class HouseVO {
     @ApiModelProperty(name = "sales", value = "销售处数量",  dataType = "Long")
     private Object sales;
 
-    @ApiModelProperty(name = "sales", value = "讲房点位数量",  dataType = "Long")
+    @ApiModelProperty(name = "points", value = "讲房点位数量",  dataType = "Long")
     private Object points;
 
-    @ApiModelProperty(name = "sales", value = "讲房销售处数量",  dataType = "Long")
+    @ApiModelProperty(name = "saleVideos", value = "讲房销售处数量",  dataType = "Long")
     private Object saleVideos;
 
-    @ApiModelProperty(name = "sales", value = "讲房样板间数量",  dataType = "Long")
+    @ApiModelProperty(name = "houseVideos", value = "讲房样板间数量",  dataType = "Long")
     private Object houseVideos;
 }

fcb-project-manager-core/src/main/resources/mybatis/mappers/TmEstateMapper.xml

@@ -16,6 +16,7 @@
         estate.id estateId,
         estate.estate_name estateName,
         estate.fcb_estate_id fcbEstateId,
+        estate.create_by_name createByName,
         house.id houseId,
         house.create_time createTime,
         house.update_time updateTime,
@@ -23,7 +24,6 @@
         house.auditor_name auditorName,
         house.audit_time auditTime,
         house.cover_imag_url coverImagUrl,
-        house.create_by_name createByName,
         house.house_title houseTitle,
         house.submit_audit_time submitAuditTime,
         house.vr_link vrLink,
@@ -38,13 +38,13 @@
         WHERE
         estate.isDelete = 0
         <if test="ew.departmentId != null and ew.departmentId != ''">
-            and estate.belong_company_id = #{departmentId}
+            and estate.belong_company_id = #{ew.departmentId}
         </if>
         <if test="ew.fcbEstateId != null and ew.fcbEstateId != ''">
-            and estate.fcb_estate_id like concat('%', #{fcbEstateId}, '%')
+            and estate.fcb_estate_id like concat('%', #{ew.fcbEstateId}, '%')
         </if>
-        <if test="ew.houseTitle != null and ew.houseTitle != ''">
-            and house.house_title like concat('%', #{ew.houseTitle}, '%')
+        <if test="ew.estateName != null and ew.estateName != ''">
+            and estate.estate_name like concat('%', #{ew.estateName}, '%')
         </if>
         <if test="ew.status != null">
             and house.status = #{ew.status}