I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能代码优化

Browse Source
yun-zuoyi
wei.peng 7 years ago
parent 1e6b4719fe
commit f31b8e659a
5 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File

31
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
Unescape Escape View File

@ -4,8 +4,10 @@ import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController;
import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysLocaleLanguageService;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.impp.framework.base.controller.BaseController;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
@ -20,9 +22,7 @@ import org.apache.shiro.authc.AuthenticationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@ -51,6 +51,9 @@ public class AuthController extends CoreBaseController {
@Autowired
private ICoreTreeService coreTreeService;
@Autowired
private SysLocaleLanguageService localeLanguageService;
@GetMapping(value="/login")
@ApiOperation(value="登陆",notes="登陆")
public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode){
@ -88,7 +91,7 @@ public class AuthController extends CoreBaseController {
LOGGER.info("用户退出...");
try {
AuthUtil.logout();
return new ResultBean(true,"");
return new ResultBean(true,"").build();
} catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
}
@ -146,4 +149,24 @@ public class AuthController extends CoreBaseController {
}
}
@PutMapping(value = "/update-language")
@ApiOperation(value="修改语言",notes="修改用户会话语言")
public ResultBean updateLanguage(String code){
try {
SysLocaleLanguage language = localeLanguageService.getSysLocaleLanguageByCode(code);
if(language != null){
AuthUtil.setSessionLanguage(language.getLanguageCode());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
return ResultBean.fail("操作失败").setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setErrorMsg("语言信息不存在");
}
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

6
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java
Unescape Escape View File

@ -56,8 +56,9 @@ public class SysDepartmentController extends CoreBaseController {
//新增初始化
ConvertBean.modelInitialize(department, user);
if(department.getParentId() == null || department.getParentId().intValue() == 0){
if(department.getParentId() == null || department.getParentId() <= 0){
department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
department.setParentNameRdd("顶级部门");
}
departmentService.insertSysDepartment(department);
@ -86,8 +87,9 @@ public class SysDepartmentController extends CoreBaseController {
.checkNotZero("organizeId",department.getOrganizeId());
ConvertBean.modelUpdate(department, user);
if(department.getParentId() == null || department.getParentId().intValue() == 0){
if(department.getParentId() == null || department.getParentId() <= 0){
department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
department.setParentNameRdd("顶级部门");
}
departmentService.updateSysDepartment(department);

8
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class SysOrganizeController extends CoreBaseController{
//新增初始化
ConvertBean.modelInitialize(organize, AuthUtil.getSessionUser());
if(organize.getParentId() == null || organize.getParentId().intValue() == 0){
if(organize.getParentId() == null || organize.getParentId() == 0){
organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
@ -61,7 +61,7 @@ public class SysOrganizeController extends CoreBaseController{
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep).build();
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
@ -79,7 +79,7 @@ public class SysOrganizeController extends CoreBaseController{
.notNull("organizeType", organize.getOrganizeType());
ConvertBean.modelUpdate(organize, AuthUtil.getSessionUser());
if(organize.getParentId() == null || organize.getParentId().intValue() == 0){
if(organize.getParentId() == null || organize.getParentId() == 0){
organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
@ -87,7 +87,7 @@ public class SysOrganizeController extends CoreBaseController{
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep).build();
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java
Unescape Escape View File

@ -54,7 +54,7 @@ public class SysPositionController extends CoreBaseController {
.notNull("positionCode",position.getPositionCode());
ConvertBean.modelInitialize(position,user);
if(position.getParentId() == null || position.getParentId().intValue() == 0){
if(position.getParentId() == null || position.getParentId() == 0){
position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
@ -85,7 +85,7 @@ public class SysPositionController extends CoreBaseController {
//修改初始化
ConvertBean.modelUpdate(position,user);
if(position.getParentId() == null || position.getParentId().intValue() == 0){
if(position.getParentId() == null || position.getParentId() == 0){
position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}

26
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ModelEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel;
import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
@ -313,7 +314,11 @@ public class CoreTreeService implements ICoreTreeService {
@Override
public List<CommonTreeModel> findOrganizeDepartment(long parentId) {
List<CommonTreeModel> result = new ArrayList<>();
List<SysOrganize> list = organizeRDao.findByProperty("parentId", parentId);
StringBuffer hql = new StringBuffer();
HqlPack.getNumEqualPack(parentId,"parentId",hql);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"organizeSort"}, hql);
List<SysOrganize> list = organizeRDao.findByHqlWhere(hql.toString());
// 循环设置子集
if(list != null && list.size() > 0){
@ -357,7 +362,11 @@ public class CoreTreeService implements ICoreTreeService {
if(bean instanceof SysOrganize){
SysOrganize organize = (SysOrganize) bean;
List<SysOrganize> organizeList = organizeRDao.findByProperty("parentId", organize.getId());
StringBuffer hql = new StringBuffer();
HqlPack.getNumEqualPack(organize.getId(),"parentId",hql);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"organizeSort"}, hql);
List<SysOrganize> organizeList = organizeRDao.findByHqlWhere(hql.toString());
if(organizeList != null && organizeList.size() > 0){
for (SysOrganize org : organizeList) {
treeModel = new CommonTreeModel();
@ -370,7 +379,11 @@ public class CoreTreeService implements ICoreTreeService {
}
}
List<SysDepartment> departmentList = departmentRDao.findByProperty("organizeId", organize.getId());
StringBuffer depHQL = new StringBuffer();
HqlPack.getNumEqualPack(organize.getId(),"organizeId",depHQL);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"departmentSort"}, depHQL);
List<SysDepartment> departmentList = departmentRDao.findByHqlWhere(depHQL.toString());
if(departmentList != null && departmentList.size() > 0){
for (SysDepartment department : departmentList) {
if(department.getParentId() != null && department.getParentId() < 0){
@ -387,7 +400,12 @@ public class CoreTreeService implements ICoreTreeService {
LOGGER.info("【{}】包含子集：{},步长：{}", parent.getBean().getClass().getName(), parent.getChildList().size(), step);
}else if(bean instanceof SysDepartment){
SysDepartment department = (SysDepartment) bean;
List<SysDepartment> departmentList = departmentRDao.findByProperty("parentId", department.getId());
StringBuffer depHQL = new StringBuffer();
HqlPack.getNumEqualPack(department.getId(),"parentId",depHQL);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"departmentSort"}, depHQL);
List<SysDepartment> departmentList = departmentRDao.findByHqlWhere(depHQL.toString());
if(departmentList != null && departmentList.size() > 0){
for (SysDepartment dep : departmentList) {
treeModel = new CommonTreeModel();

Write Preview
Loading…
Cancel
Save