admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-12-04 16:34:08 +08:00
parent 6fbb77235c
commit a45aeabb55
34 changed files with 211 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@ -755,6 +755,22 @@
<artifactId>restful-sdk</artifactId>
<version>1.0.0.6</version>
</dependency>
<!-- 广联达 -->
<dependency>
<groupId>com.glodon.cloudt.rest.client</groupId>
<artifactId>cloudt-rest-client</artifactId>
<version>2.8.0</version>
<scope>system</scope>
<systemPath>${basedir}/src/main/resources/jar/cloudt-rest-client-2.8.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>com.glodon.gys.rest.client</groupId>
<artifactId>gys-rest-client</artifactId>
<version>5.0.3</version>
<scope>system</scope>
<systemPath>${basedir}/src/main/resources/jar/gys-rest-client-5.0.3-SNAPSHOT.jar</systemPath>
</dependency>
<!-- 虹软人脸识别 -->
<dependency>

14
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceVideo.java
View File

@ -53,9 +53,21 @@ public class BigDeviceVideo implements Serializable {
*/
@Excel(name = "videoItemId", width = 15)
@ApiModelProperty(value = "视频ID")
private java.lang.Long videoItemId;
@TableField(exist = false)
@ApiModelProperty(value = "萤石云设备通道号")
private java.lang.String verificationCode;
@TableField(exist = false)
@ApiModelProperty(value = "视频类型，1萤石云，3ISC")
private java.lang.Integer videoType;
@TableField(exist = false)
@ApiModelProperty(value = "token")
private java.lang.String token;
@TableField(exist = false)
@ApiModelProperty(value = "url")
private java.lang.String url;
@TableField(exist = false)
@ApiModelProperty(value = "视频名称")
private String videoName;

4
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -279,6 +280,9 @@ public class Lifter implements Serializable {
private java.lang.Integer generalContractorsId;
@ApiModelProperty(value = "品牌")
private java.lang.String brand;
@TableField(exist = false)
@ApiModelProperty(value = "视频配置")
private ProjectVideoConfig projectVideoConfig;
@TableField(exist = false)
@ApiModelProperty(value = "设置是否在线，1在线，0离线")

5
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -443,6 +444,10 @@ public class Tower implements Serializable {
@ApiModelProperty(value = "钢丝绳设备id")
private java.lang.Long tckwWireRopeId;
@TableField(exist = false)
@ApiModelProperty(value = "视频配置")
private ProjectVideoConfig projectVideoConfig;
@TableField(exist = false)
@ApiModelProperty(value = "总承包单位企业名称")
private java.lang.String generalContractorsName;

2
src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDeviceVideoMapper.xml
View File

@ -49,7 +49,7 @@
</select>
<select id="selectListExt" resultType="com.zhgd.xmgl.modules.bigdevice.entity.BigDeviceVideo">
select bdv.*,vi.serial_number from video_item vi join big_device_video bdv on vi.item_id = bdv.video_item_id
select bdv.*,vi.serial_number,vi.verification_code from video_item vi join big_device_video bdv on vi.item_id = bdv.video_item_id
${ew.customSqlSegment}
</select>
</mapper>

27
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java
View File

@ -21,9 +21,12 @@ import com.zhgd.xmgl.modules.bigdevice.entity.dto.LifterDto;
import com.zhgd.xmgl.modules.bigdevice.entity.vo.*;
import com.zhgd.xmgl.modules.bigdevice.mapper.*;
import com.zhgd.xmgl.modules.bigdevice.service.ILifterService;
import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig;
import com.zhgd.xmgl.modules.project.service.IProjectVideoConfigService;
import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.RefUtil;
import com.zhgd.xmgl.util.TimeUtil;
import com.zhgd.xmgl.util.YsVideoUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,10 +36,7 @@ import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -71,6 +71,8 @@ public class LifterServiceImpl extends ServiceImpl<LifterMapper, Lifter> impleme
private ISystemUserService systemUserService;
@Autowired
private RedisRepository redisRepository;
@Autowired
private IProjectVideoConfigService projectVideoConfigService;
@Override
@ -181,6 +183,23 @@ public class LifterServiceImpl extends ServiceImpl<LifterMapper, Lifter> impleme
.eq(bdv + RefUtil.fieldNameUlc(BigDeviceVideo::getType), 2);
List<BigDeviceVideo> videoList = bigDeviceVideoMapper.selectListExt(queryWrapper2);
lifter.setVideoList(videoList);
HashMap<String, Object> pm = new HashMap<>();
pm.put("projectSn", lifter.getProjectSn());
ProjectVideoConfig useProjectVideoConfig = projectVideoConfigService.getUseProjectVideoConfig(pm);
lifter.setProjectVideoConfig(useProjectVideoConfig);
try {
if (CollUtil.isNotEmpty(videoList) && Objects.equals(1, useProjectVideoConfig.getVideoType())) {
String token = YsVideoUtil.getToken(useProjectVideoConfig.getAppId(), useProjectVideoConfig.getAppSecret());
for (BigDeviceVideo deviceVideo : videoList) {
deviceVideo.setToken(token);
deviceVideo.setUrl("ezopen://open.ys7.com/" + deviceVideo.getSerialNumber() + "/" +
deviceVideo.getVerificationCode() + ".hd.live");
deviceVideo.setVideoType(useProjectVideoConfig.getVideoType());
}
}
} catch (Exception e) {
e.printStackTrace();
}
return lifter;
}

22
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java
View File

@ -22,10 +22,13 @@ import com.zhgd.xmgl.modules.bigdevice.entity.vo.*;
import com.zhgd.xmgl.modules.bigdevice.mapper.*;
import com.zhgd.xmgl.modules.bigdevice.service.ITowerService;
import com.zhgd.xmgl.modules.bigdevice.service.ITowerVisualizeService;
import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig;
import com.zhgd.xmgl.modules.project.mapper.ProjectDevStatisticsMapper;
import com.zhgd.xmgl.modules.project.service.IProjectVideoConfigService;
import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.RefUtil;
import com.zhgd.xmgl.util.TimeUtil;
import com.zhgd.xmgl.util.YsVideoUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -77,6 +80,8 @@ public class TowerServiceImpl extends ServiceImpl<TowerMapper, Tower> implements
private IMqttSender mqttSender;
@Autowired
private TowerViolationMapper towerViolationMapper;
@Autowired
private IProjectVideoConfigService projectVideoConfigService;
@Autowired
@ -218,6 +223,23 @@ public class TowerServiceImpl extends ServiceImpl<TowerMapper, Tower> implements
.eq(bdv + RefUtil.fieldNameUlc(BigDeviceVideo::getType), 1);
List<BigDeviceVideo> videoList = bigDeviceVideoMapper.selectListExt(queryWrapper2);
tower.setVideoList(videoList);
HashMap<String, Object> pm = new HashMap<>();
pm.put("projectSn", tower.getProjectSn());
ProjectVideoConfig useProjectVideoConfig = projectVideoConfigService.getUseProjectVideoConfig(pm);
tower.setProjectVideoConfig(useProjectVideoConfig);
try {
if (CollUtil.isNotEmpty(videoList) && Objects.equals(1, useProjectVideoConfig.getVideoType())) {
String token = YsVideoUtil.getToken(useProjectVideoConfig.getAppId(), useProjectVideoConfig.getAppSecret());
for (BigDeviceVideo deviceVideo : videoList) {
deviceVideo.setToken(token);
deviceVideo.setUrl("ezopen://open.ys7.com/" + deviceVideo.getSerialNumber() + "/" +
deviceVideo.getVerificationCode() + ".hd.live");
deviceVideo.setVideoType(useProjectVideoConfig.getVideoType());
}
}
} catch (Exception e) {
e.printStackTrace();
}
QueryWrapper<TowerVisualize> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(TowerVisualize::getTowerSn, tower.getDevSn())
.eq(TowerVisualize::getProjectSn, tower.getProjectSn());

2
src/main/java/com/zhgd/xmgl/modules/bimface/client/BimClient.java
View File

@ -77,7 +77,7 @@ public class BimClient {
String u = String.format(uploadURL, name, url);
ResponseEntity<JSONObject> responseEntity = restTemplate.exchange(u, HttpMethod.PUT, requestEntity, JSONObject.class);
JSONObject body = responseEntity.getBody();
log.error("上传文件失败：uploadFile err:{}", JSON.toJSONString(body));
log.error("上传文件：uploadFile:{}", JSON.toJSONString(body));
if (responseEntity.getStatusCodeValue() != 200 || body == null || !"success".equals(body.getString("code"))) {
log.error("上传文件失败！项目sn为：{}，名称为：{}，url为：{}", projectSn, name, u);
throw new RuntimeException("上传文件失败！名称可能重复或其他原因！");

4
src/main/java/com/zhgd/xmgl/modules/bimface/mapper/xml/ProjectBimfaceMapper.xml
View File

@ -29,7 +29,7 @@
AND pb1.version = pb2.version
and pb1.update_date = pb2.update_date
and project_sn = #{projectSn}
ORDER BY pb1.update_date DESC
ORDER BY pb1.id DESC
LIMIT #{index},#{pageSize};
</select>
</mapper>
</mapper>

16
src/main/java/com/zhgd/xmgl/modules/bimface/service/impl/ProjectBimfaceServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bimface.api.bean.response.FileTranslateBean;
import com.bimface.api.enums.TranslateStatus;
import com.bimface.exception.BimfaceException;
import com.bimface.sdk.BimfaceClient;
@ -199,4 +200,19 @@ public class ProjectBimfaceServiceImpl extends ServiceImpl<ProjectBimfaceMapper,
return status;
}
public static void main(String[] args) {
String appKey = "Fmy1dz4zfmI1vnA3ACQaRvIIQhBIYJ06";
String appSecret = "d4c1thIpDC6jfulsLY0qFX64euHZu7S3";
BimfaceClient bimfaceClient = new BimfaceClient(appKey, appSecret);
try {
FileTranslateBean translate = bimfaceClient.getTranslate(10000829449915L);
System.out.println(translate);
String translateStatus = translate.getStatus();
System.out.println(translateStatus);
} catch (BimfaceException e) {
e.printStackTrace();
}
}
}

5
src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectVideoConfigController.java
View File

@ -64,11 +64,6 @@ public class ProjectVideoConfigController {
}
/**
* 通过id查询
* @param
* @return
*/
@ApiOperation(value = "查询启用的视频配置", notes = "查询启用的视频配置" , httpMethod="POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = false, dataType = "String"),

7
src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
View File

@ -274,6 +274,13 @@ public class Project implements Serializable {
private String xiwonAppSecret;
@ApiModelProperty(value = "bim的Url")
private String bimUrl;
@ApiModelProperty(value = "广联达项目id")
private String gldProjectId;
@ApiModelProperty(value = "广联达授权文件路径")
private String gldLicPath;
@ApiModelProperty(value = "新大屏地址（没有填则跳旧大屏）")
private String newBigScreen;
/**
* runde平台token

6
src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java
View File

@ -53,10 +53,10 @@ public class VideoItem implements Serializable {
@ApiModelProperty(value = "视频设备序列号")
private java.lang.String serialNumber;
/**
* 视频设备验证码
* 萤石云设备通道号
*/
@Excel(name = "视频设备验证码", width = 15)
@ApiModelProperty(value = "视频设备验证码")
@Excel(name = "萤石云设备通道号", width = 15)
@ApiModelProperty(value = "萤石云设备通道号")
private java.lang.String verificationCode;
/**
* 设备类型，1 枪机，2球机，3热成像，4单兵，5全景，6无人机

89
src/main/java/com/zhgd/xmgl/task/StableWaterMixStationTask.java
View File

@ -1,34 +1,41 @@
package com.zhgd.xmgl.task;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationData;
import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationRawMaterialData;
import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationSetData;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.glodon.cloudt.rest.client.RestServiceClient;
import com.glodon.cloudt.rest.client.data.HmacRestAuthInfo;
import com.glodon.cloudt.rest.client.data.RestResponseInfo;
import com.glodon.cloudt.rest.client.exception.AuthenticateException;
import com.glodon.cloudt.rest.client.exception.InvalidUriException;
import com.glodon.cloudt.rest.client.exception.NoAuthenticateException;
import com.glodon.cloudt.rest.client.impl.HmacRestServiceClient;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
import com.zhgd.xmgl.modules.stablewater.service.IStableWaterMixStationDataService;
import com.zhgd.xmgl.util.ThirdPartRequestUtil;
import lombok.extern.log4j.Log4j;
import net.javacrumbs.shedlock.core.SchedulerLock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* 水稳拌合站任务
*/
@Log4j
@Component
@RestController
public class StableWaterMixStationTask {
@Autowired
ThirdPartRequestUtil thirdPartRequestUtil;
@Autowired
IStableWaterMixStationDataService stableWaterMixStationDataService;
@Autowired
ProjectMapper projectMapper;
/**
@ -36,9 +43,69 @@ public class StableWaterMixStationTask {
*/
@Scheduled(cron = "0 2 0 * * ?")
@SchedulerLock(name = "executeStableWaterMixStationTask", lockAtMostFor = 1000 * 60 * 2, lockAtLeastFor = 1000 * 60 * 1)
@GetMapping("1204")//todo
public void executeTask() {
log.info("定时拉取广联达的搅拌站数据任务开始");
//String url = "/api/mix/v1.0/mix/product/getMachineProductList?projectId=1460369&beginTimestamp=20170710101010000";
List<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>()
.isNotNull(Project::getGldProjectId)
.ne(Project::getGldProjectId, "")
);
for (Project project : projects) {
sendHttp(project);
}
}
private void sendHttp(Project project) {
try {
/**----------------准备 -------------------*/
//第1步：下载授权文件
//第2步：获取SDK
/** ------------ 授权认证 --------------*/
//第3步：创建客户端实例
RestServiceClient serviceClient = HmacRestServiceClient.getInstance();
//第4步：加载/验证授权文件
//4.1构建认证信息
HmacRestAuthInfo restAuthInfo = new HmacRestAuthInfo();
//4.2设置授权文件路径
restAuthInfo.setLicPath(project.getGldLicPath());
//4.3权限认证
serviceClient.authenticate(restAuthInfo);
/** ------------ 拼接请求地址 --------------*/
//第5步：获取授权文件关联的GYS系统地址hostAddress
String hostAddress = serviceClient.getRestRootAddress();
//第6步：设置请求接口的URI地址apiURI(以获取集成项目列表信息为例)
String apiURI = String.format("/api/mix/v1.0/mix/product/getMachineProductList?projectId=%s&beginTimestamp=20170710101010000", project.getGldProjectId());
//第7步：拼装完整的请求网址
String fullURL = hostAddress + apiURI;
//第8步：请求数据准备（本例中为从GYS系统获取数据，无需进行请求数据的准备）
//第9步：发送请求，用来推送/获取数据
RestResponseInfo restResponseInfo = serviceClient.get(fullURL);
/** ------------ 处理请求返回结果 --------------*/
if (restResponseInfo.isSuccess()) {
//请求成功：
//第10步：处理请求结果（第三方系统自行处理）
System.out.println(restResponseInfo.getStringContent());
save(restResponseInfo.getStringContent(), project);
} else {
//请求失败:
//第11步：根据返回结果排查失败原因（数据原因第三方系统自行处理）
}
} catch (AuthenticateException e) {
e.printStackTrace();
} catch (InvalidUriException e) {
e.printStackTrace();
} catch (NoAuthenticateException e) {
e.printStackTrace();
}
}
private void save(String stringContent, Project project) {
//String projectId = "672804614860800";
//String url = String.format("/api/mix/v1.0/mix/product/getMachineProductList?projectId=%s&beginTimestamp=20170710101010000", projectId);
//String rs = thirdPartRequestUtil.get(url);
//JSONObject jo = JSON.parseObject(rs);
//if (Objects.equals(jo.getBoolean("success"), true)) {
@ -66,5 +133,7 @@ public class StableWaterMixStationTask {
// stableWaterMixStationDataService.add(data);
// }
//}
}
}

2
src/main/resources/application-cr-gsx.properties
View File

@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-cr.properties
View File

@ -23,7 +23,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://118.121.198.147:23232/
serverUrl=http://118.121.198.147:23232
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-dev.properties
View File

@ -23,7 +23,7 @@ mqtt.producer.clientId=mqttProd
mqtt.producer.defaultTopic=topic1
mqtt.consumer.clientId=mqttConsumer
mqtt.consumer.defaultTopic=topic1
serverUrl=http://127.0.0.1:23912/
serverUrl=http://127.0.0.1:23912
#视频分析url
video-analysis-url=
server.ssl.enabled=false

2
src/main/resources/application-gsx-dev.properties
View File

@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-gsx-other-env-show.properties
View File

@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://192.168.34.221:30002/
serverUrl=http://192.168.34.221:30002
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-gsx-t-dev.properties
View File

@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://192.168.34.221:30002/
serverUrl=http://192.168.34.221:30002
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-gxlt-gsx.properties
View File

@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-nmg-gsx.properties
View File

@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-shahu-gsx.properties
View File

@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-sjjt-gsx.properties
View File

@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-temp-init-gsx.properties
View File

@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-test-gsx.properties
View File

@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-ylww.properties
View File

@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-zjsj-gsx.properties
View File

@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

4
src/main/resources/application-zjsj-prod.properties
View File

@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url
@ -70,4 +70,4 @@ spring.boot.admin.client.instance.name=zjsj
double-carbon.water-data-url=http://test.cesms.net
double-carbon.ammeter-data-url=http://test.cesms.net
license.licensePath=C:/jxj/prod/backEnd/license/license.lic
license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore
license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore

2
src/main/resources/application-zjsj.properties
View File

@ -16,7 +16,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#\u89C6\u9891\u5206\u6790url
video-analysis-url=
server.ssl.enabled=false

2
src/main/resources/application-zjsj_dev.properties
View File

@ -18,7 +18,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsj
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

2
src/main/resources/application-zjwj-gsx.properties
View File

@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://124.71.67.160:8088
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url

BIN
src/main/resources/jar/cloudt-rest-client-2.8.0-SNAPSHOT.jar Normal file
View File

Binary file not shown.

BIN
src/main/resources/jar/gys-rest-client-5.0.3-SNAPSHOT.jar Normal file
View File

Binary file not shown.