优化

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

@@ -46,13 +46,13 @@ public class BjLocaleSecurityCheckController extends BaseController {
     /**
      * 获取现场安全监督检查查询详细信息
      *
-     * @param shipId 主键
+     * @param localeSecurityCheckId 主键
      */
     @Operation(summary = "获取现场安全监督检查查询详细信息")
 //    @SaCheckPermission("business:localeSecurityCheck:query")
-    @GetMapping("/{shipId}")
-    public AjaxResult getInfo(@PathVariable("shipId") String shipId) {
-        return success(bjLocaleSecurityCheckService.queryById(shipId));
+    @GetMapping("/{localeSecurityCheckId}")
+    public AjaxResult getInfo(@PathVariable("localeSecurityCheckId") String localeSecurityCheckId) {
+        return success(bjLocaleSecurityCheckService.queryById(localeSecurityCheckId));
     }
 
 }

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

@@ -46,13 +46,13 @@ public class BjTrackShipCompanyController extends BaseController {
     /**
      * 获取重点跟踪航运公司查询详细信息
      *
-     * @param shipId 主键
+     * @param trackShipCompanyId 主键
      */
     @Operation(summary = "获取重点跟踪航运公司查询详细信息")
 //    @SaCheckPermission("business:trackShipCompany:query")
-    @GetMapping("/{shipId}")
-    public AjaxResult getInfo(@PathVariable("shipId") String shipId) {
-        return success(bjTrackShipCompanyService.queryById(shipId));
+    @GetMapping("/{trackShipCompanyId}")
+    public AjaxResult getInfo(@PathVariable("trackShipCompanyId") String trackShipCompanyId) {
+        return success(bjTrackShipCompanyService.queryById(trackShipCompanyId));
     }
 
 }

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

@@ -46,13 +46,13 @@ public class BjTrackShipsController extends BaseController {
     /**
      * 获取重点跟踪船舶查询详细信息
      *
-     * @param shipId 主键
+     * @param trackShipsId 主键
      */
     @Operation(summary = "获取重点跟踪船舶查询详细信息")
 //    @SaCheckPermission("business:trackShips:query")
-    @GetMapping("/{shipId}")
-    public AjaxResult getInfo(@PathVariable("shipId") String shipId) {
-        return success(bjTrackShipsService.queryById(shipId));
+    @GetMapping("/{trackShipsId}")
+    public AjaxResult getInfo(@PathVariable("trackShipsId") String trackShipsId) {
+        return success(bjTrackShipsService.queryById(trackShipsId));
     }
 
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjLocaleSecurityCheck.java

@@ -11,23 +11,28 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 现场安全监督检查登记 bj_track_ship_company
+ * 现场安全监督检查 bj_track_ship_company
  *
  * @author libai
  * @date 2025-10-28
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("bj_track_ships")
+@TableName("bj_track_ship_company")
 public class BjLocaleSecurityCheck extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     /**
+     * 现场安全监督检查ID
+     */
+    @TableId("locale_security_check_id")
+    private Long localeSecurityCheckId;
+
+    /**
      * 船舶识别号
      */
-    @TableId("ship_id")
     private String shipId;
 
     /**
@@ -76,9 +81,9 @@ public class BjLocaleSecurityCheck extends BaseEntity {
     private DateTime releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 
     /**
      * 是否删除  0：未删除  1：已删除

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjTrackShipCompany.java

@@ -10,7 +10,7 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 重点跟踪航运公司 bj_track_ships
+ * 重点跟踪航运公司 bj_track_ship_company
  *
  * @author libai
  * @date 2025-10-28
@@ -24,6 +24,12 @@ public class BjTrackShipCompany extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 重点跟踪航运公司ID
+     */
+    @TableId("track_ship_company_id")
+    private Long trackShipCompanyId;
+
+    /**
      * 发布单位
      */
     private String releaseUnit;
@@ -64,9 +70,9 @@ public class BjTrackShipCompany extends BaseEntity {
     private Date releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 
     /**
      * 是否删除  0：未删除  1：已删除

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjTrackShips.java

@@ -11,7 +11,7 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 重点跟踪船舶登记 bj_track_ships
+ * 重点跟踪船舶 bj_track_ships
  *
  * @author libai
  * @date 2025-10-28
@@ -25,9 +25,14 @@ public class BjTrackShips extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 重点跟踪船舶ID
+     */
+    @TableId("track_ships_id")
+    private Long trackShipsId;
+
+    /**
      * 船舶识别号
      */
-    @TableId("ship_id")
     private String shipId;
 
     /**
@@ -56,9 +61,9 @@ public class BjTrackShips extends BaseEntity {
     private DateTime releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 
     /**
      * 是否删除  0：未删除  1：已删除

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjLocaleSecurityCheckBo.java

@@ -24,6 +24,11 @@ public class BjLocaleSecurityCheckBo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 现场安全监督检查ID
+     */
+    private Long localeSecurityCheckId;
+
+    /**
      * 船舶识别号
      */
     private String shipId;
@@ -74,7 +79,7 @@ public class BjLocaleSecurityCheckBo extends BaseEntity {
     private DateTime releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjTrackShipCompanyBo.java

@@ -23,6 +23,11 @@ public class BjTrackShipCompanyBo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 重点跟踪航运公司ID
+     */
+    private Long trackShipCompanyId;
+
+    /**
      * 发布单位
      */
     private String releaseUnit;
@@ -63,8 +68,8 @@ public class BjTrackShipCompanyBo extends BaseEntity {
     private Date releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjTrackShipsBo.java

@@ -24,6 +24,11 @@ public class BjTrackShipsBo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 重点跟踪船舶ID
+     */
+    private Long trackShipsId;
+
+    /**
      * 船舶识别号
      */
     private String shipId;
@@ -54,7 +59,7 @@ public class BjTrackShipsBo extends BaseEntity {
     private DateTime releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjLocaleSecurityCheckVo.java

@@ -22,6 +22,11 @@ public class BjLocaleSecurityCheckVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 现场安全监督检查ID
+     */
+    private Long localeSecurityCheckId;
+
+    /**
      * 船舶识别号
      */
     private String shipId;
@@ -72,8 +77,8 @@ public class BjLocaleSecurityCheckVo implements Serializable {
     private DateTime releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjTrackShipCompanyVo.java

@@ -21,6 +21,11 @@ public class BjTrackShipCompanyVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 重点跟踪航运公司ID
+     */
+    private Long trackShipCompanyId;
+
+    /**
      * 发布单位
      */
     private String releaseUnit;
@@ -61,8 +66,8 @@ public class BjTrackShipCompanyVo implements Serializable {
     private Date releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjTrackShipsVo.java

@@ -22,6 +22,11 @@ public class BjTrackShipsVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 重点跟踪船舶ID
+     */
+    private Long trackShipsId;
+
+    /**
      * 船舶识别号
      */
     private String shipId;
@@ -52,8 +57,8 @@ public class BjTrackShipsVo implements Serializable {
     private DateTime releaseDate;
 
     /**
-     * 是否已发布
+     * 是否已发布  0：未发布 1：已发布
      */
-    private Date releaseFlag;
+    private String releaseFlag;
 
 }

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjLocaleSecurityCheckMapper.xml

@@ -4,6 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.BjLocaleSecurityCheckMapper">
     <resultMap id="LocaleSecurityCheckVoList" type="com.ruoyi.business.domain.vo.BjLocaleSecurityCheckVo">
+        <result property="localeSecurityCheckId" column="locale_security_check_id"/>
         <result property="shipId" column="ship_id"/>
         <result property="shipNameCn" column="ship_name_cn"/>
         <result property="checkOrganization" column="check_organization"/>
@@ -17,7 +18,8 @@
         <result property="releaseFlag" column="release_flag"/>
     </resultMap>
     <select id="queryLocalSecurityCheckList" resultMap="LocaleSecurityCheckVoList">
-        select ship_id,
+        select locale_security_check_id,
+               ship_id,
                ship_name_cn,
                check_organization,
                check_address,
@@ -30,7 +32,7 @@
                release_flag
         from ry.bj_locale_security_check
         where del_flag = '0'
-        order by ship_id,
+        order by locale_security_check_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipCompanyMapper.xml

@@ -4,6 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.BjTrackShipCompanyMapper">
     <resultMap id="trackShipCompanyVoList" type="com.ruoyi.business.domain.vo.BjTrackShipCompanyVo">
+        <result property="trackShipCompanyId" column="track_ship_company_id"/>
         <result property="releaseUnit" column="release_unit"/>
         <result property="companyName" column="company_name"/>
         <result property="traceReason" column="deletionReason"/>
@@ -15,7 +16,8 @@
         <result property="releaseFlag" column="release_flag"/>
     </resultMap>
     <select id="queryTrackShipCompanyList" resultMap="trackShipCompanyVoList">
-        select release_unit,
+        select track_ship_company_id,
+               release_unit,
                company_name,
                trace_reason,
                ships,
@@ -26,7 +28,7 @@
                release_flag
         from ry.bj_track_ship_company
         where del_flag = '0'
-        order by release_unit,
+        order by track_ship_company_id,
                  RANDOM()
     </select>
 </mapper>

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipsMapper.xml

@@ -4,6 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.BjTrackShipsMapper">
     <resultMap id="trackShipsVoList" type="com.ruoyi.business.domain.vo.BjTrackShipsVo">
+        <result property="trackShipsId" column="track_ships_id"/>
         <result property="shipId" column="ship_id"/>
         <result property="shipNameCn" column="ship_name_cn"/>
         <result property="nationality" column="nationality"/>
@@ -12,7 +13,8 @@
         <result property="releaseFlag" column="release_flag"/>
     </resultMap>
     <select id="queryTrackShipsList" resultMap="trackShipsVoList">
-        select ship_id,
+        select track_ships_id,
+               ship_id,
                ship_name_cn,
                nationality,
                regport_name,
@@ -21,7 +23,7 @@
                release_flag
         from ry.bj_track_ships
         where del_flag = '0'
-        order by ship_id,
+        order by track_ships_id,
                  RANDOM()
     </select>
 </mapper>