1

src/main/java/com/fdkankan/fusion/aop/PushJmAspect.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.config.FusionConfig;
 import com.fdkankan.fusion.down.CaseDownService;
+import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.client.OtherClient;
 import com.fdkankan.fusion.mq.vo.JmGaEventVo;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
@@ -95,10 +96,13 @@ public class PushJmAspect {
 			}
 
 			return result;
+		}catch (BusinessException e){
+			log.info("servicePush-BusinessException-error:{}",e);
+			return ResultData.error(e.getCode(),e.getMessage());
 		}catch (Exception e){
-			log.info("servicePush--error:{}",e);
+			log.info("servicePush-Exception-error:{}",e);
 		}catch (Throwable throwable){
-			log.info("servicePush--error:{}",throwable);
+			log.info("servicePush-throwable-error:{}",throwable);
 		}
 		return null;
 	}

src/main/java/com/fdkankan/fusion/common/util/OBJToGLBUtil.java

@@ -95,7 +95,7 @@ public class OBJToGLBUtil {
             throw new BusinessException(ResultCode.UPLOAD_FILE_OBJ_ERROR);
         }
         LinkedHashSet<String> imgName = new LinkedHashSet<>();
-        if(allFile == null || allFile.length()<=0 ){
+        if(allFile == null  ){
             throw new BusinessException(ResultCode.UPLOAD_FILE_OBJ_ERROR);
         }
         File[] files = allFile.listFiles();

src/main/java/com/fdkankan/fusion/controller/CaseOverviewController.java

@@ -54,17 +54,6 @@ public class CaseOverviewController {
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate (@RequestBody CaseOverview caseOverview){
         caseOverviewService.saveOrUpdate(caseOverview);
-        if(StringUtils.isNotBlank(caseOverview.getListCover()) && StringUtils.isNotBlank(fusionConfig.getPushDrawUrl())){
-            CaseEntity caseEntity = caseService.getById(caseOverview.getCaseId());
-            if(caseEntity != null){
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("id",caseOverview.getId());
-                map.put("kno",caseEntity.getKNumber());
-                map.put("md5", MD5Checksum.getMD5(caseOverview.getListCover().replace("/oss/", "/oss/4dkankan/")));
-                map.put("fileUrl",caseOverview.getListCover());
-                otherClient.postJson(fusionConfig.getPushDrawUrl(),map);
-            }
-        }
         return ResultData.ok(caseOverview);
     }
 

src/main/java/com/fdkankan/fusion/entity/CaseEntity.java

@@ -130,9 +130,6 @@ public class CaseEntity implements Serializable {
     @TableField(exist = false)
     public MapConfig mapConfig;
 
-    @TableField("k_number")
-    private String kNumber;
-
     @TableField("sys_user_id")
     private Long sysUserId;
 }

src/main/java/com/fdkankan/fusion/entity/ScenePlus.java

@@ -122,6 +122,4 @@ public class ScenePlus implements Serializable {
     @TableField("has_floorplan_ai")
     private Integer hasFloorplanAi;
 
-    @TableField("k_no")
-    private String kNo;
 }

src/main/java/com/fdkankan/fusion/exception/GlobalExceptionHandler.java

@@ -30,7 +30,7 @@ public class GlobalExceptionHandler {
     @ResponseBody
     @ExceptionHandler(value = BusinessException.class)
     public ResultData businessExceptionHandler(BusinessException e) {
-        log.info("业务异常code:{},message:{}", e.getCode(), e.getMessage());
+        log.info("业务异常", e);
         return ResultData.error(e.getCode(), e.getMessage());
     }
 }

src/main/java/com/fdkankan/fusion/service/ICaseService.java

@@ -41,5 +41,4 @@ public interface ICaseService extends IService<CaseEntity> {
 
     CaseVo getInfo(Integer caseId);
 
-    CaseEntity getKnumber(String kNumber);
 }

src/main/java/com/fdkankan/fusion/service/IScenePlusService.java

@@ -26,5 +26,4 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     List<ScenePlus> getByNumListAndAi(List<String> numList);
 
-    List<ScenePlus> getKNumber(String kNumber);
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -300,14 +300,4 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         return caseVo;
     }
 
-    @Override
-    public CaseEntity getKnumber(String kNumber) {
-        LambdaQueryWrapper<CaseEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CaseEntity::getKNumber,kNumber);
-        List<CaseEntity> list = this.list(wrapper);
-        if(list != null && !list.isEmpty()){
-            return list.get(0);
-        }
-        return null;
-    }
 }

src/main/java/com/fdkankan/fusion/service/impl/ScenePlusServiceImpl.java

@@ -54,10 +54,4 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         return this.list(wrapper);
     }
 
-    @Override
-    public List<ScenePlus> getKNumber(String kNumber) {
-        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ScenePlus::getKNo,kNumber);
-        return this.list(wrapper);
-    }
 }