From 8c256f315db2a6cf2065fa637d2e391646dccf4c Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 20 Oct 2022 09:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../common/aspect/ActivitiNoticeAspect.java | 4 +--- .../fuse/entity/TbFuseResourceEntity.java | 1 - .../gateway/controller/MonitorControllerV2.java | 17 +++++------------ .../service/impl/ResourceServiceImpl.java | 5 ++--- .../security/controller/LoginController.java | 2 -- .../resources/mapper/device/TbDeviceDao.xml | 3 ++- .../resources/mapper/fuse/TbFuseResourceDao.xml | 3 ++- .../processForm/TAbilityApplicationDao.xml | 6 +++--- .../resources/mapper/resource/ResourceDao.xml | 6 ++++-- .../mapper/resourceCar/ResourceCarDao.xml | 2 +- .../main/resources/mapper/sys/SysDeptDao.xml | 14 +++++++------- .../java/io/renren/common/utils/JhlDAPTool.java | 6 +++--- 13 files changed, 31 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 9460185f..06276c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ public aliyun nexus - + https://repo1.maven.org/maven2/ true diff --git a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java index 1683e61e..5ef40aba 100644 --- a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java +++ b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java @@ -8,8 +8,6 @@ import io.renren.modules.notice.service.SysNoticeService; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.resource.service.ResourceService; -import io.renren.modules.sys.dto.SysDeptDTO; -import io.renren.modules.sys.dto.SysRoleDTO; import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.service.SysDeptService; import io.renren.modules.sys.service.SysRoleService; @@ -308,7 +306,7 @@ public class ActivitiNoticeAspect { if ("能力申请流程".equals(activitiNoticeOperation.process())) { type = 0; //审核结束通知，通知内容：【审核完成通知】您发起的+资源名称+申请已完成审核，请登录UCS“我的申请”查看详情。 - content = "【审核完成通知】您发起的" + resourceName + "申请已完成审核，请登录UCS“我的申请”查看详情。" + "审核结果为：" + finalResult; + content = "【审核完成通知】您发起的" + resourceName + "申请已完成审核，请登录UCS“我的申请”查看详情。" + "审核结果为：" + finalResult; } else if ("能力资源上架".equals(activitiNoticeOperation.process())) { type = 2; diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java index 3490fb69..b4614c39 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java @@ -2,7 +2,6 @@ package io.renren.modules.fuse.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorControllerV2.java b/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorControllerV2.java index e5d88e2e..84d4c168 100644 --- a/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorControllerV2.java +++ b/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorControllerV2.java @@ -1,8 +1,6 @@ package io.renren.modules.gateway.controller; -import cn.hutool.core.io.FileUtil; -import cn.hutool.poi.excel.ExcelUtil; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -25,7 +23,6 @@ import io.renren.modules.sys.entity.SysDeptEntity; import io.renren.modules.sys.enums.JhDeptEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.Builder; import lombok.Data; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; @@ -36,14 +33,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; + import javax.naming.NamingException; import javax.naming.directory.SearchResult; -import javax.naming.ldap.LdapContext; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.IOException; import java.util.*; import java.util.concurrent.*; @@ -357,7 +350,7 @@ public class MonitorControllerV2 { } @Data - static public class Org{ + static public class Org { @ExcelProperty("名称") String orgName; } @@ -379,8 +372,8 @@ public class MonitorControllerV2 { String origStr = (String) relult.getAttributes().get("distinguishedName").get(); String[] orgs = origStr.split(","); StringBuilder builder = new StringBuilder(); - for (int i = orgs.length -3-1; i >= 0; i--) { - builder.append("/" + orgs[i].replace("OU=","")); + for (int i = orgs.length - 3 - 1; i >= 0; i--) { + builder.append("/" + orgs[i].replace("OU=", "")); } Org org = new Org(); org.setOrgName(builder.toString()); @@ -394,7 +387,7 @@ public class MonitorControllerV2 { // ExcelUtil.getWriter().write(all, false); - ExcelUtils.exportExcelToTarget(response, "org","all", all, Org.class); + ExcelUtils.exportExcelToTarget(response, "org", "all", all, Org.class); } } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index cc91b246..d0eabfc8 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -15,7 +15,6 @@ import io.renren.common.domain.Tsingtao_xhaProperties; import io.renren.common.page.PageData; import io.renren.common.service.impl.CrudServiceImpl; import io.renren.common.utils.DateUtils; -import io.renren.modules.device.dto.TbDeviceApplyDTO; import io.renren.modules.monitor.dto.CameraChannelDto1; import io.renren.modules.monitor.entity.CameraChannel; import io.renren.modules.monitor.mapper.CameraChannelMapper; @@ -2292,7 +2291,7 @@ public class ResourceServiceImpl extends CrudServiceImpl dtoList= resourceDao.selectCensusResourceTable(params); + List dtoList = resourceDao.selectCensusResourceTable(params); List result = dtoList.stream().skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList()); return new PageData(result, dtoList.size()); } @@ -2307,7 +2306,7 @@ public class ResourceServiceImpl extends CrudServiceImpl dtoList= resourceDao.selectCensusApplyTable(params); + List dtoList = resourceDao.selectCensusApplyTable(params); List result = dtoList.stream().skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList()); return new PageData(result, dtoList.size()); } diff --git a/renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java b/renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java index 91633f0b..e9f7c48b 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java +++ b/renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java @@ -20,9 +20,7 @@ import io.renren.modules.security.service.SysUserTokenService; import io.renren.modules.security.user.SecurityUser; import io.renren.modules.security.user.UserDetail; import io.renren.modules.sys.dao.SysDeptDao; -import io.renren.modules.sys.dao.SysUserDao; import io.renren.modules.sys.dto.SysUserDTO; -import io.renren.modules.sys.entity.SysUserEntity; import io.renren.modules.sys.enums.UserStatusEnum; import io.renren.modules.sys.service.SysUserService; import io.swagger.annotations.Api; diff --git a/renren-admin/src/main/resources/mapper/device/TbDeviceDao.xml b/renren-admin/src/main/resources/mapper/device/TbDeviceDao.xml index 0815b9dd..a1dc941d 100644 --- a/renren-admin/src/main/resources/mapper/device/TbDeviceDao.xml +++ b/renren-admin/src/main/resources/mapper/device/TbDeviceDao.xml @@ -18,7 +18,8 @@ diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 509177ff..dba3c146 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1843,7 +1843,8 @@ select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1 - where 1 = 1 AND name != '访客部门' - - t1.id in - - #{id} - - + where 1 = 1 AND name != '访客部门' + + t1.id in + + #{id} + + order by t1.sort asc diff --git a/renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java b/renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java index a26a1222..c204f531 100644 --- a/renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java +++ b/renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java @@ -296,11 +296,11 @@ public class JhlDAPTool { Hashtable env = new Hashtable(); env.put(Context.INITIAL_CONTEXT_FACTORY, FACTORY); - env.put(Context.PROVIDER_URL, URL +BASEDN); + env.put(Context.PROVIDER_URL, URL + BASEDN); env.put(Context.SECURITY_AUTHENTICATION, "simple"); env.put(Context.SECURITY_PRINCIPAL, username); // 管理员 env.put(Context.SECURITY_CREDENTIALS, password); // 管理员密码 - env.put("java.naming.ldap.attributes.binary","objectGUID"); + env.put("java.naming.ldap.attributes.binary", "objectGUID"); LinkedList all = new LinkedList<>(); try { InitialLdapContext ctx = new InitialLdapContext(env, connCtls); @@ -322,7 +322,7 @@ public class JhlDAPTool { } catch (Exception e) { log.error("ldap错误", e); return null; - }finally { + } finally { closeContext(); } return all;