三江-业务中台质量记录同步代码编写
This commit is contained in:
parent
fd42a84c2a
commit
523b2a3317
@ -1,18 +1,25 @@
|
||||
package com.zhgd.xmgl.call;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.http.HttpUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.gexin.fastjson.JSON;
|
||||
import com.gexin.fastjson.TypeReference;
|
||||
import com.google.common.base.Objects;
|
||||
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
|
||||
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
|
||||
import com.zhgd.xmgl.modules.dangerous.entity.*;
|
||||
import com.zhgd.xmgl.modules.project.entity.Project;
|
||||
import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
|
||||
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
|
||||
import com.zhgd.xmgl.modules.quality.entity.QualityRectifyRecord;
|
||||
import com.zhgd.xmgl.modules.quality.entity.SjSendQualityInspectionRecord;
|
||||
import com.zhgd.xmgl.modules.quality.entity.SjSendQualityRectifyRecord;
|
||||
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
|
||||
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
|
||||
import com.zhgd.xmgl.util.ProfileJudgeUtil;
|
||||
import lombok.Data;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -21,6 +28,9 @@ import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* 三江业务中台远程调用
|
||||
@ -362,7 +372,8 @@ public class SanjiangDataCall {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
|
||||
/**
|
||||
* 获取安全的复查记录的状态
|
||||
*
|
||||
* @param status
|
||||
@ -382,4 +393,224 @@ public class SanjiangDataCall {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Async
|
||||
public void sendAddQualityInspectionRecord(QualityInspectionRecord qir) {
|
||||
if (judgeSjEnvironment()) {
|
||||
log.info("sendAddQualityInspectionRecord:{}", qir);
|
||||
String uri = "seeyon/quality/add.sj";
|
||||
String url = gateWayUrl + uri;
|
||||
String body = buildBodyQualityInspectionRecord(qir);
|
||||
log.info("url:{},body:{}", url, body);
|
||||
String result = HttpUtil.createPost(url).contentType("application/json").body(body).header(apiKeyHeadName, apiKey).execute().body();
|
||||
log.info("httpRs:{}", result);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private String buildBodyQualityInspectionRecord(QualityInspectionRecord q) {
|
||||
SjSendQualityInspectionRecord r = new SjSendQualityInspectionRecord();
|
||||
r.setId(q.getId());
|
||||
r.setRegionName(q.getRegionName());
|
||||
r.setDangerItemContent(q.getDangerItemContent());
|
||||
r.setProblemClassification(q.getDangerItemContent());
|
||||
r.setDangerDesc(q.getDangerDesc());
|
||||
r.setRemark(q.getRemark());
|
||||
r.setAddedDescription(q.getAddedDescription());
|
||||
r.setLevelName(getQualityLevelName(q.getLevel()));
|
||||
r.setUrgentLevelName(getUrgentLevelName(q.getUrgentLevel()));
|
||||
r.setInspectTime(q.getInspectTime());
|
||||
r.setEnterpriseName(getEnterpriseName(q.getEnterpriseSn()));
|
||||
r.setChangeLimitTime(q.getChangeLimitTime());
|
||||
r.setInspectManName(getUserName(q.getInspectManId()));
|
||||
r.setChangeName(getUserName(q.getChangeId()));
|
||||
r.setReviewName(getUserName(q.getReviewId()));
|
||||
r.setVerifyManName(getUserName(q.getVerifyManId()));
|
||||
r.setNotifyPersonName(getUserName(Long.valueOf(q.getNotifyPerson())));
|
||||
r.setStatusName(getQualityStatusName(q.getStatus()));
|
||||
r.setImageUrl(getQualityImageUrl(q.getImageUrl()));
|
||||
Project p = getProjectNumber(q.getProjectSn());
|
||||
if (p != null) {
|
||||
r.setProjectNumber(p.getProjectNumber());
|
||||
r.setProjectName(p.getProjectName());
|
||||
}
|
||||
return JSON.toJSONString(r);
|
||||
}
|
||||
|
||||
private String getUrgentLevelName(String urgentLevel) {
|
||||
//紧急程度，1一般，2严重，3紧要
|
||||
if (StringUtils.isBlank(urgentLevel)) {
|
||||
return null;
|
||||
}
|
||||
switch (urgentLevel) {
|
||||
case "1":
|
||||
return "一般";
|
||||
case "2":
|
||||
return "严重";
|
||||
case "3":
|
||||
return "紧要";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private String getQualityImageUrl(String imageUrl) {
|
||||
if (StringUtils.isBlank(imageUrl)) {
|
||||
return null;
|
||||
}
|
||||
String[] split = StringUtils.split(imageUrl, ",");
|
||||
//64368d099dd43180920f45a6.png*http://116.169.63.183:7070/image/64368d099dd43180920f45a6.png,64368d119dd43180920f45a7.png*http://116.169.63.183:7070/image/64368d119dd43180920f45a7.png
|
||||
List<String> urlList = Stream.of(split).map(s -> {
|
||||
return StringUtils.substringBefore(s, "*");
|
||||
}).collect(Collectors.toList());
|
||||
return getImageUrl(StringUtils.join(urlList, ","));
|
||||
}
|
||||
|
||||
private String getQualityStatusName(Integer status) {
|
||||
if (status == null) {
|
||||
return null;
|
||||
}
|
||||
switch (status) {
|
||||
//状态，1无需整改，2待整改，3待复查，4待核验，5合格，6不合格
|
||||
case 1:
|
||||
return "无需整改";
|
||||
case 2:
|
||||
return "待整改";
|
||||
case 3:
|
||||
return "待复查";
|
||||
case 4:
|
||||
return "待核验";
|
||||
case 5:
|
||||
return "合格";
|
||||
case 6:
|
||||
return "不合格";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private String getQualityLevelName(Integer level) {
|
||||
if (level == null) {
|
||||
return null;
|
||||
}
|
||||
switch (level) {
|
||||
//1一级，2二级，3三级，4四级
|
||||
case 1:
|
||||
return "一级";
|
||||
case 2:
|
||||
return "二级";
|
||||
case 3:
|
||||
return "三级";
|
||||
case 4:
|
||||
return "四级";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新质量记录（只更改状态）
|
||||
*
|
||||
* @param qir
|
||||
*/
|
||||
@Async
|
||||
public void sendUpdateQualityInspectionRecord(QualityInspectionRecord qir) {
|
||||
if (judgeSjEnvironment()) {
|
||||
log.info("sendUpdateQualityInspectionRecord:{}", qir);
|
||||
String uri = "seeyon/quality/update.sj";
|
||||
String url = gateWayUrl + uri;
|
||||
SjSendQualityInspectionRecord r = new SjSendQualityInspectionRecord();
|
||||
r.setStatusName(getQualityStatusName(qir.getStatus()));
|
||||
r.setId(qir.getId());
|
||||
String body = JSON.toJSONString(r);
|
||||
log.info("url:{},body:{}", url, body);
|
||||
String result = HttpUtil.createPost(url).contentType("application/json").body(body).header(apiKeyHeadName, apiKey).execute().body();
|
||||
log.info("httpRs:{}", result);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 三江发送业务中台的质量的整改/复查/核验记录
|
||||
*
|
||||
* @param qrr
|
||||
*/
|
||||
@Async
|
||||
public void sendAddQualityRectifyRecord(QualityRectifyRecord qrr, QualityInspectionRecord qi) {
|
||||
if (judgeSjEnvironment()) {
|
||||
log.info("sendAddQualityRectifyRecord:{}", qrr);
|
||||
Integer type = qrr.getType();
|
||||
log.info("getType:{}", type);
|
||||
//类型，1整改记录，2复查记录，3核验记录
|
||||
String uri = null;
|
||||
if (Objects.equal(type, 1)) {
|
||||
uri = "seeyon/quality/addRectification.sj";
|
||||
}
|
||||
if (Objects.equal(type, 2)) {
|
||||
uri = "seeyon/quality/addReview.sj";
|
||||
}
|
||||
if (Objects.equal(type, 3)) {
|
||||
uri = "seeyon/quality/addVerify.sj";
|
||||
}
|
||||
String url = gateWayUrl + uri;
|
||||
String body = buildBodyQualityThreeRecord(qrr, qi);
|
||||
log.info("url:{},body:{}", url, body);
|
||||
String result = HttpUtil.createPost(url).contentType("application/json").body(body).header(apiKeyHeadName, apiKey).execute().body();
|
||||
log.info("httpRs:{}", result);
|
||||
}
|
||||
}
|
||||
|
||||
private String buildBodyQualityThreeRecord(QualityRectifyRecord q, QualityInspectionRecord qi) {
|
||||
SjSendQualityRectifyRecord s = new SjSendQualityRectifyRecord();
|
||||
s.setId(q.getId());
|
||||
s.setCreateTime(DateUtil.formatDate(DateUtil.parse(q.getCreateTime())));
|
||||
s.setCreateUserName(getUserName(q.getCreateUser()));
|
||||
s.setStatusName(getQualityThreeRecordStatusName(q.getType(), q.getStatus()));
|
||||
s.setAdditionalRemarks(q.getAdditionalRemarks());
|
||||
s.setFileUrl(getQualityThreeRecordFileUrl(q.getFileUrl()));
|
||||
s.setQualityId(qi.getId());
|
||||
return JSON.toJSONString(s);
|
||||
}
|
||||
|
||||
private String getQualityThreeRecordFileUrl(String fileUrl) {
|
||||
if (StringUtils.isBlank(fileUrl)) {
|
||||
return null;
|
||||
}
|
||||
ArrayList<QualityRectifyRecordFileUrl> fileUrls = JSON.parseObject(fileUrl, new TypeReference<ArrayList<QualityRectifyRecordFileUrl>>() {
|
||||
});
|
||||
List<String> names = fileUrls.stream().map(q -> sjUploadUrlPrefix + q.name).collect(Collectors.toList());
|
||||
return StringUtils.join(names, ",");
|
||||
}
|
||||
|
||||
private String getQualityThreeRecordStatusName(Integer type, Integer status) {
|
||||
if (type == null || status == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
//1整改记录，2复查记录，3核验记录（整改时候1未整改，2已整改。复查时候1复查不合格，2复查合格。核验时候，1核验不合格，2核验合格）
|
||||
if (type == 1) {
|
||||
switch (status) {
|
||||
case 1:
|
||||
return "未整改";
|
||||
case 2:
|
||||
return "已整改";
|
||||
}
|
||||
} else if (type == 2) {
|
||||
switch (status) {
|
||||
case 1:
|
||||
return "复查不合格";
|
||||
case 2:
|
||||
return "复查合格";
|
||||
}
|
||||
} else if (type == 3) {
|
||||
switch (status) {
|
||||
case 1:
|
||||
return "核验不合格";
|
||||
case 2:
|
||||
return "核验合格";
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class QualityRectifyRecordFileUrl {
|
||||
private String name;
|
||||
private String url;
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
<if test="param.isBlack!=null">
|
||||
and a.is_black=#{param.isBlack}
|
||||
</if>
|
||||
order by a.id desc
|
||||
</select>
|
||||
<select id="selectCarTypeCount" resultType="java.util.Map">
|
||||
SELECT b.car_type_name carTypeName,COUNT(1) carTypeNum,
|
||||
@ -21,4 +22,4 @@
|
||||
WHERE a.project_sn=#{projectSn}
|
||||
group by a.car_type
|
||||
</select>
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhgd.xmgl.modules.car.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@ -64,6 +65,11 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
|
||||
if (StringUtils.isBlank(workerName)) {
|
||||
entityMap.put("driver_worker_name",MapUtils.getString(entityMap,"driverName"));
|
||||
}
|
||||
String addTime = MapUtils.getString(entityMap, "addTime");
|
||||
if (StringUtils.isNotBlank(addTime)) {
|
||||
String time = DateUtil.format(DateUtil.parse(addTime), "yyyy-MM-dd HH:mm:ss");
|
||||
entityMap.put("add_time", time);
|
||||
}
|
||||
}
|
||||
}
|
||||
return page.setRecords(list);
|
||||
|
||||
@ -0,0 +1,95 @@
|
||||
package com.zhgd.xmgl.modules.quality.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 三江发送业务中台的质量的记录
|
||||
*/
|
||||
@Data
|
||||
public class SjSendQualityInspectionRecord {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
private Long id;
|
||||
/**
|
||||
* 检查部位
|
||||
*/
|
||||
private String regionName;
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
private String dangerItemContent;
|
||||
/**
|
||||
* 问题分类
|
||||
*/
|
||||
private String problemClassification;
|
||||
/**
|
||||
* 补充说明
|
||||
*/
|
||||
private String dangerDesc;
|
||||
/**
|
||||
* 整改要求
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 事件描述
|
||||
*/
|
||||
private String addedDescription;
|
||||
/**
|
||||
* 问题等级（一级，二级，三级，四级）
|
||||
*/
|
||||
private String levelName;
|
||||
/**
|
||||
* 紧急程度（一般，严重，紧要）
|
||||
*/
|
||||
private String urgentLevelName;
|
||||
/**
|
||||
* 检查时间（格式：2023-04-08）
|
||||
*/
|
||||
private String inspectTime;
|
||||
/**
|
||||
* 分包单位
|
||||
*/
|
||||
private String enterpriseName;
|
||||
/**
|
||||
* 整改时限（格式：2023-04-08）
|
||||
*/
|
||||
private String changeLimitTime;
|
||||
/**
|
||||
* 检查人
|
||||
*/
|
||||
private String inspectManName;
|
||||
/**
|
||||
* 整改人
|
||||
*/
|
||||
private String changeName;
|
||||
/**
|
||||
* 复查人
|
||||
*/
|
||||
private String reviewName;
|
||||
/**
|
||||
* 核验人
|
||||
*/
|
||||
private String verifyManName;
|
||||
/**
|
||||
* 通知人
|
||||
*/
|
||||
private String notifyPersonName;
|
||||
/**
|
||||
* 状态（无需整改，待整改，待复查，待核验，合格，不合格）
|
||||
*/
|
||||
private String statusName;
|
||||
/**
|
||||
* 上传图片
|
||||
*/
|
||||
private String imageUrl;
|
||||
/**
|
||||
* 项目编号
|
||||
*/
|
||||
private String projectNumber;
|
||||
/**
|
||||
* 项目名称
|
||||
*/
|
||||
private String projectName;
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.zhgd.xmgl.modules.quality.entity;
|
||||
|
||||
import lombok.Data;
|
||||
/**
|
||||
* 三江发送业务中台的质量的整改/复查/核验记录
|
||||
*/
|
||||
@Data
|
||||
public class SjSendQualityRectifyRecord {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
private Long id;
|
||||
/**
|
||||
* 创建时间（格式：2023-04-08）
|
||||
*/
|
||||
private String createTime;
|
||||
/**
|
||||
* 用户名称（type=1就是检查人， type=2就是复查人，type=3就是核验人）
|
||||
*/
|
||||
private String createUserName;
|
||||
/**
|
||||
* 状态（type=1：未整改，已整改。type=2：复查不合格，复查合格。type=3：核验不合格，核验合格）
|
||||
*/
|
||||
private String statusName;
|
||||
/**
|
||||
* 相关说明
|
||||
*/
|
||||
private String additionalRemarks;
|
||||
/**
|
||||
* 图片url
|
||||
*/
|
||||
private String fileUrl;
|
||||
/**
|
||||
* 质量检查记录id
|
||||
*/
|
||||
private Long qualityId;
|
||||
}
|
||||
@ -134,6 +134,8 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
|
||||
if (qualityInspectionRecord.getRecordType() == 1 && qualityInspectionRecord.getStatus() == 2) {
|
||||
noticeService.addUserNotice(qualityInspectionRecord.getChangeId(), "您有一条质量检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "质量管理待整改", "11");
|
||||
}
|
||||
|
||||
sanjiangDataCall.sendAddQualityInspectionRecord(qualityInspectionRecord);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.quality.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zhgd.jeecg.common.mybatis.EntityMap;
|
||||
import com.zhgd.xmgl.call.SanjiangDataCall;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
|
||||
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
|
||||
import com.zhgd.xmgl.modules.quality.entity.QualityRectifyRecord;
|
||||
@ -20,7 +21,7 @@ import java.util.Map;
|
||||
/**
|
||||
* @Description: 质量检查-整改记录
|
||||
* @author： pds
|
||||
* @date： 2021-06-17
|
||||
* @date： 2021-06-17
|
||||
* @version： V1.0
|
||||
*/
|
||||
@Service
|
||||
@ -32,6 +33,8 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
|
||||
private QualityInspectionRecordMapper qualityInspectionRecordMapper;
|
||||
@Autowired
|
||||
private INoticeService noticeService;
|
||||
@Autowired
|
||||
SanjiangDataCall sanjiangDataCall;
|
||||
|
||||
@Override
|
||||
public List<EntityMap> selectRectifyRecordList(Map<String, Object> map) {
|
||||
@ -43,37 +46,39 @@ public class QualityRectifyRecordServiceImpl extends ServiceImpl<QualityRectifyR
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
qualityRectifyRecord.setCreateTime(sdf.format(new Date()));
|
||||
qualityRectifyRecordMapper.insert(qualityRectifyRecord);
|
||||
QualityInspectionRecord tempQualityInspectionRecord=qualityInspectionRecordMapper.selectById(qualityRectifyRecord.getQualityId());
|
||||
QualityInspectionRecord qualityInspectionRecord=new QualityInspectionRecord();
|
||||
QualityInspectionRecord tempQualityInspectionRecord = qualityInspectionRecordMapper.selectById(qualityRectifyRecord.getQualityId());
|
||||
QualityInspectionRecord qualityInspectionRecord = new QualityInspectionRecord();
|
||||
qualityInspectionRecord.setId(qualityRectifyRecord.getQualityId());
|
||||
if(qualityRectifyRecord.getType()==1){
|
||||
if (qualityRectifyRecord.getType() == 1) {
|
||||
//已整改时候需要复查
|
||||
if(qualityRectifyRecord.getStatus()==2){
|
||||
if (qualityRectifyRecord.getStatus() == 2) {
|
||||
qualityInspectionRecord.setStatus(3);
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getReviewId(),"您有一条质量检查的整改结果需要复查，请及时查看。","质量管理整改结果待复查","11");
|
||||
}else {
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getReviewId(), "您有一条质量检查的整改结果需要复查，请及时查看。", "质量管理整改结果待复查", "11");
|
||||
} else {
|
||||
qualityInspectionRecord.setStatus(2);
|
||||
}
|
||||
}else if(qualityRectifyRecord.getType()==2){
|
||||
} else if (qualityRectifyRecord.getType() == 2) {
|
||||
//复查合格时候需要核验
|
||||
if(qualityRectifyRecord.getStatus()==2){
|
||||
if (qualityRectifyRecord.getStatus() == 2) {
|
||||
qualityInspectionRecord.setStatus(4);
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getVerifyManId(),"您有一条质量检查的整改结果需要核验，请及时查看。","质量管理整改结果核验通知","11");
|
||||
}else{
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getVerifyManId(), "您有一条质量检查的整改结果需要核验，请及时查看。", "质量管理整改结果核验通知", "11");
|
||||
} else {
|
||||
qualityInspectionRecord.setStatus(2);
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getChangeId(),"您提交的质量检查的整改结果复查不通过，请及时重新整改。","质量管理整改结果复查通知","11");
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getChangeId(), "您提交的质量检查的整改结果复查不通过，请及时重新整改。", "质量管理整改结果复查通知", "11");
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
//核验合格时候则该记录合格
|
||||
if(qualityRectifyRecord.getStatus()==2){
|
||||
if (qualityRectifyRecord.getStatus() == 2) {
|
||||
qualityInspectionRecord.setStatus(5);
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getChangeId(),"您提交的质量检查的整改结果已通过复查。","质量管理整改结果核验通知","11");
|
||||
}else{
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getChangeId(), "您提交的质量检查的整改结果已通过复查。", "质量管理整改结果核验通知", "11");
|
||||
} else {
|
||||
qualityInspectionRecord.setStatus(2);
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getChangeId(),"您提交的质量检查的整改结果核验不通过，请及时重新整改。","质量管理整改结果核验通知","11");
|
||||
noticeService.addUserNotice(tempQualityInspectionRecord.getChangeId(), "您提交的质量检查的整改结果核验不通过，请及时重新整改。", "质量管理整改结果核验通知", "11");
|
||||
}
|
||||
}
|
||||
qualityInspectionRecordMapper.updateById(qualityInspectionRecord);
|
||||
|
||||
sanjiangDataCall.sendUpdateQualityInspectionRecord(qualityInspectionRecord);
|
||||
sanjiangDataCall.sendAddQualityRectifyRecord(qualityRectifyRecord, qualityInspectionRecord);
|
||||
}
|
||||
}
|
||||
|
||||
74
src/main/resources/application-nc-gsx.properties
Normal file
74
src/main/resources/application-nc-gsx.properties
Normal file
@ -0,0 +1,74 @@
|
||||
#http.port=30250
|
||||
http.port=23429
|
||||
#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://localhost:3306/wisdomsite_nc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
|
||||
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
|
||||
spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
|
||||
server.port=33223
|
||||
#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
|
||||
Loading…
x
Reference in New Issue
Block a user