优化

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjAdministrativePunishController.java

@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -66,9 +65,9 @@ public class BjAdministrativePunishController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
-    @GetMapping("/publishReport/{trackShipCompanyId}")
-    public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+//    @RequiresPermissions("business:administrativePunish:query")
+    @GetMapping("/publishReport/{caseNo}")
+    public AjaxResult publishReport(@PathVariable("caseNo") String caseNo) {
         BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试1").releasedDate(new Date()).chineseVesselName("上海")
                 .vesselType("散货船").portOfRegistry("上海").theShipowner("张三").shipOperators("张三").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();
@@ -86,7 +85,7 @@ public class BjAdministrativePunishController extends BaseController {
 //    @RequiresPermissions("business:administrativePunish:edit")
     @Log(title = "不予通报", businessType = BusinessType.UPDATE)
     @PutMapping("/updateReportFlag")
-    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) {
         return toAjax(bjAdministrativePunishService.updateFlag(bo));
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjBuildCheckController.java

@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -66,9 +65,9 @@ public class BjBuildCheckController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
-    @GetMapping("/publishReport/{trackShipCompanyId}")
-    public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+//    @RequiresPermissions("business:buildCheck:query")
+    @GetMapping("/publishReport/{buildCheckId}")
+    public AjaxResult publishReport(@PathVariable("buildCheckId") String buildCheckId) {
         BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试2").releasedDate(new Date()).chineseVesselName("北京")
                 .vesselType("游船").portOfRegistry("北京").theShipowner("张三").shipOperators("张三").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();
@@ -86,7 +85,7 @@ public class BjBuildCheckController extends BaseController {
 //    @RequiresPermissions("business:buildCheck:edit")
     @Log(title = "不予通报", businessType = BusinessType.UPDATE)
     @PutMapping("/updateReportFlag")
-    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) {
         return toAjax(bjBuildCheckService.updateFlag(bo));
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjLocaleSecurityCheckController.java

@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -66,9 +65,9 @@ public class BjLocaleSecurityCheckController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
-    @GetMapping("/publishReport/{trackShipCompanyId}")
-    public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+//    @RequiresPermissions("business:localeSecurityCheck:query")
+    @GetMapping("/publishReport/{localeSecurityCheckId}")
+    public AjaxResult publishReport(@PathVariable("localeSecurityCheckId") String localeSecurityCheckId) {
         BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试3").releasedDate(new Date()).chineseVesselName("深圳")
                 .vesselType("游船").portOfRegistry("深圳").theShipowner("张三").shipOperators("张三").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();
@@ -86,7 +85,7 @@ public class BjLocaleSecurityCheckController extends BaseController {
 //    @RequiresPermissions("business:localeSecurityCheck:edit")
     @Log(title = "不予通报", businessType = BusinessType.UPDATE)
     @PutMapping("/updateReportFlag")
-    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) {
         return toAjax(bjLocaleSecurityCheckService.updateFlag(bo));
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjPortReportController.java

@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -66,9 +65,9 @@ public class BjPortReportController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
-    @GetMapping("/publishReport/{trackShipCompanyId}")
-    public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+//    @RequiresPermissions("business:portReport:query")
+    @GetMapping("/publishReport/{portReportId}")
+    public AjaxResult publishReport(@PathVariable("portReportId") String portReportId) {
         BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试4").releasedDate(new Date()).chineseVesselName("广州")
                 .vesselType("游船").portOfRegistry("广州").theShipowner("李四").shipOperators("李四").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();
@@ -86,7 +85,7 @@ public class BjPortReportController extends BaseController {
 //    @RequiresPermissions("business:portReport:edit")
     @Log(title = "不予通报", businessType = BusinessType.UPDATE)
     @PutMapping("/updateReportFlag")
-    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) {
         return toAjax(bjPortReportService.updateFlag(bo));
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjSecurityCheckController.java

@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -66,9 +65,9 @@ public class BjSecurityCheckController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
-    @GetMapping("/publishReport/{trackShipCompanyId}")
-    public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+//    @RequiresPermissions("business:securityCheck:query")
+    @GetMapping("/publishReport/{shipId}")
+    public AjaxResult publishReport(@PathVariable("shipId") String shipId) {
         BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试5").releasedDate(new Date()).chineseVesselName("杭州")
                 .vesselType("集装箱船").portOfRegistry("杭州").theShipowner("李四").shipOperators("李四").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();
@@ -86,7 +85,7 @@ public class BjSecurityCheckController extends BaseController {
 //    @RequiresPermissions("business:securityCheck:edit")
     @Log(title = "不予通报", businessType = BusinessType.UPDATE)
     @PutMapping("/updateReportFlag")
-    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) {
         return toAjax(bjSecurityCheckService.updateFlag(bo));
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjServiceCheckController.java

@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -66,9 +65,9 @@ public class BjServiceCheckController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
-    @GetMapping("/publishReport/{trackShipCompanyId}")
-    public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+//    @RequiresPermissions("business:serviceCheck:query")
+    @GetMapping("/publishReport/{serviceCheckId}")
+    public AjaxResult publishReport(@PathVariable("serviceCheckId") String serviceCheckId) {
         BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试6").releasedDate(new Date()).chineseVesselName("成都")
                 .vesselType("游船").portOfRegistry("成都").theShipowner("李四").shipOperators("李四").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();
@@ -86,7 +85,7 @@ public class BjServiceCheckController extends BaseController {
 //    @RequiresPermissions("business:serviceCheck:edit")
     @Log(title = "不予通报", businessType = BusinessType.UPDATE)
     @PutMapping("/updateReportFlag")
-    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) {
         return toAjax(bjServiceCheckService.updateFlag(bo));
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjShipsRegistrationController.java

@@ -66,9 +66,9 @@ public class BjShipsRegistrationController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
-    @GetMapping("/publishReport/{trackShipCompanyId}")
-    public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+//    @RequiresPermissions("business:shipsRegistration:query")
+    @GetMapping("/publishReport/{shipId}")
+    public AjaxResult publishReport(@PathVariable("shipId") String shipId) {
         BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试7").releasedDate(new Date()).chineseVesselName("长沙")
                 .vesselType("集装箱船").portOfRegistry("长沙").theShipowner("王五").shipOperators("王五").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjTrackShipCompanyController.java

@@ -89,15 +89,13 @@ public class BjTrackShipCompanyController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
+//    @RequiresPermissions("business:trackShipCompany:query")
     @GetMapping("/publishReport/{trackShipCompanyId}")
     public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
-        BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试8").releasedDate(new Date()).chineseVesselName("武汉")
-                .vesselType("游船").portOfRegistry("武汉").theShipowner("王五").shipOperators("王五").build();
+        BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试8").releasedDate(new Date()).chineseVesselName("武汉").vesselType("游船").portOfRegistry("武汉").theShipowner("王五").shipOperators("王五").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();
         String[] middleId = {"1745010884246179850", "1745010871659073540"};
-        middleList.add(BjReleasedMiddleVo.builder().notificationMatters("测试8").notificationStandards("测试8").conm("2").wtis("测试8")
-                .middleIdList(Arrays.asList(middleId)).build());
+        middleList.add(BjReleasedMiddleVo.builder().notificationMatters("测试8").notificationStandards("测试8").conm("2").wtis("测试8").middleIdList(Arrays.asList(middleId)).build());
         released.setMiddleList(middleList);
         return success(released);
     }
@@ -109,7 +107,7 @@ public class BjTrackShipCompanyController extends BaseController {
 //    @RequiresPermissions("business:trackShipCompany:edit")
     @Log(title = "不予通报", businessType = BusinessType.UPDATE)
     @PutMapping("/updateReportFlag")
-    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) {
         return toAjax(bjTrackShipCompanyService.updateFlag(bo));
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjTrackShipsController.java

@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -66,9 +65,9 @@ public class BjTrackShipsController extends BaseController {
      * 发布通报详情
      */
     @Operation(summary = "发布通报详情")
-//    @RequiresPermissions("business:trackShipCompany:edit")
-    @GetMapping("/publishReport/{trackShipCompanyId}")
-    public AjaxResult publishReport(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+//    @RequiresPermissions("business:trackShips:query")
+    @GetMapping("/publishReport/{trackShipsId}")
+    public AjaxResult publishReport(@PathVariable("trackShipsId") String trackShipsId) {
         BjReleasedVo released = BjReleasedVo.builder().releasedUnitStr("测试9").releasedDate(new Date()).chineseVesselName("苏州")
                 .vesselType("游船").portOfRegistry("苏州").theShipowner("王五").shipOperators("王五").build();
         List<BjReleasedMiddleVo> middleList = new ArrayList<>();
@@ -86,7 +85,7 @@ public class BjTrackShipsController extends BaseController {
 //    @RequiresPermissions("business:trackShips:edit")
     @Log(title = "不予通报", businessType = BusinessType.UPDATE)
     @PutMapping("/updateReportFlag")
-    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) throws ParseException {
+    public AjaxResult editFlag(@RequestBody ReportFlagBo bo) {
         return toAjax(bjTrackShipsService.updateFlag(bo));
     }