改bug

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

@@ -41,7 +41,7 @@ public class TmAuditServiceImpl extends ServiceImpl<TmAuditDao, TmAudit> impleme
             lambdaQueryWrapper.like(TmAudit::getVrTitle , vrTitle);
         }
         if(StringUtils.isNotBlank(belongCompany)){
-            lambdaQueryWrapper.eq(TmAudit::getBelongCompanyName , belongCompany);
+            lambdaQueryWrapper.eq(TmAudit::getBelongCompanyId , belongCompany);
         }
         if(StringUtils.isNotBlank(belongEstate)){
             lambdaQueryWrapper.like(TmAudit::getBelongEstateName , belongEstate);
@@ -117,6 +117,7 @@ public class TmAuditServiceImpl extends ServiceImpl<TmAuditDao, TmAudit> impleme
         TmAudit tmAudit = new TmAudit();
         tmAudit.setId(SnowFlakeUUidUtils.generaUUid(null , null , "AUD00000"));
         tmAudit.setVrTitle(tmHouse.getHouseTitle());
+        tmAudit.setVrId(tmHouse.getId());
         tmAudit.setVrType(tmHouse.getType());
         if(null != tmEstate){
             tmAudit.setBelongEstateName(tmEstate.getEstateName());

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

@@ -32,7 +32,7 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
     public IPage<TmEstate> getListByNameOrBelong(String estateName , String belongCompany,
                                                  Long pageNum , Long pageSize){
         LambdaQueryWrapper<TmEstate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotBlank(estateName)){
+        if(StringUtils.isNotBlank(belongCompany)){
             lambdaQueryWrapper.like(TmEstate::getBelongCompanyName , belongCompany);
         }
         if(StringUtils.isNotBlank(estateName)){

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

@@ -102,6 +102,16 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         return 1 == getBaseMapper().insert(tmHouse);
     }
 
+
+    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());
+        tmHouse.setIsDelete(DeleteStatus.NOT_DELETE.getCode());
+        return tmHouse;
+    }
     public TmHouse getBySceneNumAndHouseId(String sceneNum , String projectId , String houseId){
         if(!StringUtils.isNoneBlank(sceneNum , projectId , houseId)){
             return null;

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

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * <p>
@@ -45,7 +46,7 @@ public class TmOperationServiceImpl extends ServiceImpl<TmOperationDao, TmOperat
 
     public IPage<TmOperation> getOperationList(Long pageNum , Long pageSize ,
                                                String startTime , String endTime,
-                                               String operatorName, String companyName, String phone){
+                                               String operatorName, String companyId, String phone){
         if(null == pageNum){
             pageNum = 1L;
         }
@@ -55,14 +56,20 @@ public class TmOperationServiceImpl extends ServiceImpl<TmOperationDao, TmOperat
         IPage<TmOperation> page = new Page<>(pageNum , pageSize);
         LambdaQueryWrapper<TmOperation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNoneBlank(startTime , endTime)){
-            //时间区间,TODO:
-
+           LocalDateTime start = LocalDateTime.parse(startTime , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+           LocalDateTime end = LocalDateTime.parse(endTime , DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+           if(null != start){
+               lambdaQueryWrapper.ge(TmOperation::getOperateTime , start);
+           }
+           if(null != end){
+               lambdaQueryWrapper.le(TmOperation::getOperateTime , end);
+           }
         }
         if(StringUtils.isNotBlank(operatorName)){
             lambdaQueryWrapper.like(TmOperation::getOperatorName , operatorName);
         }
-        if(StringUtils.isNotBlank(companyName)){
-            lambdaQueryWrapper.like(TmOperation::getOperatorCompanyName , companyName);
+        if(StringUtils.isNotBlank(companyId)){
+            lambdaQueryWrapper.like(TmOperation::getOperatorCompanyId , companyId);
         }
         if(StringUtils.isNotBlank(phone)){
             lambdaQueryWrapper.like(TmOperation::getOperatorPhone , phone);

src/main/java/fcb/project/manager/base/utils/FcbUtils.java

@@ -38,6 +38,7 @@ public class FcbUtils {
         String md5EncryptionStr = DataUtils.md5Encryption(JSON.toJSONString(params));
         Map<String , Object> resultMap = new HashMap<>();
         resultMap.put("authcode" , md5EncryptionStr);
+        resultMap.put("timeStamp" , System.currentTimeMillis());
         return Result.success(resultMap);
 
     }

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

@@ -46,7 +46,7 @@ public class AuditController {
             @ApiImplicitParam(name = "vrTitle", value = "vr项目名称", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "vrType", value = "vr项目类型: 1->新房;2->二手房;", paramType = "query", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "belongEstate", value = "所属楼盘", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "belongCompany", value = "所属公司", paramType = "query", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "belongCompany", value = "所属公司ID", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "auditStatus", value = "审核状态: 0->待审核;1->已审核;-1->不通过", paramType = "query", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "当前页码", paramType = "query", required = true, dataType = "Long"),
             @ApiImplicitParam(name = "pageSize", value = "每页大小", paramType = "query", required = true, dataType = "Long"),

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

@@ -109,21 +109,20 @@ public class HouseManagerController {
     }
 
     @PostMapping("/addHouse")
-    @ApiOperation(value = "创建房源-这里需要720或者四维看看微服务创建完成调用")
-    public Result<Object> addNewHouse(@RequestBody TmHouse tmHouse){
+    @ApiOperation(value = "创建默认房源")
+    public Result<Object> addNewHouse(@RequestParam String estateId){
 
-        if(!StringUtils.isNoneBlank(tmHouse.getHouseTitle() , tmHouse.getEstateId())){
-            throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘名称或者所属公司不能为空");
-        }
-        TmHouse dbHouse = tmHouseService.getOneByNameAndEstate(tmHouse.getHouseTitle() , tmHouse.getEstateId() , tmHouse.getType());
-        if(null != dbHouse){
-            log.info("{}楼盘下面的房源{}已经存在" , tmHouse.getEstateId() , tmHouse.getHouseTitle());
-            throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘已经存在，无需再添加");
+        if(StringUtils.isBlank(estateId)){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘ID不能为空");
         }
-        //创建默认是草稿的状态
+        TmHouse tmHouse = new TmHouse();
+        tmHouse.setEstateId(estateId);
         tmHouse.setStatus(0);
-        if(tmHouseService.insertNew(tmHouse)){
-            return Result.success("新增成功");
+        TmHouse latestHouse = tmHouseService.insertNewWithRsp(tmHouse);
+        if(null != latestHouse){
+            Map<String , Object> resultMap = new HashMap<>();
+            resultMap.put("houseId" , tmHouse.getId());
+            return Result.success("新增成功" , resultMap);
         }else{
             return Result.failure("新增失败");
         }

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

@@ -36,7 +36,7 @@ public class OperationController {
             @ApiImplicitParam(name = "startTime", value = "时间开始", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "endTime", value = "时间截止", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "operatorName", value = "操作人（名称）", paramType = "query", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "companyName", value = "所属公司", paramType = "query", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "companyId", value = "所属公司ID", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "phone", value = "手机号", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "pageNum", value = "当前页码", paramType = "query", required = true, dataType = "Long"),
             @ApiImplicitParam(name = "pageSize", value = "每页大小", paramType = "query", required = true, dataType = "Long")
@@ -44,13 +44,13 @@ public class OperationController {
     public Result<Object> getHouseList(@RequestParam(required = false) String startTime,
                                        @RequestParam(required = false) String endTime,
                                        @RequestParam(required = false) String operatorName,
-                                       @RequestParam(required = false) String companyName,
+                                       @RequestParam(required = false) String companyId,
                                        @RequestParam(required = false) String phone,
                                        @RequestParam() Long pageNum,
                                        @RequestParam() Long pageSize){
         IPage<TmOperation> resultPage = tmOperationService.getOperationList(pageNum ,pageSize ,
                                                                              startTime , endTime ,
-                                                                              operatorName , companyName , phone);
+                                                                              operatorName , companyId , phone);
         return  Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
                 resultPage.getCurrent(), resultPage.getRecords()));
     }

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

@@ -38,8 +38,8 @@ public class ProjectController {
             @ApiImplicitParam(name = "pageNum", value = "当前页码", paramType = "query", required = true, dataType = "Long"),
             @ApiImplicitParam(name = "pageSize", value = "每页大小", paramType = "query", required = true, dataType = "Long")
      })
-    public Result<Object> getProjectList(@PathVariable(required = false) String estateName,
-                                         @PathVariable(required = false) String belongCompany,
+    public Result<Object> getProjectList(@RequestParam(required = false) String estateName,
+                                         @RequestParam(required = false) String belongCompany,
                                          @RequestParam(name = "pageNum")Long pageNum,
                                          @RequestParam(name = "pageSize")Long pageSize){