Merge branch 'uat' of http://192.168.0.115:3000/mengshibin/fcb-project-manager into uat

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

@@ -76,7 +76,11 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
         return vos;
     }
 
-    public String exportProjectList(QueryHouseParam queryHouseParam, ContextTokenBean contextUserInfo, String token) {
+    public String exportProjectList(QueryHouseParam queryHouseParam, ContextTokenBean contextUserInfo, String token) throws InterruptedException {
+
+
+//        Thread.sleep(15000);
+
         produceQuery(queryHouseParam, contextUserInfo);
         List<HouseVO> houseList = getBaseMapper().exportProject(queryHouseParam);
         produceRes(houseList, token);
@@ -90,6 +94,7 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
                 "讲房点位数量", "创建人","创建时间", "更新时间", "状态", "审核人", "审核时间");
         ExcelUtil excelUtil = new ExcelUtil(cols);
         for(HouseVO house : houseList){
+
             int index = 0;
             num += 1;
             //楼盘数据

fcb-project-manager-core/src/main/java/fcb/project/manager/base/utils/DateUtil.java

@@ -9,6 +9,7 @@ package fcb.project.manager.base.utils;
 
 import lombok.extern.slf4j.Slf4j;
 
+import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -401,4 +402,24 @@ public final class DateUtil {
 		c2.setTime(date2);
 		return c2.after(c1);
 	}
+
+
+	/**
+	 * 获取20位随机数
+	 */
+	public static String randonNum() {
+
+		long now = System.currentTimeMillis() * 1000000L + System.nanoTime() % 1000000L;
+		Random random = new Random();
+		Integer ran = random.nextInt(10);
+
+
+		return String.valueOf(now) + ran;
+	}
+
+
+	public static void main(String[] args) {
+		randonNum();
+	}
+
 }

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

@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import java.io.*;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -738,4 +739,11 @@ public class HouseManagerController extends BaseController{
 
     }
 
+
+//    @GetMapping("/getrandom")
+//    @ApiOperation("获取20位随机数")
+//    public BigDecimal getrandom() {
+//        return DateUtil.randonNum();
+//    }
+
 }

fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/RoomIdController.java

@@ -0,0 +1,119 @@
+package fcb.project.manager.core.controller;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import fcb.project.manager.base.entity.*;
+import fcb.project.manager.base.enums.*;
+import fcb.project.manager.base.param.house.QueryHouseParam;
+import fcb.project.manager.base.service.ITmApiRoomIdLogService;
+import fcb.project.manager.base.service.custom.PanoService;
+import fcb.project.manager.base.service.impl.*;
+import fcb.project.manager.base.utils.DataUtils;
+import fcb.project.manager.base.utils.DateUtil;
+import fcb.project.manager.base.utils.ExcelUtil;
+import fcb.project.manager.base.vo.house.HouseVO;
+import fcb.project.manager.core.feignInterfaces.SceneFeign;
+import fdage.back.sdk.base.entity.Result;
+import fdage.back.sdk.base.entity.ViewResult;
+import fdage.back.sdk.base.enums.ResultCodeEnum;
+import fdage.back.sdk.base.exception.CommonBaseException;
+import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
+import fdage.back.sdk.core.alibabaUtils.AlibabaOssHelper;
+import io.swagger.annotations.*;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/7 17:38
+ * 4
+ */
+@Api(tags = "房源相关接口")
+@RestController
+@RequestMapping("fcb/project/roomid")
+@Log4j2
+@Validated
+public class RoomIdController extends BaseController{
+
+    @Autowired
+    private ITmApiRoomIdLogService iTmApiRoomIdLogService;
+
+    @GetMapping("/save")
+    @ApiOperation("获取20位随机数")
+    public Result save() {
+
+        TmApiRoomIdLog tmApiRoomIdLog = new TmApiRoomIdLog();
+        tmApiRoomIdLog.setLogId(SnowFlakeUUidUtils.generaUUid(null , null ,  UuidPreEnum.API_ROOM_ID_PRE.getPre()));
+        tmApiRoomIdLog.setCommunicateRoomId(DateUtil.randonNum());
+        tmApiRoomIdLog.setEnable(1);
+        tmApiRoomIdLog.setCreateTime(LocalDateTime.now());
+        tmApiRoomIdLog.setUpdateTime(LocalDateTime.now());
+
+        boolean bool = iTmApiRoomIdLogService.save(tmApiRoomIdLog);
+
+        if(bool){
+            return Result.success(tmApiRoomIdLog);
+        }else{
+            return Result.failure("保存失败");
+        }
+    }
+
+
+
+
+    @PostMapping("/update")
+    @ApiOperation("改")
+    public Result update(@RequestBody TmApiRoomIdLog tmApiRoomIdLog) {
+
+        if (null == tmApiRoomIdLog) {
+            return Result.failure("信息不能为空");
+        }
+        if (null == tmApiRoomIdLog.getCommunicateRoomId()) {
+            log.info("房间ID不能为空，无法更新房间信息");
+            return Result.failure("房间ID不能为空，无法更新房间信息");
+        }
+
+        LambdaQueryWrapper<TmApiRoomIdLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TmApiRoomIdLog::getCommunicateRoomId,tmApiRoomIdLog.getCommunicateRoomId());
+        tmApiRoomIdLog.setEnable(0);
+        iTmApiRoomIdLogService.update(tmApiRoomIdLog,lambdaQueryWrapper);
+
+        return Result.success();
+    }
+
+    @PostMapping("/select")
+    @ApiOperation("查")
+    public Result select(@RequestBody TmApiRoomIdLog tmApiRoomIdLog) {
+
+        LambdaQueryWrapper<TmApiRoomIdLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TmApiRoomIdLog::getCommunicateRoomId,tmApiRoomIdLog.getCommunicateRoomId());
+        lambdaQueryWrapper.last("limit 1");
+        tmApiRoomIdLog.setUpdateTime(LocalDateTime.now());
+
+        return Result.success(iTmApiRoomIdLogService.getBaseMapper().selectList(lambdaQueryWrapper));
+    }
+
+
+
+}