From 22826be87ba4c42f1fc3a5ba6749b469f6313a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Mon, 4 Mar 2024 17:17:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81swagger=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/admin/core/dao/CoreUserDao.java | 17 +- .../core/service/CorePlatformService.java | 3 +- .../admin/core/service/CoreUserService.java | 581 ++++++++++-------- .../core/web/query/CustomFilterByLcUser.java | 139 +++++ .../src/main/resources/sql/core/coreUser.md | 65 +- .../java/com/ibeetl/jlw/dao/LogoInfoDao.java | 32 + .../com/ibeetl/jlw/dao/SchoolClassDao.java | 2 +- .../java/com/ibeetl/jlw/dao/TeacherDao.java | 2 + .../java/com/ibeetl/jlw/entity/LogoInfo.java | 128 ++++ .../com/ibeetl/jlw/entity/vo/LogoInfoVO.java | 34 + .../ibeetl/jlw/service/LogoInfoService.java | 104 ++++ .../jlw/service/SchoolClassService.java | 4 + .../ibeetl/jlw/service/TeacherService.java | 4 + .../jlw/service/UserStockTradesService.java | 2 +- .../api/student/ApiStudentService.java | 25 +- .../com/ibeetl/jlw/web/AccountController.java | 58 +- .../ibeetl/jlw/web/LogoInfoController.java | 81 +++ .../com/ibeetl/jlw/web/TestController.java | 24 +- .../ibeetl/jlw/web/query/LogoInfoQuery.java | 33 + 19 files changed, 1049 insertions(+), 289 deletions(-) create mode 100644 admin-core/src/main/java/com/ibeetl/admin/core/web/query/CustomFilterByLcUser.java create mode 100644 web/src/main/java/com/ibeetl/jlw/dao/LogoInfoDao.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/LogoInfo.java create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/vo/LogoInfoVO.java create mode 100644 web/src/main/java/com/ibeetl/jlw/service/LogoInfoService.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/LogoInfoController.java create mode 100644 web/src/main/java/com/ibeetl/jlw/web/query/LogoInfoQuery.java diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java index e9cc385d..7c8ee00d 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java @@ -1,6 +1,7 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreUser; +import com.ibeetl.admin.core.web.query.CustomFilterByLcUser; import org.apache.commons.logging.Log; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; @@ -56,9 +57,23 @@ public interface CoreUserDao extends BaseMapper { void updateUserId(Long newId, Long oldId); List getCoreUserListAndOldIdIsNull(); + CoreUser getCoreUserByOldId(Long oldId); CoreUser findByUsername(String username); - List> findAllUser(); + List> findAllUser(); + + List> getUsersByLC(Integer id, + String idList, + String typeId, + String keyword, + String keyword2, + int pageSize, int pageIndex); + List> accountDalGetList(Integer id, + String idList, + String typeId, + String keyword, + String keyword2 + ); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java index 6758bdda..01f71892 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java @@ -104,6 +104,7 @@ public class CorePlatformService { @Autowired private CoreFunctionDao sysFunctionDao; @Autowired private CorePlatformService self; @Autowired private DataAccessFactory dataAccessFactory; + private CoreUser user; @PostConstruct @SuppressWarnings("unchecked") @@ -200,7 +201,7 @@ public class CorePlatformService { public MenuItem getMenuItem(long userId, long orgId) { CoreUserDao coreUserDao1 = SpringUtil.getBean("coreUserDao"); System.out.println(coreUserDao1); - CoreUser user = coreUserDao1.unique(userId); + user = coreUserDao1.unique(userId); if (this.isSupperAdmin(user)) { return self.buildMenu(); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 6940f07f..ff3bccc5 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -13,6 +13,7 @@ import com.ibeetl.admin.core.rbac.UserLoginInfo; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.util.enums.DelFlagEnum; import com.ibeetl.admin.core.util.enums.GeneralStateEnum; +import com.ibeetl.admin.core.web.query.CustomFilterByLcUser; import org.apache.commons.lang3.StringUtils; import org.beetl.sql.core.SQLManager; import org.springframework.beans.factory.annotation.Autowired; @@ -34,237 +35,239 @@ import static com.ibeetl.admin.core.util.enums.GeneralStateEnum.ENABLE; @Transactional @Validated public class CoreUserService extends CoreBaseService { - @Autowired - CoreUserDao coreUserDao; - - @Autowired - CoreOrgDao orgDao; - - @Autowired - PasswordEncryptService passwordEncryptService; - - @Autowired SQLManager sqlManager; - - public UserLoginInfo login(String userName,String password){ - CoreUser query = new CoreUser(); - query.setCode(userName); - query.setPassword(passwordEncryptService.password(password)); - query.setState(ENABLE.getValue()); - CoreUser user = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode,userName). - andEq(CoreUser::getPassword, passwordEncryptService.password(password)) - .andEq(CoreUser::getState, ENABLE.getValue()).single(); - if(user==null) { - throw new PlatformException("用户"+userName+"不存在或者密码错误"); - } - if(!user.getState().equals(ENABLE.getValue())){ - throw new PlatformException("用户"+userName+"已经失效"); - } - if(user.getDelFlag()==DelFlagEnum.DELETED.getValue()) { - throw new PlatformException("用户"+userName+"已经删除"); - } - - List orgs = getUserOrg(user.getId(),user.getOrgId()); - UserLoginInfo loginInfo = new UserLoginInfo(); - loginInfo.setOrgs(orgs); - loginInfo.setUser(user); - return loginInfo; - - } - - /** - * 新增用户 （指定身份，不会增加权限） - * - * 创建用户，并增加权限 - * {@link com.ibeetl.jlw.service.WebPlatformService#createUser} - * - * @param userCode 用户Code - * @param password 登录密码（明文传入） 为空时候，默认为123qwe - * @param orgId 组织ID - * @param jobType0 岗位 - * @param jobType1 岗位子类型 - */ - public Long createUserBySomeParams(String userCode, String password, Long orgId, MenuEnums jobType0, MenuEnums jobType1 ) { - Assert.notEmpty(userCode, "用户编号不能为空！"); - Assert.notNull(orgId, "机构ID不能为空！"); - Assert.notNull(jobType0, "岗位不能为空！"); - Assert.notNull(jobType1, "岗位子类型不能为空！"); + @Autowired + CoreUserDao coreUserDao; + + @Autowired + CoreOrgDao orgDao; + + @Autowired + PasswordEncryptService passwordEncryptService; + + @Autowired + SQLManager sqlManager; + + public UserLoginInfo login(String userName, String password) { + CoreUser query = new CoreUser(); + query.setCode(userName); + query.setPassword(passwordEncryptService.password(password)); + query.setState(ENABLE.getValue()); + CoreUser user = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode, userName). + andEq(CoreUser::getPassword, passwordEncryptService.password(password)) + .andEq(CoreUser::getState, ENABLE.getValue()).single(); + if (user == null) { + throw new PlatformException("用户" + userName + "不存在或者密码错误"); + } + if (!user.getState().equals(ENABLE.getValue())) { + throw new PlatformException("用户" + userName + "已经失效"); + } + if (user.getDelFlag() == DelFlagEnum.DELETED.getValue()) { + throw new PlatformException("用户" + userName + "已经删除"); + } + + List orgs = getUserOrg(user.getId(), user.getOrgId()); + UserLoginInfo loginInfo = new UserLoginInfo(); + loginInfo.setOrgs(orgs); + loginInfo.setUser(user); + return loginInfo; + + } + + /** + * 新增用户 （指定身份，不会增加权限） + *

+ * 创建用户，并增加权限 + * {@link com.ibeetl.jlw.service.WebPlatformService#createUser} + * + * @param userCode 用户Code + * @param password 登录密码（明文传入） 为空时候，默认为123qwe + * @param orgId 组织ID + * @param jobType0 岗位 + * @param jobType1 岗位子类型 + */ + public Long createUserBySomeParams(String userCode, String password, Long orgId, MenuEnums jobType0, MenuEnums jobType1) { + Assert.notEmpty(userCode, "用户编号不能为空！"); + Assert.notNull(orgId, "机构ID不能为空！"); + Assert.notNull(jobType0, "岗位不能为空！"); + Assert.notNull(jobType1, "岗位子类型不能为空！"); // Boolean length = userCode.length() <= 16; // Assert.isTrue(length, "输入内容："+userCode+ " 超过16个字符！"); - // 判断用户Code唯一 - Boolean isNotExist = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode,userCode).count() == 0; - Assert.isTrue(isNotExist, "用户名重复！"); - - CoreUser user = new CoreUser(); - user.setName(userCode); - user.setCode(userCode); - user.setPassword(defaultIfBlank(passwordEncryptService.password(password), "123qwe")); - user.setState(ENABLE.getValue()); - user.setCreateTime(new Date()); - user.setDelFlag(0); - user.setJobType0(jobType0.name()); - user.setJobType1(jobType1.name()); - user.setOrgId(orgId); - - coreUserDao.insert(user); - CoreUser c = new CoreUser(); - c.setId(user.getId()); - c.setOldId(50000+user.getId()); - coreUserDao.updateTemplateById(c); - return user.getId(); - } - - - - - public Long createUserBySomeParams(String userCode, String password, Long orgId, MenuEnums jobType0, MenuEnums jobType1,Long oldId ) { - Assert.notEmpty(userCode, "用户编号不能为空！"); - Assert.notNull(orgId, "机构ID不能为空！"); - Assert.notNull(jobType0, "岗位不能为空！"); - Assert.notNull(jobType1, "岗位子类型不能为空！"); + // 判断用户Code唯一 + Boolean isNotExist = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode, userCode).count() == 0; + Assert.isTrue(isNotExist, "用户名重复！"); + + CoreUser user = new CoreUser(); + user.setName(userCode); + user.setCode(userCode); + user.setPassword(defaultIfBlank(passwordEncryptService.password(password), "123qwe")); + user.setState(ENABLE.getValue()); + user.setCreateTime(new Date()); + user.setDelFlag(0); + user.setJobType0(jobType0.name()); + user.setJobType1(jobType1.name()); + user.setOrgId(orgId); + + coreUserDao.insert(user); + CoreUser c = new CoreUser(); + c.setId(user.getId()); + c.setOldId(50000 + user.getId()); + coreUserDao.updateTemplateById(c); + return user.getId(); + } + + + public Long createUserBySomeParams(String userCode, String password, Long orgId, MenuEnums jobType0, MenuEnums jobType1, Long oldId) { + Assert.notEmpty(userCode, "用户编号不能为空！"); + Assert.notNull(orgId, "机构ID不能为空！"); + Assert.notNull(jobType0, "岗位不能为空！"); + Assert.notNull(jobType1, "岗位子类型不能为空！"); // Boolean length = userCode.length() <= 16; // Assert.isTrue(length, "输入内容："+userCode+ " 超过16个字符！"); - // 判断用户Code唯一 - Boolean isNotExist = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode,userCode).count() == 0; - Assert.isTrue(isNotExist, "用户名重复！"); - - CoreUser user = new CoreUser(); - user.setName(userCode); - user.setCode(userCode); - user.setPassword(defaultIfBlank(passwordEncryptService.password(password), "123qwe")); - user.setState(ENABLE.getValue()); - user.setCreateTime(new Date()); - user.setDelFlag(0); - user.setJobType0(jobType0.name()); - user.setJobType1(jobType1.name()); - user.setOrgId(orgId); + // 判断用户Code唯一 + Boolean isNotExist = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode, userCode).count() == 0; + Assert.isTrue(isNotExist, "用户名重复！"); + + CoreUser user = new CoreUser(); + user.setName(userCode); + user.setCode(userCode); + user.setPassword(defaultIfBlank(passwordEncryptService.password(password), "123qwe")); + user.setState(ENABLE.getValue()); + user.setCreateTime(new Date()); + user.setDelFlag(0); + user.setJobType0(jobType0.name()); + user.setJobType1(jobType1.name()); + user.setOrgId(orgId); user.setOldId(oldId); - coreUserDao.insert(user); - CoreUser c = new CoreUser(); - c.setId(user.getId()); - coreUserDao.updateTemplateById(c); - return user.getId(); - } - - public List getUserOrg(long userId,long orgId){ - List orgs = orgDao.queryOrgByUser(userId); - if(orgs.isEmpty()){ - //没有赋值任何角色，默认给一个所在部门 - CoreOrg userOrg = orgDao.unique(orgId); - orgs.add(userOrg); - } - return orgs; - } - - public List getAllUsersByRole(String role){ - return coreUserDao.getUserByRole(role); - } - - public CoreUser getUserByCode(String userName){ - CoreUser user = new CoreUser(); - user.setCode(userName); - return coreUserDao.templateOne(user); - } - - public void updateTemplateById(CoreUser user){ - coreUserDao.updateTemplateById(user); - } - - public CoreOrg getOrgById(Long orgId){ - return orgDao.unique(orgId); - } - - public CoreUser getUserById(Long userId){ - return coreUserDao.unique(userId); - } - - public List getOrgCode(List orgIds){ - return orgDao.queryAllOrgCode(orgIds); - } - - public List getCoreUserList(CoreUser coreUser){ - return coreUserDao.template(coreUser); - } - - - public List getCoreUserListAndOldIdIsNull(){ - return coreUserDao.getCoreUserListAndOldIdIsNull(); - } - - public CoreUser findByOldId(Long oldId){ - return coreUserDao.getCoreUserByOldId(oldId); - } - - /** - * 验证 - * @return - */ - public Boolean verifyPwd(@NotBlank(message = "待验证的密码不能为空！") String pwd, @NotNull(message = "用户ID不能为空！") Long userId) { - CoreUser user = new CoreUser(); - user.setId(userId); - user.setState(GeneralStateEnum.ENABLE.getValue()); - user.setDelFlag(DelFlagEnum.NORMAL.getValue()); - CoreUser coreUser = coreUserDao.templateOne(user); - return coreUser.getPassword().equals(passwordEncryptService.password(pwd)); - } - - /** - * 验证 - * @return - */ - public Boolean editPwdByOld(@NotBlank(message = "旧密码不能为空！") String oldPwd, - @NotBlank(message = "新密码不能为空！") String newPwd, - @NotNull(message = "用户ID不能为空！") Long userId) { - Assert.isTrue(verifyPwd(oldPwd, userId), "旧密码验证失败！"); - CoreUser entity = new CoreUser(); - entity.setId(userId); - entity.setPassword(newPwd); - return coreUserDao.updateTemplateById(entity) > 0; - } - - /** - * 验证-不需要验证旧密码 - * @return - */ - public Boolean editPwdByOldNotVerify(@NotBlank(message = "新密码不能为空！") String newPwd, - @NotNull(message = "用户ID不能为空！") Long userId) { - CoreUser entity = new CoreUser(); - entity.setId(userId); - entity.setPassword(newPwd); - return coreUserDao.updateTemplateById(entity) > 0; - } - - - /** - * 根据用户ID更新用户登录的信息 - * 记录，用户信息 - * @return - */ - public Boolean recordLoginInformation(Long userId,String lastLoginTime) { - CoreUser cacheUser = coreUserDao.single(userId); - if (cacheUser == null) { - return false; - } - - Long newLoginCount = defaultIfNull(cacheUser.getLoginCount(), 0L) + 1L; - - CoreUser entity = new CoreUser(); - entity.setId(userId); - entity.setLoginCount(newLoginCount); - entity.setLastLoginTime(StringUtils.isEmpty(lastLoginTime) ? null : DateUtil.round(new Date(Long.parseLong(lastLoginTime)),DateField.SECOND)); - return coreUserDao.updateTemplateById(entity) > 0; - } - - - - /** - * 根据身份标识，尝试获取该身份对应的ID - * @param coreUser - * @return - */ + coreUserDao.insert(user); + CoreUser c = new CoreUser(); + c.setId(user.getId()); + coreUserDao.updateTemplateById(c); + return user.getId(); + } + + public List getUserOrg(long userId, long orgId) { + List orgs = orgDao.queryOrgByUser(userId); + if (orgs.isEmpty()) { + //没有赋值任何角色，默认给一个所在部门 + CoreOrg userOrg = orgDao.unique(orgId); + orgs.add(userOrg); + } + return orgs; + } + + public List getAllUsersByRole(String role) { + return coreUserDao.getUserByRole(role); + } + + public CoreUser getUserByCode(String userName) { + CoreUser user = new CoreUser(); + user.setCode(userName); + return coreUserDao.templateOne(user); + } + + public void updateTemplateById(CoreUser user) { + coreUserDao.updateTemplateById(user); + } + + public CoreOrg getOrgById(Long orgId) { + return orgDao.unique(orgId); + } + + public CoreUser getUserById(Long userId) { + return coreUserDao.unique(userId); + } + + public List getOrgCode(List orgIds) { + return orgDao.queryAllOrgCode(orgIds); + } + + public List getCoreUserList(CoreUser coreUser) { + return coreUserDao.template(coreUser); + } + + + public List getCoreUserListAndOldIdIsNull() { + return coreUserDao.getCoreUserListAndOldIdIsNull(); + } + + public CoreUser findByOldId(Long oldId) { + return coreUserDao.getCoreUserByOldId(oldId); + } + + /** + * 验证 + * + * @return + */ + public Boolean verifyPwd(@NotBlank(message = "待验证的密码不能为空！") String pwd, @NotNull(message = "用户ID不能为空！") Long userId) { + CoreUser user = new CoreUser(); + user.setId(userId); + user.setState(GeneralStateEnum.ENABLE.getValue()); + user.setDelFlag(DelFlagEnum.NORMAL.getValue()); + CoreUser coreUser = coreUserDao.templateOne(user); + return coreUser.getPassword().equals(passwordEncryptService.password(pwd)); + } + + /** + * 验证 + * + * @return + */ + public Boolean editPwdByOld(@NotBlank(message = "旧密码不能为空！") String oldPwd, + @NotBlank(message = "新密码不能为空！") String newPwd, + @NotNull(message = "用户ID不能为空！") Long userId) { + Assert.isTrue(verifyPwd(oldPwd, userId), "旧密码验证失败！"); + CoreUser entity = new CoreUser(); + entity.setId(userId); + entity.setPassword(newPwd); + return coreUserDao.updateTemplateById(entity) > 0; + } + + /** + * 验证-不需要验证旧密码 + * + * @return + */ + public Boolean editPwdByOldNotVerify(@NotBlank(message = "新密码不能为空！") String newPwd, + @NotNull(message = "用户ID不能为空！") Long userId) { + CoreUser entity = new CoreUser(); + entity.setId(userId); + entity.setPassword(newPwd); + return coreUserDao.updateTemplateById(entity) > 0; + } + + + /** + * 根据用户ID更新用户登录的信息 + * 记录，用户信息 + * + * @return + */ + public Boolean recordLoginInformation(Long userId, String lastLoginTime) { + CoreUser cacheUser = coreUserDao.single(userId); + if (cacheUser == null) { + return false; + } + + Long newLoginCount = defaultIfNull(cacheUser.getLoginCount(), 0L) + 1L; + + CoreUser entity = new CoreUser(); + entity.setId(userId); + entity.setLoginCount(newLoginCount); + entity.setLastLoginTime(StringUtils.isEmpty(lastLoginTime) ? null : DateUtil.round(new Date(Long.parseLong(lastLoginTime)), DateField.SECOND)); + return coreUserDao.updateTemplateById(entity) > 0; + } + + + /** + * 根据身份标识，尝试获取该身份对应的ID + * @param coreUser + * @return + */ // public Long tryToGetIdByIdentity(CoreUser coreUser, Consumer consumer) throws ClassNotFoundException { // Long id = null; // // 如果是超管 @@ -295,41 +298,105 @@ public class CoreUserService extends CoreBaseService { // consumer.accept(id); // return id; // } - /** - * 根据用户名和密码查询用户，用于子系统登录 - */ - public Map getUserByUsernameAndPwd(String username,String password){ - return coreUserDao.getUserByUsernameAndPwd(username,password); - } - - public Map getTeacherByNo(String username){ - return coreUserDao.getTeacherByNo(username); - } - - public Map getStudentByNo(String username){ - return coreUserDao.getStudentByNo(username); - } - - public Map getStudentByNoOfNet(String username){ - return coreUserDao.getStudentByNoOfNet(username); - } - - public Map getTeacherByNoOfNet(String username){ - return coreUserDao.getTeacherByNoOfNet(username); - } - - public Map getAdminByNo(String username){return coreUserDao.getAdminByNo(username);} - public void updateUserId(Long newId,Long oldId){ - coreUserDao.updateUserId(newId, oldId); - } - - public CoreUser findByUsername(String username){ - return coreUserDao.findByUsername(username); - } - - public List> findAllUser(){ - return coreUserDao.findAllUser(); - } + + /** + * 根据用户名和密码查询用户，用于子系统登录 + */ + public Map getUserByUsernameAndPwd(String username, String password) { + return coreUserDao.getUserByUsernameAndPwd(username, password); + } + + public Map getTeacherByNo(String username) { + return coreUserDao.getTeacherByNo(username); + } + + public Map getStudentByNo(String username) { + return coreUserDao.getStudentByNo(username); + } + + public Map getStudentByNoOfNet(String username) { + return coreUserDao.getStudentByNoOfNet(username); + } + + public Map getTeacherByNoOfNet(String username) { + return coreUserDao.getTeacherByNoOfNet(username); + } + + public Map getAdminByNo(String username) { + return coreUserDao.getAdminByNo(username); + } + + public void updateUserId(Long newId, Long oldId) { + coreUserDao.updateUserId(newId, oldId); + } + + public CoreUser findByUsername(String username) { + return coreUserDao.findByUsername(username); + } + + public List> findAllUser() { + return coreUserDao.findAllUser(); + } + + public List> getUsersByLC(CustomFilterByLcUser customFilter, int page, int size) { + + Integer page1 = size; + if (page <= 0) { + page = 1; + } + Integer page2 = (page - 1) * size; + + String role = null; + if (customFilter.getTypeId() != null) { + role = customFilter.getTypeId() == 3 ? "js" : "xs"; + } + + StringBuilder sb = new StringBuilder(); + if (customFilter.getIdList() != null && customFilter.getIdList().size() > 0) { + for (int i = 0; i < customFilter.getIdList().size(); i++) { + sb.append(customFilter.getIdList().get(i)); + if (i < customFilter.getIdList().size() - 1) { + sb.append(","); + } + } + } + String ids = null; + if (sb != null) { + ids = sb.toString(); + } + + return coreUserDao.getUsersByLC(customFilter.getId(),ids, role, customFilter.getKeyword() + , customFilter.getKeyword2(), page1, page2); + } + + + + + public List> accountDalGetList(CustomFilterByLcUser customFilter) { + String role = null; + if (customFilter.getTypeId() != null) { + role = customFilter.getTypeId() == 3 ? "js" : "xs"; + } + + StringBuilder sb = new StringBuilder(); + if (customFilter.getIdList() != null && customFilter.getIdList().size() > 0) { + for (int i = 0; i < customFilter.getIdList().size(); i++) { + sb.append(customFilter.getIdList().get(i)); + if (i < customFilter.getIdList().size() - 1) { + sb.append(","); + } + } + } + String ids = null; + if (sb != null) { + ids = sb.toString(); + } + + return coreUserDao.accountDalGetList(customFilter.getId(),ids, role, customFilter.getKeyword() + , customFilter.getKeyword2()); + } + + } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/query/CustomFilterByLcUser.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/query/CustomFilterByLcUser.java new file mode 100644 index 00000000..d2c764e6 --- /dev/null +++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/query/CustomFilterByLcUser.java @@ -0,0 +1,139 @@ +package com.ibeetl.admin.core.web.query; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public class CustomFilterByLcUser { + + @JsonProperty("Id") + private Integer Id; + + @JsonProperty("Id2") + private Integer Id2; + @JsonProperty("IdList") + private List IdList; + @JsonProperty("Id2List") + private List Id2List; + @JsonProperty("TypeId") + private Integer TypeId; + @JsonProperty("UserId") + private Integer UserId; + @JsonProperty("StudentId") + private Integer StudentId; + @JsonProperty("KeyWord") + private String Keyword; + @JsonProperty("KeyWord2") + private String Keyword2; + @JsonProperty("KeyWord1Ex") + private boolean Keyword1Ex; + @JsonProperty("StatusId") + private Integer StatusId; + @JsonProperty("SortName") + private String SortName; + @JsonProperty("SortWay") + private Boolean SortWay; + public Integer getId() { + return Id; + } + + public void setId(Integer id) { + Id = id; + } + + public Integer getId2() { + return Id2; + } + + public void setId2(Integer id2) { + Id2 = id2; + } + + public List getIdList() { + return IdList; + } + + public void setIdList(List idList) { + IdList = idList; + } + + public List getId2List() { + return Id2List; + } + + public void setId2List(List id2List) { + Id2List = id2List; + } + + public Integer getTypeId() { + return TypeId; + } + + public void setTypeId(Integer typeId) { + TypeId = typeId; + } + + public Integer getUserId() { + return UserId; + } + + public void setUserId(Integer userId) { + UserId = userId; + } + + public Integer getStudentId() { + return StudentId; + } + + public void setStudentId(Integer studentId) { + StudentId = studentId; + } + + public String getKeyword() { + return Keyword; + } + + public void setKeyword(String keyword) { + Keyword = keyword; + } + + public String getKeyword2() { + return Keyword2; + } + + public void setKeyword2(String keyword2) { + Keyword2 = keyword2; + } + + public boolean isKeyword1Ex() { + return Keyword1Ex; + } + + public void setKeyword1Ex(boolean keyword1Ex) { + Keyword1Ex = keyword1Ex; + } + + public Integer getStatusId() { + return StatusId; + } + + public void setStatusId(Integer statusId) { + StatusId = statusId; + } + + public String getSortName() { + return SortName; + } + + public void setSortName(String sortName) { + SortName = sortName; + } + + public Boolean getSortWay() { + return SortWay; + } + + public void setSortWay(Boolean sortWay) { + SortWay = sortWay; + } +} diff --git a/admin-core/src/main/resources/sql/core/coreUser.md b/admin-core/src/main/resources/sql/core/coreUser.md index d53789f0..c8ea161b 100644 --- a/admin-core/src/main/resources/sql/core/coreUser.md +++ b/admin-core/src/main/resources/sql/core/coreUser.md @@ -168,4 +168,67 @@ findByUsername findAllUser === -select ID as userId,CODE as accountNo,PASSWORD as password from core_user \ No newline at end of file +select ID as userId,CODE as accountNo,PASSWORD as password from core_user + +getUsersByLC +=== + select core_user.old_id as id, + core_user.name as username, + core_user.CODE as schoolNumber, + 1 as sex, + '' as phone, + '' as emailAddress, + '' as address, + 0 as status, + core_role.CODE as roleId, + core_user.CREATE_TIME as createTime, + core_user.old_id, + core_role.CODE, + core_role.NAME + from core_user + join core_user_role cur on core_user.ID = cur.USER_ID + join core_role on cur.ROLE_ID = core_role.ID + where 1=1 and core_role.CODE != 'cjgly' + and core_role.CODE != 'jsgly' and core_role.CODE != 'yxgly' + @if(!isEmpty(id)){ + and core_user.old_id = #id# + @} + @if(!isEmpty(idList)){ + and find_in_set(core_user.old_id,#idList#) + @} + @if(!isEmpty(typeId)){ + and core_role.CODE=#typeId# + @} + @if(!isEmpty(keyword)){ + and (core_user.name like #"%"+keyword+"%"# or core_user.code like #"%"+keyword+"%"#) + @} + @if(!isEmpty(keyword2)){ + and (core_user.code like #"%"+keyword+"%"#) + @} + order by core_user.CREATE_TIME + limit #pageSize# offset #pageIndex# + + +accountDalGetList +=== + select cu.old_id as id, + cu.CODE as accountNo, + cu.PASSWORD as password, + cu.old_id as userId, + CREATE_TIME as createTime +from core_user cu +where 1 = 1 +@if(!isEmpty(id)){ +and cu.old_id = #id# +@} +@if(!isEmpty(idList)){ +and find_in_set(cu.old_id,#idList#) +@} + +@if(!isEmpty(keyword)){ +and (cu.name like #"%"+keyword+"%"# or cu.code like #"%"+keyword+"%"#) +@} +@if(!isEmpty(keyword2)){ +and (cu.code like #"%"+keyword+"%"#) +@} +order by cu.CREATE_TIME \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/LogoInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/LogoInfoDao.java new file mode 100644 index 00000000..58caeb32 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/dao/LogoInfoDao.java @@ -0,0 +1,32 @@ +package com.ibeetl.jlw.dao; + +import com.ibeetl.jlw.entity.LogoInfo; +import com.ibeetl.jlw.entity.ResourcesApplicationCourse; +import com.ibeetl.jlw.entity.SchoolClass; +import com.ibeetl.jlw.web.query.LogoInfoQuery; +import com.ibeetl.jlw.web.query.SchoolClassQuery; +import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository +@SqlResource("jlw.logoInfo") +public interface LogoInfoDao extends BaseMapper { + + + LogoInfo findById(Long id); + + LogoInfo findByApplicationId(Long applicationId); + + LogoInfo findByApplicationIdAndSchoolId(Long applicationId,Long schoolId); + + + PageQuery queryByCondition(PageQuery query); + + + List getValuesByQueryNotWithPermission(LogoInfoQuery logoInfoQuery); +} diff --git a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java index 9cdba43c..59ff9df8 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java @@ -40,7 +40,7 @@ public interface SchoolClassDao extends BaseMapper { List> getClassesBySchoolId(Long schoolId); - + List> userClassDalGetClassListById(); List> findClassesByTeacherId(Long teacherId); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java index 47f8fe0b..b75c58f2 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java @@ -58,4 +58,6 @@ public interface TeacherDao extends BaseMapper{ List> findAllTeacherBySchoolId(Long schoolId); List getByTeacherJobNameAndOrgId(String teacherJobName, Long orgId); + + List> userClassDalGetList(); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/entity/LogoInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/LogoInfo.java new file mode 100644 index 00000000..f4d2efed --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/LogoInfo.java @@ -0,0 +1,128 @@ +package com.ibeetl.jlw.entity; + + +import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.InsertIgnore; + +import javax.validation.constraints.NotNull; +import java.util.Date; + + +public class LogoInfo extends BaseEntity { + + @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) + // @SeqID(name = ORACLE_CORE_SEQ_NAME) + @AutoID + private Long id; + + @ApiModelProperty("应用id") + private Long applicationId; + @ApiModelProperty("应用名称") + private String applicationName; + + @ApiModelProperty("logo路径") + private String path; + + @ApiModelProperty("学校id") + private Long schoolId; + + @ApiModelProperty("底部版权信息") + private String copyright; + + @ApiModelProperty("创建人id") + private Long createId; + + @ApiModelProperty("创建人姓名") + private String createName; + @ApiModelProperty("学校名称") + private String schoolName; + /** + * 新增时间 + */ + @InsertIgnore + private Date addTime; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getApplicationId() { + return applicationId; + } + + public void setApplicationId(Long applicationId) { + this.applicationId = applicationId; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public Long getSchoolId() { + return schoolId; + } + + public void setSchoolId(Long schoolId) { + this.schoolId = schoolId; + } + + public Date getAddTime() { + return addTime; + } + + public void setAddTime(Date addTime) { + this.addTime = addTime; + } + + public String getCopyright() { + return copyright; + } + + public void setCopyright(String copyright) { + this.copyright = copyright; + } + + public Long getCreateId() { + return createId; + } + + public void setCreateId(Long createId) { + this.createId = createId; + } + + public String getCreateName() { + return createName; + } + + public void setCreateName(String createName) { + this.createName = createName; + } + + public String getApplicationName() { + return applicationName; + } + + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/LogoInfoVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/LogoInfoVO.java new file mode 100644 index 00000000..491a9e7b --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/LogoInfoVO.java @@ -0,0 +1,34 @@ +package com.ibeetl.jlw.entity.vo; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +@ApiModel(value = "学校子系统logo配置入参") +@Getter +@Setter +@Data +public class LogoInfoVO { + + @ApiModelProperty("ID,当修改操作时，该值不为Null ,新增操作时该值为Null") + private Long id; + + @ApiModelProperty("应用id") + private Long applicationId; + + @ApiModelProperty("应用名称") + private String applicationName; + + @ApiModelProperty("logo路径") + private String path; + + @ApiModelProperty("学校id") + private Long schoolId; + + @ApiModelProperty("底部版权信息") + private String copyright; + +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/LogoInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/LogoInfoService.java new file mode 100644 index 00000000..2123898a --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/service/LogoInfoService.java @@ -0,0 +1,104 @@ +package com.ibeetl.jlw.service; + + +import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.jlw.dao.LogoInfoDao; +import com.ibeetl.jlw.entity.LogoInfo; +import com.ibeetl.jlw.entity.ResourcesApplication; +import com.ibeetl.jlw.entity.UniversitiesColleges; +import com.ibeetl.jlw.entity.vo.LogoInfoVO; +import com.ibeetl.jlw.web.query.LogoInfoQuery; +import org.beetl.sql.core.engine.PageQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; + +import java.util.List; + +@Service +@Transactional +public class LogoInfoService extends CoreBaseService { + + @Autowired + LogoInfoDao logoInfoDao; + @Autowired + UniversitiesCollegesService universitiesCollegesService; + + + public LogoInfo insert(LogoInfoVO vo) { + LogoInfo logoInfo1 = findByApplicationIdAndSchoolId(vo.getApplicationId(), vo.getSchoolId()); + Assert.isNull(logoInfo1, "该应用已配置logo信息"); + LogoInfo logoInfo = new LogoInfo(); + logoInfo.setApplicationId(vo.getApplicationId()); + logoInfo.setPath(vo.getPath()); + logoInfo.setSchoolId(vo.getSchoolId()); + if (vo.getSchoolId() != null) { + UniversitiesColleges universitiesColleges = universitiesCollegesService.getById(vo.getSchoolId()); + logoInfo.setSchoolName(universitiesColleges.getUniversitiesCollegesName()); + } + logoInfo.setCopyright(vo.getCopyright()); + logoInfo.setApplicationName(vo.getApplicationName()); + logoInfoDao.insert(logoInfo); + return logoInfo; + } + + public boolean deleteById(Long id) { + LogoInfo info = findById(id); + if (info != null) { + logoInfoDao.deleteById(id); + return true; + } + return false; + } + + + public LogoInfo findById(Long id) { + return logoInfoDao.findById(id); + } + + public LogoInfo update(LogoInfoVO vo) { + Assert.notNull(vo.getId(), "ID不能为空"); + LogoInfo info = findById(vo.getId()); + if (vo.getApplicationId() != null) { + info.setApplicationId(vo.getApplicationId()); + } + if (vo.getPath() != null) { + info.setPath(vo.getPath()); + } + if (vo.getSchoolId() != null) { + info.setSchoolId(vo.getSchoolId()); + if (vo.getSchoolId() != null) { + UniversitiesColleges universitiesColleges = universitiesCollegesService.getById(vo.getSchoolId()); + info.setSchoolName(universitiesColleges.getUniversitiesCollegesName()); + } + } + if (vo.getCopyright() != null) { + info.setCopyright(vo.getCopyright()); + } + if (vo.getApplicationName() != null) { + info.setApplicationName(vo.getApplicationName()); + } + logoInfoDao.updateTemplateById(info); + return info; + } + + //查询默认的logo图片设置和底部版权信息 + public LogoInfo findByApplicationId(Long applicationId) { + return logoInfoDao.findByApplicationId(applicationId); + } + + public LogoInfo findByApplicationIdAndSchoolId(Long applicationId, Long schoolId) { + return logoInfoDao.findByApplicationIdAndSchoolId(applicationId, schoolId); + } + + public PageQuery queryByCondition(PageQuery query) { + PageQuery ret = logoInfoDao.queryByCondition(query); + queryListAfter(ret.getList()); + return ret; + } + + public List getValuesByQueryNotWithPermission(LogoInfoQuery logoInfoQuery) { + return logoInfoDao.getValuesByQueryNotWithPermission(logoInfoQuery); + } +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java index 8a858c50..89d57b66 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java @@ -283,6 +283,10 @@ public class SchoolClassService extends CoreBaseService { return schoolClassDao.getClassesBySchoolId(schoolId); } + public List> userClassDalGetClassListById(){ + return schoolClassDao.userClassDalGetClassListById(); + } + public List> getClassListByMajorId(String majorId) { return schoolClassDao.getClassListByMajorId(majorId); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java index b215b627..1339c231 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java @@ -912,4 +912,8 @@ public class TeacherService extends CoreBaseService { return dataList; } + public List> userClassDalGetList(){ + return teacherDao.userClassDalGetList(); + } + } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UserStockTradesService.java b/web/src/main/java/com/ibeetl/jlw/service/UserStockTradesService.java index 654df416..7a7ade7a 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UserStockTradesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UserStockTradesService.java @@ -201,7 +201,7 @@ public class UserStockTradesService extends CoreBaseService { List> maps = userStockTradesDao.findListByStudentId(studentId); Map resultMap = new HashMap<>(); if (maps == null || maps.size() == 0) { - maps = userStockTradesDao.findListByStudentId(4048L); + return null; } for (Map map : maps) { String strCreateTime = (String) map.get("strCreateTime"); diff --git a/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java index 1186f53c..2d5b8707 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java @@ -178,7 +178,7 @@ public class ApiStudentService { StudentAccountCrowdfundingSystem cfEarnings = studentAccountCrowdfundingSystemService.getInfo(studentId); List accountEquityInvestmentSystems = studentAccountEquityInvestmentSystemService.getInfo(studentId); Double pevcEarnings = getPevcEarnings(coreUser.getOldId()); - StudentAccountEquityInvestmentSystem accountEquityInvestmentSystem = accountEquityInvestmentSystems == null ? null : accountEquityInvestmentSystems.get(0); + StudentAccountEquityInvestmentSystem accountEquityInvestmentSystem = accountEquityInvestmentSystems == null||accountEquityInvestmentSystems.size()==0 ? null : accountEquityInvestmentSystems.get(0); StudentAccountP2pSystem p2pEarnings = studentAccountP2pSystemService.getValuesByStudentId(studentId); StudentAccountMockTradingSystem qhEarnings = studentAccountMockTradingSystemService.getByStudentIdAndAppId(studentId, -16L); StudentAccountMockTradingSystem gpEarnings = studentAccountMockTradingSystemService.getByStudentIdAndAppId(studentId, 16L); @@ -199,9 +199,14 @@ public class ApiStudentService { if (gpEarnings != null) { initialTotalAssets = initialTotalAssets + gpEarnings.getInitialCapital().doubleValue(); } - Double cf = cfEarnings == null ? 0D : cfEarnings.getCumulativeIncome().doubleValue(); - Double p2p = p2pEarnings == null ? 0D : p2pEarnings.getCumulativeIncome().doubleValue(); - + Double cf=0D; + if(cfEarnings!=null&&cfEarnings.getCumulativeIncome()!=null){ + cf = cfEarnings == null ? 0D : cfEarnings.getCumulativeIncome().doubleValue(); + } + Double p2p = 0D; + if(p2pEarnings!=null&&p2pEarnings.getCumulativeIncome()!=null){ + p2p = p2pEarnings == null ? 0D : p2pEarnings.getCumulativeIncome().doubleValue(); + } List all = hsValuesService.findAll(); Map lineMap = new HashMap<>(); @@ -214,13 +219,13 @@ public class ApiStudentService { for (HsValues values : all) { xList.add(values.getCreateTimeStr()); yList.add(String.valueOf(values.getHsValue() * 100)); - + double accumulatedTotalProfitLoss = 0; if (stockTrades != null) { - double accumulatedTotalProfitLoss =stockTrades.get(values.getCreateTimeStr())==null?0:(Double) stockTrades.get(values.getCreateTimeStr()); - Double accRate = (accumulatedTotalProfitLoss + pevcEarnings + cf + p2p) / initialTotalAssets * 100; //模拟交易累计盈亏 - yList1.add(accRate == null ? "0" : String.valueOf(accRate)); + accumulatedTotalProfitLoss = stockTrades.get(values.getCreateTimeStr()) == null ? 0 : (Double) stockTrades.get(values.getCreateTimeStr()); } + Double accRate = (accumulatedTotalProfitLoss + pevcEarnings + cf + p2p) / initialTotalAssets * 100; + yList1.add(accRate == null ? "0" : String.valueOf(accRate)); } yLists.add(yList); yLists.add(yList1); @@ -366,11 +371,11 @@ public class ApiStudentService { private Double getPevcEarnings(Long userId) { String url = "http://120.79.161.177:8029/Account/GetZyAmount?UserId=" + userId; String ret = HttpJsonRequest.sendPostRequest(url, null, "UserId=" + userId, "application/x-www-form-urlencoded"); - double resultValue=0; + double resultValue = 0; ObjectMapper objectMapper = new ObjectMapper(); try { JsonNode jsonNode = objectMapper.readTree(ret); - resultValue = jsonNode.get("result").asDouble(); + resultValue = jsonNode.get("result").asDouble(); } catch (Exception e) { e.printStackTrace(); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java index 8455d2bf..7eff1aff 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java @@ -1,23 +1,21 @@ package com.ibeetl.jlw.web; -import com.ibeetl.admin.console.web.query.UserQuery; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.admin.core.web.query.CustomFilterByLcUser; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.enums.AccountTypeEnum; import com.ibeetl.jlw.service.*; import com.ibeetl.jlw.web.query.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import javafx.beans.binding.DoubleExpression; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.sql.*; @@ -1228,14 +1226,58 @@ public class AccountController { @ApiOperation("导入模拟交易数据") @PostMapping("importMNJYData") - public void importMNJYData(){ + public void importMNJYData() { userStockTradesService.insertByZhiyun2(); } @ApiOperation("修改用户模拟交易参赛AccountId") @PostMapping("updateUserStockTradesAccountId") - public void updateUserStockTradesAccountId(){ + public void updateUserStockTradesAccountId() { userStockTradesService.updateAccountId(); } + + + @ApiOperation("理财系统获取用户分页列表") + @GetMapping("getUsersByLC.json") + public JsonResult getUsersByLC(@RequestParam("customFilter") String customFilterJson, Integer pageIndex, Integer pageSize) { + ObjectMapper objectMapper = new ObjectMapper(); + try { + CustomFilterByLcUser customFilter = objectMapper.readValue(customFilterJson, CustomFilterByLcUser.class); + return JsonResult.success(userService.getUsersByLC(customFilter, pageIndex, pageSize)); + } catch (JsonProcessingException e) { + // JSON解析失败 + e.printStackTrace(); + // 返回解析失败的错误信息 + return JsonResult.fail("Failed to parse JSON: " + e.getMessage()); + } + } + + @ApiOperation("理财系统accountDalGetList方法") + @GetMapping("accountDalGetList.json") + public JsonResult accountDalGetList(@RequestParam("customFilter") String customFilterJson) { + ObjectMapper objectMapper = new ObjectMapper(); + try { + CustomFilterByLcUser customFilter = objectMapper.readValue(customFilterJson, CustomFilterByLcUser.class); + return JsonResult.success(userService.accountDalGetList(customFilter)); + } catch (JsonProcessingException e) { + // JSON解析失败 + e.printStackTrace(); + // 返回解析失败的错误信息 + return JsonResult.fail("Failed to parse JSON: " + e.getMessage()); + } + } + + @ApiOperation("理财系统获取教师userClassDal.GetList接口") + @GetMapping("userClassDalGetList.json") + public JsonResult userClassDalGetList() { + return JsonResult.success(teacherService.userClassDalGetList()); + } + + @ApiOperation("理财系统userclassDAL.GetClassListById接口") + @GetMapping("userClassDalGetClassListById.json") + public JsonResult userClassDalGetClassListById(){ + return JsonResult.success(schoolClassService.userClassDalGetClassListById()); + } + } diff --git a/web/src/main/java/com/ibeetl/jlw/web/LogoInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/LogoInfoController.java new file mode 100644 index 00000000..af5e0751 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/LogoInfoController.java @@ -0,0 +1,81 @@ +package com.ibeetl.jlw.web; + + +import cn.jlw.Interceptor.SCoreUser; +import com.ibeetl.admin.core.annotation.Function; +import com.ibeetl.admin.core.entity.CoreUser; +import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.entity.LogoInfo; +import com.ibeetl.jlw.service.LogoInfoService; +import com.ibeetl.jlw.web.query.LogoInfoQuery; +import com.ibeetl.jlw.web.query.ResourcesApplicationQuery; +import com.ibeetl.jlw.web.query.SchoolClassQuery; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.beetl.sql.core.engine.PageQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser; + +@Controller +@Api(tags = {"资源管理 - 子应用Logo和底部版权信息管理"}) +public class LogoInfoController extends BaseController{ + + + private static final String MODEL = "/jlw/logoInfo"; + private static final String API = "/api/logoInfo"; + private final Log log = LogFactory.getLog(this.getClass()); + @Autowired + private LogoInfoService logoInfoService; + + + @GetMapping(API + "/getList.do") + @ResponseBody + @ApiOperation("分页列表") + public JsonResult> getList(LogoInfoQuery condition) { + CoreUser coreUser = getUser(); + List list = logoInfoService.getValuesByQueryNotWithPermission(condition); + return JsonResult.success(list); + } + + @PostMapping(MODEL + "/list.json") + @Function("logoInfo.query") + @ResponseBody + @ApiOperation("分页列表") + public JsonResult list(LogoInfoQuery condition, @SCoreUser CoreUser coreUser) { + PageQuery page = condition.getPageQuery(); + logoInfoService.queryByCondition(page); + + Map map = new HashMap<>(); + map.put("count", page.getTotalRow()); + map.put("data", page.getList()); + map.put("beTeacher", null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? 1 : 2);//是否是教师 1是 2否 + + return JsonResult.successMap(map); + + } + /* 后台页面 */ + + @GetMapping(MODEL + "/index.do") + @Function("logoInfo.query") + @ResponseBody + @ApiOperation("后台系统管理界面") + public ModelAndView index(@SCoreUser CoreUser coreUser) { + ModelAndView view = new ModelAndView("/jlw/logoInfo/index.html"); + view.addObject("search", LogoInfoQuery.class.getName()); + view.addObject("beTeacher", null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? 1 : 2);//是否是教师 1是 2否 + return view; + } + +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/TestController.java b/web/src/main/java/com/ibeetl/jlw/web/TestController.java index a063df2e..8d2bdbec 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TestController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TestController.java @@ -96,11 +96,13 @@ public class TestController { conn = openConn(); String sql = "select EduSchools.Name,EduLevel.LevelName,EduUsers.EmailAddress, \n" + - " EduUsers.UserName,EduSchools.IsDeleted from EduSchools \n" + + " EduUsers.UserName,EduSchools.IsDeleted,\n" + + " EduSchools.Id,\n" + + " EduSchools.ICIBTSchoolId from EduSchools \n" + " join EduUsers on EduSchools.Id=EduUsers.SchoolId \n" + " join EduUserRoles on EduUsers.Id = EduUserRoles.UserId \n" + " join EduLevel on EduSchools.LevelId=EduLevel.Id where \n" + - " EduUserRoles.RoleId=2 and EduSchools.Name = '广西农业职业技术大学'"; + " EduUserRoles.RoleId=2 and EduSchools.Name = '西安明德理工学院'"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); while (resultSet.next()) { @@ -118,6 +120,8 @@ public class TestController { universitiesColleges.setUniversitiesCollegesContacts(resultSet.getString(4)); universitiesColleges.setUniversitiesCollegesContactsEmail(resultSet.getString(3)); universitiesColleges.setUniversitiesCollegesStatus(resultSet.getInt(5) + 1); + universitiesColleges.setOldSchoolId(resultSet.getLong("id")); + universitiesColleges.setIcibtSchoolId(resultSet.getInt("icibtSchoolId")); universitiesColleges.setAddTime(new Date()); universitiesColleges.setUniversitiesCollegesStatus(1); createUserDTO.setUserCode(resultSet.getString(4)); @@ -155,7 +159,7 @@ public class TestController { " EduColleges col" + " JOIN EduSchools sch " + "ON" + - " col.SchoolId = sch.id where sch.Name='广西农业职业技术大学'"; + " col.SchoolId = sch.id where sch.Name='西安明德理工学院'"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); int i = 0; @@ -230,7 +234,7 @@ public class TestController { "FROM " + " EduMajors ma " + " JOIN EduColleges col ON ma.CollegeId = col.Id " + - " JOIN EduSchools sch ON col.schoolId = sch.id where sch.Name='广西农业职业技术大学'"; + " JOIN EduSchools sch ON col.schoolId = sch.id where sch.Name='西安明德理工学院'"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); int i = 0; @@ -272,6 +276,7 @@ public class TestController { universitySystemQuery.setOrgId(universitiesColleges.getOrgId()); universitySystemQuery.setUserId(universitiesColleges.getUserId()); + universitySystemQuery.setOldId(oldId); universitySystemService.add(universitySystemQuery); } @@ -304,7 +309,7 @@ public class TestController { " cla.id," + " cla.schoolId \n" + " FROM \n" + - " EduClasses cla where schoolId=125"; + " EduClasses cla where schoolId=175"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); int i = 0; @@ -381,12 +386,13 @@ public class TestController { " tea.TeacherNo AS teacherNo, " + " tea.PhoneNo, " + " tea.Sex, " + - " tea.IsDeleted " + + " tea.IsDeleted,\n" + + " tea.Id as id " + "FROM " + " EduTeachers tea " + " JOIN EduColleges col ON tea.CollegeId = col.Id " + " JOIN EduMajors maj ON tea.MajorId = maj.Id " + - " JOIN EduSchools sch ON tea.SchoolId = sch.Id where sch.Name='广西农业职业技术大学'"; + " JOIN EduSchools sch ON tea.SchoolId = sch.Id where sch.Name='西安明德理工学院'"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); int i = 0; @@ -425,6 +431,7 @@ public class TestController { genderEnum = GenderEnum.WOMAN; } teacher.setTeacherGender(genderEnum); + teacher.setOldId(resultSet.getLong("id")); teacher.setAddTime(new Date()); teacherService.add(teacher); } @@ -466,7 +473,7 @@ public class TestController { " JOIN EduMajors maj ON stu.MajorId = maj.Id " + " JOIN EduSchools sch ON stu.SchoolId = sch.Id " + " JOIN EduClasses cla ON stu.ClassId = cla.Id" + - " join EduUsers us on stu.StudentNo = us.UserName where sch.Name='广西农业职业技术大学'"; + " join EduUsers us on stu.StudentNo = us.UserName where sch.Name='西安明德理工学院'"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); int i = 0; @@ -504,7 +511,6 @@ public class TestController { if (schoolClass == null) { continue; } - Student studentNoAndOrgId = studentService.getStudentByStudentNoAndOrgId(student.getStudentSn(), schoolClass.getOrgId()); if (studentNoAndOrgId != null) { continue; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/LogoInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/LogoInfoQuery.java new file mode 100644 index 00000000..456d302d --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/web/query/LogoInfoQuery.java @@ -0,0 +1,33 @@ +package com.ibeetl.jlw.web.query; + +import com.ibeetl.admin.core.annotation.Query; +import com.ibeetl.admin.core.web.query.PageParam; +import io.swagger.annotations.ApiModelProperty; + +public class LogoInfoQuery extends PageParam { + + @Query(name = "应用名称", display = true) + @ApiModelProperty("应用名称") + private String applicationName; + + @Query(name = "学校名称", display = true) + @ApiModelProperty("学校名称") + private String schoolName; + + + public String getApplicationName() { + return applicationName; + } + + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } +}