Merge branch 'message' of licailing/wenlvju into master

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

@@ -19,6 +19,8 @@ public interface ProgrammeRepo extends JpaRepository<Programme, Long>, JpaSpecif
 
     List<Programme> findAllByPerformanceIdAndProgrammeStatus(Long performanceId, ProgrammeStatus status);
 
+    long countAllByPerformanceId(Long performanceId);
+
     long countAllByArrangeIdAndSignedInIsNull(Long arrangeId);
 
     @Query("update Programme t set t.allSigned = true where t.arrangeId = ?1")

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

@@ -140,16 +140,16 @@ public class ParticipantService {
                 BarcodeFormat.QR_CODE, 1000, 1000, hints);
         BufferedImage code = MatrixToImageWriter.toBufferedImage(bitMatrix);
 
-        BufferedImage avatarImg = new BufferedImage(240, 240, BufferedImage.TYPE_INT_ARGB);
+        BufferedImage avatarImg = new BufferedImage(249, 249, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g2 = avatarImg.createGraphics();
         g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
         g2.setComposite(AlphaComposite.SrcOver);
         g2.setBackground(Color.GREEN);
-        g2.drawImage(code, 0, 0, 240, 240, null);
+        g2.drawImage(code, 0, 0, 249, 249, null);
 
-        g.drawImage(avatarImg, 1898, 253, 240, 240, null);
+        g.drawImage(avatarImg, 1894, 248, 249, 249, null);
 
 
         // 文字
@@ -166,7 +166,7 @@ public class ParticipantService {
         String name = participant.getName();
         g.setFont(font);              //设置字体
         //设置水印的坐标
-        g.drawString(name, 400, 607);
+        g.drawString(name, 400, 612);
 
 
         // 节目名称
@@ -178,7 +178,7 @@ public class ParticipantService {
             g.drawString(body1, 1200, 795);
             g.drawString(body2, 1200, 835);
         } else {
-            g.drawString(programmeName, 1220, 831);
+            g.drawString(programmeName, 1220, 835);
         }
 
         g.dispose();

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

@@ -77,8 +77,9 @@ public class PerformanceController extends BaseController {
 
     @GetMapping("/backGet/{id}")
     public Performance backGet(@PathVariable Long id) {
-        //        performance.setProgrammeNum(programmeRepo.countAllByPerformanceIdAndStatusGreaterThan(id, 0));
-        return performanceRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        Performance performance = performanceRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        performance.setProgrammeNum(programmeRepo.countAllByPerformanceId(id));
+        return performance;
     }
 
 

src/test/java/com/izouma/wenlvju/service/performance/ParticipantServiceTest.java

@@ -149,4 +149,10 @@ public class ParticipantServiceTest extends ApplicationTests {
         System.out.println(reports);
 
     }
+
+    @Test
+    public void test5() throws IOException, WriterException {
+        Participant participant = participantRepo.findById(3048L).orElseThrow(new BusinessException("无记录"));
+        System.out.println(participantService.createMeritAward(participant, "最美的风景"));
+    }
 }