代码格式化

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;

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;
 

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.*;

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;

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;

renren-admin/src/main/resources/mapper/device/TbDeviceDao.xml

@@ -18,7 +18,8 @@
     </resultMap>
 
     <select id="getDeviceDTOList" resultMap="deviceDTO">
-        select td.*, IFNULL(ANY_VALUE(tda.state),1) as state from tb_device td left join tb_device_apply tda on td.id=tda.device_id
+        select td.*, IFNULL(ANY_VALUE(tda.state),1) as state from tb_device td left join tb_device_apply tda on
+        td.id=tda.device_id
         <if test="userId != null and userId != ''">
             and tda.creator = #{userId}
         </if>

renren-admin/src/main/resources/mapper/fuse/TbFuseResourceDao.xml

@@ -7,7 +7,8 @@
         insert into tb_fuse_resource(id, fuse_id, resource_id, sequence, type, dept_name, resource_name)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.fuseId}, #{item.resourceId}, #{item.sequence}, #{item.type}, #{item.deptName}, #{item.resourceName})
+            (#{item.id}, #{item.fuseId}, #{item.resourceId}, #{item.sequence}, #{item.type}, #{item.deptName},
+            #{item.resourceName})
         </foreach>
     </insert>
 

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -1843,7 +1843,8 @@
 
     <select id="selectCensusResourceTable" resultType="java.util.Map">
         SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, tdr.create_date AS createDate,
-        CASE WHEN (tdr.del_flag=0 OR tdr.del_flag=5) THEN '通过' WHEN tdr.del_flag=6 THEN '不通过' ELSE '审核中' END AS approveStatus, trma.instance_id AS applyNumber
+        CASE WHEN (tdr.del_flag=0 OR tdr.del_flag=5) THEN '通过' WHEN tdr.del_flag=6 THEN '不通过' ELSE '审核中' END AS
+        approveStatus, trma.instance_id AS applyNumber
         FROM (SELECT IF(d.type='组件服务', a.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date,
         d.name
         FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND
@@ -1938,7 +1939,8 @@
             '青岛市大数据发展管理局' AS 'resourceDeptName',
             '会议室' AS 'type',
             tm.create_date AS 'createDate',
-            CASE tmb.state WHEN 1 THEN '审核中' WHEN 2 THEN '通过' WHEN 3 THEN '不通过' ELSE '审核中' END AS 'approveStatus',
+            CASE tmb.state WHEN 1 THEN '审核中' WHEN 2 THEN '通过' WHEN 3 THEN '不通过' ELSE '审核中' END AS
+            'approveStatus',
             '' AS 'applyNumber'
             FROM
             t_meetingroom_book tmb,