Skip to content
GitLab
Commit 18144407 authored by trumansdo's avatar trumansdo
Browse files

应用codestyle 


千万千万要用vscode打开前端项目，或者关闭eslint，移除它
Signed-off-by: default avatartrumansdo <1012243881@qq.com>
parent 9b3d96a6
Show whitespace changes
Inline Side-by-side
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/FunctionController.java
View file @ 18144407
......@@ -44,11 +44,8 @@ public class FunctionController {
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/admin/function";
@Autowired
CorePlatformService platformService;
@Autowired
private FunctionConsoleService functionConsoleService;
@Autowired CorePlatformService platformService;
@Autowired private FunctionConsoleService functionConsoleService;
/*页面*/
......@@ -66,6 +63,7 @@ public class FunctionController {
ModelAndView view = new ModelAndView("/admin/function/add.html");
return view;
}
@GetMapping(MODEL + "/edit.do")
@Function("function.edit")
public ModelAndView edit(Integer id) {
......@@ -80,14 +78,15 @@ public class FunctionController {
@RequestMapping(MODEL + "/add.json")
@Function("function.add")
@ResponseBody
public JsonResult<CoreFunction> addFunction(@Validated(ValidateConfig.ADD.class) CoreFunction function) {
public JsonResult<CoreFunction> addFunction(
@Validated(ValidateConfig.ADD.class) CoreFunction function) {
String code = function.getCode();
CoreFunction dbFunction = functionConsoleService.getFunction(code);
if(dbFunction!=null){
throw new FormFieldException(CoreFunction.class.getName(),"code","已经存在");
if (dbFunction != null) {
throw new FormFieldException(CoreFunction.class.getName(), "code", "已经存在");
}
if(function.getParentId()==null){
if (function.getParentId() == null) {
function.setParentId(0l);
}
function.setCreateTime(new Date());
......@@ -95,20 +94,20 @@ public class FunctionController {
return JsonResult.success(function);
}
@RequestMapping(MODEL + "/update.json")
@Function("function.update")
@ResponseBody
public JsonResult<?> updateFunction(@Validated(ValidateConfig.UPDATE.class) CoreFunction function) {
public JsonResult<?> updateFunction(
@Validated(ValidateConfig.UPDATE.class) CoreFunction function) {
CoreFunction dbFunction = functionConsoleService.getFunction(function.getCode());
if(dbFunction!=null&&!dbFunction.getId().equals(function.getId())){
throw new FormFieldException(CoreFunction.class.getName(),"code","已经存在");
if (dbFunction != null && !dbFunction.getId().equals(function.getId())) {
throw new FormFieldException(CoreFunction.class.getName(), "code", "已经存在");
}
if(function.getParentId()==null){
if (function.getParentId() == null) {
function.setParentId(0l);
}
// function.setCreateTime(dbFunction.getCreateTime());
// function.setCreateTime(dbFunction.getCreateTime());
functionConsoleService.updateFunction(function);
return JsonResult.success();
}
......@@ -119,31 +118,29 @@ public class FunctionController {
public JsonResult<CoreFunction> getFunction(Long id) {
CoreFunction function = functionConsoleService.getFunction(id);
if (function.hasParent()){
if (function.hasParent()) {
CoreFunction parent = functionConsoleService.getFunction(function.getParentId());
function.set("parentName",parent.getName());
}else {
function.set("parentName","");
function.set("parentName", parent.getName());
} else {
function.set("parentName", "");
}
functionConsoleService.queryEntityAfter(function);
return JsonResult.success(function);
}
@RequestMapping(MODEL + "/delete.json")
@Function("function.delete")
@ResponseBody
public JsonResult deleteFunction(Long id) {
CoreFunction fun = functionConsoleService.queryById(id);
if (fun == null) {
throw new PlatformException("删除失败,没有找到Function "+id+"!");
throw new PlatformException("删除失败,没有找到Function " + id + "!");
}
//删除功能和所有子功能
// 删除功能和所有子功能
functionConsoleService.deleteFunction(id);
return new JsonResult().success();
}
/**
* 字典列表 分页
*
......@@ -158,19 +155,17 @@ public class FunctionController {
PageQuery page = condtion.getPageQuery();
functionConsoleService.queryByCondtion(page);
return JsonResult.success(page);
}
@PostMapping(MODEL + "/list/condition.json")
@Function("function.query")
@ResponseBody
public JsonResult<List<Map<String, Object>>> listCondtion() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, FunctionQuery.class);
List<Map<String, Object>> list =
AnnotationUtil.getInstance().getAnnotations(Query.class, FunctionQuery.class);
return JsonResult.success(list);
}
private List<Long> findChildFunctionIds(Long funtionId) {
FunctionItem funItem = platformService.buildFunction().findChild(funtionId);
......@@ -179,9 +174,6 @@ public class FunctionController {
return children;
}
@RequestMapping(MODEL + "/batchDel.json")
@Function("function.delete")
@ResponseBody
......@@ -189,27 +181,24 @@ public class FunctionController {
List<Long> dels = ConvertUtil.str2longs(ids);
functionConsoleService.batchDeleteFunction(dels);
return new JsonResult().success();
}
@PostMapping(MODEL + "/tree.json")
@Function("function.query")
@ResponseBody
public JsonResult<List<FunctionNodeView> > tree() {
public JsonResult<List<FunctionNodeView>> tree() {
FunctionItem root = this.platformService.buildFunction();
List<FunctionNodeView> tree = buildFunctionTree(root);
return JsonResult.success(tree);
}
private List<FunctionNodeView> buildFunctionTree(FunctionItem node){
private List<FunctionNodeView> buildFunctionTree(FunctionItem node) {
List<FunctionItem> list = node.getChildren();
if(list.size()==0){
if (list.size() == 0) {
return Collections.EMPTY_LIST;
}
List<FunctionNodeView> views = new ArrayList<FunctionNodeView>(list.size());
for(FunctionItem item :list){
for (FunctionItem item : list) {
FunctionNodeView view = new FunctionNodeView();
view.setCode(item.getData().getCode());
view.setName(item.getData().getName());
......@@ -221,7 +210,4 @@ public class FunctionController {
}
return views;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/MenuController.java
View file @ 18144407
......@@ -28,22 +28,16 @@ import com.ibeetl.admin.core.util.AnnotationUtil;
import com.ibeetl.admin.core.util.ConvertUtil;
import com.ibeetl.admin.core.web.JsonResult;
/**
* @author lijiazhi
*/
/** @author lijiazhi */
@Controller
public class MenuController {
private static final String MODEL = "/admin/menu";
private final Log log = LogFactory.getLog(this.getClass());
@Autowired MenuConsoleService menuService;
@Autowired
MenuConsoleService menuService;
@Autowired
CorePlatformService platformService;
@Autowired CorePlatformService platformService;
/*页面*/
......@@ -61,6 +55,7 @@ public class MenuController {
ModelAndView view = new ModelAndView("/admin/menu/add.html");
return view;
}
@GetMapping(MODEL + "/edit.do")
@Function("menu.edit")
public ModelAndView edit(Integer id) {
......@@ -74,6 +69,7 @@ public class MenuController {
/**
* 查询
*
* @param menu
* @return
*/
......@@ -81,11 +77,11 @@ public class MenuController {
@Function("menu.query")
@ResponseBody
public JsonResult condition() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, MenuQuery.class);
List<Map<String, Object>> list =
AnnotationUtil.getInstance().getAnnotations(Query.class, MenuQuery.class);
return JsonResult.success(list);
}
@PostMapping(MODEL + "/list.json")
@Function("menu.query")
@ResponseBody
......@@ -95,9 +91,9 @@ public class MenuController {
return JsonResult.success(page);
}
/**
* 添加
*
* @param menu
* @return
*/
......@@ -112,6 +108,7 @@ public class MenuController {
/**
* 更新
*
* @param fun
* @return
*/
......@@ -125,6 +122,7 @@ public class MenuController {
/**
* 根据id查询菜单信息
*
* @param id 菜单Id
* @return
*/
......@@ -142,6 +140,7 @@ public class MenuController {
/**
* 删除
*
* @param id 菜单id
* @return
*/
......@@ -155,6 +154,7 @@ public class MenuController {
/**
* 批量删除
*
* @param ids 菜单id集合
* @return
*/
......@@ -166,10 +166,4 @@ public class MenuController {
menuService.batchDeleteMenuId(dels);
return new JsonResult().success();
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/OrgConsoleController.java
View file @ 18144407
......@@ -33,6 +33,7 @@ import com.ibeetl.admin.core.web.JsonResult;
/**
* 描述: 组织机构 controller
*
* @author : xiandafu
*/
@Controller
......@@ -40,16 +41,11 @@ public class OrgConsoleController {
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/admin/org";
@Autowired
private OrgConsoleService orgConsoleService;
@Autowired
UserConsoleService userConsoleService;
@Autowired
CorePlatformService platformService;
@Autowired private OrgConsoleService orgConsoleService;
@Autowired UserConsoleService userConsoleService;
@Autowired CorePlatformService platformService;
/*页面*/
......@@ -70,19 +66,19 @@ public class OrgConsoleController {
return view;
}
@GetMapping(MODEL + "/user/list.do")
@Function("org.query")
public ModelAndView getUsers(Long orgId) {
ModelAndView view = new ModelAndView("/admin/org/orgUser.html");
CoreOrg org = orgConsoleService.queryById(orgId);
view.addObject("org", org);
view.addObject("search",OrgUserQuery.class.getName());
view.addObject("search", OrgUserQuery.class.getName());
return view;
}
/**
* 组织机构列表 分页
*
* @param condtion 查询条件
* @return
*/
......@@ -97,28 +93,31 @@ public class OrgConsoleController {
/**
* 获取列表查询条件
*
* @return
*/
@PostMapping(MODEL + "/list/condition.json")
@Function("org.query")
@ResponseBody
public JsonResult<List<Map<String, Object>>> listCondtion() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, OrgQuery.class);
List<Map<String, Object>> list =
AnnotationUtil.getInstance().getAnnotations(Query.class, OrgQuery.class);
return JsonResult.success(list);
}
/**
* 保存数据
*
* @param org
* @return
*/
@PostMapping(MODEL + "/save.json")
@Function("org.save")
@ResponseBody
public JsonResult<Long> save(@Validated(ValidateConfig.ADD.class) CoreOrg org, BindingResult result) {
public JsonResult<Long> save(
@Validated(ValidateConfig.ADD.class) CoreOrg org, BindingResult result) {
if (result.hasErrors()) {
return JsonResult.failMessage(result.toString());
}
org.setCreateTime(new Date());
......@@ -127,9 +126,9 @@ public class OrgConsoleController {
return JsonResult.success(org.getId());
}
/**
* 更新数据
*
* @param org
* @return
*/
......@@ -146,12 +145,9 @@ public class OrgConsoleController {
}
}
/**
* 删除组织机构
*
* @param ids 组织id，多个用“,”隔开
* @return
*/
......@@ -168,7 +164,6 @@ public class OrgConsoleController {
return new JsonResult().success();
}
@PostMapping(MODEL + "/user/list.json")
@Function("org.query")
@ResponseBody
......@@ -177,5 +172,4 @@ public class OrgConsoleController {
orgConsoleService.queryUserByCondition(page);
return JsonResult.success(page);
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/RoleConsoleController.java
View file @ 18144407
......@@ -35,26 +35,20 @@ import com.ibeetl.admin.core.util.ConvertUtil;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.web.JsonResult;
/**
* 角色
*/
/** 角色 */
@Controller
public class RoleConsoleController {
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/admin/role";
@Autowired
private RoleConsoleService roleConsoleService;
@Autowired private RoleConsoleService roleConsoleService;
@Autowired
private FunctionConsoleService functionConsoleService;
@Autowired private FunctionConsoleService functionConsoleService;
@Autowired
CorePlatformService platformService;
@Autowired CorePlatformService platformService;
@Autowired
private OrgConsoleService orgConsoleService;
@Autowired private OrgConsoleService orgConsoleService;
/* 页面 */
......@@ -98,6 +92,7 @@ public class RoleConsoleController {
ModelAndView view = new ModelAndView("/admin/role/function.html");
return view;
}
@GetMapping(MODEL + "/data.do")
@Function("role.function.query")
public ModelAndView data() {
......@@ -137,7 +132,8 @@ public class RoleConsoleController {
@Function("role.query")
@ResponseBody
public JsonResult<List<Map<String, Object>>> listCondtion() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, RoleQuery.class);
List<Map<String, Object>> list =
AnnotationUtil.getInstance().getAnnotations(Query.class, RoleQuery.class);
return JsonResult.success(list);
}
......@@ -170,7 +166,6 @@ public class RoleConsoleController {
@PostMapping(MODEL + "/update.json")
@Function("role.edit")
@ResponseBody
public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) CoreRole role) {
boolean success = roleConsoleService.update(role);
......@@ -200,8 +195,7 @@ public class RoleConsoleController {
/**
* (批量)删除
*
* @param ids
* 角色id
* @param ids 角色id
* @return
*/
@PostMapping(MODEL + "/delete.json")
......@@ -220,8 +214,7 @@ public class RoleConsoleController {
/**
* 查询角色下授权用户列表
*
* @param queryCondtion
* 查询条件
* @param queryCondtion 查询条件
* @return
*/
@PostMapping(MODEL + "/user/list.json")
......@@ -289,14 +282,14 @@ public class RoleConsoleController {
List<Long> delIds = new ArrayList<Long>();
List<Long> dbs = functionConsoleService.getFunctionByRole(roleId);
Iterator<Long> it = all.iterator();
for(Long id:all) {
if(!dbs.contains(id)) {
for (Long id : all) {
if (!dbs.contains(id)) {
addIds.add(id);
}
}
for(Long id:dbs) {
if(!all.contains(id)) {
for (Long id : dbs) {
if (!all.contains(id)) {
delIds.add(id);
}
}
......@@ -307,7 +300,7 @@ public class RoleConsoleController {
@PostMapping(MODEL + "/function/updateDataAccess.json")
@Function("role.function.updateDataAccess")
@ResponseBody
public JsonResult updateFunctionDataAccess(Long roleId,Long fnId,Integer accessType) {
public JsonResult updateFunctionDataAccess(Long roleId, Long fnId, Integer accessType) {
RoleDataAccessFunction data = new RoleDataAccessFunction();
data.setRoleId(roleId);
data.setId(fnId);
......@@ -325,5 +318,4 @@ public class RoleConsoleController {
view.addObject("list", list);
return view;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleController.java
View file @ 18144407
......@@ -55,21 +55,13 @@ public class UserConsoleController {
private final Log log = LogFactory.getLog(this.getClass());
private static final String MODEL = "/admin/user";
@Autowired
UserConsoleService userConsoleService;
@Autowired
CorePlatformService platformService;
@Autowired
RoleConsoleService roleConsoleService;
@Autowired
OrgConsoleService orgConsoleService;
@Autowired
FileService fileService;
@Autowired UserConsoleService userConsoleService;
@Autowired CorePlatformService platformService;
@Autowired RoleConsoleService roleConsoleService;
@Autowired OrgConsoleService orgConsoleService;
@Autowired FileService fileService;
/* 页面 */
......@@ -183,7 +175,8 @@ public class UserConsoleController {
@Function("user.query")
@ResponseBody
public JsonResult<List<Map<String, Object>>> indexCondtion() {
List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, UserQuery.class);
List<Map<String, Object>> list =
AnnotationUtil.getInstance().getAnnotations(Query.class, UserQuery.class);
return JsonResult.success(list);
}
......@@ -200,7 +193,6 @@ public class UserConsoleController {
this.platformService.restUserSession(user.getCode());
}
return JsonResult.success();
}
/**
......@@ -216,7 +208,6 @@ public class UserConsoleController {
List<Long> enables = ConvertUtil.str2longs(ids);
userConsoleService.batchUpdateUserState(enables, GeneralStateEnum.ENABLE);
return JsonResult.success();
}
/**
......@@ -260,7 +251,6 @@ public class UserConsoleController {
this.userConsoleService.saveUserRole(userRole);
this.platformService.clearFunctionCache();
return JsonResult.success(userRole.getId());
}
/**
......@@ -279,19 +269,19 @@ public class UserConsoleController {
return JsonResult.success();
}
@PostMapping(MODEL + "/excel/export.json")
@Function("user.export")
@ResponseBody
public JsonResult<String> export(HttpServletResponse response, UserQuery condtion) {
String excelTemplate = "excelTemplates/admin/user/user_collection_template.xls";
PageQuery<CoreUser> page = condtion.getPageQuery();
//取出全部符合条件的
// 取出全部符合条件的
page.setPageSize(Integer.MAX_VALUE);
page.setPageNumber(1);
page.setTotalRow(Integer.MAX_VALUE);
List<UserExcelExportData> users = userConsoleService.queryExcel(page);
try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
try (InputStream is =
Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
if (is == null) {
throw new PlatformException("模板资源不存在：" + excelTemplate);
}
......@@ -300,13 +290,10 @@ public class UserConsoleController {
Context context = new Context();
context.putVar("users", users);
JxlsHelper.getInstance().processTemplate(is, os, context);
//下载参考FileSystemContorller
// 下载参考FileSystemContorller
return JsonResult.success(item.getPath());
} catch (IOException e) {
throw new PlatformException(e.getMessage());
}
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/dto/DictExcelImportData.java
View file @ 18144407
......@@ -4,8 +4,8 @@ import com.ibeetl.admin.core.entity.CoreDict;
/**
* 字典数据导入,参考 dict_mapping.xml
* @author xiandafu
*
* @author xiandafu
*/
public class DictExcelImportData extends CoreDict {
private Integer excelId;
......@@ -26,6 +26,4 @@ public class DictExcelImportData extends CoreDict {
public void setParentExcelId(Integer parentExcelId) {
this.parentExcelId = parentExcelId;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/dto/RoleDataAccessFunction.java
View file @ 18144407
......@@ -21,5 +21,4 @@ public class RoleDataAccessFunction extends CoreFunction {
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/dto/UserExcelExportData.java
View file @ 18144407
......@@ -7,8 +7,8 @@ import com.ibeetl.admin.core.annotation.Dict;
/**
* excel导出需要的模板数据
* @author xiandafu
*
* @author xiandafu
*/
public class UserExcelExportData {
protected Long id;
......@@ -18,47 +18,60 @@ public class UserExcelExportData {
private String password;
private String stateText;
private String jobType1Text;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getOrgText() {
return orgText;
}
public void setOrgText(String orgText) {
this.orgText = orgText;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getStateText() {
return stateText;
}
public void setStateText(String stateText) {
this.stateText = stateText;
}
public String getJobType1Text() {
return jobType1Text;
}
public void setJobType1Text(String jobType1Text) {
this.jobType1Text = jobType1Text;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/AuditQuery.java
View file @ 18144407
......@@ -8,32 +8,36 @@ import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.util.Tool;
import com.ibeetl.admin.core.web.query.PageParam;
/**
* 审计查询条件
*/
/** 审计查询条件 */
public class AuditQuery extends PageParam {
@Query(name = "功能名称", display = true,fuzzy=true)
@Query(name = "功能名称", display = true, fuzzy = true)
private String functionName;
@Query(name = "功能编号", display = true,fuzzy=true)
@Query(name = "功能编号", display = true, fuzzy = true)
private String functionCode;
@Query(name = "用户名称", display = true,fuzzy=true)
@Query(name = "用户名称", display = true, fuzzy = true)
private String userName;
@Query(name="创建日期",display=true,type=Query.TYPE_DATE_BETWEEN)
@Query(name = "创建日期", display = true, type = Query.TYPE_DATE_BETWEEN)
private String createDateRange;
private Date createDateMin;
private Date createDateMax;
public String getFunctionCode() {
return functionCode;
}
public void setFunctionCode(String functionCode) {
this.functionCode = functionCode;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
......@@ -41,35 +45,38 @@ public class AuditQuery extends PageParam {
public String getCreateDateRange() {
return createDateRange;
}
public void setCreateDateRange(String createDateRange) {
this.createDateRange = createDateRange;
if(StringUtils.isEmpty(createDateRange)) {
return ;
if (StringUtils.isEmpty(createDateRange)) {
return;
}
Date[] ds = Tool.parseDataRange(createDateRange);
this.createDateMin=ds[0];
this.createDateMax =ds[1];
this.createDateMin = ds[0];
this.createDateMax = ds[1];
}
public Date getCreateDateMin() {
return createDateMin;
}
public void setCreateDateMin(Date createDateMin) {
this.createDateMin = createDateMin;
}
public Date getCreateDateMax() {
return createDateMax;
}
public void setCreateDateMax(Date createDateMax) {
this.createDateMax = createDateMax;
}
public String getFunctionName() {
return functionName;
}
public void setFunctionName(String functionName) {
this.functionName = functionName;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/CmsBlogQuery.java
View file @ 18144407
......@@ -4,17 +4,16 @@ import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import com.ibeetl.admin.core.web.query.PageParam;
import java.util.Date;
/**
*CmsBlog查询
*/
/** CmsBlog查询 */
public class CmsBlogQuery extends PageParam {
@Query(name = "id", display = true)
private Integer id;
public Integer getId(){
public Integer getId() {
return id;
}
public void setId(Integer id ){
public void setId(Integer id) {
this.id = id;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/CoreDictQuery.java
View file @ 18144407
......@@ -4,41 +4,49 @@ import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import com.ibeetl.admin.core.web.query.PageParam;
import java.util.Date;
/**
*CoreDict查询
*/
/** CoreDict查询 */
public class CoreDictQuery extends PageParam {
@Query(name = "字典值", display = true)
private String value;
@Query(name = "字典名称", display = true)
private String name;
@Query(name = "字典类型名称", display = true)
private String typeName;
@Query(name = "父字典", display = true)
private String parent;
public String getValue(){
public String getValue() {
return value;
}
public void setValue(String value ){
public void setValue(String value) {
this.value = value;
}
public String getName(){
public String getName() {
return name;
}
public void setName(String name ){
public void setName(String name) {
this.name = name;
}
public String getTypeName(){
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName ){
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public String getParent(){
public String getParent() {
return parent;
}
public void setParent(String parent ){
public void setParent(String parent) {
this.parent = parent;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/CoreFunctionQuery.java
View file @ 18144407
......@@ -3,33 +3,38 @@ package com.ibeetl.admin.console.web.query;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import com.ibeetl.admin.core.web.query.PageParam;
/**
*功能查询
*/
/** 功能查询 */
public class CoreFunctionQuery extends PageParam {
@Query(name = "名称", display = true)
private String name;
@Query(name = "访问路径", display = true)
private String accessUrl;
@Query(name = "功能点类型", display = true)
private String type;
public String getName(){
public String getName() {
return name;
}
public void setName(String name ){
public void setName(String name) {
this.name = name;
}
public String getAccessUrl(){
public String getAccessUrl() {
return accessUrl;
}
public void setAccessUrl(String accessUrl ){
public void setAccessUrl(String accessUrl) {
this.accessUrl = accessUrl;
}
public String getType(){
public String getType() {
return type;
}
public void setType(String type ){
public void setType(String type) {
this.type = type;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/FunctionQuery.java
View file @ 18144407
......@@ -5,64 +5,70 @@ import java.util.List;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.web.query.PageParam;
/**
* 功能表单查询条件
*/
/** 功能表单查询条件 */
public class FunctionQuery extends PageParam {
@Query(name = "代码", display = true,fuzzy=true)
@Query(name = "代码", display = true, fuzzy = true)
private String code;
@Query(name = "名称", display = true,fuzzy=true)
@Query(name = "名称", display = true, fuzzy = true)
private String name;
@Query(name = "访问地址",fuzzy=true)
@Query(name = "访问地址", fuzzy = true)
private String accessUrl;
@Query(name="上一级功能",display=true,type=Query.TYPE_CONTROL,control="fun")
@Query(name = "上一级功能", display = true, type = Query.TYPE_CONTROL, control = "fun")
private Long parentFunctionId;
private Long functionId;
//查询子类
// 查询子类
private List<Long> functionIds;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAccessUrl() {
return accessUrl;
}
public void setAccessUrl(String accessUrl) {
this.accessUrl = accessUrl;
}
public List<Long> getFunctionIds() {
return functionIds;
}
public void setFunctionIds(List<Long> functionIds) {
this.functionIds = functionIds;
}
public Long getFunctionId() {
return functionId;
}
public void setFunctionId(Long functionId) {
this.functionId = functionId;
}
public Long getParentFunctionId() {
return parentFunctionId;
}
public void setParentFunctionId(Long parentFunctionId) {
this.parentFunctionId = parentFunctionId;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/MenuQuery.java
View file @ 18144407
......@@ -3,47 +3,50 @@ package com.ibeetl.admin.console.web.query;
import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.web.query.PageParam;
/**
* 菜单查询条件
*/
/** 菜单查询条件 */
public class MenuQuery extends PageParam {
@Query(name = "代码", display = true,fuzzy=true)
@Query(name = "代码", display = true, fuzzy = true)
private String code;
@Query(name = "名称", display = true,fuzzy=true)
@Query(name = "名称", display = true, fuzzy = true)
private String name;
@Query(name = "菜单入口地址", display = true,fuzzy=true)
@Query(name = "菜单入口地址", display = true, fuzzy = true)
private String url;
@Query(name="上一级菜单",display=true,type=Query.TYPE_CONTROL,control="menu")
@Query(name = "上一级菜单", display = true, type = Query.TYPE_CONTROL, control = "menu")
private Long parentMenuId;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public Long getParentMenuId() {
return parentMenuId;
}
public void setParentMenuId(Long parentMenuId) {
this.parentMenuId = parentMenuId;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/OrgQuery.java
View file @ 18144407
......@@ -4,18 +4,19 @@ import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import com.ibeetl.admin.core.web.query.PageParam;
/**
* 字典表单查询条件
*/
/** 字典表单查询条件 */
public class OrgQuery extends PageParam {
@Query(name = "机构编号", display = true)
private String code;
@Query(name = "机构名称", display = true)
private String name;
@Query(name="机构类型",display=true,type=Query.TYPE_DICT,dict=CoreDictType.ORG_TYPE)
@Query(name = "机构类型", display = true, type = Query.TYPE_DICT, dict = CoreDictType.ORG_TYPE)
private String type;
@Query(name="上一级机构",display=true,type=Query.TYPE_CONTROL,control="org")
@Query(name = "上一级机构", display = true, type = Query.TYPE_CONTROL, control = "org")
private String parentOrgId;
public String getCode() {
......@@ -49,5 +50,4 @@ public class OrgQuery extends PageParam {
public void setParentOrgId(String parentOrgId) {
this.parentOrgId = parentOrgId;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/OrgTreeQuery.java
View file @ 18144407
......@@ -4,11 +4,9 @@ import java.util.List;
import com.ibeetl.admin.core.web.query.PageParam;
/**
* 描述: 带有组织树相关的查询
*/
/** 描述: 带有组织树相关的查询 */
public class OrgTreeQuery extends PageParam {
protected Long orgId; //组织id
protected Long orgId; // 组织id
protected List<Long> orgIds;
public Long getOrgId() {
......
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/OrgUserQuery.java
View file @ 18144407
......@@ -9,63 +9,68 @@ import com.ibeetl.admin.core.web.query.PageParam;
public class OrgUserQuery extends PageParam {
@Query(name="账号",display=true,fuzzy=true)
private String code ;
@Query(name="名称",display=true,fuzzy=true)
private String name ;
@Query(name = "账号", display = true, fuzzy = true)
private String code;
@Query(name="状态",display=true,type=Query.TYPE_DICT,dict=CoreDictType.USER_STATE)
@Query(name = "名称", display = true, fuzzy = true)
private String name;
@Query(name = "状态", display = true, type = Query.TYPE_DICT, dict = CoreDictType.USER_STATE)
private String state;
@Query(name="职务",display=true,type=Query.TYPE_DICT,dict="job_type",group="job_type")
@Query(name = "职务", display = true, type = Query.TYPE_DICT, dict = "job_type", group = "job_type")
private String jobType0;
@Query(name="职务明细",display=true,type=Query.TYPE_DICT,dict="",group="job_type")
@Query(name = "职务明细", display = true, type = Query.TYPE_DICT, dict = "", group = "job_type")
private String jobType1;
private Long orgId;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public String getJobType0() {
return jobType0;
}
public void setJobType0(String jobType0) {
this.jobType0 = jobType0;
}
public String getJobType1() {
return jobType1;
}
public void setJobType1(String jobType1) {
this.jobType1 = jobType1;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/RoleQuery.java
View file @ 18144407
......@@ -4,18 +4,16 @@ import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import com.ibeetl.admin.core.web.query.PageParam;
/**
* 描述: 角色查询条件
*
*/
/** 描述: 角色查询条件 */
public class RoleQuery extends PageParam {
@Query(name = "编码", display = true)
private String code;
@Query(name = "名称", display = true)
private String name;
@Query(name = "业务角色类型", type = Query.TYPE_DICT,dict=CoreDictType.ROLE_TYPE)
private String type;
@Query(name = "业务角色类型", type = Query.TYPE_DICT, dict = CoreDictType.ROLE_TYPE)
private String type;
public String getCode() {
return code;
......@@ -40,8 +38,4 @@ public class RoleQuery extends PageParam {
public void setType(String type) {
this.type = type;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/RoleUserQuery.java
View file @ 18144407
......@@ -4,12 +4,11 @@ import com.ibeetl.admin.core.annotation.Query;
import com.ibeetl.admin.core.util.enums.CoreDictType;
import com.ibeetl.admin.core.web.query.PageParam;
/**
* 描述: 角色李的用户列表
*/
/** 描述: 角色李的用户列表 */
public class RoleUserQuery extends PageParam {
@Query(name = "编码", display = true)
private String userCode;
@Query(name = "名称", display = true)
private String userName;
......@@ -38,9 +37,4 @@ public class RoleUserQuery extends PageParam {
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
}
plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/query/UserQuery.java
View file @ 18144407
......@@ -11,99 +11,113 @@ import com.ibeetl.admin.core.web.query.PageParam;
public class UserQuery extends PageParam {
@Query(name="账号",display=true,fuzzy=true)
private String code ;
@Query(name="名称",display=true,fuzzy=true)
private String name ;
@Query(name="部门",display=true,type=Query.TYPE_CONTROL,control="org")
@Query(name = "账号", display = true, fuzzy = true)
private String code;
@Query(name = "名称", display = true, fuzzy = true)
private String name;
@Query(name = "部门", display = true, type = Query.TYPE_CONTROL, control = "org")
private Long orgId;
@Query(name="状态",display=true,type=Query.TYPE_DICT,dict=CoreDictType.USER_STATE)
@Query(name = "状态", display = true, type = Query.TYPE_DICT, dict = CoreDictType.USER_STATE)
private String state;
@Query(name="职务",display=true,type=Query.TYPE_DICT,dict="job_type",group="job_type")
@Query(name = "职务", display = true, type = Query.TYPE_DICT, dict = "job_type", group = "job_type")
private String jobType0;
@Query(name="职务明细",display=true,type=Query.TYPE_DICT,dict="",group="job_type")
@Query(name = "职务明细", display = true, type = Query.TYPE_DICT, dict = "", group = "job_type")
private String jobType1;
@Query(name="创建日期",display=true,type=Query.TYPE_DATE_BETWEEN)
@Query(name = "创建日期", display = true, type = Query.TYPE_DATE_BETWEEN)
private String createDateRange;
private Date createDateMin;
private Date createDateMax;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public String getJobType0() {
return jobType0;
}
public void setJobType0(String jobType0) {
this.jobType0 = jobType0;
}
public String getJobType1() {
return jobType1;
}
public void setJobType1(String jobType1) {
this.jobType1 = jobType1;
}
public String getCreateDateRange() {
return createDateRange;
}
public void setCreateDateRange(String createDateRange) {
this.createDateRange = createDateRange;
if(StringUtils.isEmpty(createDateRange)) {
return ;
if (StringUtils.isEmpty(createDateRange)) {
return;
}
Date[] ds = Tool.parseDataRange(createDateRange);
this.createDateMin=ds[0];
this.createDateMax =ds[1];
this.createDateMin = ds[0];
this.createDateMax = ds[1];
}
public Date getCreateDateMin() {
return createDateMin;
}
public void setCreateDateMin(Date createDateMin) {
this.createDateMin = createDateMin;
}
public Date getCreateDateMax() {
return createDateMax;
}
public void setCreateDateMax(Date createDateMax) {
this.createDateMax = createDateMax;
}
// public String getJobSubType() {
// return jobSubType;
// }
// public void setJobSubType(String jobSubType) {
// this.jobSubType = jobSubType;
// }
//
// public String getJobSubType() {
// return jobSubType;
// }
// public void setJobSubType(String jobSubType) {
// this.jobSubType = jobSubType;
// }
//
}
Supports Markdown
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