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

配置全量更新时的异常处理增加服务端的异常状态，增加国际化参数。

Browse Source
This commit is contained in:
zhangwei
2018-12-03 11:48:16 +08:00
parent 388f2d3c0b
commit 90a64dfbb2
9 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
View File

@@ -23,6 +23,7 @@ import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.SysDataDictionaryName;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.CacheUtils;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
@@ -85,7 +86,7 @@ public class ConfigSynchronizationController extends BaseController {
*/
@RequestMapping(value = {"send"})
public void send(Model model,HttpServletRequest request,HttpServletResponse response){
int status = 0;
int status = -2;
try {
configSynchronizationService.send(request,response,null);
status = 1;
@@ -99,10 +100,13 @@ public class ConfigSynchronizationController extends BaseController {
e.printStackTrace();
} catch (ClassNotFoundException e) {
e.printStackTrace();
}catch(MaatConvertException e){
e.printStackTrace();
status = -1;
}catch (Exception e) {
e.printStackTrace();
}finally{
if(status==0){
if(status!=1){
SysDataDictionaryName sysDictName = new SysDataDictionaryName();
sysDictName.setMark("currrent_sync_status");
List<SysDataDictionaryName> dictList = dictService.findDicByName(sysDictName);
@@ -112,7 +116,7 @@ public class ConfigSynchronizationController extends BaseController {
if(!StringUtil.isEmpty(itemList)){
SysDataDictionaryItem item = itemList.get(0);
item.setDictionaryId(dict.getId().intValue());
item.setItemValue("-2");//界面组织数据失败
item.setItemValue(String.valueOf(status));//-2界面组织数据失败，-1服务端返回的失败
dictService.updateDictItem(item);
//删除字典缓存
CacheUtils.remove(Constants.CACHE_DICT_MAP);