diff --git a/src/main/java/com/nis/domain/FunctionRegionDict.java b/src/main/java/com/nis/domain/FunctionRegionDict.java index c597b784a..de8dc0f9c 100644 --- a/src/main/java/com/nis/domain/FunctionRegionDict.java +++ b/src/main/java/com/nis/domain/FunctionRegionDict.java @@ -15,6 +15,7 @@ public class FunctionRegionDict extends BaseCfg { private String configDistrict; private String configDesc; private Integer isMaat; + private Integer regionType; public Integer getDictId() { return dictId; } @@ -57,5 +58,11 @@ public class FunctionRegionDict extends BaseCfg { public void setIsMaat(Integer isMaat) { this.isMaat = isMaat; } + public Integer getRegionType() { + return regionType; + } + public void setRegionType(Integer regionType) { + this.regionType = regionType; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index b9689da7e..32576c7b8 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -33,7 +33,7 @@ public class AvController extends BaseController { //音视频文件样例配置列表 @RequestMapping(value = {"/sample/fileSampleList"}) public String fileSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvFileSampleCfg entity){ - Page page = avCfgService.getAvFileSampleList(new Page(request, response), entity); + Page page = avCfgService.getAvFileSampleList(new Page(request, response,"a"), entity); model.addAttribute("page", page); initPageCondition(model); return "/cfg/av/fileSampleList"; @@ -41,7 +41,7 @@ public class AvController extends BaseController { //音视频标志样例配置列表 @RequestMapping(value = {"/sample/signSampleList"}) public String signSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvSignSampleCfg entity){ - Page page = avCfgService.getAvSignSampleList(new Page(request, response), entity); + Page page = avCfgService.getAvSignSampleList(new Page(request, response,"a"), entity); model.addAttribute("page", page); initPageCondition(model); return "/cfg/av/signSampleList"; @@ -86,7 +86,7 @@ public class AvController extends BaseController { File uploadSampleFile = new File(sampleFilePath+sep+sampleFileName); FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile); FileCopyUtils.copy(sampleFile.getBytes(),uploadSampleFile); - String host = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+"/"+request.getContextPath(); + String host = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath(); String srcUrl = host+"/srcFile/"+uploadSrcFile.getName(); String sampleUrl = host+"/sampleFile/"+uploadSampleFile.getName(); logger.info("srcUrl:"+srcUrl); diff --git a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml index 7d8e2d6b7..34cc7f18d 100644 --- a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml +++ b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml @@ -10,10 +10,11 @@ + - dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat + dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type - - - ${menu.sort} - - - - ${fns:abbr(menu.permission,30)} - - - ', this.href)"> - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + +
+  ${menu.name}${menu.code}${menu.functionId}${fns:abbr(menu.href,30)} + + + + + ${menu.sort} + + + + + + + + ${fns:abbr(menu.permission,30)} ', this.href)">
-
- -
- - - - - - + +
+ +
+
+ + + + + + - - + + - + \ No newline at end of file