fix:异常拦截及程序传输修改

src/main/java/net/vtstar/zhongtong/avi/equipment/controller/EquipmentController.java

@@ -7,7 +7,9 @@ import lombok.extern.slf4j.Slf4j;
 import net.vtstar.scada.base.equipmgt.domain.EquipInfo;
 import net.vtstar.user.search.controller.vo.SearchVo;
 import net.vtstar.utils.domain.Return;
+import net.vtstar.zhongtong.avi.equipment.domain.Program;
 import net.vtstar.zhongtong.avi.equipment.domain.vo.EquipRequestVO;
+import net.vtstar.zhongtong.avi.equipment.domain.vo.ProgramTransferVO;
 import net.vtstar.zhongtong.avi.equipment.service.EquipmentService;
 import net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,10 +60,7 @@ public class EquipmentController {
 
     @ApiOperation(value = "程序传输")
     @PostMapping("/program/transfer")
-    private Return programTransfer(@RequestParam("equipCode") String equipCode,
-                                   @RequestParam("equipName") String equipName,
-                                   @RequestParam(value = "remark",required = false) String remark,
-                                   MultipartFile file){
+    private Return programTransfer(@RequestBody ProgramTransferVO transferVO){
 
         return Return.success();
     }
@@ -81,4 +80,12 @@ public class EquipmentController {
         }
         return Return.success();
     }
+
+    @ApiOperation("文件上传")
+    @PostMapping("/file/upload")
+    public Return uploadNcFile(@RequestParam("file") MultipartFile file){
+        Program program = new Program();
+        program.setPath("D:/test/a.txt");
+        return Return.success(program);
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/Program.java

+package net.vtstar.zhongtong.avi.equipment.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("程序文件")
+public class Program {
+
+    private Long id;
+
+    private String name;
+
+    private String path;
+
+    private Date createTime;
+}

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/vo/ProgramTransferVO.java

+package net.vtstar.zhongtong.avi.equipment.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("程序传输")
+public class ProgramTransferVO {
+
+    @ApiModelProperty(notes = "设备编码")
+    private String equipCode;
+
+    @ApiModelProperty(notes = "设备名称")
+    private String equipName;
+
+    @ApiModelProperty(notes = "文件路径")
+    private String filePath;
+
+    @ApiModelProperty(notes = "备注")
+    private String remark;
+}

src/main/java/net/vtstar/zhongtong/avi/equipment/job/StateDataSaveJob.java

+package net.vtstar.zhongtong.avi.equipment.job;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class StateDataSaveJob {
+
+
+}

src/main/java/net/vtstar/zhongtong/avi/global/advice/BaseExceptionAdvice.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 @Slf4j
 @Order(1)
-@RestControllerAdvice("net.vtstar.huaying.mes")
+@RestControllerAdvice("net.vtstar")
 public class BaseExceptionAdvice {
 
 	@ExceptionHandler(value = Exception.class)

src/main/java/net/vtstar/zhongtong/avi/global/web/Show.java

@@ -6,7 +6,6 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.math.BigDecimal;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD,ElementType.LOCAL_VARIABLE})