改bug

src/main/java/com/izouma/uwip/domain/Message.java

@@ -1,5 +1,6 @@
 package com.izouma.uwip.domain;
 
+import com.izouma.uwip.converter.LongArrayConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,6 +9,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
+import javax.persistence.Convert;
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -16,7 +20,8 @@ import org.hibernate.annotations.Where;
 @Where(clause = "del = 0")
 public class Message extends BaseEntity {
     @ApiModelProperty(value = "接收人")
-    private Long receiveUserId;
+    @Convert(converter = LongArrayConverter.class)
+    private List<Long> receiveUserId;
 
     @ApiModelProperty(value = "是否已读")
     private boolean read;

src/main/java/com/izouma/uwip/domain/Patent.java

@@ -105,5 +105,5 @@ public class Patent extends BaseEntity {
 
     @Column(columnDefinition = "TEXT")
     @Convert(converter = HandleListConverter.class)
-    private List<Handle> handle = new ArrayList<>();
+    private List<Handle> handle;
 }

src/main/java/com/izouma/uwip/dto/AttachmentDTO.java

@@ -1,12 +1,13 @@
 package com.izouma.uwip.dto;
 
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @AllArgsConstructor
 @Data
 @Builder
@@ -24,4 +25,8 @@ public class AttachmentDTO {
 
     private String remark;
 
+    private String size;
+
+    private int version;
+
 }

src/main/java/com/izouma/uwip/repo/LogoPatentRepo.java

@@ -14,7 +14,7 @@ public interface LogoPatentRepo extends JpaRepository<LogoPatent, Long>, JpaSpec
     @Transactional
     void softDelete(Long id);
 
-    @Query(nativeQuery = true, value = "select ifnull(max(sort + 1),1) from  logo_patent where del = true")
+    @Query(nativeQuery = true, value = "select ifnull(max(sort + 1),1) from  logo_patent where del = false")
     int findMax();
 
 

src/main/java/com/izouma/uwip/service/AttachmentService.java

@@ -1,5 +1,7 @@
 package com.izouma.uwip.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.izouma.uwip.domain.Attachment;
 import com.izouma.uwip.dto.AttachmentDTO;
 import com.izouma.uwip.dto.PageQuery;
@@ -41,7 +43,7 @@ public class AttachmentService {
         }
         if (size > 1024) {
             BigDecimal bigDecimal = new BigDecimal(size / 1024);
-            return bigDecimal.setScale(2,BigDecimal.ROUND_UP) + "KB";
+            return bigDecimal.setScale(2, BigDecimal.ROUND_UP) + "KB";
         }
         return size + "B";
     }
@@ -58,9 +60,15 @@ public class AttachmentService {
                     .fileName(dto.getFileName())
                     .url(dto.getUrl())
                     .remark(dto.getRemark())
-                    .size(getSize(dto.getUrl()))
-                    .version(attachmentRepo.findVersion(dto.getAttachmentName(), patentId))
+                    .size(dto.getSize())
+                    .version(dto.getVersion())
                     .build();
+            if (StrUtil.isBlank(dto.getSize())) {
+                build.setSize(getSize(dto.getUrl()));
+            }
+            if (dto.getVersion() == 0) {
+                build.setVersion(attachmentRepo.findVersion(dto.getAttachmentName(), patentId));
+            }
             attachmentRepo.save(build);
         });
 

src/main/java/com/izouma/uwip/service/DomesticPatentService.java

@@ -3,6 +3,7 @@ package com.izouma.uwip.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.izouma.uwip.domain.DomesticPatent;
+import com.izouma.uwip.domain.Handle;
 import com.izouma.uwip.domain.Patent;
 import com.izouma.uwip.dto.DomesticPatentDTO;
 import com.izouma.uwip.dto.PageQuery;
@@ -18,6 +19,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -48,7 +50,11 @@ public class DomesticPatentService {
             ObjUtils.mergePatent(orig1, patent);
 
             // 流程信息
-            patentService.saveHandle(record.getWorkflow().toString(), userId, orig1.getHandle());
+            List<Handle> handleList = orig1.getHandle();
+            if (handleList == null) {
+                handleList = new ArrayList<>();
+            }
+            patentService.saveHandle(record.getWorkflow().toString(), userId, handleList);
 
             if (ObjectUtil.isNull(record.getApplyStatus()) || !ApplyStatus.COMPLETED.equals(record.getApplyStatus())) {
                 orig1.setApplyStatus(this.getApplyStatus(record.getWorkflow()));

src/main/java/com/izouma/uwip/service/LogoPatentService.java

@@ -4,7 +4,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.izouma.uwip.domain.Handle;
 import com.izouma.uwip.domain.LogoPatent;
 import com.izouma.uwip.dto.PageQuery;
-import com.izouma.uwip.enums.*;
+import com.izouma.uwip.enums.ApplyStatus;
+import com.izouma.uwip.enums.CaseStage;
+import com.izouma.uwip.enums.CaseType;
+import com.izouma.uwip.enums.LogoWorkflow;
 import com.izouma.uwip.exception.BusinessException;
 import com.izouma.uwip.repo.LogoPatentRepo;
 import com.izouma.uwip.utils.JpaUtils;
@@ -15,6 +18,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
@@ -31,6 +35,15 @@ public class LogoPatentService {
     }
 
     public void saveHandle(LogoWorkflow workflow, Long userId, List<Handle> handles) {
+//        if (handles == null) {
+//            handles = new ArrayList<>();
+//            handles.add(Handle.builder()
+//                    .workflow(workflow.toString())
+//                    .userId(userId)
+//                    .checkAt(LocalDateTime.now())
+//                    .build());
+//            return handles;
+//        }
         handles.sort(Comparator.comparing(Handle::getCheckAt));
         int size = handles.size();
 
@@ -41,6 +54,7 @@ public class LogoPatentService {
                     .checkAt(LocalDateTime.now())
                     .build());
         }
+//        return handles;
     }
 
     public LogoPatent save(LogoPatent record, Long userId) {
@@ -56,7 +70,7 @@ public class LogoPatentService {
             }
             ObjUtils.merge(orig, record);
             // 流程记录
-            this.saveHandle(workflow, userId,orig.getHandle());
+            this.saveHandle(workflow, userId, orig.getHandle());
 
             if (ObjectUtil.isNull(record.getApplyStatus()) || !ApplyStatus.COMPLETED.equals(record.getApplyStatus())) {
                 orig.setApplyStatus(this.getApplyStatus(workflow));

src/main/java/com/izouma/uwip/service/PatentService.java

@@ -9,8 +9,7 @@ import com.izouma.uwip.domain.Patent;
 import com.izouma.uwip.dto.PageQuery;
 import com.izouma.uwip.dto.PatentDTO;
 import com.izouma.uwip.enums.ApplyStatus;
-import com.izouma.uwip.repo.LogoPatentRepo;
-import com.izouma.uwip.repo.PatentRepo;
+import com.izouma.uwip.repo.*;
 import com.izouma.uwip.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -29,8 +28,11 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class PatentService {
 
-    private final PatentRepo     patentRepo;
-    private final LogoPatentRepo logoPatentRepo;
+    private final PatentRepo              patentRepo;
+    private final LogoPatentRepo          logoPatentRepo;
+    private final DomesticPatentRepo      domesticPatentRepo;
+    private final InternationalPatentRepo internationalPatentRepo;
+    private final CountryPatentRepo       countryPatentRepo;
 
     public Page<Patent> all(PageQuery pageQuery) {
         return patentRepo.findAll(JpaUtils.toSpecification(pageQuery, Patent.class), JpaUtils.toPageRequest(pageQuery));
@@ -156,6 +158,24 @@ public class PatentService {
         return map;
     }
 
+    /*
+    趋势
+    1 周
+    2 月
+    3 年
+     */
+    public Map<Integer, Integer> getTrend(int type) {
+        Map<Integer, Integer> map = new HashMap<>();
+        switch (type) {
+
+            case 3:
+
+        }
+
+
+        return map;
+    }
+
     private Map<LocalDate, Integer> getData(List<Patent> patents, List<LogoPatent> logoPatents,
                                             LocalDate now, int day) {
         Map<LocalDate, Integer> map = new HashMap<>();

src/main/java/com/izouma/uwip/web/AttachmentController.java

@@ -1,5 +1,6 @@
 package com.izouma.uwip.web;
 
+import cn.hutool.core.util.StrUtil;
 import com.izouma.uwip.domain.Attachment;
 import com.izouma.uwip.domain.User;
 import com.izouma.uwip.repo.UserRepo;
@@ -37,8 +38,14 @@ public class AttachmentController extends BaseController {
             return attachmentRepo.save(orig);
         }
         record.setAttachmentName(record.getAttachmentName().trim());
-        record.setVersion(attachmentRepo.findVersion(record.getAttachmentName(), record.getPatentId()));
-        record.setSize(attachmentService.getSize(record.getUrl()));
+
+        if (StrUtil.isBlank(record.getSize())) {
+            record.setSize(attachmentService.getSize(record.getUrl()));
+        }
+        if (record.getVersion() == 0) {
+            record.setVersion(attachmentRepo.findVersion(record.getAttachmentName(), record.getPatentId()));
+        }
+//        record.setSize(attachmentService.getSize(record.getUrl()));
         return attachmentRepo.save(record);
     }
 

src/main/java/com/izouma/uwip/web/CountryPatentController.java

@@ -5,6 +5,7 @@ import com.izouma.uwip.dto.CountryPatentDTO;
 import com.izouma.uwip.dto.PageQuery;
 import com.izouma.uwip.exception.BusinessException;
 import com.izouma.uwip.repo.CountryPatentRepo;
+import com.izouma.uwip.repo.PatentRepo;
 import com.izouma.uwip.service.CountryPatentService;
 import com.izouma.uwip.utils.ObjUtils;
 import com.izouma.uwip.utils.excel.ExcelUtils;
@@ -22,6 +23,7 @@ import java.util.List;
 public class CountryPatentController extends BaseController {
     private final CountryPatentService countryPatentService;
     private final CountryPatentRepo    countryPatentRepo;
+    private final PatentRepo           patentRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -58,6 +60,8 @@ public class CountryPatentController extends BaseController {
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
+        CountryPatent cPatent = countryPatentRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        patentRepo.softDelete(cPatent.getPatentId());
         countryPatentRepo.softDelete(id);
     }
 

src/main/java/com/izouma/uwip/web/DomesticPatentController.java

@@ -2,6 +2,7 @@ package com.izouma.uwip.web;
 
 import com.izouma.uwip.domain.DomesticPatent;
 import com.izouma.uwip.dto.DomesticPatentDTO;
+import com.izouma.uwip.repo.PatentRepo;
 import com.izouma.uwip.service.DomesticPatentService;
 import com.izouma.uwip.dto.PageQuery;
 import com.izouma.uwip.exception.BusinessException;
@@ -23,6 +24,7 @@ import java.util.List;
 public class DomesticPatentController extends BaseController {
     private final DomesticPatentService domesticPatentService;
     private final DomesticPatentRepo    domesticPatentRepo;
+    private final PatentRepo            patentRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -64,6 +66,8 @@ public class DomesticPatentController extends BaseController {
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
+        DomesticPatent dPatent = domesticPatentRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        patentRepo.softDelete(dPatent.getPatentId());
         domesticPatentRepo.softDelete(id);
     }
 

src/main/java/com/izouma/uwip/web/InternationalPatentController.java

@@ -2,16 +2,16 @@ package com.izouma.uwip.web;
 
 import com.izouma.uwip.domain.InternationalPatent;
 import com.izouma.uwip.dto.InternationalPatentDTO;
-import com.izouma.uwip.service.InternationalPatentService;
 import com.izouma.uwip.dto.PageQuery;
 import com.izouma.uwip.exception.BusinessException;
 import com.izouma.uwip.repo.InternationalPatentRepo;
+import com.izouma.uwip.repo.PatentRepo;
+import com.izouma.uwip.service.InternationalPatentService;
 import com.izouma.uwip.utils.ObjUtils;
 import com.izouma.uwip.utils.SecurityUtils;
 import com.izouma.uwip.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;
@@ -24,6 +24,7 @@ import java.util.List;
 public class InternationalPatentController extends BaseController {
     private final InternationalPatentService internationalPatentService;
     private final InternationalPatentRepo    internationalPatentRepo;
+    private final PatentRepo                 patentRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -65,6 +66,8 @@ public class InternationalPatentController extends BaseController {
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
+        InternationalPatent iPatent = internationalPatentRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        patentRepo.softDelete(iPatent.getPatentId());
         internationalPatentRepo.softDelete(id);
     }
 

src/main/vue/src/views/LogoPatentAdd.vue

@@ -154,6 +154,8 @@ export default {
             data.userId = this.$store.state.userInfo.id;
             data.applyStatus = 'APPLY_STAGE';
             delete data.attachment1;
+            let size = this.formData.attachment1.size;
+            this.formData.attachment1.size = parseFloat(size).toFixed(2) + 'KB';
             data.attachments = [{ ...this.formData.attachment1 }];
 
             this.saving = true;