| pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ycl-server/src/main/resources/application-dev.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ycl-server/src/main/resources/application-prod.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -126,6 +126,12 @@ </dependencyManagement> <dependencies> <!-- sip协议栈 --> <dependency> <groupId>javax.sip</groupId> <artifactId>jain-sip-ri</artifactId> <version>1.3.0-91</version> </dependency> <!-- 海康client --> <dependency> <groupId>com.hikvision.ga</groupId> ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -80,6 +80,9 @@ workOrderList.stream().filter(item -> { return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType()); }); if (CollectionUtils.isEmpty(workOrderList)) { return Boolean.TRUE; } List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList()); // 查出数据库中国标码对应的未完成的工单 List<WorkOrder> inDatabaseWorkOrderList = new LambdaQueryChainWrapper<>(baseMapper) @@ -128,6 +131,7 @@ YwPoint point = pointMapping.get(workOrder.getSerialNumber()); if (Objects.isNull(point)) { notAddList.add(workOrder); continue; } workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5)); workOrder.setUnitId(Math.toIntExact(point.getUnitId())); @@ -138,6 +142,9 @@ } } waitAddList.removeAll(notAddList); if (CollectionUtils.isEmpty(waitAddList)) { return Boolean.TRUE; } this.saveBatch(waitAddList); // 如果是直接下发，添加下发记录 if (WorkOrderStatusEnum.DISTRIBUTED.equals(waitAddList.get(0).getStatus())) { ycl-server/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@ # 版权年份 copyrightYear: 2024 # 文件路径 示例（ Windows配置D:/zgyw/uploadPath，Linux配置 /home/zgyw/uploadPath） profile: E:/ycl/zgyw/uploadPath profile: /home/zgyw/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -17,10 +17,10 @@ # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 port: 8080 port: 8085 servlet: # 应用的访问路径 context-path: / context-path: /zgyw tomcat: # tomcat的URI编码 uri-encoding: UTF-8 @@ -36,9 +36,9 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://51.92.65.72:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8 username: root password: ycl@202466 password: zgyw@202488 type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver @@ -76,12 +76,14 @@ spring.data: redis: # 地址 host: 42.193.1.25 host: 127.0.0.1 # 端口，默认为6379 port: 6379 password: ycl2018 password: # 数据库索引 database: 0 database: 1 # 密码(如没有密码请注释掉) # password: # 连接超时时间 timeout: 10s # 是否开启ssl @@ -109,33 +111,29 @@ # 发布和订阅连接池大小 subscriptionConnectionPoolSize: 50 # Swagger配置 swagger: # 是否开启swagger enabled: true enabled: false # 请求前缀 pathMapping: /dev-api pathMapping: /prod-api # MongoDB配置 spring: data: mongodb: host: 42.193.1.25 database: zgyw port: 27017 username: admin password: ycl@202466 uri: mongodb://root1:yunwei%402024@192.168.3.88:27017/zgyw?authSource=admin # 拉取数据请求配置 request: retry: 4 # 最大重试次数 youYunDomain: 123.123.123.5 # 优云地址 haiKangDomain: 123.123.123.1 # 海康地址 youYunDomain: http://51.92.65.56 # 优云地址 haiKangDomain: 51.92.65.48 # 海康地址 youYun: tenantId: 11 email: 11 passwd: 11 apikey: 11 accesskey: 11 tenantId: e10adc3949ba59abbe56e057f20f88dd email: yunwei passwd: Yesc@123 apikey: 72fcfd6825304f7fa0453134de620f3a accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19 ycl-server/src/main/resources/application-prod.yml
@@ -36,9 +36,9 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://51.92.65.72:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8 username: root password: ycl@202466 password: zgyw@202488 type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver @@ -76,10 +76,10 @@ spring.data: redis: # 地址 host: 42.193.1.25 host: 127.0.0.1 # 端口，默认为6379 port: 6379 password: ycl2018 password: # 数据库索引 database: 1 # 密码(如没有密码请注释掉) @@ -115,7 +115,7 @@ # Swagger配置 swagger: # 是否开启swagger enabled: true enabled: false # 请求前缀 pathMapping: /prod-api @@ -123,21 +123,17 @@ spring: data: mongodb: host: 42.193.1.25 database: zgyw port: 27017 username: admin password: ycl@202466 uri: mongodb://root:yunwei%402024@127.0.0.1:27017/zgyw?authSource=admin # 拉取数据请求配置 request: retry: 4 # 最大重试次数 youYunDomain: 123.123.123.5 # 优云地址 haiKangDomain: 123.123.123.1 # 海康地址 youYunDomain: http://51.92.65.56 # 优云地址 haiKangDomain: 51.92.65.48 # 海康地址 youYun: tenantId: e10adc3949ba59abbe56e057f2gg88dd email: 11 passwd: 11 apikey: 11 tenantId: e10adc3949ba59abbe56e057f20f88dd email: yunwei passwd: Yesc@123 apikey: 72fcfd6825304f7fa0453134de620f3a accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19
