modeling yml

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/TestController.java

@@ -0,0 +1,26 @@
+package com.fdkankan.modeling;
+
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.oss.UploadUtils;
+import com.fdkankan.platform.api.feign.PlatformClient;
+import com.fdkankan.platform.api.vo.Company;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/ts")
+public class TestController {
+
+    @Autowired
+    private UploadUtils uploadUtils;
+    @Resource
+    private PlatformClient platformClient;
+    @GetMapping("/up")
+    private ResultData<Company> upload(){
+        return platformClient.getCompanyById(11L);
+    }
+}

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneReceiver.java

@@ -90,7 +90,7 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
 
 
     @Resource
-    private UploadToOssUtil uploadUtils;
+    private UploadToOssUtil uploadToOssUtil;
 
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgExt,
@@ -267,7 +267,7 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
                 //计算模型并返回需要上传oss的文件集合
                 map = ComputerUtil.computer(projectNum, path, buildType);
 
-                uploadUtils.uploadMulFiles(map);
+                uploadToOssUtil.uploadMulFiles(map);
                 log.info("双目上完oss结束修改数据："+projectNum);
                 sceneService.updateTime(projectNum, space, payStatus);
             } else {
@@ -364,7 +364,7 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
                     map.put(path + File.separator + "capture/Up2.txt", "data/data" + projectNum + "/Up2.txt");
                 }
 
-                uploadUtils.uploadMulFiles(map);
+                uploadToOssUtil.uploadMulFiles(map);
                 payStatus = 1;
 
                 File spaceFile = null;
@@ -643,11 +643,11 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
                     statusJson.put("thumb", scene.getThumb());
                     statusJson.put("payStatus", sceneProExt.getPayStatus());
                     FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"status.json", statusJson.toString());
-                    uploadUtils.upload(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"status.json",
+                    uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"status.json",
                             "data/data"+projectNum+File.separator+"status.json");
 
                     //上送日志
-                    uploadUtils.upload(sceneProExt.getDataSource()+File.separator+"console.log",
+                    uploadToOssUtil.upload(sceneProExt.getDataSource()+File.separator+"console.log",
                             "build_log/"+scene.getSceneCode()+File.separator+"console.log");
 
 

4dkankan-center-platform/src/main/java/com/fdkankan/FeignConfiguration.java

@@ -0,0 +1,14 @@
+package com.fdkankan;
+
+import feign.Logger;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FeignConfiguration {
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        return Logger.Level.FULL;
+    }
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/platform/aop/FeignAopInterceptor.java

@@ -1,110 +0,0 @@
-package com.fdkankan.platform.aop;
-
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
-
-@Component // 将对象交由spring进行管理
-@Aspect // 代表此类为一个切面类
-public class FeignAopInterceptor {
-	/** 初始化日志打印 */
-	public static final Logger log = LoggerFactory.getLogger("feignVisitLog");
-
-	// 切入点表达式
-	@Pointcut("execution(public * com.fdkankan.platform.feign.*.*.*(..))")
-	public void privilege() {
-	}
-
-	@Around("privilege()")
-	public Object around(ProceedingJoinPoint pjp) throws Throwable {
-
-		// 获取类名
-		String className = pjp.getTarget().getClass().getName();// pjp.getTarget().getClass().getSimpleName();
-		// 获取执行的方法名称
-		String methodName = pjp.getSignature().getName();
-		// 获取参数名称
-		String[] parameterNamesArgs = ((MethodSignature) pjp.getSignature()).getParameterNames();
-		// 定义返回参数
-		Object result = null;
-		// 获取方法参数
-		Object[] args = pjp.getArgs();
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		// 请求的URL
-		String requestURL = request.getRequestURL().toString();
-		String ip = getIpAddr(request);
-
-		StringBuffer paramsBuf = new StringBuffer();
-		// 获取请求参数集合并进行遍历拼接
-		for (int i = 0; i < args.length; i++) {
-			if (paramsBuf.length() > 0) {
-				paramsBuf.append("|");
-			}
-			paramsBuf.append(parameterNamesArgs[i]).append(" = ").append(args[i]);
-		}
-		StringBuffer headerBuf = new StringBuffer();
-		Enumeration<String> headerNames = request.getHeaderNames();
-		while (headerNames.hasMoreElements()) {
-			String key = (String) headerNames.nextElement();
-			String value = request.getHeader(key);
-			if (headerBuf.length() > 0) {
-				headerBuf.append("|");
-			}
-			headerBuf.append(key).append("=").append(value);
-		}
-
-		// 打印请求参数参数
-		// 记录开始时间
-		long start = System.currentTimeMillis();
-
-		log.info("请求| ip:{} | 请求接口:{} | 请求类:{} | 方法 :{} | 参数:{} | 请求header:{}|请求时间 :{}", ip, requestURL, className, methodName, paramsBuf.toString(),
-				headerBuf.toString(), start);
-		// 执行目标方法
-		result = pjp.proceed();
-		// 获取执行完的时间 打印返回报文
-		log.info("返回| 请求接口:{}| 方法 :{} | 请求时间:{} | 处理时间:{} 毫秒 | 返回结果 :{}", requestURL, methodName, start, (System.currentTimeMillis() - start), result);
-		return result;
-	}
-
-	/**
-	 * @Title: getIpAddr
-	 * @Description: 获取ip
-	 * @param request
-	 * @return
-	 * @return String 返回类型
-	 */
-	public String getIpAddr(HttpServletRequest request) {
-		String ipAddress = null;
-		ipAddress = request.getHeader("x-forwarded-for");
-		if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-			ipAddress = request.getHeader("Proxy-Client-IP");
-		}
-		if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-			ipAddress = request.getHeader("WL-Proxy-Client-IP");
-		}
-		if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
-			ipAddress = request.getRemoteAddr();
-		}
-
-// 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
-		if (ipAddress != null && ipAddress.length() > 15) { // "***.***.***.***".length()
-			// = 15
-			if (ipAddress.indexOf(",") > 0) {
-				ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
-			}
-		}
-		// 或者这样也行,对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
-//return ipAddress!=null&&!"".equals(ipAddress)?ipAddress.split(",")[0]:null;
-		return ipAddress;
-	}
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/platform/feign/ModelingFeign.java

@@ -4,6 +4,8 @@ import com.fdkankan.platform.user.entity.User;
 import com.fdkankan.platform.user.entity.UserIncrement;
 import com.fdkankan.platform.user.service.IUserIncrementService;
 import com.fdkankan.platform.user.service.IUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/feign")
 public class ModelingFeign {
 
+    private static Logger log = LoggerFactory.getLogger("feignVisitLog");
+
     @Autowired
     private IUserService userService;
     @Autowired
@@ -24,11 +28,18 @@ public class ModelingFeign {
 
     @PostMapping("/getUserByName")
     public User getUserByName(@RequestParam(value = "userName", required = false) String userName) {
-        return userService.getUserByUserName(userName);
+        log.info("modeling服务调用:getUserByName,参数：userName:{},",userName);
+        User entity = userService.getUserByUserName(userName);
+        log.info("modeling服务调用:getUserByName,返回:{}",entity);
+        return entity;
     }
     @PostMapping("/getUserIncrementByCameraId")
     public UserIncrement getUserIncrementByCameraId(@RequestParam(value = "cameraId", required = false) Long cameraId) {
-        return userIncrementService.getByCameraId(cameraId);
+        log.info("modeling服务调用:getUserIncrementByCameraId,参数：cameraId:{},",cameraId);
+        UserIncrement entity = userIncrementService.getByCameraId(cameraId);
+        log.info("modeling服务调用:getUserIncrementByCameraId,返回:{}",entity);
+        return entity;
     }
 
 }
+

4dkankan-center-platform/src/main/java/com/fdkankan/platform/feign/SceneFeign.java

@@ -8,6 +8,8 @@ import com.fdkankan.platform.goods.service.ICameraDetailService;
 import com.fdkankan.platform.goods.service.ICameraService;
 import com.fdkankan.platform.goods.service.ICompanyService;
 import com.fdkankan.platform.user.service.IUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +23,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/feign")
 public class SceneFeign {
 
+    private static Logger log = LoggerFactory.getLogger("feignVisitLog");
+
     @Autowired
     private ICameraService cameraService;
     @Autowired
@@ -32,31 +36,50 @@ public class SceneFeign {
 
     @PostMapping("/getCameraByChildName")
     public Camera getCameraByChildName(@RequestParam(value = "childName", required = false) String childName) {
-        return cameraService.getByChildName(childName);
+        log.info("scene服务调用:getCameraByChildName,参数：childName:{},",childName);
+        Camera camera = cameraService.getByChildName(childName);
+        log.info("scene服务调用:getCameraByChildName,返回:{}",camera);
+        return camera;
     }
 
     @PostMapping("/getCameraDetailByCameraId")
     public CameraDetail getCameraDetailByCameraId(@RequestParam(value = "cameraId", required = false) Long cameraId) {
-        return cameraDetailService.getByCameraId(cameraId);
+        log.info("scene服务调用:getCameraDetailByCameraId,参数：cameraId:{},",cameraId);
+        CameraDetail detail = cameraDetailService.getByCameraId(cameraId);
+        log.info("scene服务调用:getCameraDetailByCameraId,返回:{}",detail);
+        return detail;
     }
 
     @PostMapping("/updateCameraDetailByCameraIdAndSpace")
     public CameraDetail updateCameraDetailByCameraIdAndSpace(@RequestParam(value = "cameraId", required = false) Long cameraId,
                                                              @RequestParam(value = "space", required = false) Long space) {
-        return cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId,space);
+        log.info("scene服务调用:updateCameraDetailByCameraIdAndSpace,参数：cameraId:{},space:{},",cameraId,space);
+        CameraDetail detail = cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId,space);
+        log.info("scene服务调用:updateCameraDetailByCameraIdAndSpace,返回:{}",detail);
+        return detail;
     }
 
     @PostMapping("/getCameraBySnCode")
     public Camera getCameraBySnCode(@RequestParam(value = "snCode", required = false) String snCode) {
-        return cameraService.getBySnCode(snCode);
+        log.info("scene服务调用:getCameraBySnCode,参数：snCode:{},",snCode);
+        Camera detail = cameraService.getBySnCode(snCode);
+        log.info("scene服务调用:getCameraBySnCode,返回:{}",detail);
+        return detail;
     }
     @PostMapping("/getSSOUserByUserId")
     public SSOUser getSSOUserByUserId(@RequestParam(value = "userId", required = false) Long userId) {
-        return userService.getSSOUserByUserId(userId);
+        log.info("scene服务调用:getSSOUserByUserId,参数：userId:{},",userId);
+        SSOUser ssoUser =  userService.getSSOUserByUserId(userId);
+        log.info("scene服务调用:getSSOUserByUserId,返回:{}",ssoUser);
+        return ssoUser;
     }
     @PostMapping("/getCompanyById")
     public Company getCompanyById(@RequestParam(value = "companyId", required = false) Long companyId) {
-        return companyService.getById(companyId);
+        log.info("scene服务调用: getCompanyById,参数：companyId:{},",companyId);
+        Company entity = companyService.getById(companyId);
+        log.info("scene服务调用: getCompanyById,返回:{}",entity);
+        return entity;
     }
 
 }
+

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/CameraDetail.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.goods.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@ToString
 @TableName("t_camera_detail")
 public class CameraDetail implements Serializable {
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/entity/Company.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.goods.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@ToString
 @TableName("t_company")
 public class Company implements Serializable {
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/User.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.user.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@ToString
 @TableName("t_user")
 public class User implements Serializable {
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/entity/UserIncrement.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.user.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@ToString
 @TableName("t_user_increment")
 public class UserIncrement implements Serializable {
 

4dkankan-common/src/main/java/com/fdkankan/common/user/SSOUser.java

@@ -1,11 +1,13 @@
 package com.fdkankan.common.user;
 
 import lombok.Data;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Set;
 
 @Data
+@ToString
 public class SSOUser implements Serializable {
 
     private static final long serialVersionUID = -2560069033053679931L;