zoro 1 yıl önce
ebeveyn
işleme
8108a4df80

+ 17 - 0
src/main/java/com/shcd/scheduling/DredgingSchedule.java

@@ -6,6 +6,7 @@ import com.shcd.service.dredging.DredgingService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
+import groovy.util.logging.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -13,6 +14,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Component
+@Slf4j
 public class DredgingSchedule {
     @Resource
     private DredgingService dredgingService;
@@ -34,4 +36,19 @@ public class DredgingSchedule {
        }
        return ReturnT.SUCCESS;
     }
+
+    @XxlJob("DredgingCamera")
+    public ReturnT<String> dredgingCamera(){
+        List<DredgingImportRule> dredgingImportRules =  dredgingService.getAllProjectId();
+        if (!dredgingImportRules.isEmpty()){
+            for (DredgingImportRule dredgingImportRule : dredgingImportRules) {
+                try {
+                    dredgingService.updateShipCamera(dredgingImportRule.getProjectOverviewId());
+                }catch (Exception e){
+                    e.printStackTrace();
+                    XxlJobLogger.log("刷新船舶失败 : {}" ,  e.getMessage());
+                }
+            }
+        }
+    }
 }

+ 2 - 0
src/main/java/com/shcd/service/dredging/DredgingService.java

@@ -9,4 +9,6 @@ public interface DredgingService {
     String importData(DredgingImportRule dredgingImportRule);
 
     List<DredgingImportRule> getAllProjectId();
+
+    void updateShipCamera(String projectOverviewId);
 }

+ 15 - 0
src/main/java/com/shcd/service/dredging/impl/DredgingServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.lang.generator.SnowflakeGenerator;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.Method;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.shcd.entity.dredging.*;
 import com.shcd.mapper.dredging.BasiceMapper;
@@ -43,6 +44,8 @@ public class DredgingServiceImpl implements DredgingService {
     private String dredgingWorkOrderUrl;
     @Value("${dredgingWorkTraceUrl}")
     private String dredgingWorkTraceUrl;
+    @Value("${dredgingWorkCameraUrl}")
+    private String dredgingWorkCameraUrl;
 
     @Autowired
     private DredgingSpoilAreaService dredgingSpoilAreaService;
@@ -193,4 +196,16 @@ public class DredgingServiceImpl implements DredgingService {
     public List<DredgingImportRule> getAllProjectId() {
         return basiceMapper.getAllProjectId();
     }
+
+    @Override
+    public void updateShipCamera(String projectOverviewId) {
+        HttpResponse token = getToken();
+        if (Boolean.parseBoolean(token.body())){
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("projectId",projectOverviewId);
+            HttpResponse response = HttpUtil.createPost(dredgingWorkCameraUrl).body(jsonObject.toString()).setConnectionTimeout(30000).execute();
+            List<HashMap> hashMaps = JSONArray.parseArray(response.body(), HashMap.class);
+
+        }
+    }
 }

+ 15 - 14
src/main/resources/profile/test/application.properties

@@ -1,18 +1,18 @@
 server.port=9098
 
-#数据库连接配置
+#\u6570\u636E\u5E93\u8FDE\u63A5\u914D\u7F6E
 spring.datasource.url=jdbc:oracle:thin:@//172.17.190.5/orcl
 #spring.datasource.url=jdbc:oracle:thin:@//198.39.1.218/shhwdb
 #spring.datasource.url=jdbc:oracle:thin:@//10.114.4.56/shhwdb
 spring.datasource.username=ghjg_basics
 spring.datasource.password=GHJG@123
-#空间坐标系参数 生产库
+#\u7A7A\u95F4\u5750\u6807\u7CFB\u53C2\u6570 \u751F\u4EA7\u5E93
 spaceCoordinatesSystem=300003
-#空间坐标系参数 测试库
+#\u7A7A\u95F4\u5750\u6807\u7CFB\u53C2\u6570 \u6D4B\u8BD5\u5E93
 #spaceCoordinatesSystem=300015
 swagger2.enable=true
 
-#增加tomcatpost请求传参大小为10m
+#\u589E\u52A0tomcatpost\u8BF7\u6C42\u4F20\u53C2\u5927\u5C0F\u4E3A10m
 server.tomcat.max-http-post-size=-1
 
 
@@ -21,7 +21,7 @@ spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
 spring.datasource.hikari.maximum-pool-size= 60
 spring.datasource.hikari.maximum-idle = 15
 spring.datasource.hikari.idle-timeout= 30000
-#Mybatis配置
+#Mybatis\u914D\u7F6E
 mybatis.mapper-locations=classpath*:mapper/*.xml
 mybatis.type-aliases-package=com.shcd.entity
 mybatis.configuration.useGeneratedkeys=true
@@ -29,7 +29,7 @@ mybatis.configuration.mapUnderscoreToCamelCase=true
 mybatis.configuration.call-setters-on-nulls=true
 #mybatis-plus.type-enums-package=com.shcd.ghjg.eum
 
-#����sql��ӡ��Ӧ�ķ����ӿ����ڵİ�
+#\uFFFD\uFFFD\uFFFD\uFFFDsql\uFFFD\uFFFD\u04E1\uFFFD\uFFFD\u04E6\uFFFD\u0137\uFFFD\uFFFD\uFFFD\uFFFD\u04FF\uFFFD\uFFFD\uFFFD\uFFFD\u06B5\u0130\uFFFD
 logging.level.com.shcd.ghjg.dao=debug
 
 spring.jmx.enabled=false
@@ -43,23 +43,23 @@ xxl.job.accessToken=
 xxl.job.executor.logpath=
 xxl.job.executor.logretentiondays=30
 
-# redis配置
+# redis\u914D\u7F6E
 spring.redis.database=1
-# 生产系统Redis
+# \u751F\u4EA7\u7CFB\u7EDFRedis
 spring.redis.host=172.17.159.1
-# 卡口系统Redis
+# \u5361\u53E3\u7CFB\u7EDFRedis
 #spring.redis.host=localhost
 spring.redis.port=6379
 spring.redis.password=b7dz82g#psNEvvuc
-# 最大连接数
+# \u6700\u5927\u8FDE\u63A5\u6570
 spring.redis.jedis.pool.max-active=200
-# 最大阻塞等待时间(负数表示没限制)
+# \u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u8D1F\u6570\u8868\u793A\u6CA1\u9650\u5236\uFF09
 spring.redis.jedis.pool.max-wait=-1
-# 最大空闲
+# \u6700\u5927\u7A7A\u95F2
 spring.redis.jedis.pool.max-idle=10
-# 最小空闲
+# \u6700\u5C0F\u7A7A\u95F2
 spring.redis.jedis.pool.min-idle=-1
-# 连接超时时间
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
 spring.redis.timeout=10000
 
 dredgingTokenUrl=http://172.31.233.22:8093/dredging/token/getToken
@@ -69,4 +69,5 @@ dredgingProjectUrl=http://172.31.233.22:8093/dredging/projectOverview/GetProject
 dredgingElectricFenUrl=http://172.31.233.22:8093/dredging/elecfence/GetElectronicFence
 dredgingWorkOrderUrl=http://172.31.233.22:8093/dredging/workOrder/GetWorkOrderList
 dredgingWorkTraceUrl=http://172.31.233.22:8093/dredging/workOrderHistory/getWorkHistory
+dredgingWorkCameraUrl=http://172.31.233.22:8093/dredging/getProjectCameraList
 #geographyChangeUrl=http://172.17.231.65:8080/NHJTWebservice/common/CommonWebservice.asmx/ChangeDataCoordinateNoLog