bug修复
This commit is contained in:
parent
a262f58edd
commit
60df60b520
@ -1,10 +1,7 @@
|
|||||||
package com.zhgd.xmgl.modules.file.service.impl;
|
package com.zhgd.xmgl.modules.file.service.impl;
|
||||||
|
|
||||||
import java.util.List;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
|
|
||||||
|
|
||||||
import com.zhgd.jeecg.upload.Uploader;
|
import com.zhgd.jeecg.upload.Uploader;
|
||||||
import com.zhgd.jeecg.upload.domain.UploadFile;
|
import com.zhgd.jeecg.upload.domain.UploadFile;
|
||||||
import com.zhgd.jeecg.upload.factory.ChunkUploaderFactory;
|
import com.zhgd.jeecg.upload.factory.ChunkUploaderFactory;
|
||||||
@ -13,10 +10,14 @@ import com.zhgd.xmgl.base.UploadFileDTO;
|
|||||||
import com.zhgd.xmgl.modules.file.entity.ProjectFile;
|
import com.zhgd.xmgl.modules.file.entity.ProjectFile;
|
||||||
import com.zhgd.xmgl.modules.file.mapper.ProjectFileMapper;
|
import com.zhgd.xmgl.modules.file.mapper.ProjectFileMapper;
|
||||||
import com.zhgd.xmgl.modules.file.service.IFiletransferService;
|
import com.zhgd.xmgl.modules.file.service.IFiletransferService;
|
||||||
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class FiletransferServiceImpl implements IFiletransferService {
|
public class FiletransferServiceImpl implements IFiletransferService {
|
||||||
@ -27,31 +28,43 @@ public class FiletransferServiceImpl implements IFiletransferService {
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void uploadFile(HttpServletRequest request, UploadFileDTO UploadFileDto) {
|
public void uploadFile(HttpServletRequest request, UploadFileDTO uploadFileDTO) {
|
||||||
UploadFile uploadFile = new UploadFile();
|
UploadFile uploadFile = new UploadFile();
|
||||||
uploadFile.setChunkNumber(UploadFileDto.getChunkNumber());
|
uploadFile.setChunkNumber(uploadFileDTO.getChunkNumber());
|
||||||
uploadFile.setChunkSize(UploadFileDto.getChunkSize());
|
uploadFile.setChunkSize(uploadFileDTO.getChunkSize());
|
||||||
uploadFile.setTotalChunks(UploadFileDto.getTotalChunks());
|
uploadFile.setTotalChunks(uploadFileDTO.getTotalChunks());
|
||||||
uploadFile.setIdentifier(UploadFileDto.getIdentifier());
|
uploadFile.setIdentifier(uploadFileDTO.getIdentifier());
|
||||||
uploadFile.setTotalSize(UploadFileDto.getTotalSize());
|
uploadFile.setTotalSize(uploadFileDTO.getTotalSize());
|
||||||
uploadFile.setCurrentChunkSize(UploadFileDto.getCurrentChunkSize());
|
uploadFile.setCurrentChunkSize(uploadFileDTO.getCurrentChunkSize());
|
||||||
Uploader uploader = new ChunkUploaderFactory().getUploader(uploadFile);
|
Uploader uploader = new ChunkUploaderFactory().getUploader(uploadFile);
|
||||||
List<UploadFile> uploadFileList = uploader.upload(request,basePath);
|
List<UploadFile> uploadFileList = uploader.upload(request, basePath);
|
||||||
for (int i = 0; i < uploadFileList.size(); i++){
|
checkParams(uploadFileDTO, uploadFile);
|
||||||
|
for (int i = 0; i < uploadFileList.size(); i++) {
|
||||||
uploadFile = uploadFileList.get(i);
|
uploadFile = uploadFileList.get(i);
|
||||||
if (uploadFile.getSuccess() == 1){
|
if (uploadFile.getSuccess() == 1) {
|
||||||
ProjectFile userFile = new ProjectFile();
|
ProjectFile userFile = new ProjectFile();
|
||||||
userFile.setExtendName(uploadFile.getFileType());
|
userFile.setExtendName(uploadFile.getFileType());
|
||||||
userFile.setFileName(uploadFile.getFileName());
|
userFile.setFileName(uploadFile.getFileName());
|
||||||
userFile.setFilePath(UploadFileDto.getFilePath());
|
userFile.setFilePath(uploadFileDTO.getFilePath());
|
||||||
userFile.setProjectSn(UploadFileDto.getProjectSn());
|
userFile.setProjectSn(uploadFileDTO.getProjectSn());
|
||||||
userFile.setIsDir(0);
|
userFile.setIsDir(0);
|
||||||
userFile.setFileUrl(uploadFile.getUrl());
|
userFile.setFileUrl(uploadFile.getUrl());
|
||||||
userFile.setFileSize(uploadFile.getFileSize()+"");
|
userFile.setFileSize(uploadFile.getFileSize() + "");
|
||||||
userFile.setUploadTime(DateUtil.getCurrentTime());
|
userFile.setUploadTime(DateUtil.getCurrentTime());
|
||||||
projectFileMapper.insert(userFile);
|
projectFileMapper.insert(userFile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void checkParams(UploadFileDTO uploadFileDTO, UploadFile uploadFile) {
|
||||||
|
List<ProjectFile> projectFiles = projectFileMapper.selectList(new LambdaQueryWrapper<ProjectFile>()
|
||||||
|
.eq(ProjectFile::getProjectSn, uploadFileDTO.getProjectSn())
|
||||||
|
.eq(ProjectFile::getFileName, uploadFile.getFileName())
|
||||||
|
.eq(ProjectFile::getExtendName, uploadFile.getFileType())
|
||||||
|
.eq(ProjectFile::getIsDir, 0));
|
||||||
|
if (CollectionUtils.isNotEmpty(projectFiles)) {
|
||||||
|
throw new OpenAlertException("该文件已存在");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -81,19 +81,7 @@ public class DeepExcavationEngineeringController {
|
|||||||
@ApiOperation(value = "编辑深基坑-工程信息", notes = "编辑深基坑-工程信息", httpMethod = "POST")
|
@ApiOperation(value = "编辑深基坑-工程信息", notes = "编辑深基坑-工程信息", httpMethod = "POST")
|
||||||
@PostMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<DeepExcavationEngineering> edit(@RequestBody DeepExcavationEngineering deepExcavationEngineering) {
|
public Result<DeepExcavationEngineering> edit(@RequestBody DeepExcavationEngineering deepExcavationEngineering) {
|
||||||
Result<DeepExcavationEngineering> result = new Result<DeepExcavationEngineering>();
|
return Result.success(deepExcavationEngineeringService.edit(deepExcavationEngineering));
|
||||||
DeepExcavationEngineering deepExcavationEngineeringEntity = deepExcavationEngineeringService.getById(deepExcavationEngineering.getId());
|
|
||||||
if (deepExcavationEngineeringEntity == null) {
|
|
||||||
result.error500(MessageUtil.get("notFindErr"));
|
|
||||||
} else {
|
|
||||||
boolean ok = deepExcavationEngineeringService.updateById(deepExcavationEngineering);
|
|
||||||
//TODO 返回false说明什么?
|
|
||||||
if (ok) {
|
|
||||||
result.successMsg(MessageUtil.get("editSucess"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -94,23 +94,26 @@ public class DeepExcavationEngineering implements Serializable {
|
|||||||
private String surveyScheme ;
|
private String surveyScheme ;
|
||||||
/**地勘报告*/
|
/**地勘报告*/
|
||||||
@Excel(name = "地勘报告", width = 15)
|
@Excel(name = "地勘报告", width = 15)
|
||||||
@ApiModelProperty(value="地勘报告")
|
@ApiModelProperty(value = "地勘报告")
|
||||||
private String prospectingReport ;
|
private String prospectingReport;
|
||||||
/**设计图纸*/
|
/**
|
||||||
|
* 设计图纸
|
||||||
|
*/
|
||||||
@Excel(name = "设计图纸", width = 15)
|
@Excel(name = "设计图纸", width = 15)
|
||||||
@ApiModelProperty(value="设计图纸")
|
@ApiModelProperty(value = "设计图纸")
|
||||||
private String deviseDrawing ;
|
private String deviseDrawing;
|
||||||
/**图片*/
|
/**
|
||||||
|
* 图片
|
||||||
|
*/
|
||||||
@Excel(name = "图片", width = 15)
|
@Excel(name = "图片", width = 15)
|
||||||
@ApiModelProperty(value="图片")
|
@ApiModelProperty(value = "图片")
|
||||||
private String imageUrl ;
|
private String imageUrl;
|
||||||
/**状态,1进行中,2已完成*/
|
@Excel(name = "状态,0,未开工,1进行中,2已完成", width = 15)
|
||||||
@Excel(name = "状态,1进行中,2已完成", width = 15)
|
@ApiModelProperty(value = "状态,0,未开工,1进行中,2已完成")
|
||||||
@ApiModelProperty(value="状态,1进行中,2已完成")
|
private Integer status;
|
||||||
private Integer status ;
|
|
||||||
|
|
||||||
@ApiModelProperty(value="默认监测内容ID")
|
@ApiModelProperty(value = "默认监测内容ID")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private java.lang.String monitorTypeIds;
|
private java.lang.String monitorTypeIds;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,4 +22,6 @@ public interface IDeepExcavationEngineeringService extends IService<DeepExcavati
|
|||||||
IPage<DeepExcavationEngineering> selectDeepExcavationEngineeringPage(Map<String, Object> map);
|
IPage<DeepExcavationEngineering> selectDeepExcavationEngineeringPage(Map<String, Object> map);
|
||||||
|
|
||||||
List<DeepExcavationEngineering> selectDeepExcavationList(Map<String, Object> map);
|
List<DeepExcavationEngineering> selectDeepExcavationList(Map<String, Object> map);
|
||||||
|
|
||||||
|
DeepExcavationEngineering edit(DeepExcavationEngineering deepExcavationEngineering);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,17 +2,20 @@ package com.zhgd.xmgl.modules.foundation.service.impl;
|
|||||||
|
|
||||||
|
|
||||||
import cn.hutool.core.date.DatePattern;
|
import cn.hutool.core.date.DatePattern;
|
||||||
|
import cn.hutool.core.date.DateTime;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||||
import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationEngineering;
|
import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationEngineering;
|
||||||
import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationMonitorTypeRela;
|
import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationMonitorTypeRela;
|
||||||
import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationEngineeringMapper;
|
import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationEngineeringMapper;
|
||||||
import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationMeasurePointMapper;
|
import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationMeasurePointMapper;
|
||||||
import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationMonitorTypeMapper;
|
import com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationMonitorTypeMapper;
|
||||||
import com.zhgd.xmgl.modules.foundation.service.*;
|
import com.zhgd.xmgl.modules.foundation.service.*;
|
||||||
|
import com.zhgd.xmgl.util.MessageUtil;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -57,6 +60,8 @@ public class DeepExcavationEngineeringServiceImpl extends ServiceImpl<DeepExcava
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void saveDeepExcavationEngineering(DeepExcavationEngineering deepExcavationEngineering) {
|
public void saveDeepExcavationEngineering(DeepExcavationEngineering deepExcavationEngineering) {
|
||||||
|
checkParams(deepExcavationEngineering);
|
||||||
|
setStatus(deepExcavationEngineering);
|
||||||
deepExcavationEngineeringMapper.insert(deepExcavationEngineering);
|
deepExcavationEngineeringMapper.insert(deepExcavationEngineering);
|
||||||
if (StringUtils.isNotEmpty(deepExcavationEngineering.getMonitorTypeIds())) {
|
if (StringUtils.isNotEmpty(deepExcavationEngineering.getMonitorTypeIds())) {
|
||||||
String date = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
|
String date = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
|
||||||
@ -85,4 +90,36 @@ public class DeepExcavationEngineeringServiceImpl extends ServiceImpl<DeepExcava
|
|||||||
public List<DeepExcavationEngineering> selectDeepExcavationList(Map<String, Object> map) {
|
public List<DeepExcavationEngineering> selectDeepExcavationList(Map<String, Object> map) {
|
||||||
return deepExcavationEngineeringMapper.selectDeepExcavationList(map);
|
return deepExcavationEngineeringMapper.selectDeepExcavationList(map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DeepExcavationEngineering edit(DeepExcavationEngineering deepExcavationEngineering) {
|
||||||
|
DeepExcavationEngineering deepExcavationEngineeringEntity = getById(deepExcavationEngineering.getId());
|
||||||
|
if (deepExcavationEngineeringEntity == null) {
|
||||||
|
throw new OpenAlertException(MessageUtil.get("notFindErr"));
|
||||||
|
}
|
||||||
|
checkParams(deepExcavationEngineering);
|
||||||
|
setStatus(deepExcavationEngineering);
|
||||||
|
updateById(deepExcavationEngineering);
|
||||||
|
return deepExcavationEngineering;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkParams(DeepExcavationEngineering deepExcavationEngineering) {
|
||||||
|
if (DateUtil.parse(deepExcavationEngineering.getStartTime()).compareTo(DateUtil.parse(deepExcavationEngineering.getEndTime())) > 0) {
|
||||||
|
throw new OpenAlertException("开工时间不能大于完工时间");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setStatus(DeepExcavationEngineering deepExcavationEngineering) {
|
||||||
|
DateTime start = DateUtil.parse(deepExcavationEngineering.getStartTime());
|
||||||
|
DateTime end = DateUtil.parse(deepExcavationEngineering.getEndTime());
|
||||||
|
DateTime now = DateTime.now();
|
||||||
|
if (now.compareTo(start) < 0) {
|
||||||
|
deepExcavationEngineering.setStatus(0);
|
||||||
|
} else if (now.compareTo(start) >= 0 && now.compareTo(end) < 0) {
|
||||||
|
deepExcavationEngineering.setStatus(1);
|
||||||
|
} else {
|
||||||
|
deepExcavationEngineering.setStatus(2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -146,6 +147,13 @@ public class ProjectFileController {
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
//筛选掉不存在的文件夹
|
||||||
|
Map<String, Object> fileDirPathMap = filePathList.stream().map(e -> {
|
||||||
|
e.setFilePath(e.getFilePath() + e.getFileName() + "/");
|
||||||
|
return e;
|
||||||
|
}).collect(Collectors.toMap(e -> e.getFilePath(), e -> e, (t, t2) -> t));
|
||||||
|
List<TreeNode> treeNodes = resultTreeNode.getChildren().stream().filter(e -> fileDirPathMap.containsKey(e.getAttributes().get("filePath"))).collect(Collectors.toList());
|
||||||
|
resultTreeNode.setChildren(treeNodes);
|
||||||
result.setSuccess(true);
|
result.setSuccess(true);
|
||||||
result.setResult(resultTreeNode);
|
result.setResult(resultTreeNode);
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||||||
import com.gexin.fastjson.JSON;
|
import com.gexin.fastjson.JSON;
|
||||||
import com.zhgd.jeecg.common.api.vo.Result;
|
import com.zhgd.jeecg.common.api.vo.Result;
|
||||||
import com.zhgd.jeecg.common.execption.ExistException;
|
import com.zhgd.jeecg.common.execption.ExistException;
|
||||||
|
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||||
import com.zhgd.xmgl.call.SanjiangDataCall;
|
import com.zhgd.xmgl.call.SanjiangDataCall;
|
||||||
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
|
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
|
||||||
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
|
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
|
||||||
@ -27,6 +28,7 @@ import com.zhgd.xmgl.modules.project.mapper.ProgressTaskMapper;
|
|||||||
import com.zhgd.xmgl.modules.project.service.ProgressTaskService;
|
import com.zhgd.xmgl.modules.project.service.ProgressTaskService;
|
||||||
import com.zhgd.xmgl.util.ProfileJudgeUtil;
|
import com.zhgd.xmgl.util.ProfileJudgeUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import net.sf.mpxj.MPXJException;
|
||||||
import net.sf.mpxj.ProjectFile;
|
import net.sf.mpxj.ProjectFile;
|
||||||
import net.sf.mpxj.Relation;
|
import net.sf.mpxj.Relation;
|
||||||
import net.sf.mpxj.Task;
|
import net.sf.mpxj.Task;
|
||||||
@ -237,6 +239,8 @@ public class ProgressTaskServiceImpl extends ServiceImpl<ProgressTaskMapper, Pro
|
|||||||
}
|
}
|
||||||
throw new RuntimeException("mpp文件数据为空!");
|
throw new RuntimeException("mpp文件数据为空!");
|
||||||
|
|
||||||
|
} catch (MPXJException e) {
|
||||||
|
throw new OpenAlertException("上传甘特图失败,请上传.mpp文件");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("解析文件错误!", e);
|
log.error("解析文件错误!", e);
|
||||||
throw new RuntimeException("上传甘特图失败,失败原因为:" + e.getMessage());
|
throw new RuntimeException("上传甘特图失败,失败原因为:" + e.getMessage());
|
||||||
|
|||||||
@ -2353,6 +2353,10 @@
|
|||||||
FROM worker_type wt
|
FROM worker_type wt
|
||||||
LEFT JOIN team_info ti ON wt.id = ti.worker_type_id
|
LEFT JOIN team_info ti ON wt.id = ti.worker_type_id
|
||||||
LEFT JOIN worker_info wi ON (ti.id = wi.team_id and wi.inService_type = 1)
|
LEFT JOIN worker_info wi ON (ti.id = wi.team_id and wi.inService_type = 1)
|
||||||
|
where 1=1
|
||||||
|
<if test="projectSn != null and projectSn != ''">
|
||||||
|
and wt.project_sn = #{projectSn}
|
||||||
|
</if>
|
||||||
<if test="projectSnList != null and projectSnList != ''">
|
<if test="projectSnList != null and projectSnList != ''">
|
||||||
and wt.project_sn in
|
and wt.project_sn in
|
||||||
<foreach collection="projectSnList" item="item" index="index"
|
<foreach collection="projectSnList" item="item" index="index"
|
||||||
|
|||||||
@ -1,74 +0,0 @@
|
|||||||
#http.port=30250
|
|
||||||
http.port=33445
|
|
||||||
#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
|
||||||
#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC
|
|
||||||
#spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
|
||||||
#spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
|
||||||
#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
|
|
||||||
#spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
|
||||||
spring.datasource.url=jdbc:mysql://139.9.66.234:33306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
|
|
||||||
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
|
|
||||||
spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
|
|
||||||
server.port=33444
|
|
||||||
#server.port=30246
|
|
||||||
basePath=C:/jxj/prod/backEnd/itbgpImage/
|
|
||||||
server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/
|
|
||||||
#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll
|
|
||||||
#basePath=F:/zhgd/itbgpImage/
|
|
||||||
#server.tomcat.basedir=F:/zhgd/tempImage/
|
|
||||||
#arcsoft.dllPath=F:/zhgd/dll
|
|
||||||
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
|
|
||||||
security.enable=false
|
|
||||||
isGetStandardData=false
|
|
||||||
isGetEnvironmentData=false
|
|
||||||
isGetFaceFeatureDate=false
|
|
||||||
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
|
|
||||||
video.alarm.newUrl=223.82.100.80:6040
|
|
||||||
wx-appid=
|
|
||||||
wx-AppSecret=
|
|
||||||
mqtt-scope=zjsjTopic
|
|
||||||
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
|
|
||||||
video-analysis-url=
|
|
||||||
server.ssl.enabled=false
|
|
||||||
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
|
|
||||||
defaultZwComapnySn=
|
|
||||||
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
|
|
||||||
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
|
|
||||||
spring.file-storage.default-platform=local
|
|
||||||
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
|
|
||||||
spring.file-storage.thumbnail-suffix=.jpg
|
|
||||||
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
|
|
||||||
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
|
|
||||||
spring.file-storage.local[0].platform=local
|
|
||||||
#\u542F\u7528\u5B58\u50A8
|
|
||||||
spring.file-storage.local[0].enable-storage=true
|
|
||||||
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
|
|
||||||
spring.file-storage.local[0].enable-access=false
|
|
||||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
|
|
||||||
spring.file-storage.local[0].domain=
|
|
||||||
# \u5B58\u50A8\u5730\u5740
|
|
||||||
spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/
|
|
||||||
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
|
|
||||||
spring.file-storage.local[0].path-patterns=
|
|
||||||
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
|
|
||||||
spring.file-storage.aliyun-oss[0].enable-storage=false
|
|
||||||
spring.file-storage.aliyun-oss[0].access-key=
|
|
||||||
spring.file-storage.aliyun-oss[0].secret-key=
|
|
||||||
spring.file-storage.aliyun-oss[0].end-point=
|
|
||||||
spring.file-storage.aliyun-oss[0].bucket-name=
|
|
||||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
|
|
||||||
spring.file-storage.aliyun-oss[0].domain=
|
|
||||||
spring.file-storage.aliyun-oss[0].base-path=
|
|
||||||
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
|
|
||||||
spring.boot.admin.client.instance.service-url=http://localhost:18070
|
|
||||||
spring.boot.admin.client.instance.name=zjsj
|
|
||||||
# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740
|
|
||||||
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
|
|
||||||
#\u9AD8\u652F\u6A21\u7684tcp\u670D\u52A1\u7AEF\u7684\u7AEF\u53E3\u53F7
|
|
||||||
high_formwork.netty.port=15333
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
http.port=52421
|
|
||||||
spring.datasource.url=jdbc:mysql://localhost:3306/jxj_wisdom_template?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&useSSL=false
|
|
||||||
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
|
|
||||||
spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
|
|
||||||
server.port=30016
|
|
||||||
basePath=C:/jxj/prod/backEnd/itbgpImage/
|
|
||||||
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
|
|
||||||
security.enable=false
|
|
||||||
isGetStandardData=false
|
|
||||||
isGetEnvironmentData=false
|
|
||||||
isGetFaceFeatureDate=false
|
|
||||||
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
|
|
||||||
video.alarm.newUrl=223.82.100.80:6040
|
|
||||||
wx-appid=
|
|
||||||
wx-AppSecret=
|
|
||||||
mqtt.username=admin
|
|
||||||
mqtt.password=public
|
|
||||||
#mqtt.url=tcp://139.159.226.224:1883
|
|
||||||
mqtt.url=ws://121.196.214.246:8083/mqtt
|
|
||||||
mqtt.producer.clientId=mqttProd
|
|
||||||
mqtt.producer.defaultTopic=topic1
|
|
||||||
mqtt.consumer.clientId=mqttConsumer
|
|
||||||
mqtt.consumer.defaultTopic=topic1
|
|
||||||
mqtt-scope=prodTopic
|
|
||||||
serverUrl=http://124.71.178.44:8
|
|
||||||
#\u89C6\u9891\u5206\u6790url
|
|
||||||
video-analysis-url=
|
|
||||||
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
|
|
||||||
defaultZwComapnySn=
|
|
||||||
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
|
|
||||||
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
|
|
||||||
spring.file-storage.default-platform=local
|
|
||||||
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
|
|
||||||
spring.file-storage.thumbnail-suffix=.jpg
|
|
||||||
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
|
|
||||||
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
|
|
||||||
spring.file-storage.local[0].platform=local
|
|
||||||
#\u542F\u7528\u5B58\u50A8
|
|
||||||
spring.file-storage.local[0].enable-storage=true
|
|
||||||
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
|
|
||||||
spring.file-storage.local[0].enable-access=false
|
|
||||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
|
|
||||||
spring.file-storage.local[0].domain=
|
|
||||||
# \u5B58\u50A8\u5730\u5740
|
|
||||||
spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/
|
|
||||||
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
|
|
||||||
spring.file-storage.local[0].path-patterns=
|
|
||||||
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
|
|
||||||
spring.file-storage.aliyun-oss[0].enable-storage=false
|
|
||||||
spring.file-storage.aliyun-oss[0].access-key=
|
|
||||||
spring.file-storage.aliyun-oss[0].secret-key=
|
|
||||||
spring.file-storage.aliyun-oss[0].end-point=
|
|
||||||
spring.file-storage.aliyun-oss[0].bucket-name=
|
|
||||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
|
|
||||||
spring.file-storage.aliyun-oss[0].domain=
|
|
||||||
spring.file-storage.aliyun-oss[0].base-path=
|
|
||||||
#\u5BA2\u6237\u7AEF License\u76F8\u5173\u914D\u7F6E
|
|
||||||
#license.licensePath=D:/license_demo/client/license.lic
|
|
||||||
#license.publicKeysStorePath=D:/license_demo/client/publicCerts.keystore
|
|
||||||
#redis
|
|
||||||
spring.redis.database=1
|
|
||||||
spring.redis.host=127.0.0.1
|
|
||||||
spring.redis.port=6379
|
|
||||||
spring.redis.password=
|
|
||||||
spring.redis.timeout=2000s
|
|
||||||
spring.redis.lettuce.pool.max-active=8
|
|
||||||
spring.redis.lettuce.pool.max-wait=60s
|
|
||||||
spring.redis.lettuce.pool.max-idle=10
|
|
||||||
spring.redis.lettuce.pool.min-idle=10
|
|
||||||
server.tomcat.basedir=C:/tempImage/
|
|
||||||
license.licensePath=C:/license/license.lic
|
|
||||||
license.publicKeysStorePath=C:/license/publicCerts.keystore
|
|
||||||
govt.host=
|
|
||||||
server.ssl.enabled=false
|
|
||||||
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
|
|
||||||
spring.boot.admin.client.instance.service-url=http://localhost:18070
|
|
||||||
spring.boot.admin.client.instance.name=zjsj
|
|
||||||
# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740
|
|
||||||
double-carbon.water-data-url=http://test.cesms.net
|
|
||||||
double-carbon.ammeter-data-url=http://test.cesms.net
|
|
||||||
Loading…
x
Reference in New Issue
Block a user