111

src/main/java/com/fdkankan/project/tieta/constant/Constant.java

@@ -2,8 +2,8 @@ package com.fdkankan.project.tieta.constant;
 
 public class Constant {
 
-    public static final String QUEUE_SCENE_CONVERT = "queue-scene-convert";
+    public static final String QUEUE_SCENE_CONVERT = "queue-scene-convert-2";
 
-    public static final String REDIS_SCENE_CONVERT_HISTORY = "scene:convert:history:%s";
+    public static final String REDIS_SCENE_CONVERT_HISTORY = "scene:convert2:history:%s";
 
 }

src/main/java/com/fdkankan/project/tieta/controller/ConvertController.java

@@ -41,7 +41,7 @@ public class ConvertController {
 
     @PostMapping("/push")
     public ResultData push(@RequestBody @Validated ScenePushDTO dto){
-        return convertService.scenePush(dto);
+        return convertService.scenePush(dto, "api");
     }
 
     @GetMapping("/pushHistory")

src/main/java/com/fdkankan/project/tieta/controller/SceneController.java

@@ -29,7 +29,7 @@ import java.util.List;
  * @since 2024-06-25
  */
 @RestController
-@RequestMapping("/scene")
+@RequestMapping("/push")
 public class SceneController {
 
     @Autowired
@@ -75,6 +75,11 @@ public class SceneController {
         return  ResultData.ok();
     }
 
+    @GetMapping(value = "/ping")
+    public ResultData ping(){
+        return ResultData.ok();
+    }
+
 
 
 

src/main/java/com/fdkankan/project/tieta/entity/FullphotoFileindex.java

@@ -22,7 +22,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("T_FULLPHOTO_FILEINDEX")
+@TableName("RES_FILE.T_FULLPHOTO_FILEINDEX")
 public class FullphotoFileindex extends Model<FullphotoFileindex> {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/fdkankan/project/tieta/httpclient/HttpClient.java

@@ -9,7 +9,7 @@ import com.dtflys.forest.annotation.Var;
 
 public interface HttpClient {
 
-    @Post("{url}")
+    @Post(url = "{url}", connectTimeout = 30000,  readTimeout = 30000, maxRetryInterval = 3)
     JSONObject postJson(@Var("url") String url, @JSONBody Object object);
 
 

src/main/java/com/fdkankan/project/tieta/service/IConvertService.java

@@ -8,7 +8,7 @@ public interface IConvertService {
 
     void sendConvert(SendConvertDTO dto);
 
-    ResultData scenePush(ScenePushDTO dto);
+    ResultData scenePush(ScenePushDTO dto, String convertType);
 
     void scenePushHistory();
 

src/main/java/com/fdkankan/project/tieta/service/impl/ConvertServiceImpl.java

@@ -44,7 +44,7 @@ public class ConvertServiceImpl implements IConvertService {
     }
 
     @Override
-    public ResultData scenePush(ScenePushDTO dto) {
+    public ResultData scenePush(ScenePushDTO dto, String convertType) {
         JSONObject playload = new JSONObject();
         playload.put("stationCode", dto.getStationCode());
         playload.put("entityId", dto.getEntityId());
@@ -56,14 +56,22 @@ public class ConvertServiceImpl implements IConvertService {
             JSONObject item = new JSONObject();
             item.put("fileName", v.getFileName());
             item.put("fileType", v.getFileType());
-            item.put("fileUrl", v.getFileUrl());
+            item.put("fileUrl", v.getFileUrl().replace("120.52.40.57", "192.168.53.186").replace("ziyuanfastdfs.chinatowercom.cn", "192.168.53.186"));
             return item;
         }).collect(Collectors.toList());
         playload.put("fileList", fileList);
+        if(StrUtil.isNotEmpty(convertType)){
+            playload.put("convertType", convertType);
+        }
         mqProducer.sendByWorkQueue(Constant.QUEUE_SCENE_CONVERT, playload);
         return ResultData.ok();
     }
 
+    public static void main(String[] args) {
+        String str =  "http://ziyuanfastdfs.chinatowercom.cn:1888/asfsdf/dfsdf.jpg";
+        System.out.println(str.replace("120.52.40.57", "192.168.53.186").replace("ziyuanfastdfs.chinatowercom.cn", "192.168.53.186"));
+    }
+
     @Override
     public void scenePushHistory() {
         List<FullphotoFileindex> fullphotoFileindices = null;
@@ -79,7 +87,7 @@ public class ConvertServiceImpl implements IConvertService {
                     String value = redisClient.get(key);
                     if(StrUtil.isEmpty(value)){
                         try {
-                            this.scenePush(ScenePushDTO.builder().stationCode(item.getStationCode()).entityId(item.getEntityId()).build());
+                            this.scenePush(ScenePushDTO.builder().stationCode(item.getStationCode()).entityId(item.getEntityId()).build(), null);
                             redisClient.add(key, "1");
                         }catch (Exception e){
                             log.error("history scene push fail, stationCode:{}, entityId:{}", item.getStationCode(), item.getEntityId(), e);

src/main/resources/application-dev.yml

@@ -20,6 +20,14 @@ spring:
     username: RES_FILE
     password: qNQVkH3YbA
     driver-class-name: oracle.jdbc.OracleDriver
+    hikari:
+      maximum-pool-size: 20 #连接池最大连接数
+      minimum-idle: 5 #连接池最小连接数
+      connection-timeout: 30000
+      idle-timeout: 600000
+      max-lifetime: 1800000
+      login-timeout: 60000
+      pool-name: MyHikariCP
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml
   configuration:

src/main/resources/application-preprod.yml

@@ -20,6 +20,14 @@ spring:
     username: RES_VR
     password: qawsed@123.
     driver-class-name: oracle.jdbc.OracleDriver
+    hikari:
+      maximum-pool-size: 20 #连接池最大连接数
+      minimum-idle: 5 #连接池最小连接数
+      connection-timeout: 30000
+      idle-timeout: 600000
+      max-lifetime: 1800000
+      login-timeout: 60000
+      pool-name: MyHikariCP
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml
   configuration:

src/main/resources/application-prod.yml

@@ -20,6 +20,14 @@ spring:
     username: RES_VR
     password: qawsed@123.
     driver-class-name: oracle.jdbc.OracleDriver
+    hikari:
+      maximum-pool-size: 20 #连接池最大连接数
+      minimum-idle: 5 #连接池最小连接数
+      connection-timeout: 30000
+      idle-timeout: 600000
+      max-lifetime: 1800000
+      login-timeout: 60000
+      pool-name: MyHikariCP
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml
   configuration:

src/main/resources/application-test.yml

@@ -20,6 +20,14 @@ spring:
     username: RES_FILE
     password: qNQVkH3YbA
     driver-class-name: oracle.jdbc.OracleDriver
+    hikari:
+      maximum-pool-size: 20 #连接池最大连接数
+      minimum-idle: 5 #连接池最小连接数
+      connection-timeout: 30000
+      idle-timeout: 600000
+      max-lifetime: 1800000
+      login-timeout: 60000
+      pool-name: MyHikariCP
 mybatis-plus:
   mapper-locations: classpath:mapper/*Mapper.xml
   configuration:

src/main/resources/mapper/FullphotoFileindexMapper.xml

@@ -28,7 +28,7 @@
     </sql>
 
     <select id="pageStationCodeAndEntityId" resultMap="BaseResultMap">
-        select DISTINCT t.STATION_CODE, t.ENTITY_ID from T_FULLPHOTO_FILEINDEX t where t.FILE_TYPE = '11' and t.status = 1
+        select DISTINCT t.STATION_CODE, t.ENTITY_ID from RES_FILE.T_FULLPHOTO_FILEINDEX t where t.FILE_TYPE = '11' and t.status = 1
     </select>
 
 </mapper>