Merge remote-tracking branch 'origin/master'

jeecg_module_ems/src/main/java/org/jeecg/modules/space/controller/SpaceController.java

@@ -1,20 +1,15 @@
-package org.jeecg.modules.space.controller;
+package org.jeecg.modules.baseSpace.controller;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.space.entity.Space;
-import org.jeecg.modules.space.service.ISpaceService;
+import org.jeecg.modules.baseSpace.entity.Space;
+import org.jeecg.modules.baseSpace.service.ISpaceService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,18 +18,10 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.UserConstants;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;

jeecg_module_ems/src/main/java/org/jeecg/modules/space/entity/Space.java

@@ -1,12 +1,10 @@
-package org.jeecg.modules.space.entity;
+package org.jeecg.modules.baseSpace.entity;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +12,6 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
 
 /**
  * @Description: 空间管理

jeecg_module_ems/src/main/java/org/jeecg/modules/space/mapper/SpaceMapper.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.space.mapper;
+package org.jeecg.modules.baseSpace.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.space.entity.Space;
+import org.jeecg.modules.baseSpace.entity.Space;
 
 import java.util.List;
 import java.util.Map;

jeecg_module_ems/src/main/java/org/jeecg/modules/space/mapper/xml/SpaceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.space.mapper.SpaceMapper">
+<mapper namespace="org.jeecg.modules.baseSpace.mapper.SpaceMapper">
 
 	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
 		update ems_space set has_child = #{status} where id = #{id}
@@ -22,4 +22,4 @@
 		</if>
 	</select>
 
-</mapper>
+</mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/space/service/ISpaceService.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.space.service;
+package org.jeecg.modules.baseSpace.service;
 
 import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.space.entity.Space;
+import org.jeecg.modules.baseSpace.entity.Space;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.exception.JeecgBootException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,10 +17,10 @@ public interface ISpaceService extends IService<Space> {
 
 	/**根节点父ID的值*/
 	public static final String ROOT_PID_VALUE = "0";
-	
+
 	/**树节点有子节点状态值*/
 	public static final String HASCHILD = "1";
-	
+
 	/**树节点无子节点状态值*/
 	public static final String NOCHILD = "0";
 
@@ -30,7 +30,7 @@ public interface ISpaceService extends IService<Space> {
 	 * @param space
 	 */
 	void addSpace(Space space);
-	
+
 	/**
    * 修改节点
    *
@@ -38,7 +38,7 @@ public interface ISpaceService extends IService<Space> {
    * @throws JeecgBootException
    */
 	void updateSpace(Space space) throws JeecgBootException;
-	
+
 	/**
 	 * 删除节点
 	 *

jeecg_module_ems/src/main/java/org/jeecg/modules/space/service/impl/SpaceServiceImpl.java

@@ -1,12 +1,12 @@
-package org.jeecg.modules.space.service.impl;
+package org.jeecg.modules.baseSpace.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.space.entity.Space;
-import org.jeecg.modules.space.mapper.SpaceMapper;
-import org.jeecg.modules.space.service.ISpaceService;
+import org.jeecg.modules.baseSpace.entity.Space;
+import org.jeecg.modules.baseSpace.mapper.SpaceMapper;
+import org.jeecg.modules.baseSpace.service.ISpaceService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,7 +41,7 @@ public class SpaceServiceImpl extends ServiceImpl<SpaceMapper, Space> implements
 		}
 		baseMapper.insert(space);
 	}
-	
+
 	@Override
 	public void updateSpace(Space space) {
 		Space entity = this.getById(space.getId());
@@ -61,7 +61,7 @@ public class SpaceServiceImpl extends ServiceImpl<SpaceMapper, Space> implements
 		}
 		baseMapper.updateById(space);
 	}
-	
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void deleteSpace(String id) throws JeecgBootException {
@@ -99,7 +99,7 @@ public class SpaceServiceImpl extends ServiceImpl<SpaceMapper, Space> implements
             baseMapper.deleteById(id);
         }
 	}
-	
+
 	@Override
     public List<Space> queryTreeListNoPage(QueryWrapper<Space> queryWrapper) {
         List<Space> dataList = baseMapper.selectList(queryWrapper);