1
0

2 کامیت‌ها ce7d8f6a9f ... c83166c37d

نویسنده SHA1 پیام تاریخ
  wang.sq@aliyun.com c83166c37d Merge remote-tracking branch 'origin/master' 2 هفته پیش
  wang.sq@aliyun.com d3782757c9 fix:优化组套刀具信息 2 هفته پیش

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/ThreeCoordinateImpl.java

@@ -100,7 +100,7 @@ public class ThreeCoordinateImpl extends SuperCacheServiceImpl<ThreeCoordinateMa
 
                 if(instructionUrl.isEmpty() || instructionUrl.length()<=0){
 
-                    threeCoordinateEntity.setResult("接口地址为空");
+                    threeCoordinateEntity.setResult("推送接口地址为空");
                     threeCoordinateEntity.setStatus(60);
                     continue;
                 }

+ 6 - 1
imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/ThreeDimensionalControl.java

@@ -10,12 +10,15 @@ import com.github.zuihou.business.cutterdata.cuttercategories.service.CutterCate
 import com.github.zuihou.business.externalApi.entity.ThreeCoordinateEntity;
 import com.github.zuihou.business.externalApi.service.PlcService;
 import com.github.zuihou.business.externalApi.service.ThreeCoordinateService;
+import com.github.zuihou.business.util.FileUtil;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.log.annotation.SysLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +40,7 @@ import java.util.Map;
 @SysLog(enabled = true)
 public class ThreeDimensionalControl  extends SuperController<ThreeCoordinateService, Long, ThreeCoordinateEntity, ThreeCoordinateEntity, ThreeCoordinateEntity, ThreeCoordinateEntity> {
 
+    private static Logger logger = LoggerFactory.getLogger(ThreeDimensionalControl.class);
     @Autowired
     private ThreeCoordinateService threeCoordinateService;
 
@@ -64,7 +68,8 @@ public class ThreeDimensionalControl  extends SuperController<ThreeCoordinateSer
     @PostMapping(value = "/three-coordinate-test-results")
     @SysLog("接受三坐标检测数据")
     public R threeCoordinateTestResults(@RequestBody String json) throws Exception{
-
+        logger.error("1111111111111111");
+        logger.warn("2222222222222222222");
         log.info("====================接受三坐标数据===================={}",json);
 
         return R.success();