fix(jg)：处理使用登记证顺延问题

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationManageMapper.java

@@ -34,6 +34,7 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
 
     List<CertificateVo> queryCertificateInIds(@Param("ids") List<String> ids);
 
-    @MapKey("year")
     List<Map<String, String>> initUseRegistrationCodeIntoRedis(@Param("year") String year);
+
+    List<Map<String, String>> initVehicleUseRegCodeIntoRedis(@Param("year") String year);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -217,25 +217,37 @@
 
     <select id="initUseRegistrationCodeIntoRedis" resultType="java.util.Map">
         SELECT
-            SUBSTR(t.use_registration_code, 1, 5) AS prefix,
-            SUBSTR(MAX(t.use_registration_code), 6, 5) AS code
+            SUBSTR( T.use_registration_code, 1, 5 ) AS prefix,
+            SUBSTR( MAX ( T.use_registration_code ), 6, 5 ) AS code
         FROM
-            tzs_jg_use_registration_manage t
-                LEFT JOIN
-            tzs_jg_use_registration tjur
-            ON tjur.use_registration_code = t.use_registration_code
-                AND (tjur.reg_type IS NULL OR tjur.reg_type = '2' OR tjur.reg_type = '0')
-                AND tjur.is_delete = 0
-                LEFT JOIN
-            tzs_jg_vehicle_information v
-            ON v.use_registration_code = t.use_registration_code
-                and v.reg_type = '0'
+            tzs_jg_use_registration_manage T
+            RIGHT JOIN tzs_jg_use_registration tjur ON tjur.use_registration_code = T.use_registration_code
         WHERE
-            LENGTH(t.use_registration_code) = 14
-          AND SUBSTR(t.use_registration_code, 1, 1) IN ('容', '锅', '管', '瓶', '梯', '起', '索', '游', '车')
+          LENGTH ( T.use_registration_code ) = 14
+          AND SUBSTR( T.use_registration_code, 1, 1 ) IN ( '容', '锅', '管', '瓶', '梯', '起', '索', '游', '车' )
           AND TRIM(t.use_registration_code) LIKE concat('%(',#{year},')')
+          AND ( tjur.reg_type IS NULL OR tjur.reg_type = '2' OR tjur.reg_type = '0' )
+          AND tjur.is_delete = 0
         GROUP BY
-            SUBSTR(t.use_registration_code, 1, 5)
+            SUBSTR( T.use_registration_code, 1, 5 )
+        HAVING code <![CDATA[ <> ]]> '00000'
+        ORDER BY prefix
+    </select>
+
+    <select id="initVehicleUseRegCodeIntoRedis" resultType="java.util.Map">
+        SELECT
+            SUBSTR(M.use_registration_code, 1, 5) AS prefix,
+            SUBSTR(MAX(M.use_registration_code), 6, 5) AS code
+        FROM
+            tzs_jg_use_registration_manage M
+            RIGHT JOIN tzs_jg_vehicle_information v ON v.use_registration_code = M.use_registration_code
+        WHERE
+            LENGTH ( M.use_registration_code ) = 14
+          AND SUBSTR( M.use_registration_code, 1, 1 ) IN ( '容', '锅', '管', '瓶', '梯', '起', '索', '游', '车' )
+          and v.reg_type is null
+          AND TRIM ( M.use_registration_code ) LIKE concat ( '%(',#{year}, ')' )
+        GROUP BY
+            SUBSTR( M.use_registration_code, 1, 5 )
         HAVING code <![CDATA[ <> ]]> '00000'
         ORDER BY prefix
     </select>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -318,9 +318,9 @@ public class JgUseRegistrationManageController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/initRegCodeIntoRedis")
     @ApiOperation(httpMethod = "GET", value = "初始化使用登记证序列号到Redis", notes = "初始化使用登记证序列号到Redis")
-    public ResponseModel<Object> initUseRegistrationCodeIntoRedis() {
-        jgUseRegistrationManageServiceImpl.initUseRegistrationCodeIntoRedis();
-        return ResponseHelper.buildResponse("Redis初始化完成!");
+    public ResponseModel<Object> initUseRegistrationCodeIntoRedis(@RequestParam(value = "year", defaultValue = "24") String year) {
+        jgUseRegistrationManageServiceImpl.initUseRegistrationCodeIntoRedis(year);
+        return ResponseHelper.buildResponse(year +"年使用登记证序列码Redis初始化完成!");
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java

@@ -766,12 +766,18 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         return parseArray(json, FormValue.class);
     }
 
-    public void initUseRegistrationCodeIntoRedis() {
+    public void initUseRegistrationCodeIntoRedis(String year) {
         // 获取当前年份的两位数
         String currentYearSuffix = String.valueOf(LocalDate.now().getYear() % 100);
         Date endOfYear = com.yeejoin.amos.boot.module.ymt.api.common.DateUtils.calculateEndOfYear(new Date());
-        // 从数据库中加载数据并批量设置到 Redis
-        jgUseRegistrationManageMapper.initUseRegistrationCodeIntoRedis(currentYearSuffix)
+        // 非车用气瓶-从数据库中加载使用登记证最大序列码刷新到Redis中
+        jgUseRegistrationManageMapper.initUseRegistrationCodeIntoRedis(year)
+                .forEach(resultMap ->
+                        Optional.ofNullable(resultMap)
+                                .ifPresent(map -> setValueWithoutExpiration(map.get("prefix"), map.get("code")))
+                );
+        // 车用气瓶-从数据库中加载使用登记证最大序列码刷新到Redis中
+        jgUseRegistrationManageMapper.initVehicleUseRegCodeIntoRedis(year)
                 .forEach(resultMap ->
                         Optional.ofNullable(resultMap)
                                 .ifPresent(map -> setValueWithoutExpiration(map.get("prefix"), map.get("code")))