Skip to content

F
foc_manage
Commit 58d82750 by java-李谡
Options

修改jdbc连接，代码review,去除UI切换

parent 1ba13285
Showing with 196 additions and 304 deletions
WebContent/WEB-INF/views/modules/sys/sysIndex2.jsp
...@@ -133,14 +133,14 @@ ...@@ -133,14 +133,14 @@
<div class="brand"><span id="productName">${fns:getValue('productName')}</span></div> <div class="brand"><span id="productName">${fns:getValue('productName')}</span></div>
<ul id="userControl" class="nav pull-right"><%-- <ul id="userControl" class="nav pull-right"><%--
<li><a href="${pageContext.request.contextPath}${fns:getFrontPath()}/index-${fnc:getCurrentSiteId()}.html" target="_blank" title="访问网站主页"><i class="icon-home"></i></a></li>--%> <li><a href="${pageContext.request.contextPath}${fns:getFrontPath()}/index-${fnc:getCurrentSiteId()}.html" target="_blank" title="访问网站主页"><i class="icon-home"></i></a></li>--%>
<li id="themeSwitch" class="dropdown"> <%--<li id="themeSwitch" class="dropdown">--%>
<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="主题切换"><i class="icon-th-large"></i></a> <%--<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="主题切换"><i class="icon-th-large"></i></a>--%>
<ul class="dropdown-menu"> <%--<ul class="dropdown-menu">--%>
<c:forEach items="${fns:getDictList('theme')}" var="dict"><li><a href="#" onclick="location='${pageContext.request.contextPath}/theme/${dict.value}?url='+location.href">${dict.label}</a></li></c:forEach> <%--<c:forEach items="${fns:getDictList('theme')}" var="dict"><li><a href="#" onclick="location='${pageContext.request.contextPath}/theme/${dict.value}?url='+location.href">${dict.label}</a></li></c:forEach>--%>
<li><a href="javascript:cookie('tabmode','${cookie.tabmode.value eq '1' ? '0' : '1'}');location=location.href">${cookie.tabmode.value eq '1' ? '关闭' : '开启'}页签模式</a></li> <%--<li><a href="javascript:cookie('tabmode','${cookie.tabmode.value eq '1' ? '0' : '1'}');location=location.href">${cookie.tabmode.value eq '1' ? '关闭' : '开启'}页签模式</a></li>--%>
</ul> <%--</ul>--%>
<!--[if lte IE 6]><script type="text/javascript">$('#themeSwitch').hide();</script><![endif]--> <%--<!--[if lte IE 6]><script type="text/javascript">$('#themeSwitch').hide();</script><![endif]-->--%>
</li> <%--</li>--%>
<li id="userInfo" class="dropdown"> <li id="userInfo" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="个人信息">您好, ${fns:getUser().name}&nbsp;<span id="notifyNum" class="label label-info hide"></span></a> <a class="dropdown-toggle" data-toggle="dropdown" href="#" title="个人信息">您好, ${fns:getUser().name}&nbsp;<span id="notifyNum" class="label label-info hide"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
......
src/com/ejweb/core/conf/SecurityPropertyPlaceholderConfigurer.java
...@@ -153,7 +153,7 @@ public class SecurityPropertyPlaceholderConfigurer extends PropertyPlaceholderCo ...@@ -153,7 +153,7 @@ public class SecurityPropertyPlaceholderConfigurer extends PropertyPlaceholderCo
// } // }
// } // }
System.out.println(DES3Utils.encrypt("jdbc:mysql://10.70.78.27:3306/foc?useUnicode=true&characterEncoding=utf-8", CONF_DESC_KEY)); // System.out.println(DES3Utils.encrypt("jdbc:mysql://10.70.78.27:3306/foc?useUnicode=true&characterEncoding=utf-8", CONF_DESC_KEY));
// System.out.println(DES3Utils.decrypt("7aaee3bf1b522eeeb27b967ef218248f7b15a97cd36dfddec36d4db09e9d03ee7cc6a4738c942183df0929c2937db163e9cd92ba373f32208f3eecbf8e3a2db330c7ea9972bb81a166a76c7ae55aa85e", CONF_DESC_KEY)); System.out.println(DES3Utils.decrypt("7aaee3bf1b522eee9c5cade1a71670f3aed546d27bf021874da7580fa9df6021c87eaddeb9b9a6eb200842455cb776b4347eb35b6c4fb07af249a322047538d40a3047091eb83489e3f02dd6c57c44d6", CONF_DESC_KEY));
} }
} }
src/com/ejweb/modules/aircraft/web/AircraftController.java
...@@ -91,8 +91,6 @@ public class AircraftController extends BaseController { ...@@ -91,8 +91,6 @@ public class AircraftController extends BaseController {
/** /**
* 获取机构JSON数据。 * 获取机构JSON数据。
* @param extId 排除的ID
* @param grade 显示级别
* @param response * @param response
* @return * @return
*/ */
......
src/com/ejweb/modules/airline/service/VerifyService.java
...@@ -60,67 +60,59 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> { ...@@ -60,67 +60,59 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> {
verifyEntity.setPage(page); verifyEntity.setPage(page);
PageHelper.startPage(page.getPageNo(), page.getPageSize()); PageHelper.startPage(page.getPageNo(), page.getPageSize());
List<VerifyEntity> list = verifyDao.findAllList(verifyEntity); List<VerifyEntity> list = verifyDao.findAllList(verifyEntity);
for(VerifyEntity entity : list){ for (VerifyEntity entity : list) {
if("06".equals(entity.getVerifType())||"07".equals(entity.getVerifType()) if ("06".equals(entity.getVerifType()) || "07".equals(entity.getVerifType())
||"08".equals(entity.getVerifType())){ || "08".equals(entity.getVerifType())) {
entity.setExpiryDate("长期有效"); entity.setExpiryDate("长期有效");
}else{ } else {
Integer day = verifyDao.getDay(entity); Integer day = verifyDao.getDay(entity);
if(day!=null){ if (day != null) {
if(day<=0)day=0; if (day <= 0) day = 0;
day=90-day; day = 90 - day;
if(day<0){ if (day < 0) {
entity.setExpiryDate("0"); entity.setExpiryDate("0");
entity.setStatus("失效"); entity.setStatus("失效");
}else{ } else {
entity.setExpiryDate(day+""); entity.setExpiryDate(day + "");
entity.setStatus("有效"); entity.setStatus("有效");
} }
} }
} }
} }
// List<VerifEntity> list1 = verifyDao.findAllList2(verifyEntity);
page.setList(list); page.setList(list);
return page; return page;
} }
public List<VerifyEntity> findAllList(VerifyEntity verifyEntity) { public List<VerifyEntity> findAllList(VerifyEntity verifyEntity) {
List<VerifyEntity> list=verifyDao.findAllList1(verifyEntity); List<VerifyEntity> list = verifyDao.findAllList1(verifyEntity);
/* for (VerifyEntity verifyEntity1 : list) {
AirportEntity areaAr = verifyEntity1.getAreaAr();// 到达地
AirportEntity areaSt = verifyEntity1.getAreaSt();// 出发地
if (areaAr != null && areaSt != null && !areaSt.getCityName().equals("") && areaSt.getCityName() != null
&& !areaAr.getCityName().equals("") && areaAr.getCityName() != null) {
verifyEntity1.setAirline(areaSt.getCityName() + areaSt.getAirportIata() + "-" + areaAr.getCityName()
+ areaAr.getAirportIata());
}
}*/
return list; return list;
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public void inser(VerifyEntity verifyEntity,List<ConnectEntity> list) { public void inser(VerifyEntity verifyEntity, List<ConnectEntity> list) {
UserProfileEntity user = new UserProfileEntity(); UserProfileEntity user = new UserProfileEntity();
user.setId(UserUtils.getUser().getId()); user.setId(UserUtils.getUser().getId());
String departId = userProfileDao.getDepartId(user); String departId = userProfileDao.getDepartId(user);
DepartEntity depart = new DepartEntity(); DepartEntity depart = new DepartEntity();
depart.setId(departId); depart.setId(departId);
verifyEntity.setDepart(depart); verifyEntity.setDepart(depart);
if(StringUtils.isBlank(verifyEntity.getExpiryDate())||isNumeric(verifyEntity.getExpiryDate())){ if (StringUtils.isBlank(verifyEntity.getExpiryDate()) || isNumeric(verifyEntity.getExpiryDate())) {
verifyEntity.setExpiryDate(null); verifyEntity.setExpiryDate(null);
} }
verifyDao.insert(verifyEntity); verifyDao.insert(verifyEntity);
for(ConnectEntity connect: list){ for (ConnectEntity connect : list) {
connectDao.insert(connect); connectDao.insert(connect);
} }
} }
public boolean isNumeric(String str){
public boolean isNumeric(String str) {
Pattern pattern = Pattern.compile("[0-9]*"); Pattern pattern = Pattern.compile("[0-9]*");
Matcher isNum = pattern.matcher(str); Matcher isNum = pattern.matcher(str);
if( !isNum.matches() ){ if (!isNum.matches()) {
return false; return false;
} }
return true; return true;
...@@ -140,7 +132,7 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> { ...@@ -140,7 +132,7 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> {
verifyDao.insert(verifyEntity); verifyDao.insert(verifyEntity);
// 如果不是航线则结束 // 如果不是航线则结束
if ("06".equals(verifyEntity.getVerifType()) || "07".equals(verifyEntity.getVerifType()) if ("06".equals(verifyEntity.getVerifType()) || "07".equals(verifyEntity.getVerifType())
|| "08".equals(verifyEntity.getVerifType()) ) { || "08".equals(verifyEntity.getVerifType())) {
return; return;
} }
ConnectEntity connect = new ConnectEntity(); ConnectEntity connect = new ConnectEntity();
...@@ -171,8 +163,7 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> { ...@@ -171,8 +163,7 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> {
verif.setExpiryDate(verifyEntity.getExpiryDate()); verif.setExpiryDate(verifyEntity.getExpiryDate());
verif.setAircraft(verifyEntity.getAircraft()); verif.setAircraft(verifyEntity.getAircraft());
if ("06".equals(verifyEntity.getVerifType()) || "07".equals(verifyEntity.getVerifType()) if ("06".equals(verifyEntity.getVerifType()) || "07".equals(verifyEntity.getVerifType())
|| "08".equals(verifyEntity.getVerifType()) ) { || "08".equals(verifyEntity.getVerifType())) {
// verif.setAreaAr(verifyEntity.getAreaAr());
verif.setAreaSt(verifyEntity.getAreaSt()); verif.setAreaSt(verifyEntity.getAreaSt());
verif.setFlightNo(verifyEntity.getFlightNo()); verif.setFlightNo(verifyEntity.getFlightNo());
verifyDao.update(verifyEntity); verifyDao.update(verifyEntity);
...@@ -185,15 +176,6 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> { ...@@ -185,15 +176,6 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> {
verif.setFlightNo(verifyEntity.getFlightNo()); verif.setFlightNo(verifyEntity.getFlightNo());
} }
verifyDao.update(verif); verifyDao.update(verif);
/* // 如果不是航线则结束
if ("06".equals(verifyEntity.getVerifType()) || "07".equals(verifyEntity.getVerifType())
|| "08".equals(verifyEntity.getVerifType()) ) {
verifyDao.update(verifyEntity);
return;
}
if ("1".equals(verifyEntity.getConnect().getIsMain())) {
verifyDao.update(verifyEntity);
}*/
ConnectEntity connect = new ConnectEntity(); ConnectEntity connect = new ConnectEntity();
connect = verifyEntity.getConnect(); connect = verifyEntity.getConnect();
...@@ -215,7 +197,7 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> { ...@@ -215,7 +197,7 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> {
} }
@Transactional(readOnly = false) @Transactional(readOnly = false)
public VerifyEntity getverifyByVerifNo(String VerifNo) { public VerifyEntity getVerifyByVerifyNo(String VerifNo) {
VerifyEntity verifyEntity = new VerifyEntity(); VerifyEntity verifyEntity = new VerifyEntity();
verifyEntity.setVerifNo(VerifNo); verifyEntity.setVerifNo(VerifNo);
return verifyDao.getverifyByVerifNo(verifyEntity); return verifyDao.getverifyByVerifNo(verifyEntity);
......
src/com/ejweb/modules/airline/web/VerifyController.java
...@@ -37,11 +37,11 @@ import com.ejweb.modules.airline.entity.VerifyError; ...@@ -37,11 +37,11 @@ import com.ejweb.modules.airline.entity.VerifyError;
/** /**
*
* Verify Controller * Verify Controller
* @team IT Team *
* @author zhanglg * @author zhanglg
* @version 1.0 * @version 1.0
* @team IT Team
* @time 2016年8月30日 * @time 2016年8月30日
*/ */
...@@ -66,16 +66,16 @@ public class VerifyController extends BaseController { ...@@ -66,16 +66,16 @@ public class VerifyController extends BaseController {
} }
@RequiresPermissions("vrf:verify:view") @RequiresPermissions("vrf:verify:view")
@RequestMapping(value = { "list", "" }) @RequestMapping(value = {"list", ""})
public String list(VerifyEntity verifyEntity, HttpServletRequest request, HttpServletResponse response, public String list(VerifyEntity verifyEntity, HttpServletRequest request, HttpServletResponse response,
Model model,String message) { Model model, String message) {
if(message!=null){ if (message != null) {
model.addAttribute("message", message); model.addAttribute("message", message);
} }
verifyEntity.setVerifStatus("02"); verifyEntity.setVerifStatus("02");
Page<VerifyEntity> page = verifyService.findList(new Page<VerifyEntity>(request, response), verifyEntity); Page<VerifyEntity> page = verifyService.findList(new Page<VerifyEntity>(request, response), verifyEntity);
model.addAttribute("page", page); model.addAttribute("page", page);
List<AirportEntity> airportData= airportService.findAllList(new AirportEntity()); List<AirportEntity> airportData = airportService.findAllList(new AirportEntity());
model.addAttribute("airportList", airportData); model.addAttribute("airportList", airportData);
return "modules/airline/verifyList"; return "modules/airline/verifyList";
} }
...@@ -90,8 +90,8 @@ public class VerifyController extends BaseController { ...@@ -90,8 +90,8 @@ public class VerifyController extends BaseController {
@RequiresPermissions("vrf:verify:view") @RequiresPermissions("vrf:verify:view")
@RequestMapping(value = "form") @RequestMapping(value = "form")
public String form(VerifyEntity verifyEntity, Model model) { public String form(VerifyEntity verifyEntity, Model model) {
if(!model.containsAttribute("airportList")){ if (!model.containsAttribute("airportList")) {
List<AirportEntity> airportData= airportService.findAllList(new AirportEntity()); List<AirportEntity> airportData = airportService.findAllList(new AirportEntity());
model.addAttribute("airportList", airportData); model.addAttribute("airportList", airportData);
} }
return "modules/airline/verifyForm"; return "modules/airline/verifyForm";
...@@ -100,7 +100,7 @@ public class VerifyController extends BaseController { ...@@ -100,7 +100,7 @@ public class VerifyController extends BaseController {
@RequiresPermissions("vrf:verify:edit") @RequiresPermissions("vrf:verify:edit")
@RequestMapping(value = "save") @RequestMapping(value = "save")
public String save(VerifyEntity verifyEntity, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) { public String save(VerifyEntity verifyEntity, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
if (!beanValidator(model, verifyEntity)){ if (!beanValidator(model, verifyEntity)) {
return form(verifyEntity, model); return form(verifyEntity, model);
} }
verifyService.save(verifyEntity); verifyService.save(verifyEntity);
...@@ -110,10 +110,10 @@ public class VerifyController extends BaseController { ...@@ -110,10 +110,10 @@ public class VerifyController extends BaseController {
@RequiresPermissions("vrf:verifytype:view") @RequiresPermissions("vrf:verifytype:view")
@RequestMapping(value = "typelist") @RequestMapping(value = "typelist")
public String typelist(VerifyEntity verifyEntity, HttpServletRequest request, HttpServletResponse response, public String typeList(VerifyEntity verifyEntity, HttpServletRequest request, HttpServletResponse response,
Model model) { Model model) {
verifyEntity.setVerifStatus("02"); verifyEntity.setVerifStatus("02");
AircraftEntity aircraftEntity=new AircraftEntity(); AircraftEntity aircraftEntity = new AircraftEntity();
aircraftEntity.setVerify(verifyEntity); aircraftEntity.setVerify(verifyEntity);
List<AircraftEntity> list = aircraftService.findVrfList(aircraftEntity); List<AircraftEntity> list = aircraftService.findVrfList(aircraftEntity);
model.addAttribute("list", list); model.addAttribute("list", list);
...@@ -127,21 +127,23 @@ public class VerifyController extends BaseController { ...@@ -127,21 +127,23 @@ public class VerifyController extends BaseController {
addMessage(redirectAttributes, "删除成功"); addMessage(redirectAttributes, "删除成功");
return "redirect:" + adminPath + "/airline/verify/list?repage"; return "redirect:" + adminPath + "/airline/verify/list?repage";
} }
@ResponseBody @ResponseBody
@RequestMapping("checkNameExist") @RequestMapping("checkNameExist")
public String checkNameExist(String oldVerifNo,String VerifNo) { public String checkNameExist(String oldVerifNo, String VerifNo) {
if (VerifNo !=null && VerifNo.equals(oldVerifNo)) { if (VerifNo != null && VerifNo.equals(oldVerifNo)) {
return "true"; // 不存在 return "true"; // 不存在
} else if (VerifNo !=null && verifyService.getverifyByVerifNo(VerifNo)==null) { } else if (VerifNo != null && verifyService.getVerifyByVerifyNo(VerifNo) == null) {
return "true"; // 不存在 return "true"; // 不存在
} }
return "false"; // 存在 return "false"; // 存在
} }
@RequiresPermissions("vrf:verify:edit") @RequiresPermissions("vrf:verify:edit")
@RequestMapping(value = "exportFile") @RequestMapping(value = "exportFile")
public String exportFile(VerifyEntity verifyEntity,HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) { public String exportFile(VerifyEntity verifyEntity, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
try { try {
String fileName = "航线管理"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx"; String fileName = "航线管理" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
verifyEntity.setVerifStatus("02"); verifyEntity.setVerifStatus("02");
// 查询数据 // 查询数据
List<VerifyEntity> list = verifyService.findAllList(verifyEntity); List<VerifyEntity> list = verifyService.findAllList(verifyEntity);
...@@ -152,10 +154,11 @@ public class VerifyController extends BaseController { ...@@ -152,10 +154,11 @@ public class VerifyController extends BaseController {
.dispose(); .dispose();
return null; return null;
} catch (Exception e) { } catch (Exception e) {
addMessage(redirectAttributes,"导出失败！失败信息："+e.getMessage()); addMessage(redirectAttributes, "导出失败！失败信息：" + e.getMessage());
} }
return "redirect:" + adminPath + "/airline/verify/list?repage"; return "redirect:" + adminPath + "/airline/verify/list?repage";
} }
@RequiresPermissions("vrf:verify:edit") @RequiresPermissions("vrf:verify:edit")
@RequestMapping(value = "/import/template") @RequestMapping(value = "/import/template")
public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) { public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
...@@ -164,20 +167,22 @@ public class VerifyController extends BaseController { ...@@ -164,20 +167,22 @@ public class VerifyController extends BaseController {
new ExportExcel("航线管理数据", VerifyEntity.class, 2)/*.setDataList(list)*/.write(response, fileName).dispose(); new ExportExcel("航线管理数据", VerifyEntity.class, 2)/*.setDataList(list)*/.write(response, fileName).dispose();
return null; return null;
} catch (Exception e) { } catch (Exception e) {
addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage()); addMessage(redirectAttributes, "导入模板下载失败！失败信息：" + e.getMessage());
} }
return "redirect:" + adminPath + "/airline/verify/list?repage"; return "redirect:" + adminPath + "/airline/verify/list?repage";
} }
/** /**
* 批量导入 * 批量导入
*
* @param file * @param file
* @param redirectAttributes * @param redirectAttributes
* @return * @return
*/ */
@RequiresPermissions("vrf:verify:edit") @RequiresPermissions("vrf:verify:edit")
@RequestMapping(value = "import", method= RequestMethod.POST) @RequestMapping(value = "import", method = RequestMethod.POST)
public String importFile(MultipartFile file, RedirectAttributes redirectAttributes,Model model) { public String importFile(MultipartFile file, RedirectAttributes redirectAttributes, Model model) {
List<VerifyError> listerr=new ArrayList<VerifyError>(); List<VerifyError> verifyErrorList = new ArrayList<VerifyError>();
int successNum = 0; int successNum = 0;
int failureNum = 0; int failureNum = 0;
StringBuilder failureMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder();
...@@ -187,113 +192,113 @@ public class VerifyController extends BaseController { ...@@ -187,113 +192,113 @@ public class VerifyController extends BaseController {
// FileManipulation.check(file.getOriginalFilename()); // FileManipulation.check(file.getOriginalFilename());
ImportExcel ei = new ImportExcel(file, 1, 0); ImportExcel ei = new ImportExcel(file, 1, 0);
List<VerifyEntity> list = ei.getDataList(VerifyEntity.class); List<VerifyEntity> list = ei.getDataList(VerifyEntity.class);
List<AirportEntity> airlist = AirportService.findTList(new AirportEntity()); List<AirportEntity> airList = AirportService.findTList(new AirportEntity());
int m=2; int m = 2;
for (VerifyEntity verify : list){ for (VerifyEntity verify : list) {
m++; m++;
if (StringUtils.isBlank(verify.getVerifType())){ if (StringUtils.isBlank(verify.getVerifType())) {
VerifyError err=new VerifyError(); VerifyError err = new VerifyError();
err.setNo(m+""); err.setNo(m + "");
err.setRouteNo(verify.getRouteNo()); err.setRouteNo(verify.getRouteNo());
err.setErrorMsg("航线管理 开航指令单号: "+verify.getRouteNo()+"的论证类型不存在; "); err.setErrorMsg("航线管理 开航指令单号: " + verify.getRouteNo() + "的论证类型不存在; ");
listerr.add(err); verifyErrorList.add(err);
failureMsg.append("<br/>航线管理 开航指令单号: "+verify.getRouteNo()+"的论证类型不存在; "); failureMsg.append("<br/>航线管理 开航指令单号: " + verify.getRouteNo() + "的论证类型不存在; ");
failureNum++; failureNum++;
continue; continue;
} }
if (StringUtils.isBlank(verify.getVerifNo())||StringUtils.isBlank(verify.getRouteNo())){ if (StringUtils.isBlank(verify.getVerifNo()) || StringUtils.isBlank(verify.getRouteNo())) {
VerifyError err=new VerifyError(); VerifyError err = new VerifyError();
err.setNo(m+""); err.setNo(m + "");
err.setRouteNo(verify.getRouteNo()); err.setRouteNo(verify.getRouteNo());
err.setErrorMsg("航线管理 开航指令单号: "+verify.getRouteNo()+"的论证论证单号或开航指令号不能为空; "); err.setErrorMsg("航线管理 开航指令单号: " + verify.getRouteNo() + "的论证论证单号或开航指令号不能为空; ");
listerr.add(err); verifyErrorList.add(err);
failureMsg.append("<br/>航线管理 开航指令单号: "+verify.getRouteNo()+"的论证论证单号或开航指令号不能为空; "); failureMsg.append("<br/>航线管理 开航指令单号: " + verify.getRouteNo() + "的论证论证单号或开航指令号不能为空; ");
failureNum++; failureNum++;
continue; continue;
} }
if ( verify.getAircraft()==null||StringUtils.isBlank(verify.getAircraft().getId())){ if (verify.getAircraft() == null || StringUtils.isBlank(verify.getAircraft().getId())) {
VerifyError err=new VerifyError(); VerifyError err = new VerifyError();
err.setNo(m+""); err.setNo(m + "");
err.setRouteNo(verify.getRouteNo()); err.setRouteNo(verify.getRouteNo());
err.setErrorMsg("航线管理 开航指令单号: "+verify.getRouteNo()+"的飞机型号不存在; "); err.setErrorMsg("航线管理 开航指令单号: " + verify.getRouteNo() + "的飞机型号不存在; ");
listerr.add(err); verifyErrorList.add(err);
failureMsg.append("<br/>航线管理 开航指令单号: "+verify.getRouteNo()+"的飞机型号不存在; "); failureMsg.append("<br/>航线管理 开航指令单号: " + verify.getRouteNo() + "的飞机型号不存在; ");
failureNum++; failureNum++;
continue; continue;
} }
if ("06".equals(verify.getVerifType()) || "07".equals(verify.getVerifType()) if ("06".equals(verify.getVerifType()) || "07".equals(verify.getVerifType())
|| "08".equals(verify.getVerifType()) ) { || "08".equals(verify.getVerifType())) {
VerifyError err=new VerifyError(); VerifyError err = new VerifyError();
err.setNo(m+""); err.setNo(m + "");
err.setRouteNo(verify.getRouteNo()); err.setRouteNo(verify.getRouteNo());
err.setErrorMsg("航线管理 开航指令单号: "+verify.getRouteNo()+"的论证类型不支持上传; "); err.setErrorMsg("航线管理 开航指令单号: " + verify.getRouteNo() + "的论证类型不支持上传; ");
listerr.add(err); verifyErrorList.add(err);
failureMsg.append("<br/>航线管理 开航指令单号: "+verify.getRouteNo()+"的论证类型不支持上传; "); failureMsg.append("<br/>航线管理 开航指令单号: " + verify.getRouteNo() + "的论证类型不支持上传; ");
failureNum++; failureNum++;
continue; continue;
} }
try{ try {
BeanValidators.validateWithException(validator, verify); BeanValidators.validateWithException(validator, verify);
if(verifyService.CheckValidator(verify).size()>0){ if (verifyService.CheckValidator(verify).size() > 0) {
VerifyError err=new VerifyError(); VerifyError err = new VerifyError();
err.setNo(m+""); err.setNo(m + "");
err.setRouteNo(verify.getRouteNo()); err.setRouteNo(verify.getRouteNo());
err.setErrorMsg("航线管理 开航指令单号: "+verify.getRouteNo()+"或 论证单号:"+verify.getVerifNo()+" 已存在; "); err.setErrorMsg("航线管理 开航指令单号: " + verify.getRouteNo() + "或 论证单号:" + verify.getVerifNo() + " 已存在; ");
listerr.add(err); verifyErrorList.add(err);
failureMsg.append("<br/>航线管理 开航指令单号: "+verify.getRouteNo()+"或 论证单号:"+verify.getVerifNo()+" 已存在; "); failureMsg.append("<br/>航线管理 开航指令单号: " + verify.getRouteNo() + "或 论证单号:" + verify.getVerifNo() + " 已存在; ");
failureNum++; failureNum++;
continue; continue;
}else{ } else {
verify.setVerifStatus("02"); verify.setVerifStatus("02");
String airline = verify.getAirline(); String airline = verify.getAirline();
if ("05".equals(verify.getVerifType())){ if ("05".equals(verify.getVerifType())) {
if(airline.contains("-")){ if (airline.contains("-")) {
airline = airline.replaceAll("-", "="); airline = airline.replaceAll("-", "=");
verify.setRoundtripType("01"); verify.setRoundtripType("01");
}else{ } else {
verify.setRoundtripType("02"); verify.setRoundtripType("02");
} }
} }
String[] airs=airline.split("="); String[] airs = airline.split("=");
if(airs.length>1){ if (airs.length > 1) {
List<String> lst=new ArrayList<String>(); List<String> lst = new ArrayList<String>();
for(int n=1;n<=airs.length;n++){ for (int n = 1; n <= airs.length; n++) {
for(AirportEntity entity:airlist){ for (AirportEntity entity : airList) {
if(entity.getCityName().equals(airs[n-1])){ if (entity.getCityName().equals(airs[n - 1])) {
lst.add(entity.getAirportIata()); lst.add(entity.getAirportIata());
break; break;
} }
} }
} }
if(lst.size()!=airs.length){ if (lst.size() != airs.length) {
VerifyError err=new VerifyError(); VerifyError err = new VerifyError();
err.setNo(m+""); err.setNo(m + "");
err.setRouteNo(verify.getRouteNo()); err.setRouteNo(verify.getRouteNo());
err.setErrorMsg("航线: "+verify.getAirline()+" 异常,对应不上三字码; "); err.setErrorMsg("航线: " + verify.getAirline() + " 异常,对应不上三字码; ");
listerr.add(err); verifyErrorList.add(err);
failureMsg.append("<br/>航线: "+verify.getAirline()+" 异常,对应不上三字码; "); failureMsg.append("<br/>航线: " + verify.getAirline() + " 异常,对应不上三字码; ");
failureNum++; failureNum++;
continue; continue;
}else{ } else {
verify.preInsert(); verify.preInsert();
AirportEntity areaSt=new AirportEntity(); AirportEntity areaSt = new AirportEntity();
areaSt.setAirportIata(lst.get(0)); areaSt.setAirportIata(lst.get(0));
verify.setAreaSt(areaSt); verify.setAreaSt(areaSt);
AirportEntity areaAr=new AirportEntity(); AirportEntity areaAr = new AirportEntity();
areaAr.setAirportIata(lst.get(1)); areaAr.setAirportIata(lst.get(1));
verify.setAreaAr(areaAr); verify.setAreaAr(areaAr);
List<ConnectEntity> connl=new ArrayList<ConnectEntity>(); List<ConnectEntity> connl = new ArrayList<ConnectEntity>();
ConnectEntity connect=new ConnectEntity(); ConnectEntity connect = new ConnectEntity();
connect.preInsert(); connect.preInsert();
connect.setIsMain("1"); connect.setIsMain("1");
connect.setVerifId(verify.getId()); connect.setVerifId(verify.getId());
connect.setDepIata(lst.get(0)); connect.setDepIata(lst.get(0));
connect.setArrIata(lst.get(1)); connect.setArrIata(lst.get(1));
connl.add(connect); connl.add(connect);
if(!"01".equals(verify.getRoundtripType())){ if (!"01".equals(verify.getRoundtripType())) {
ConnectEntity connect1=new ConnectEntity(); ConnectEntity connect1 = new ConnectEntity();
connect1.preInsert(); connect1.preInsert();
connect1.setIsMain("0"); connect1.setIsMain("0");
connect1.setVerifId(verify.getId()); connect1.setVerifId(verify.getId());
...@@ -302,22 +307,22 @@ public class VerifyController extends BaseController { ...@@ -302,22 +307,22 @@ public class VerifyController extends BaseController {
connl.add(connect1); connl.add(connect1);
} }
for(int n=2;n<lst.size();n++){ for (int n = 2; n < lst.size(); n++) {
ConnectEntity connect2=new ConnectEntity(); ConnectEntity connect2 = new ConnectEntity();
connect2.preInsert(); connect2.preInsert();
connect2.setIsMain("2"); connect2.setIsMain("2");
connect2.setVerifId(verify.getId()); connect2.setVerifId(verify.getId());
connect2.setDepIata(lst.get(n-1)); connect2.setDepIata(lst.get(n - 1));
connect2.setArrIata(lst.get(n)); connect2.setArrIata(lst.get(n));
connl.add(connect2); connl.add(connect2);
if(!"01".equals(verify.getRoundtripType())){ if (!"01".equals(verify.getRoundtripType())) {
ConnectEntity connect3=new ConnectEntity(); ConnectEntity connect3 = new ConnectEntity();
connect3.preInsert(); connect3.preInsert();
connect3.setIsMain("0"); connect3.setIsMain("0");
connect3.setVerifId(verify.getId()); connect3.setVerifId(verify.getId());
connect3.setDepIata(lst.get(n)); connect3.setDepIata(lst.get(n));
connect3.setArrIata(lst.get(n-1)); connect3.setArrIata(lst.get(n - 1));
connl.add(connect3); connl.add(connect3);
} }
...@@ -326,70 +331,53 @@ public class VerifyController extends BaseController { ...@@ -326,70 +331,53 @@ public class VerifyController extends BaseController {
successNum++; successNum++;
continue; continue;
} }
}else{ } else {
VerifyError err=new VerifyError(); VerifyError err = new VerifyError();
err.setNo(m+""); err.setNo(m + "");
err.setRouteNo(verify.getRouteNo()); err.setRouteNo(verify.getRouteNo());
err.setErrorMsg("航线: "+verify.getAirline()+"格式异常; "); err.setErrorMsg("航线: " + verify.getAirline() + "格式异常; ");
listerr.add(err); verifyErrorList.add(err);
failureMsg.append("<br/>航线: "+verify.getAirline()+"格式异常; "); failureMsg.append("<br/>航线: " + verify.getAirline() + "格式异常; ");
failureNum++; failureNum++;
continue; continue;
/* String airport=null;
for(AirportEntity entity:airlist){
if(entity.getAirportName().equals(airline)){
airport=entity.getAirportIata();
break;
} }
} }
if(airport==null){ } catch (ConstraintViolationException ex) {
failureMsg.append("<br/>航线: "+verify.getAirline()+" 异常; "); VerifyError err = new VerifyError();
failureNum++; err.setNo(m + "");
}else{
AirportEntity areaSt=new AirportEntity();
areaSt.setAirportIata(airport);
verify.setAreaSt(areaSt);
}*/
}
// verifyService.save(verify);
}
}catch(ConstraintViolationException ex){
VerifyError err=new VerifyError();
err.setNo(m+"");
err.setRouteNo(verify.getRouteNo()); err.setRouteNo(verify.getRouteNo());
err.setErrorMsg("航线管理 "+" 导入失败："); err.setErrorMsg("航线管理 " + " 导入失败：");
listerr.add(err); verifyErrorList.add(err);
failureMsg.append("<br/>航线管理 "+" 导入失败："); failureMsg.append("<br/>航线管理 " + " 导入失败：");
List<String> messageList = BeanValidators.extractPropertyAndMessageAsList(ex, ": "); List<String> messageList = BeanValidators.extractPropertyAndMessageAsList(ex, ": ");
for (String message : messageList){ for (String message : messageList) {
failureMsg.append(message+"; "); failureMsg.append(message + "; ");
failureNum++; failureNum++;
} }
}catch (Exception ex) { } catch (Exception ex) {
failureMsg.append(" 导入失败："+ex.getMessage()); failureMsg.append(" 导入失败：" + ex.getMessage());
} }
} }
if (failureNum>0){ if (failureNum > 0) {
failureMsg.insert(0, "，失败 "+failureNum+" 条数据，导入信息如下："); failureMsg.insert(0, "，失败 " + failureNum + " 条数据，导入信息如下：");
} }
addMessage(redirectAttributes, "已成功导入 "+successNum+" 条数据"+ "，失败 "+failureNum+" 条数据"); addMessage(redirectAttributes, "已成功导入 " + successNum + " 条数据" + "，失败 " + failureNum + " 条数据");
} catch (Exception e) { } catch (Exception e) {
addMessage(redirectAttributes, "导入数据失败！失败信息："+e.getMessage()); addMessage(redirectAttributes, "导入数据失败！失败信息：" + e.getMessage());
} }
if(failureNum>20){ if (failureNum > 20) {
model.addAttribute("list", listerr); model.addAttribute("list", verifyErrorList);
return "modules/airline/verifyError"; return "modules/airline/verifyError";
}else{ } else {
return "redirect:" + adminPath + "/airline/verify/list?repage"; return "redirect:" + adminPath + "/airline/verify/list?repage";
} }
} }
@RequiresPermissions("vrf:verify:view") @RequiresPermissions("vrf:verify:view")
@RequestMapping(value = "error") @RequestMapping(value = "error")
public String error(VerifyEntity verifyEntity,Model model,List<VerifyError> list){ public String error(VerifyEntity verifyEntity, Model model, List<VerifyError> list) {
model.addAttribute("list", list); model.addAttribute("list", list);
return "modules/airline/verifyError"; return "modules/airline/verifyError";
} }
......
src/com/ejweb/modules/contact/service/AirportService.java
...@@ -105,7 +105,7 @@ public class AirportService extends CrudService<AirportDao, AirportEntity> { ...@@ -105,7 +105,7 @@ public class AirportService extends CrudService<AirportDao, AirportEntity> {
return str.substring(0, 1).toUpperCase(); return str.substring(0, 1).toUpperCase();
} }
public List<AirportEntity> getAllAriportsData(AirportEntity entity){ public List<AirportEntity> getAllAirportsData(AirportEntity entity){
return dao.findAllAirport(entity); return dao.findAllAirport(entity);
} }
......
src/com/ejweb/modules/contact/service/UserProfileServce.java
...@@ -106,9 +106,6 @@ public class UserProfileServce extends CrudService<UserProfileDao, UserProfileEn ...@@ -106,9 +106,6 @@ public class UserProfileServce extends CrudService<UserProfileDao, UserProfileEn
userProfileDao.insertUserProfileByHrm(userProfileEntity2); userProfileDao.insertUserProfileByHrm(userProfileEntity2);
} }
public String getDepartId(UserProfileEntity entity){
return userProfileDao.getDepartId(entity);
}
public List<Dict> getUserTypeDict(Dict dict) { public List<Dict> getUserTypeDict(Dict dict) {
return dictDao.findListByType(dict); return dictDao.findListByType(dict);
......
src/com/ejweb/modules/contact/web/AirportBaseController.java
...@@ -102,7 +102,7 @@ public class AirportBaseController extends BaseController{ ...@@ -102,7 +102,7 @@ public class AirportBaseController extends BaseController{
public List<Map<String,String>> getAirportsData(){ public List<Map<String,String>> getAirportsData(){
List<Map<String,String>> listMap = new ArrayList<>(); List<Map<String,String>> listMap = new ArrayList<>();
Map<String,String> map = new HashMap<String, String>(); Map<String,String> map = new HashMap<String, String>();
List<AirportEntity> lists = airportService.getAllAriportsData(new AirportEntity()); List<AirportEntity> lists = airportService.getAllAirportsData(new AirportEntity());
if(lists.size()>0 ){ if(lists.size()>0 ){
for(AirportEntity entity : lists ){ for(AirportEntity entity : lists ){
map.put("id", entity.getId()); map.put("id", entity.getId());
...@@ -118,7 +118,6 @@ public class AirportBaseController extends BaseController{ ...@@ -118,7 +118,6 @@ public class AirportBaseController extends BaseController{
if (!beanValidator(model, baseEntity)){ if (!beanValidator(model, baseEntity)){
return form(baseEntity, model); return form(baseEntity, model);
} }
// AirportTBaseEntity entity = new AirportTBaseEntity();
if(baseEntity.getReadyH()==null||baseEntity.getReadyH()==0){ if(baseEntity.getReadyH()==null||baseEntity.getReadyH()==0){
baseEntity.setReadyH(null); baseEntity.setReadyH(null);
} }
...@@ -132,28 +131,6 @@ public class AirportBaseController extends BaseController{ ...@@ -132,28 +131,6 @@ public class AirportBaseController extends BaseController{
if (!CollectionUtils.isEmpty(baseEntity.getAirportsList())) { if (!CollectionUtils.isEmpty(baseEntity.getAirportsList())) {
airportBaseService.union(baseEntity); airportBaseService.union(baseEntity);
} }
// //插入关联表
// if(StringUtils.isNotEmpty(baseEntity.getAirports())||baseEntity.getAirportsList()!= null){
// String[] str =null;
// if(StringUtils.isNotEmpty(baseEntity.getAirports())){
// str = baseEntity.getAirports().split(",");
// }else if(baseEntity.getAirportsList().size() > 0){
// str = baseEntity.getAirportsList().toArray(new String[baseEntity.getAirportsList().size()]);
// }
// for(int i=0;i<str.length;i++){
// entity.setId(str[i]);
// AirportTBaseEntity entity1 = airportBaseService.getAirportTBase(entity);
// if(entity1 == null){
// entity1 = new AirportTBaseEntity();
// entity1.setId(entity.getId());
// entity1.setBaseId(baseEntity.getId());
// airportBaseService.insert(entity1);
// }else{
// entity1.setBaseId(baseEntity.getId());
// airportBaseService.update(entity1);
// }
// }
// }
addMessage(redirectAttributes, "保存成功"); addMessage(redirectAttributes, "保存成功");
return "redirect:" + adminPath + "/contact/airportBase/list?repage"; return "redirect:" + adminPath + "/contact/airportBase/list?repage";
} }
......
src/com/ejweb/modules/contact/web/AirportController.java
...@@ -183,48 +183,7 @@ public class AirportController extends BaseController { ...@@ -183,48 +183,7 @@ public class AirportController extends BaseController {
* @param redirectAttributes * @param redirectAttributes
* @return * @return
*/ */
/*
* @RequiresPermissions("im:airport:edit")
*
* @RequestMapping("batchImport") public String batchImport(MultipartFile
* file, RedirectAttributes redirectAttributes) { try { List<Map<String,
* String>> excelContents =
* ImportExcel.getImportFileContent(file.getInputStream()); if
* (excelContents != null && excelContents.size() > 0) { if
* (!excelContents.get(0).containsKey("机场名称") ||
* !excelContents.get(0).containsKey("三字码") ||
* !excelContents.get(0).containsKey("四字码") ||
* !excelContents.get(0).containsKey("所属国家") ||
* !excelContents.get(0).containsKey("所属城市") ) {
* addMessage(redirectAttributes,
* "导入失败, 机场名称、三字码、四字码、所属国家、所属城市为必填字段,请按模板进行填写！"); return "redirect:" +
* adminPath + "/contact/contacts/list?repage"; } StringBuilder
* errorContents = new StringBuilder(); for (int i = 0; i <
* excelContents.size(); i ++) { AirportEntity entity = new AirportEntity();
* AirportEntity airport =
* airportService.getAirportByAirportIata(excelContents.get(i).get("三字码"));
* if (airport!=null) { errorContents.append("添加第").append(String.valueOf(i
* +
* 1)).append("行数据失败，错误原因：三字码+"+airport.getAirportIata()+"+存在，请重新填写！<br/>");
* continue; } entity.setAirportName(excelContents.get(i).get("机场名称"));
* entity.setAirportIata(excelContents.get(i).get("三字码"));
* entity.setAirportIcao(excelContents.get(i).get("四字码"));
* entity.setCountryName(excelContents.get(i).get("所属国家"));
* entity.setCityName(excelContents.get(i).get("所属城市"));
* entity.setLiftoffTime(Integer.parseInt(excelContents.get(i).get("延误标准-起飞"
* )));
* entity.setLandingTime(Integer.parseInt(excelContents.get(i).get("延误标准-落地"
* ))); String status = excelContents.get(i).get("状态");
* entity.setStatus(StringUtils.isBlank(status)?Short.parseShort(status):1);
* try { airportService.save(entity); } catch (Exception e) {
* errorContents.append("插入第").append(String.valueOf(i +
* 1)).append("行数据失败，错误原因：系统错误，请联系技术员！"); } } if
* (StringUtils.isBlank(errorContents.toString())) {
* errorContents.append("导入成功！"); } addMessage(redirectAttributes,
* errorContents.toString()); } } catch (IOException e) {
* e.printStackTrace(); } return "redirect:" + adminPath +
* "/contact/airport/list?repage"; }
*/
@RequiresPermissions("im:airport:edit") @RequiresPermissions("im:airport:edit")
@RequestMapping(value = "batchImport", method = RequestMethod.POST) @RequestMapping(value = "batchImport", method = RequestMethod.POST)
public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) { public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
......
src/com/ejweb/modules/sys/service/SystemService.java
...@@ -253,14 +253,6 @@ public class SystemService extends BaseService implements InitializingBean { ...@@ -253,14 +253,6 @@ public class SystemService extends BaseService implements InitializingBean {
return password.equals(Encodes.encodeHex(salt) + Encodes.encodeHex(hashPassword)); return password.equals(Encodes.encodeHex(salt) + Encodes.encodeHex(hashPassword));
} }
/**
* 获得活动会话
*
* @return
*/
public Collection<Session> getActiveSessions() {
return sessionDao.getActiveSessions(false);
}
// -- Role Service --// // -- Role Service --//
...@@ -280,9 +272,6 @@ public class SystemService extends BaseService implements InitializingBean { ...@@ -280,9 +272,6 @@ public class SystemService extends BaseService implements InitializingBean {
return roleDao.getByEnname(r); return roleDao.getByEnname(r);
} }
public List<Role> findRole(Role role) {
return roleDao.findList(role);
}
public List<Role> findAllRole(Role role) { public List<Role> findAllRole(Role role) {
return UserUtils.getRoleList(role); return UserUtils.getRoleList(role);
......
src/com/ejweb/modules/sys/web/LoginController.java
...@@ -188,15 +188,15 @@ public class LoginController extends BaseController{ ...@@ -188,15 +188,15 @@ public class LoginController extends BaseController{
/** /**
* 获取主题方案 * 获取主题方案
*/ */
@RequestMapping(value = "/theme/{theme}") // @RequestMapping(value = "/theme/{theme}")
public String getThemeInCookie(@PathVariable String theme, HttpServletRequest request, HttpServletResponse response){ // public String getThemeInCookie(@PathVariable String theme, HttpServletRequest request, HttpServletResponse response){
if (StringUtils.isNotBlank(theme)){ // if (StringUtils.isNotBlank(theme)){
CookieUtils.setCookie(response, "theme", theme); // CookieUtils.setCookie(response, "theme", theme);
}else{ // }else{
theme = CookieUtils.getCookie(request, "theme"); // theme = CookieUtils.getCookie(request, "theme");
} // }
return "redirect:"+request.getParameter("url"); // return "redirect:"+request.getParameter("url");
} // }
/** /**
* 是否是验证码登录 * 是否是验证码登录
......
src/com/ejweb/modules/sys/web/RoleController.java
...@@ -34,6 +34,7 @@ import com.ejweb.modules.sys.utils.UserUtils; ...@@ -34,6 +34,7 @@ import com.ejweb.modules.sys.utils.UserUtils;
/** /**
* 角色Controller * 角色Controller
*
* @author ThinkGem * @author ThinkGem
* @version 2013-12-05 * @version 2013-12-05
*/ */
...@@ -48,10 +49,10 @@ public class RoleController extends BaseController { ...@@ -48,10 +49,10 @@ public class RoleController extends BaseController {
private OfficeService officeService; private OfficeService officeService;
@ModelAttribute("role") @ModelAttribute("role")
public Role get(@RequestParam(required=false) String id) { public Role get(@RequestParam(required = false) String id) {
if (StringUtils.isNotBlank(id)){ if (StringUtils.isNotBlank(id)) {
return systemService.getRole(id); return systemService.getRole(id);
}else{ } else {
return new Role(); return new Role();
} }
} }
...@@ -67,7 +68,7 @@ public class RoleController extends BaseController { ...@@ -67,7 +68,7 @@ public class RoleController extends BaseController {
@RequiresPermissions("sys:role:view") @RequiresPermissions("sys:role:view")
@RequestMapping(value = "form") @RequestMapping(value = "form")
public String form(Role role, Model model) { public String form(Role role, Model model) {
if (role.getOffice()==null){ if (role.getOffice() == null) {
role.setOffice(UserUtils.getUser().getOffice()); role.setOffice(UserUtils.getUser().getOffice());
} }
model.addAttribute("role", role); model.addAttribute("role", role);
...@@ -79,22 +80,22 @@ public class RoleController extends BaseController { ...@@ -79,22 +80,22 @@ public class RoleController extends BaseController {
@RequiresPermissions("sys:role:edit") @RequiresPermissions("sys:role:edit")
@RequestMapping(value = "save") @RequestMapping(value = "save")
public String save(Role role, Model model, RedirectAttributes redirectAttributes) { public String save(Role role, Model model, RedirectAttributes redirectAttributes) {
if(!UserUtils.getUser().isAdmin()&&role.getSysData().equals(GConstants.YES)){ if (!UserUtils.getUser().isAdmin() && role.getSysData().equals(GConstants.YES)) {
addMessage(redirectAttributes, "越权操作，只有超级管理员才能修改此数据！"); addMessage(redirectAttributes, "越权操作，只有超级管理员才能修改此数据！");
return "redirect:" + adminPath + "/sys/role/?repage"; return "redirect:" + adminPath + "/sys/role/?repage";
} }
if(GConstants.isDemoMode()){ if (GConstants.isDemoMode()) {
addMessage(redirectAttributes, "演示模式，不允许操作！"); addMessage(redirectAttributes, "演示模式，不允许操作！");
return "redirect:" + adminPath + "/sys/role/?repage"; return "redirect:" + adminPath + "/sys/role/?repage";
} }
if (!beanValidator(model, role)){ if (!beanValidator(model, role)) {
return form(role, model); return form(role, model);
} }
if (!"true".equals(checkName(role.getOldName(), role.getName()))){ if (!"true".equals(checkName(role.getOldName(), role.getName()))) {
addMessage(model, "保存角色'" + role.getName() + "'失败, 角色名已存在"); addMessage(model, "保存角色'" + role.getName() + "'失败, 角色名已存在");
return form(role, model); return form(role, model);
} }
if (!"true".equals(checkEnname(role.getOldEnname(), role.getEnname()))){ if (!"true".equals(checkEnName(role.getOldEnname(), role.getEnname()))) {
addMessage(model, "保存角色'" + role.getName() + "'失败, 英文名已存在"); addMessage(model, "保存角色'" + role.getName() + "'失败, 英文名已存在");
return form(role, model); return form(role, model);
} }
...@@ -106,27 +107,22 @@ public class RoleController extends BaseController { ...@@ -106,27 +107,22 @@ public class RoleController extends BaseController {
@RequiresPermissions("sys:role:edit") @RequiresPermissions("sys:role:edit")
@RequestMapping(value = "delete") @RequestMapping(value = "delete")
public String delete(Role role, RedirectAttributes redirectAttributes) { public String delete(Role role, RedirectAttributes redirectAttributes) {
if(!UserUtils.getUser().isAdmin() && role.getSysData().equals(GConstants.YES)){ if (!UserUtils.getUser().isAdmin() && role.getSysData().equals(GConstants.YES)) {
addMessage(redirectAttributes, "越权操作，只有超级管理员才能修改此数据！"); addMessage(redirectAttributes, "越权操作，只有超级管理员才能修改此数据！");
return "redirect:" + adminPath + "/sys/role/?repage"; return "redirect:" + adminPath + "/sys/role/?repage";
} }
if(GConstants.isDemoMode()){ if (GConstants.isDemoMode()) {
addMessage(redirectAttributes, "演示模式，不允许操作！"); addMessage(redirectAttributes, "演示模式，不允许操作！");
return "redirect:" + adminPath + "/sys/role/?repage"; return "redirect:" + adminPath + "/sys/role/?repage";
} }
// if (Role.isAdmin(id)){
// addMessage(redirectAttributes, "删除角色失败, 不允许内置角色或编号空");
//// }else if (UserUtils.getUser().getRoleIdList().contains(id)){
//// addMessage(redirectAttributes, "删除角色失败, 不能删除当前用户所在角色");
// }else{
systemService.deleteRole(role); systemService.deleteRole(role);
addMessage(redirectAttributes, "删除角色成功"); addMessage(redirectAttributes, "删除角色成功");
// }
return "redirect:" + adminPath + "/sys/role/?repage"; return "redirect:" + adminPath + "/sys/role/?repage";
} }
/** /**
* 角色分配页面 * 角色分配页面
*
* @param role * @param role
* @param model * @param model
* @return * @return
...@@ -141,6 +137,7 @@ public class RoleController extends BaseController { ...@@ -141,6 +137,7 @@ public class RoleController extends BaseController {
/** /**
* 角色分配 -- 打开角色分配对话框 * 角色分配 -- 打开角色分配对话框
*
* @param role * @param role
* @param model * @param model
* @return * @return
...@@ -158,6 +155,7 @@ public class RoleController extends BaseController { ...@@ -158,6 +155,7 @@ public class RoleController extends BaseController {
/** /**
* 角色分配 -- 根据部门编号获取用户列表 * 角色分配 -- 根据部门编号获取用户列表
*
* @param officeId * @param officeId
* @param response * @param response
* @return * @return
...@@ -165,7 +163,7 @@ public class RoleController extends BaseController { ...@@ -165,7 +163,7 @@ public class RoleController extends BaseController {
@RequiresPermissions("sys:role:view") @RequiresPermissions("sys:role:view")
@ResponseBody @ResponseBody
@RequestMapping(value = "users") @RequestMapping(value = "users")
public List<Map<String, Object>> users(String officeId,String userName, HttpServletResponse response) { public List<Map<String, Object>> users(String officeId, String userName, HttpServletResponse response) {
List<Map<String, Object>> mapList = Lists.newArrayList(); List<Map<String, Object>> mapList = Lists.newArrayList();
User user = new User(); User user = new User();
user.setOffice(new Office(officeId)); user.setOffice(new Office(officeId));
...@@ -183,6 +181,7 @@ public class RoleController extends BaseController { ...@@ -183,6 +181,7 @@ public class RoleController extends BaseController {
/** /**
* 角色分配 -- 从角色中移除用户 * 角色分配 -- 从角色中移除用户
*
* @param userId * @param userId
* @param roleId * @param roleId
* @param redirectAttributes * @param redirectAttributes
...@@ -190,32 +189,33 @@ public class RoleController extends BaseController { ...@@ -190,32 +189,33 @@ public class RoleController extends BaseController {
*/ */
@RequiresPermissions("sys:role:edit") @RequiresPermissions("sys:role:edit")
@RequestMapping(value = "outrole") @RequestMapping(value = "outrole")
public String outrole(String userId, String roleId, RedirectAttributes redirectAttributes) { public String outRole(String userId, String roleId, RedirectAttributes redirectAttributes) {
if(GConstants.isDemoMode()){ if (GConstants.isDemoMode()) {
addMessage(redirectAttributes, "演示模式，不允许操作！"); addMessage(redirectAttributes, "演示模式，不允许操作！");
return "redirect:" + adminPath + "/sys/role/assign?id="+roleId; return "redirect:" + adminPath + "/sys/role/assign?id=" + roleId;
} }
Role role = systemService.getRole(roleId); Role role = systemService.getRole(roleId);
User user = systemService.getUser(userId); User user = systemService.getUser(userId);
if (UserUtils.getUser().getId().equals(userId)) { if (UserUtils.getUser().getId().equals(userId)) {
addMessage(redirectAttributes, "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！"); addMessage(redirectAttributes, "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
}else { } else {
if (user.getRoleList().size() <= 1){ if (user.getRoleList().size() <= 1) {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。"); addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
}else{ } else {
Boolean flag = systemService.outUserInRole(role, user); Boolean flag = systemService.outUserInRole(role, user);
if (!flag) { if (!flag) {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！"); addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
}else { } else {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！"); addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
} }
} }
} }
return "redirect:" + adminPath + "/sys/role/assign?id="+role.getId(); return "redirect:" + adminPath + "/sys/role/assign?id=" + role.getId();
} }
/** /**
* 角色分配 * 角色分配
*
* @param role * @param role
* @param idsArr * @param idsArr
* @param redirectAttributes * @param redirectAttributes
...@@ -224,9 +224,9 @@ public class RoleController extends BaseController { ...@@ -224,9 +224,9 @@ public class RoleController extends BaseController {
@RequiresPermissions("sys:role:edit") @RequiresPermissions("sys:role:edit")
@RequestMapping(value = "assignrole") @RequestMapping(value = "assignrole")
public String assignRole(Role role, String[] idsArr, RedirectAttributes redirectAttributes) { public String assignRole(Role role, String[] idsArr, RedirectAttributes redirectAttributes) {
if(GConstants.isDemoMode()){ if (GConstants.isDemoMode()) {
addMessage(redirectAttributes, "演示模式，不允许操作！"); addMessage(redirectAttributes, "演示模式，不允许操作！");
return "redirect:" + adminPath + "/sys/role/assign?id="+role.getId(); return "redirect:" + adminPath + "/sys/role/assign?id=" + role.getId();
} }
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
int newNum = 0; int newNum = 0;
...@@ -237,12 +237,13 @@ public class RoleController extends BaseController { ...@@ -237,12 +237,13 @@ public class RoleController extends BaseController {
newNum++; newNum++;
} }
} }
addMessage(redirectAttributes, "已成功分配 "+newNum+" 个用户"+msg); addMessage(redirectAttributes, "已成功分配 " + newNum + " 个用户" + msg);
return "redirect:" + adminPath + "/sys/role/assign?id="+role.getId(); return "redirect:" + adminPath + "/sys/role/assign?id=" + role.getId();
} }
/** /**
* 验证角色名是否有效 * 验证角色名是否有效
*
* @param oldName * @param oldName
* @param name * @param name
* @return * @return
...@@ -251,9 +252,9 @@ public class RoleController extends BaseController { ...@@ -251,9 +252,9 @@ public class RoleController extends BaseController {
@ResponseBody @ResponseBody
@RequestMapping(value = "checkName") @RequestMapping(value = "checkName")
public String checkName(String oldName, String name) { public String checkName(String oldName, String name) {
if (name!=null && name.equals(oldName)) { if (name != null && name.equals(oldName)) {
return "true"; return "true";
} else if (name!=null && systemService.getRoleByName(name) == null) { } else if (name != null && systemService.getRoleByName(name) == null) {
return "true"; return "true";
} }
return "false"; return "false";
...@@ -261,17 +262,18 @@ public class RoleController extends BaseController { ...@@ -261,17 +262,18 @@ public class RoleController extends BaseController {
/** /**
* 验证角色英文名是否有效 * 验证角色英文名是否有效
* @param oldName *
* @param name * @param oldEnName
* @param enName
* @return * @return
*/ */
@RequiresPermissions("user") @RequiresPermissions("user")
@ResponseBody @ResponseBody
@RequestMapping(value = "checkEnname") @RequestMapping(value = "checkEnname")
public String checkEnname(String oldEnname, String enname) { public String checkEnName(String oldEnName, String enName) {
if (enname!=null && enname.equals(oldEnname)) { if (enName != null && enName.equals(oldEnName)) {
return "true"; return "true";
} else if (enname!=null && systemService.getRoleByEnname(enname) == null) { } else if (enName != null && systemService.getRoleByEnname(enName) == null) {
return "true"; return "true";
} }
return "false"; return "false";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment