gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、错误异常界面国际化；2、服务请求异常国际化；3、文件样例界面样式修改。

Browse Source
This commit is contained in:
zhangwei
2018-05-21 14:10:11 +08:00
parent da85e1800d
commit cd9b60d0e0
10 changed files with 94 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/nis/util/ConfigServiceUtil.java
View File

@@ -14,6 +14,7 @@ import net.sf.json.JSONObject;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.httpclient.ClientUtil;
public class ConfigServiceUtil {
@@ -39,13 +40,10 @@ public class ConfigServiceUtil {
Response response= header.get();
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}
if(result == null){
return "0";
}else{
return result;
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
}
/**
* MAAT配置提交
@@ -64,7 +62,7 @@ public class ConfigServiceUtil {
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
@@ -86,7 +84,7 @@ public class ConfigServiceUtil {
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
@@ -110,7 +108,7 @@ public class ConfigServiceUtil {
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
@@ -137,7 +135,7 @@ public class ConfigServiceUtil {
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
@@ -164,7 +162,7 @@ public class ConfigServiceUtil {
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
}
@@ -187,7 +185,7 @@ public class ConfigServiceUtil {
if( response.getStatus() == 200){
result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
return result;
}
@@ -201,7 +199,7 @@ public class ConfigServiceUtil {
if( response.getStatus() == 200){
String result= response.readEntity(String.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+response.readEntity(String.class));
}
} catch (Exception e) {
e.printStackTrace();

4
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -72,9 +72,7 @@ public class AvController extends BaseController {
public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response,
String ids,AvFileSampleCfg entity,MultipartFile srcFile,MultipartFile sampleFile){
try{
if(StringUtil.isEmpty(entity.getSrcUrl()) &&
StringUtil.isEmpty(entity.getSampleUrl()) &&
srcFile!=null && sampleFile!=null &&
if(srcFile!=null && sampleFile!=null &&
srcFile.getSize()>0 && sampleFile.getSize()>0){
String sep = System.getProperty("file.separator");

18
src/main/java/com/nis/web/service/configuration/AvCfgService.java
View File

@@ -72,14 +72,14 @@ public class AvCfgService extends BaseService{
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
Integer compileId = Integer.parseInt(result);
if(compileId!=0){
entity.setCompileId(compileId);
avCfgDao.insertAvFileSample(entity);
}else{
throw new MaatConvertException("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
}else{
entity.setEditorId(UserUtils.getUser().getId());
@@ -100,14 +100,14 @@ public class AvCfgService extends BaseService{
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
Integer compileId = Integer.parseInt(result);
if(compileId!=0){
entity.setCompileId(compileId);
avCfgDao.insertAvSignSample(entity);
}else{
throw new MaatConvertException("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
}else{
@@ -171,7 +171,7 @@ public class AvCfgService extends BaseService{
} catch (Exception e) {
e.printStackTrace();
logger.info("音视频文件样例配置下发失败");
throw new MaatConvertException("音视频文件样例配置下发失败："+e.getMessage());
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}
@@ -190,7 +190,7 @@ public class AvCfgService extends BaseService{
} catch (Exception e) {
e.printStackTrace();
logger.info("音视频文件样例配置下发失败");
throw new MaatConvertException("音视频文件样例配置下发失败："+e.getMessage());
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}else if(isAudit==3){
//调用服务接口取消配置
@@ -203,7 +203,7 @@ public class AvCfgService extends BaseService{
} catch (Exception e) {
e.printStackTrace();
logger.info("音视频文件样取消配置失败");
throw new MaatConvertException("音视频文件样例取消配置失败："+e.getMessage());
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}
}
@@ -246,7 +246,7 @@ public class AvCfgService extends BaseService{
} catch (Exception e) {
e.printStackTrace();
logger.info("音视频标志样例配置下发失败");
throw new MaatConvertException("音视频标识样例配置下发失败："+e.getMessage());
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}else if(isAudit==3){
//调用服务接口取消配置
@@ -259,7 +259,7 @@ public class AvCfgService extends BaseService{
} catch (Exception e) {
e.printStackTrace();
logger.info("音视频标志样例取消配置失败");
throw new MaatConvertException("音视频标识样例取消失败："+e.getMessage());
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}