1、配置预置初始需要在配置表中插入一条记录，并初始下发服务接口；
2、配置修改action后需要审核流程，才可下发更新服务接口配置内容或配置状态。
This commit is contained in:
zhangwei
@@ -291,7 +291,7 @@ public class AvCfgService extends BaseService{
|
||||
entity.setCreateTime(new Date());
|
||||
//调用服务接口获取compileId
|
||||
Integer compileId = 0;
|
||||
try {
|
||||
/*try {
|
||||
List<Integer> compileIds = ConfigServiceUtil.getId(1,1);
|
||||
if(!StringUtil.isEmpty(compileIds)){
|
||||
compileId = compileIds.get(0);
|
||||
@@ -300,13 +300,13 @@ public class AvCfgService extends BaseService{
|
||||
e.printStackTrace();
|
||||
logger.info("获取编译ID出错");
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
|
||||
}
|
||||
if(compileId!=0){
|
||||
}*/
|
||||
// if(compileId!=0){
|
||||
entity.setCompileId(compileId);
|
||||
avCfgDao.insertAvSignSample(entity);
|
||||
}else{
|
||||
/*}else{
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
|
||||
}
|
||||
}*/
|
||||
|
||||
}else{
|
||||
entity.setEditorId(UserUtils.getUser().getId());
|
||||
@@ -318,7 +318,7 @@ public class AvCfgService extends BaseService{
|
||||
//添加即时生效
|
||||
entity.setIsValid(1);
|
||||
entity.setIsAudit(1);
|
||||
audioAuditAvSignSample(entity,1);
|
||||
audioAuditAvSignSample(entity,1,true);
|
||||
}
|
||||
public void updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids){
|
||||
String[] idArray = ids.split(",");
|
||||
@@ -375,18 +375,28 @@ public class AvCfgService extends BaseService{
|
||||
}
|
||||
}
|
||||
|
||||
public void audioAuditAvSignSample(AvSignSampleCfg entity,Integer isAudit) throws MaatConvertException{
|
||||
public void audioAuditAvSignSample(AvSignSampleCfg entity,Integer isAudit,boolean init) throws MaatConvertException{
|
||||
entity.setAuditTime(new Date());
|
||||
entity.setAuditorId(UserUtils.getUser().getId());
|
||||
avCfgDao.auditAvSignSample(entity);
|
||||
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
|
||||
if(isAudit==1){
|
||||
list.add(entity);
|
||||
//调用服务接口下发配置数据
|
||||
String json=gsonToJson(list);
|
||||
logger.info("文件样例下发配置参数："+json);
|
||||
//调用服务接口下发配置
|
||||
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
logger.info("音视频标志样例配置下发响应信息："+result.getMsg());
|
||||
|
||||
if(init){//预置配置时初始下发配置
|
||||
list.add(entity);
|
||||
//调用服务接口下发配置数据
|
||||
String json=gsonToJson(list);
|
||||
logger.info("文件样例下发配置参数："+json);
|
||||
//调用服务接口下发配置
|
||||
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
logger.info("音视频标志样例配置下发响应信息："+result.getMsg());
|
||||
}else{
|
||||
list.add(entity);
|
||||
String json=gsonToJson(list);
|
||||
logger.info("标志状态变更："+json);
|
||||
//调用服务接口修改配置内容
|
||||
String result = ConfigServiceUtil.patch(json, 2);
|
||||
logger.info("视频标志样状态变更响应信息："+result);
|
||||
}
|
||||
}else if(isAudit==3){
|
||||
AvSignSampleCfg cfg = new AvSignSampleCfg();
|
||||
cfg.setIsValid(0);
|
||||
@@ -399,78 +409,57 @@ public class AvCfgService extends BaseService{
|
||||
//调用服务接口取消配置
|
||||
ToMaatResult result = ConfigServiceUtil.put(json, 2);
|
||||
logger.info("音视频标志样例配置取消配置响应信息："+result.getMsg());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
//预置配置下发
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void auditAvSignSample() throws MaatConvertException{
|
||||
try {
|
||||
AvSignSampleCfg entity = new AvSignSampleCfg();
|
||||
List<AvSignSampleCfg> avSignSampleList = avCfgDao.getAvSignSampleList(entity);
|
||||
if(avSignSampleList!=null&&avSignSampleList.size()>0){
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void auditAvSignSample() throws MaatConvertException{
|
||||
try {
|
||||
AvSignSampleCfg entity = new AvSignSampleCfg();
|
||||
List<AvSignSampleCfg> avSignSampleList = avCfgDao.getAvSignSampleList(entity);
|
||||
if(avSignSampleList!=null&&avSignSampleList.size()>0){
|
||||
// avCfgDao.updateAvSignSampleValid(entity);
|
||||
// avCfgDao.auditAvSignSample(entity);
|
||||
// List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
|
||||
// avSignSampleList.add(entity);
|
||||
for (AvSignSampleCfg av : avSignSampleList) {
|
||||
av.setAuditTime(new Date());
|
||||
av.setAuditorId(UserUtils.getUser().getId());
|
||||
if(av.getIsValid()!=null&&av.getIsValid()!=1){
|
||||
av.setIsValid(1);
|
||||
}
|
||||
avCfgDao.updateAvSignSampleValid(av);
|
||||
for (AvSignSampleCfg av : avSignSampleList) {
|
||||
av.setAuditTime(new Date());
|
||||
av.setAuditorId(UserUtils.getUser().getId());
|
||||
if(av.getIsValid()!=null&&av.getIsValid()!=1){
|
||||
av.setIsValid(1);
|
||||
}
|
||||
//调用服务接口取消配置
|
||||
String json=gsonToJson(avSignSampleList);
|
||||
logger.info("标志状态变更："+json);
|
||||
//调用服务接口取消配置
|
||||
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
logger.info("音视频标志样状态变更响应信息："+result.getMsg());
|
||||
}else{
|
||||
logger.info("视频场景预置失败，数据为空");
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
|
||||
avCfgDao.updateAvSignSampleValid(av);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
//调用服务接口取消配置
|
||||
String json=gsonToJson(avSignSampleList);
|
||||
logger.info("标志状态变更："+json);
|
||||
//调用服务接口取消配置
|
||||
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
logger.info("音视频标志样状态变更响应信息："+result.getMsg());
|
||||
}else{
|
||||
logger.info("视频场景预置失败，数据为空");
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.info("视频场景预置失败，数据为空");
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
|
||||
}
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void auditAvSignSample(AvSignSampleCfg entity) throws Exception{
|
||||
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
|
||||
entity.setAuditTime(new Date());
|
||||
entity.setDescription("0");
|
||||
list.add(entity);
|
||||
try {
|
||||
|
||||
}
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void auditAvSignSample(AvSignSampleCfg entity) throws Exception{
|
||||
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
|
||||
entity.setEditTime(new Date());
|
||||
entity.setDescription("0");
|
||||
list.add(entity);
|
||||
try {
|
||||
avCfgDao.updateAvSignSampleValid(entity);
|
||||
|
||||
// avCfgDao.auditAvSignSample(entity);
|
||||
//更新配置
|
||||
|
||||
if(entity.getIsValid()!=null&&entity.getIsValid()==Constants.VALID_YES){
|
||||
//调用服务接口取消配置
|
||||
String json=gsonToJson(list);
|
||||
logger.info("标志状态变更："+json);
|
||||
//调用服务接口取消配置
|
||||
String result = ConfigServiceUtil.patch(json, 2);
|
||||
logger.info("视频标志样状态变更响应信息："+result);
|
||||
}
|
||||
if(entity.getIsValid()!=null&&entity.getIsValid()==Constants.VALID_NO){
|
||||
//调用服务接口取消配置
|
||||
String json=gsonToJson(list);
|
||||
logger.info("标志状态变更："+json);
|
||||
//调用服务接口取消配置
|
||||
ToMaatResult result = ConfigServiceUtil.put(json, 2);
|
||||
logger.info("视频标志样状态变更响应信息："+result.getMsg());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
/*public void auditAvSignSample(AvSignSampleCfg entity,Integer isAudit) throws MaatConvertException{
|
||||
avCfgDao.auditAvSignSample(entity);
|
||||
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
|
||||
|
||||
Reference in New Issue
Block a user