优化

src/main/java/com/izouma/wenlvju/domain/Rate.java

@@ -14,7 +14,6 @@ import lombok.*;
 import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/izouma/wenlvju/domain/RateExpertAudit.java

@@ -2,7 +2,6 @@ package com.izouma.wenlvju.domain;
 
 import com.izouma.wenlvju.converter.StringArrayConverter;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/izouma/wenlvju/domain/performance/Arrange.java

@@ -3,7 +3,6 @@ package com.izouma.wenlvju.domain.performance;
 import com.izouma.wenlvju.annotations.SearchableOne;
 import com.izouma.wenlvju.converter.LongArrayConverter;
 import com.izouma.wenlvju.domain.BaseEntity;
-import com.izouma.wenlvju.enums.PerformanceStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,7 +11,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
-import javax.persistence.*;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.List;

src/main/java/com/izouma/wenlvju/domain/regulation/EquipmentLog.java

@@ -1,7 +1,6 @@
 package com.izouma.wenlvju.domain.regulation;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.wenlvju.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import org.hibernate.annotations.Where;

src/main/java/com/izouma/wenlvju/dto/ArrangeProgrammeDTO.java

@@ -1,7 +1,6 @@
 package com.izouma.wenlvju.dto;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.enums.SignedIn;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/izouma/wenlvju/dto/ArtTypeDTO.java

@@ -2,7 +2,6 @@ package com.izouma.wenlvju.dto;
 
 import com.izouma.wenlvju.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/izouma/wenlvju/dto/ExpertDTO.java

@@ -1,7 +1,6 @@
 package com.izouma.wenlvju.dto;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.izouma.wenlvju.domain.User;
 import io.swagger.annotations.ApiModel;

src/main/java/com/izouma/wenlvju/dto/ParticipantDTO.java

@@ -1,7 +1,6 @@
 package com.izouma.wenlvju.dto;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.wenlvju.domain.performance.Participant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/izouma/wenlvju/dto/ProgScoreAdminDTO.java

@@ -4,11 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.wenlvju.domain.performance.Programme;
-import com.izouma.wenlvju.enums.CompetitionGroup;
-import com.izouma.wenlvju.enums.SignedIn;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

src/main/java/com/izouma/wenlvju/dto/ProgrammeAwardDTO.java

@@ -9,7 +9,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Data

src/main/java/com/izouma/wenlvju/dto/ProgrammeDTO.java

@@ -4,11 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.wenlvju.annotations.EnumFormat;
-import com.izouma.wenlvju.domain.VideoObject;
 import com.izouma.wenlvju.domain.performance.Participant;
 import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.enums.CompetitionGroup;
-import com.izouma.wenlvju.enums.PerformanceStatus;
 import com.izouma.wenlvju.enums.ProgrammeStatus;
 import com.izouma.wenlvju.utils.excel.EnumExcelConverter;
 import com.izouma.wenlvju.utils.excel.LocalDateConverter;

src/main/java/com/izouma/wenlvju/dto/RecordDTO.java

@@ -10,7 +10,6 @@ import com.izouma.wenlvju.domain.RecordSpecialty;
 import com.izouma.wenlvju.utils.excel.BooleanConverter;
 import com.izouma.wenlvju.utils.excel.LocalDateConverter;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/izouma/wenlvju/repo/RecordRepo.java

@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
-import java.util.List;
 
 public interface RecordRepo extends JpaRepository<Record, Long>, JpaSpecificationExecutor<Record> {
     @Query("update Record t set t.del = true where t.id = ?1")

src/main/java/com/izouma/wenlvju/repo/SmsRecordRepo.java

@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Optional;
 
 public interface SmsRecordRepo extends JpaRepository<SmsRecord, Long> {
@@ -15,8 +14,6 @@ public interface SmsRecordRepo extends JpaRepository<SmsRecord, Long> {
 
     Optional<SmsRecord> findLastByPhoneAndExpiresAtAfterAndExpiredFalse(String phone, LocalDateTime time);
 
-    List<SmsRecord> findAllByPhoneAndExpiresAtAfterAndExpiredFalse(String phone, LocalDateTime time);
-
     @Query("update SmsRecord s set s.expired = true where s.phone = ?1")
     @Modifying
     @Transactional

src/main/java/com/izouma/wenlvju/repo/performance/ArrangeRepo.java

@@ -22,8 +22,5 @@ public interface ArrangeRepo extends JpaRepository<Arrange, Long>, JpaSpecificat
     Arrange findFirstByPerformanceIdAndAuditTimes(Long performanceId, int auditTimes);
 
     long countArrangeByPerformanceId(Long performanceId);
-//    @Query("update Arrange t set t.publish = true where t.performanceId = ?1")
-//    @Modifying
-//    @Transactional
-//    void publish(Long performanceId);
+
 }

src/main/java/com/izouma/wenlvju/service/MessageService.java

@@ -3,7 +3,6 @@ package com.izouma.wenlvju.service;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.alibaba.excel.metadata.CellData;
 import com.izouma.wenlvju.domain.Message;
 import com.izouma.wenlvju.dto.MessageUpload;
 import com.izouma.wenlvju.dto.PageQuery;

src/main/java/com/izouma/wenlvju/service/RateService.java

@@ -26,7 +26,6 @@ import com.lowagie.text.pdf.PdfWriter;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.Version;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
@@ -48,7 +47,6 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-//@AllArgsConstructor
 public class RateService {
 
     @Autowired

src/main/java/com/izouma/wenlvju/service/SettingService.java

@@ -1,7 +1,6 @@
 package com.izouma.wenlvju.service;
 
 import com.alibaba.fastjson.JSON;
-import com.izouma.wenlvju.domain.ArtType;
 import com.izouma.wenlvju.domain.Setting;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.repo.SettingRepo;

src/main/java/com/izouma/wenlvju/service/performance/ParticipantService.java

@@ -3,7 +3,6 @@ package com.izouma.wenlvju.service.performance;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.izouma.wenlvju.domain.Award;
 import com.izouma.wenlvju.domain.performance.Participant;
 import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.dto.PageQuery;

src/main/java/com/izouma/wenlvju/service/performance/ProgrammeScoreService.java

@@ -17,8 +17,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.Id;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Service

src/main/java/com/izouma/wenlvju/service/regulation/RecordExpertAuditService.java

@@ -1,7 +1,6 @@
 package com.izouma.wenlvju.service.regulation;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.izouma.wenlvju.domain.RateExpertAudit;
 import com.izouma.wenlvju.domain.regulation.RecordExpertAudit;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;

src/main/java/com/izouma/wenlvju/web/AnnouncementController.java

@@ -22,7 +22,7 @@ public class AnnouncementController extends BaseController {
     private AnnouncementService announcementService;
     private AnnouncementRepo announcementRepo;
 
-    //@PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public Announcement save(@RequestBody Announcement record) {
         if (record.getId() != null) {

src/main/java/com/izouma/wenlvju/web/AuthenticationController.java

@@ -3,7 +3,6 @@ package com.izouma.wenlvju.web;
 import com.izouma.wenlvju.domain.User;
 import com.izouma.wenlvju.enums.AuthorityName;
 import com.izouma.wenlvju.exception.AuthenticationException;
-import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.security.JwtTokenUtil;
 import com.izouma.wenlvju.security.JwtUser;
 import com.izouma.wenlvju.security.JwtUserFactory;
@@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
 import java.util.Objects;
 
 @Slf4j

src/main/java/com/izouma/wenlvju/web/AwardController.java

@@ -2,16 +2,15 @@ package com.izouma.wenlvju.web;
 
 import com.izouma.wenlvju.domain.Award;
 import com.izouma.wenlvju.domain.performance.Performance;
-import com.izouma.wenlvju.repo.performance.PerformanceRepo;
-import com.izouma.wenlvju.service.AwardService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.AwardRepo;
+import com.izouma.wenlvju.repo.performance.PerformanceRepo;
+import com.izouma.wenlvju.service.AwardService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/izouma/wenlvju/web/CollaborateController.java

@@ -2,15 +2,14 @@ package com.izouma.wenlvju.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.izouma.wenlvju.domain.Collaborate;
-import com.izouma.wenlvju.service.CollaborateService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.CollaborateRepo;
+import com.izouma.wenlvju.service.CollaborateService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/izouma/wenlvju/web/EzvizTokenController.java

@@ -1,16 +1,15 @@
 package com.izouma.wenlvju.web;
 
 import com.izouma.wenlvju.domain.EzvizToken;
-import com.izouma.wenlvju.service.EzvizTokenService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.EzvizTokenRepo;
+import com.izouma.wenlvju.service.EzvizTokenService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/izouma/wenlvju/web/FileUploadController.java

@@ -2,7 +2,6 @@ package com.izouma.wenlvju.web;
 
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.service.storage.StorageService;
-import com.izouma.wenlvju.utils.VideoUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.RandomStringUtils;

src/main/java/com/izouma/wenlvju/web/MessageController.java

@@ -1,24 +1,20 @@
 package com.izouma.wenlvju.web;
 
 import com.izouma.wenlvju.domain.Message;
-import com.izouma.wenlvju.dto.MessageUpload;
-import com.izouma.wenlvju.service.MessageService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.MessageRepo;
+import com.izouma.wenlvju.service.MessageService;
 import com.izouma.wenlvju.service.sms.NjwlSmsService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 
 @RestController

src/main/java/com/izouma/wenlvju/web/OperationLogController.java

@@ -4,7 +4,6 @@ import com.izouma.wenlvju.domain.OperationLog;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.OperationLogRepo;
-import com.izouma.wenlvju.service.OperationLogService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
@@ -23,7 +22,6 @@ import static com.izouma.wenlvju.utils.JpaUtils.toSpecification;
 @RequestMapping("/operationLog")
 @AllArgsConstructor
 public class OperationLogController extends BaseController {
-    private OperationLogService operationLogService;
     private OperationLogRepo operationLogRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")

src/main/java/com/izouma/wenlvju/web/RateExpertAuditController.java

@@ -3,12 +3,11 @@ package com.izouma.wenlvju.web;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.izouma.wenlvju.domain.RateExpertAudit;
-import com.izouma.wenlvju.service.RateExpertAuditService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.RateExpertAuditRepo;
+import com.izouma.wenlvju.service.RateExpertAuditService;
 import com.izouma.wenlvju.utils.ObjUtils;
-import com.izouma.wenlvju.utils.SecurityUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;

src/main/java/com/izouma/wenlvju/web/RecordSpecialtyController.java

@@ -1,14 +1,14 @@
 package com.izouma.wenlvju.web;
+
 import com.izouma.wenlvju.domain.RecordSpecialty;
-import com.izouma.wenlvju.service.RecordSpecialtyService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.RecordSpecialtyRepo;
+import com.izouma.wenlvju.service.RecordSpecialtyService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/izouma/wenlvju/web/UserController.java

@@ -26,7 +26,6 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.transaction.Transactional;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/com/izouma/wenlvju/web/performance/ArrangeController.java

@@ -1,20 +1,18 @@
 package com.izouma.wenlvju.web.performance;
 
-import com.izouma.wenlvju.dto.ArrangeDTO;
-import com.izouma.wenlvju.utils.SecurityUtils;
-import com.izouma.wenlvju.web.BaseController;
 import com.izouma.wenlvju.domain.performance.Arrange;
-import com.izouma.wenlvju.service.performance.ArrangeService;
+import com.izouma.wenlvju.dto.ArrangeDTO;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.performance.ArrangeRepo;
+import com.izouma.wenlvju.service.performance.ArrangeService;
 import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.SecurityUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
-
+import com.izouma.wenlvju.web.BaseController;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

src/main/java/com/izouma/wenlvju/web/performance/PerformanceController.java

@@ -2,7 +2,6 @@ package com.izouma.wenlvju.web.performance;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.izouma.wenlvju.domain.performance.Performance;
-import com.izouma.wenlvju.domain.performance.PerformanceSchedule;
 import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;