yangys
7 天以前 4852d6c95e98ef9390d9cbebce97c1bb7fcb04ad
机床回传文件调整
已修改6个文件
22 ■■■■■ 文件已修改
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/entity/MachineBackFile.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/DynamicDirectoryWatcher.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
@@ -39,7 +39,7 @@
     */
    @Operation(summary = "接收", description = "接收文件")
    @PostMapping("/accept")
    public R<Void> accept(String ids) {
    public R<Void> accept(@RequestParam String ids) {
        service.accept(ids);
        return R.success();
    }
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/entity/MachineBackFile.java
@@ -15,9 +15,8 @@
@TableName("mdm_machine_back_file")
public class MachineBackFile extends BizEntity {
    public static int STATUS_ACCEPTED = 2;
    public static int STATUS_REJECTED = 2;
    public static int STATUS_REJECTED = 3;
    private String programId;
    private Long ncProgramId;
    /**
     * 确认时间
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/DynamicDirectoryWatcher.java
@@ -4,6 +4,7 @@
import java.nio.file.Path;
import java.util.Set;
@Service
public class DynamicDirectoryWatcher {
    private final FileWatcherService fileWatcherService;
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/filewatch/MachineFileBackListener.java
@@ -44,9 +44,12 @@
                log.warn("文件传输中,后续再操作{}",filePath);
            }
        } catch (IOException e) {
            log.error("回传文件操作IO错误",e);
            throw new RuntimeException(e);
        } catch (InterruptedException e) {
            log.error("sleep出错");
        } catch (Exception e) {
            log.error("机床回传文件处理异常",e);
        }
    }
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
@@ -12,9 +12,10 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>
    <select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,p.name program_name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
        from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
             left join mdm_nc_program p on f.program_id=p.id
        select f.id,p.name name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
        from mdm_machine_back_file f
             left join mdm_nc_program p on f.nc_program_id=p.id
            join mdm_machine m on p.machine_code=m.code
       <where>
           f.status=1 and f.is_deleted=0
@@ -32,8 +33,9 @@
    <!--机床回传程序处理分页-->
    <select id="handlePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,p.name name,p.code,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
        from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
        left join mdm_nc_program p on f.program_id=p.id
        from mdm_machine_back_file f
        left join mdm_nc_program p on f.nc_program_id=p.id
        left join mdm_machine m on p.machine_code=m.code
        <where>
        f.status=2 and f.is_deleted=0
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -249,6 +249,7 @@
                                prog.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
                                prog.setIsLocked(jsonObject.getInteger("isLocked"));
                                prog.setIsTest(jsonObject.getInteger("isTest"));
                                prog.setIsTextFile(jsonObject.getBoolean("isTextFile"));
                                prog.setMachineCode(jsonObject.getString("machineCode"));
                                prog.setNcNodeId(jsonObject.getLong("ncNodeId"));
                                prog.setDrawingNo(jsonObject.getString("drawingNo"));