From: qiaowei Date: Fri, 17 May 2019 06:56:10 +0000 (+0800) Subject: 用户管理 X-Git-Tag: 1.0.0^2~215 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=d97d9d235fdf4134af5101f42a9bc248ad70b853;p=epayment%2Ffood_payapi.git 用户管理 --- diff --git a/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java b/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java index beb4a881..806b049c 100644 --- a/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java +++ b/src/main/java/com/supwisdom/dlpay/api/dao/AccountDao.java @@ -1,6 +1,9 @@ package com.supwisdom.dlpay.api.dao; import com.supwisdom.dlpay.api.domain.TAccount; +import com.supwisdom.dlpay.api.domain.TPerson; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Lock; import org.springframework.data.jpa.repository.Query; @@ -33,4 +36,6 @@ public interface AccountDao extends JpaRepository { @Query("select a from TAccount a where a.userid = ?1 and a.subjno=?2") TAccount findByUseridAndSubjno(String userid, String subjno); + + Page findAllByAccnameContaining(String accname, Pageable pageable); } diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java b/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java index dc98e910..dc976435 100644 --- a/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java @@ -69,6 +69,10 @@ public class TAccount { @Column(name = "CLOSEDATE", length = 8) private String closedate; + @OneToOne + @JoinColumn(name = "USERID",insertable = false,updatable = false) + private TPerson person; + public TAccount() { } @@ -277,4 +281,12 @@ public class TAccount { } return false; } + + public TPerson getPerson() { + return person; + } + + public void setPerson(TPerson person) { + this.person = person; + } } diff --git a/src/main/java/com/supwisdom/dlpay/framework/dao/RoleFunctionDao.java b/src/main/java/com/supwisdom/dlpay/framework/dao/RoleFunctionDao.java index a8381a1d..d1f2d379 100644 --- a/src/main/java/com/supwisdom/dlpay/framework/dao/RoleFunctionDao.java +++ b/src/main/java/com/supwisdom/dlpay/framework/dao/RoleFunctionDao.java @@ -18,7 +18,7 @@ public interface RoleFunctionDao extends JpaRepository { List findByRoleId(String roleId); - @Query(value = " select f.id||'' as id ,f.parentid||'' as pid,f.name,case when rf.id is null then 0 else 1 end as checked,case when rf.id is null then 1 else 0 end as open from tb_function f " + + @Query(value = " select f.id||'' as id ,f.parentid||'' as pid,f.name,case when rf.id is null then 0 else 1 end as checked,case when f.parentid=-1 then 1 else 0 end as open from tb_function f " + " left join tb_role_function rf on rf.functionid = f.id and rf.roleid=?1 " + " union all " + " select r.id||'_res' as id,r.function_id||'' as pid,r.name,case when p.id is null then 0 else 1 end as checked,0 as open from tb_resource r " + diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/AccountPerson.java b/src/main/java/com/supwisdom/dlpay/system/bean/AccountPerson.java new file mode 100644 index 00000000..2a870c0d --- /dev/null +++ b/src/main/java/com/supwisdom/dlpay/system/bean/AccountPerson.java @@ -0,0 +1,4 @@ +package com.supwisdom.dlpay.system.bean; + +public class AccountPerson { +} diff --git a/src/main/java/com/supwisdom/dlpay/system/controller/UserController.java b/src/main/java/com/supwisdom/dlpay/system/controller/UserController.java index 087e71c4..718fa533 100644 --- a/src/main/java/com/supwisdom/dlpay/system/controller/UserController.java +++ b/src/main/java/com/supwisdom/dlpay/system/controller/UserController.java @@ -1,5 +1,6 @@ package com.supwisdom.dlpay.system.controller; +import com.supwisdom.dlpay.api.domain.TAccount; import com.supwisdom.dlpay.api.domain.TPerson; import com.supwisdom.dlpay.framework.util.PageResult; import com.supwisdom.dlpay.framework.util.WebConstant; @@ -17,7 +18,6 @@ public class UserController { @Autowired private UserDataService userDataService; - @GetMapping("/user/index") public String sysparaView() { return "system/user/index"; @@ -41,4 +41,28 @@ public class UserController { return new PageResult<>(99, "系统查询错误"); } } + @GetMapping("/user/acc") + public String acc() { + return "system/user/account"; + } + + @GetMapping("/user/account") + @PreAuthorize("hasPermission('/user/account','')") + @ResponseBody + public PageResult getDataAccountList(@RequestParam("page") Integer pageNo, + @RequestParam("limit") Integer pageSize, + @RequestParam(value = "searchkey", required = false) String searchKey) { + try { + if (null == pageNo || pageNo < 1) pageNo = WebConstant.PAGENO_DEFAULT; + if (null == pageSize || pageSize < 1) pageSize = WebConstant.PAGESIZE_DEFAULT; + PersonParamBean searchBean = new PersonParamBean(); + searchBean.setPageNo(pageNo); + searchBean.setName(searchKey); + searchBean.setPageSize(pageSize); + return userDataService.getAccountsByKey(searchBean); + } catch (Exception e) { + e.printStackTrace(); + return new PageResult<>(99, "系统查询错误"); + } + } } diff --git a/src/main/java/com/supwisdom/dlpay/system/service/UserDataService.java b/src/main/java/com/supwisdom/dlpay/system/service/UserDataService.java index d5a614e0..34748c74 100644 --- a/src/main/java/com/supwisdom/dlpay/system/service/UserDataService.java +++ b/src/main/java/com/supwisdom/dlpay/system/service/UserDataService.java @@ -1,5 +1,6 @@ package com.supwisdom.dlpay.system.service; +import com.supwisdom.dlpay.api.domain.TAccount; import com.supwisdom.dlpay.api.domain.TPerson; import com.supwisdom.dlpay.framework.util.PageResult; import com.supwisdom.dlpay.system.bean.PersonParamBean; @@ -10,4 +11,7 @@ public interface UserDataService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class,readOnly = true) PageResult getPersonsByKey(PersonParamBean param); + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class,readOnly = true) + PageResult getAccountsByKey(PersonParamBean param); + } diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java b/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java index aab27cf5..315927fe 100644 --- a/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java +++ b/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java @@ -1,6 +1,8 @@ package com.supwisdom.dlpay.system.service.impl; +import com.supwisdom.dlpay.api.dao.AccountDao; import com.supwisdom.dlpay.api.dao.PersonDao; +import com.supwisdom.dlpay.api.domain.TAccount; import com.supwisdom.dlpay.api.domain.TPerson; import com.supwisdom.dlpay.framework.util.PageResult; import com.supwisdom.dlpay.framework.util.StringUtil; @@ -16,14 +18,25 @@ import org.springframework.stereotype.Service; public class UserDataServiceImpl implements UserDataService { @Autowired private PersonDao personDao; + @Autowired + private AccountDao accountDao; @Override public PageResult getPersonsByKey(PersonParamBean param) { Pageable pageable = PageRequest.of(param.getPageNo() - 1, param.getPageSize() - , Sort.by("id")); + , Sort.by(Sort.Direction.DESC,"lastsaved")); if (!StringUtil.isEmpty(param.getName())) { return new PageResult<>(personDao.findAllByNameContaining(param.getName(), pageable)); } return new PageResult<>(personDao.findAll(pageable)); } + + @Override + public PageResult getAccountsByKey(PersonParamBean param) { + Pageable pageable = PageRequest.of(param.getPageNo() - 1, param.getPageSize()); + if (!StringUtil.isEmpty(param.getName())) { + return new PageResult<>(accountDao.findAllByAccnameContaining(param.getName(), pageable)); + } + return new PageResult<>(accountDao.findAll(pageable)); + } } diff --git a/src/main/resources/static/custom/module/index.js b/src/main/resources/static/custom/module/index.js index 6b492961..992d4d96 100755 --- a/src/main/resources/static/custom/module/index.js +++ b/src/main/resources/static/custom/module/index.js @@ -11,7 +11,6 @@ layui.define(['admin', 'layer', 'element'], function (exports) { $('.layui-layout-admin .layui-nav a[lay-href]').each(function () { var menuName = $(this).text(); var menuPath = $(this).attr('lay-href'); - console.log(menuPath,menuName); if ('javascript:;' != menuPath && '' != menuPath) { var key = menuPath.replace(/[?:=&/]/g, '_'); $(this).attr('href', '#!' + key); diff --git a/src/main/resources/templates/system/role/index.html b/src/main/resources/templates/system/role/index.html index 5dcd1f71..e2208e08 100644 --- a/src/main/resources/templates/system/role/index.html +++ b/src/main/resources/templates/system/role/index.html @@ -22,7 +22,6 @@ let form = layui.form; let table = layui.table; let admin = layui.admin; - form.render('select'); // 渲染表格 diff --git a/src/main/resources/templates/system/user/account.html b/src/main/resources/templates/system/user/account.html new file mode 100644 index 00000000..bd23479b --- /dev/null +++ b/src/main/resources/templates/system/user/account.html @@ -0,0 +1,133 @@ +
+
+

账户管理

+ + 用户中心 + 账户管理 + +
+
+
+ 搜索： +   + +
+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/system/user/index.html b/src/main/resources/templates/system/user/index.html index 8035a583..e2a49210 100644 --- a/src/main/resources/templates/system/user/index.html +++ b/src/main/resources/templates/system/user/index.html @@ -14,7 +14,7 @@ -
+