提醒任务优化

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsLoanController.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -38,15 +39,12 @@ public class IsMaterialsLoanController extends BaseController
     @Autowired
     private IIsMaterialsLoanService isMaterialsLoanService;
 
-    /**
-     * 查询物资借出分页
-     */
     @ApiOperation("查询物资借出-分页")
     @Parameters({
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    // @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
     @GetMapping("/getIsMaterialsLoanPage")
     public CommonResult<Page<MaterialsLoanPageVO>> getIsMaterialsLoanPage(Page<IsMaterialsLoan> page, MaterialsLoanPageDTO dto)
     {
@@ -54,12 +52,9 @@ public class IsMaterialsLoanController extends BaseController
         return CommonResult.success(result);
     }
 
-    /**
-     * 导出物资借出列表
-     */
     @ApiOperation("导出物资借出列表")
     @Parameter(name = "isMaterialsLoan", description = "实体参数")
-    // @PreAuthorize("@ss.hasPermi('iscs:loan:export')")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:export')")
     @Log(title = "物资借出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsMaterialsLoan")
     public void exportIsMaterialsLoan(HttpServletResponse response, IsMaterialsLoan isMaterialsLoan)
@@ -69,23 +64,18 @@ public class IsMaterialsLoanController extends BaseController
         util.exportExcel(response, list, "物资借出数据");
     }
 
-    /**
-     * 获取物资借出详细信息
-     */
     @ApiOperation("获取物资借出详细信息")
     @Parameter(name = "materialsLoanId", description = "materialsLoanId")
-    // @PreAuthorize("@ss.hasPermi('iscs:loan:query')")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:query')")
     @GetMapping(value = "/selectIsMaterialsLoanById")
     public CommonResult<IsMaterialsLoan> selectIsMaterialsLoanById(Long materialsLoanId)
     {
         return CommonResult.success(isMaterialsLoanService.selectIsMaterialsLoanByMaterialsLoanId(materialsLoanId));
     }
 
-    /**
-     * 新增物资借出
-     */
+
     @ApiOperation("新增物资借出")
-    // @PreAuthorize("@ss.hasPermi('iscs:loan:add')")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:add')")
     @Log(title = "物资借出", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterialsLoan")
     public CommonResult<Boolean> insertIsMaterialsLoan(@RequestBody @Parameter(name = "dto", description = "新增数据类,放到body") AddLoanDTO dto)
@@ -94,7 +84,7 @@ public class IsMaterialsLoanController extends BaseController
     }
 
     @ApiOperation("物资归还")
-    // @PreAuthorize("@ss.hasPermi('iscs:loan:add')")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:edit')")
     @Log(title = "物资归还", businessType = BusinessType.INSERT)
     @PostMapping("/returnIsMaterialsLoan")
     public CommonResult<Boolean> returnIsMaterialsLoan(@RequestBody @Parameter(name = "dto", description = "新增数据类,放到body") ReturnLoanDTO dto)
@@ -106,7 +96,7 @@ public class IsMaterialsLoanController extends BaseController
      * 修改物资借出
      */
     @ApiOperation("修改物资借出")
-    // @PreAuthorize("@ss.hasPermi('iscs:loan:edit')")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:edit')")
     @Log(title = "物资借出", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialsLoan")
     public CommonResult<Boolean> updateIsMaterialsLoan(@RequestBody @Parameter(name = "isMaterialsLoan", description = "修改数据类,放到body") IsMaterialsLoan isMaterialsLoan)
@@ -118,8 +108,8 @@ public class IsMaterialsLoanController extends BaseController
      * 删除物资借出
      */
     @ApiOperation("删除物资借出")
-    // @PreAuthorize("@ss.hasPermi('iscs:loan:remove')")
-    @Log(title = "物资借出", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('iscs:loan:remove')")
+    @Log(title = "删除物资借出", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsMaterialsLoanByMaterialsLoanIds")
     public CommonResult<Boolean> deleteIsMaterialsLoanByMaterialsLoanIds(String materialsLoanIds)
     {
@@ -131,7 +121,7 @@ public class IsMaterialsLoanController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    //  @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:return')")
     @GetMapping("/getReturnReminderPage")
     public CommonResult<Page<ReminderPageVO>> getReturnReminderPage(Page<IsMaterialsLoan> page, ReminderPageDTO dto)
     {
@@ -144,7 +134,7 @@ public class IsMaterialsLoanController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    // @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:expired')")
     @GetMapping("/getExpiredReminderPage")
     public CommonResult<Page<ReminderPageVO>> getReminderPage(Page<IsMaterialsLoan> page, ReminderPageDTO dto)
     {

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsLoanServiceImpl.java

@@ -31,9 +31,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -121,13 +122,14 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
                 //         && materialsLoan.getRestitutionToId() == null) {
                 if (!"1".equals(materialsLoan.getStatus())) {
                         // 没有归还则需要开始新增提醒消息
-                    IsMaterials materials = isMaterialsService.getById(materialsLoan.getMaterialsId());
-                    Map<String, Object> templateParams = new HashMap<>();
-                    templateParams.put("借出时间", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(materialsLoan.getLoanTime()));
-                    templateParams.put("物资", materials.getMaterialsName());
-                    templateParams.put("归还时间", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(materialsLoan.getRestitutionTime()));
-                    notifySendService.sendSingleNotifyToMember(materialsLoan.getLoanUserId(),
-                            "REMINDER_RETURN", templateParams);
+                    // IsMaterials materials = isMaterialsService.getById(materialsLoan.getMaterialsId());
+                    // Map<String, Object> templateParams = new HashMap<>();
+                    // templateParams.put("借出时间", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(materialsLoan.getLoanTime()));
+                    // templateParams.put("物资", materials.getMaterialsName());
+                    // templateParams.put("归还时间", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(materialsLoan.getRestitutionTime()));
+                    // notifySendService.sendSingleNotifyToMember(materialsLoan.getLoanUserId(),
+                    //        "REMINDER_RETURN", templateParams);
+
                     // 存储到is_materials_reminder
                     IsMaterialsReminder isMaterialsReminder = new IsMaterialsReminder();
                     isMaterialsReminder.setMaterialsLoanId(materialsLoanId);
@@ -154,7 +156,6 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
      * 发送归还报警
      * @param messageId
      */
-    @Transactional
     public void sendAlarmMessage(String messageId) {
         Long materialsLoanId = messages.get(messageId);
         if (materialsLoanId != null) {
@@ -170,13 +171,14 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
 
                 if (!"1".equals(materialsLoan.getStatus())) {
                     // 没有归还则需要开始新增提醒消息
-                    IsMaterials materials = isMaterialsService.getById(materialsLoan.getMaterialsId());
-                    Map<String, Object> templateParams = new HashMap<>();
-                    templateParams.put("借出时间", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(materialsLoan.getLoanTime()));
-                    templateParams.put("物资", materials.getMaterialsName());
-                    templateParams.put("归还时间", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(materialsLoan.getRestitutionTime()));
-                    notifySendService.sendSingleNotifyToMember(materialsLoan.getLoanUserId(),
-                            "ALARM_RETURN", templateParams);
+                    //IsMaterials materials = isMaterialsService.getById(materialsLoan.getMaterialsId());
+                    //Map<String, Object> templateParams = new HashMap<>();
+                    //templateParams.put("借出时间", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(materialsLoan.getLoanTime()));
+                    //templateParams.put("物资", materials.getMaterialsName());
+                    //templateParams.put("归还时间", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(materialsLoan.getRestitutionTime()));
+                    //notifySendService.sendSingleNotifyToMember(materialsLoan.getLoanUserId(),
+                    //        "ALARM_RETURN", templateParams);
+
                     // 存储到is_materials_reminder
                     IsMaterialsReminder isMaterialsReminder = new IsMaterialsReminder();
                     isMaterialsReminder.setMaterialsLoanId(materialsLoanId);
@@ -187,12 +189,15 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
                     update(Wrappers.<IsMaterialsLoan>lambdaUpdate()
                             .eq(IsMaterialsLoan::getMaterialsLoanId, materialsLoanId)
                             .set(IsMaterialsLoan::getStatus, 2));
+                    System.out.println("发送消息告警成功，借出数据id: " + materialsLoanId);
                 }
             }
         }
     }
 
 
+
+
     /**
      * 查询物资借出
      *