licailing 4 лет назад
Родитель
Сommit
897ef20443

+ 0 - 24
src/main/java/com/izouma/wenlvju/converter/ExpertConverter.java

@@ -1,24 +0,0 @@
-package com.izouma.wenlvju.converter;
-
-import com.alibaba.fastjson.JSON;
-import com.izouma.wenlvju.dto.Expert;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.persistence.AttributeConverter;
-
-public class ExpertConverter implements AttributeConverter<Expert, String> {
-    @Override
-    public String convertToDatabaseColumn(Expert fileObject) {
-        if (fileObject != null  )
-            return JSON.toJSONString(fileObject);
-        return null;
-    }
-
-    @Override
-    public Expert convertToEntityAttribute(String s) {
-        if (StringUtils.isNotEmpty(s)) {
-            return JSON.parseObject(s, Expert.class);
-        }
-        return null;
-    }
-}

+ 0 - 5
src/main/java/com/izouma/wenlvju/domain/User.java

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.izouma.wenlvju.annotations.Searchable;
 import com.izouma.wenlvju.annotations.SearchableOne;
 import com.izouma.wenlvju.config.Constants;
-import com.izouma.wenlvju.converter.ExpertConverter;
-import com.izouma.wenlvju.dto.Expert;
 import com.izouma.wenlvju.security.Authority;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -83,9 +81,6 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "艺术分类id")
     private Long artTypeId;
 
-//    @Convert(converter = ExpertConverter.class)
-//    private Expert expert;
-
     @SearchableOne
     private String position;
 

+ 0 - 10
src/main/java/com/izouma/wenlvju/dto/Expert.java

@@ -1,10 +0,0 @@
-package com.izouma.wenlvju.dto;
-
-import lombok.Data;
-
-@Data
-public class Expert {
-    private String work;
-
-    private String position;
-}

+ 0 - 5
src/main/java/com/izouma/wenlvju/dto/ExpertDTO.java

@@ -39,11 +39,6 @@ public class ExpertDTO {
 
     public ExpertDTO(User user, String artType) {
         BeanUtil.copyProperties(user, this);
-//        Expert expert = user.getExpert();
-//        if (ObjectUtil.isNotNull(expert)){
-//            this.work = expert.getWork();
-//            this.position = expert.getPosition();
-//        }
         this.artType = artType;
         if (StrUtil.isBlank(artType) && StrUtil.isNotBlank(user.getDistrict())) {
             this.artType = user.getDistrict();

+ 0 - 7
src/main/java/com/izouma/wenlvju/enums/ApplyStatus.java

@@ -1,7 +0,0 @@
-package com.izouma.wenlvju.enums;
-
-public enum ApplyStatus {
-    PENDING,
-    PASS,
-    DENY
-}

+ 0 - 23
src/main/java/com/izouma/wenlvju/enums/RecordStatus.java

@@ -1,23 +0,0 @@
-package com.izouma.wenlvju.enums;
-
-public enum RecordStatus {
-    /*
-    正常
-     */
-    NORMAL("正常"),
-
-    /*
-    已撤销
-     */
-    WITHDRAWN("已撤销")
-
-    ;
-    private final String spec;
-    RecordStatus(String spec){
-        this.spec = spec;
-    }
-
-    public String getSpec() {
-        return spec;
-    }
-}

+ 4 - 4
src/main/java/com/izouma/wenlvju/web/FileUploadController.java

@@ -106,8 +106,8 @@ public class FileUploadController {
 
             File destDir = TempFile.createTempDirectory("import." + FilenameUtils.getExtension(file.getOriginalFilename()));
             file.transferTo(destDir);
-            Long videoTime = VideoUtils.getVideoTime(destDir);
-            log.info("视频长度:" + videoTime);
+//            Long videoTime = VideoUtils.getVideoTime(destDir);
+//            log.info("视频长度:" + videoTime);
 
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
@@ -169,8 +169,8 @@ public class FileUploadController {
 
             File destDir = TempFile.createTempDirectory("import." + FilenameUtils.getExtension(file.getOriginalFilename()));
             file.transferTo(destDir);
-            Long videoTime = VideoUtils.getVideoTime(destDir);
-            log.info("视频长度:" + videoTime);
+//            Long videoTime = VideoUtils.getVideoTime(destDir);
+//            log.info("视频长度:" + videoTime);
 
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
 

+ 1 - 1
src/main/vue/src/views/performance/ProgrammeList.vue

@@ -255,7 +255,7 @@
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
             </el-table-column>
-            <el-table-column prop="programmeStatus" label="节目状态" min-width="90">
+            <el-table-column prop="programmeStatus" label="节目状态" min-width="100">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>