`fix`

ruoyi-admin/pom.xml

@@ -61,6 +61,9 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+       
+
+
     </dependencies>
 
     <build>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblFacilitiesController.java

@@ -1,20 +1,23 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.poi.excel.ExcelReader;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.JSUtils;
 import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.system.domain.TableDetection;
 import com.ruoyi.system.domain.TblDetectionLog;
 import com.ruoyi.system.service.ISysDeptService;
@@ -38,6 +41,9 @@ import com.ruoyi.system.domain.TblFacilities;
 import com.ruoyi.system.service.ITblFacilitiesService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import static com.ruoyi.common.utils.file.FileUploadUtils.getAbsoluteFile;
 
 /**
  * 设施Controller
@@ -77,6 +83,128 @@ public class TblFacilitiesController extends BaseController
         return getDataTable(list);
     }
 
+    @PostMapping("/upload")
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            if(fileName.contains(".xlsx")||fileName.contains(".xls")){
+                fileName = fileName.replace(Constants.RESOURCE_PREFIX+"/upload","");
+
+                ExcelReader reader = cn.hutool.poi.excel.ExcelUtil.getReader(getAbsoluteFile(RuoYiConfig.getUploadPath(), fileName).getAbsolutePath());
+                List<List<Object>> readAll = reader.read();
+                AtomicInteger index = new AtomicInteger();
+
+
+
+                SysDictData sysDictData = new SysDictData();
+                sysDictData = new SysDictData();
+                sysDictData.setDictType("sys_area");
+                List<SysDictData> list1 = list1 = sysDictDataService.selectDictDataList(sysDictData);
+                Map<String, String> areamap = new HashMap<>();
+                for (SysDictData d : list1
+                ) {
+                    areamap.put( d.getDictLabel(),d.getDictValue());
+                }
+                sysDictData = new SysDictData();
+                sysDictData.setDictType("facilities_pstz");
+                list1 = sysDictDataService.selectDictDataList(sysDictData);
+                Map<String, String> facilities_pstz = new HashMap<>();
+                for (SysDictData d : list1
+                ) {
+                    facilities_pstz.put(d.getDictLabel(),d.getDictValue());
+                }
+
+
+                List<SysDept> depts = deptService.selectDeptList(new SysDept());
+//                Map<Long, SysDept> deptmap = new HashMap<>();
+//                for (SysDept d : depts
+//                ) {
+//                    deptmap.put(d.getDeptId(), d);
+//                }
+                List<TblFacilities> facilities = new ArrayList<>();
+
+
+
+                readAll.forEach(i->{
+                    if(index.getAndIncrement() >1){
+                        if(i.size()>=34){
+                            TblFacilities tblFacilities = new TblFacilities();
+                            Map<String,Object> ext1 =new HashMap<>();
+                            ext1.put("tz_id",i.get(1));
+                            ext1.put("tz_ss_name",i.get(3));
+                            ext1.put("tz_area_new",areamap.get(i.get(2)));
+                            ext1.put("tz_ss_road",i.get(4));
+                            ext1.put("tz_ss_pstz",facilities_pstz.get(i.get(5)));
+                            ext1.put("tz_ss_road_se",i.get(6));
+                            ext1.put("tz_ss_road_start",i.get(7));
+                            ext1.put("tz_ss_road_end",i.get(8));
+                            ext1.put("tz_ss_river",i.get(9));
+                            ext1.put("tz_ssly",i.get(10));
+                            ext1.put("tz_gwly",i.get(11));
+                            ext1.put("tz_xlymc",i.get(12));
+                            ext1.put("tz_pkbh",i.get(13));
+                            ext1.put("tz_ss_dn",i.get(14));
+                            ext1.put("tz_ss_data_length",i.get(15));
+                            ext1.put("tz_ss_data_main_length",i.get(16));
+                            ext1.put("tz_ss_data_minor_length",i.get(17));
+                            ext1.put("tz_ss_data_jing",i.get(18));
+                            ext1.put("tz_pfk",i.get(19));
+                            ext1.put("tz_ss_data_ysk",i.get(20));
+                            ext1.put("tz_bz_total",i.get(21));
+                            ext1.put("tz_bz_dan",i.get(22));
+                            ext1.put("tz_bz_shuang",i.get(23));
+                            ext1.put("tz_bz_san",i.get(24));
+                            ext1.put("tz_bz_si",i.get(25));
+                            ext1.put("tz_bz_duo",i.get(26));
+                            ext1.put("tz_ss_type",i.get(27));
+                            ext1.put("tz_ss_info",i.get(28));
+                            ext1.put("tz_jgsj",i.get(29));
+                            ext1.put("tz_ss_time",i.get(30));
+                            ext1.put("tz_ss_from",i.get(31));
+                            ext1.put("tz_jssj",i.get(32));
+                            if(i.get(33).toString().length()>0){
+                                List<String> deptss = Arrays.asList(i.get(33).toString().split(","));
+                                List<Long> deptids  = new ArrayList<>();
+                                depts.forEach(dept->{
+                                    if(deptss.contains(dept.getDeptName())){
+                                        deptids.add(dept.getDeptId());
+                                    }
+                                });
+                                ext1.put("tz_ss_unit",deptids.toArray());
+                            }
+                            ext1.put("tz_ss_more",i.get(34));
+                            tblFacilities.setExt1(JSON.toJSONString(ext1));
+                            tblFacilities.setParams(null);
+                            facilities.add(tblFacilities);
+
+                        }
+
+
+
+
+                    }
+
+                });
+
+                tblFacilitiesService.saveBatch(facilities);
+                System.out.println("ss");
+            }else{
+                return AjaxResult.error("请上传excel文件");
+            }
+
+            return AjaxResult.success();
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
 
     @PreAuthorize("@ss.hasPermi('system:facilities:list')")
     @PostMapping("/list")

ruoyi-admin/src/main/resources/application.yml

@@ -92,13 +92,33 @@ token:
     expireTime: 30
   
 # MyBatis配置
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
+#mybatis:
+#    # 搜索指定包别名
+#    typeAliasesPackage: com.ruoyi.**.domain
+#    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+#    mapperLocations: classpath*:mapper/**/*Mapper.xml
+#    # 加载全局的配置文件
+#    configLocation: classpath:mybatis/mybatis-config.xml
+
+# MyBatis配置
+mybatis-plus:
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 关闭MP3.0自带的banner
+    banner: false
+    db-config:
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
+      id-type: auto
+      # 默认数据库表下划线命名
+      table-underline: true
+  configuration:
+    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 返回类型为Map,显示null对应的字段
+    call-setters-on-nulls: true
 
 # PageHelper分页插件
 pagehelper: 

ruoyi-common/pom.xml

@@ -155,6 +155,25 @@
             <version>1.5.27</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.2.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.18</version>
+        </dependency>
+
 
 <!--        <dependency>-->
 <!--            <groupId>org.projectlombok</groupId>-->

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
@@ -16,26 +18,33 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
+    @TableField(exist = false)
     private String createBy;
 
     /** 创建时间 */
+    @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    @TableField(exist = false)
     /** 更新者 */
     private String updateBy;
 
     /** 更新时间 */
+    @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /** 备注 */
+    @TableField(exist = false)
     private String remark;
 
     /** 请求参数 */
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java

@@ -1,132 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import javax.sql.DataSource;
-import org.apache.ibatis.io.VFS;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.util.ClassUtils;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * Mybatis支持*匹配扫描包
- * 
- * @author ruoyi
- */
-@Configuration
-public class MyBatisConfig
-{
-    @Autowired
-    private Environment env;
-
-    static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
-
-    public static String setTypeAliasesPackage(String typeAliasesPackage)
-    {
-        ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
-        MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
-        List<String> allResult = new ArrayList<String>();
-        try
-        {
-            for (String aliasesPackage : typeAliasesPackage.split(","))
-            {
-                List<String> result = new ArrayList<String>();
-                aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
-                        + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
-                Resource[] resources = resolver.getResources(aliasesPackage);
-                if (resources != null && resources.length > 0)
-                {
-                    MetadataReader metadataReader = null;
-                    for (Resource resource : resources)
-                    {
-                        if (resource.isReadable())
-                        {
-                            metadataReader = metadataReaderFactory.getMetadataReader(resource);
-                            try
-                            {
-                                result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
-                            }
-                            catch (ClassNotFoundException e)
-                            {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-                }
-                if (result.size() > 0)
-                {
-                    HashSet<String> hashResult = new HashSet<String>(result);
-                    allResult.addAll(hashResult);
-                }
-            }
-            if (allResult.size() > 0)
-            {
-                typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
-            }
-            else
-            {
-                throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
-            }
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-        return typeAliasesPackage;
-    }
-
-    public Resource[] resolveMapperLocations(String[] mapperLocations)
-    {
-        ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
-        List<Resource> resources = new ArrayList<Resource>();
-        if (mapperLocations != null)
-        {
-            for (String mapperLocation : mapperLocations)
-            {
-                try
-                {
-                    Resource[] mappers = resourceResolver.getResources(mapperLocation);
-                    resources.addAll(Arrays.asList(mappers));
-                }
-                catch (IOException e)
-                {
-                    // ignore
-                }
-            }
-        }
-        return resources.toArray(new Resource[resources.size()]);
-    }
-
-    @Bean
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
-    {
-        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
-        String mapperLocations = env.getProperty("mybatis.mapperLocations");
-        String configLocation = env.getProperty("mybatis.configLocation");
-        typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
-        VFS.addImplClass(SpringBootVFS.class);
-
-        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
-        sessionFactory.setDataSource(dataSource);
-        sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
-        sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
-        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
-        return sessionFactory.getObject();
-    }
-}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -0,0 +1,69 @@
+package com.ruoyi.framework.config;
+
+/**
+ * @Description: TODO
+ * @Author: huangcheng
+ * @Date: 2023/3/6
+ * @Version V1.0
+ */
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * Mybatis Plus 配置
+ *
+ * @author ruoyi
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+public class MybatisPlusConfig
+{
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor()
+    {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 分页插件
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
+        // 乐观锁插件
+        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
+        // 阻断插件
+        interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+        return interceptor;
+    }
+
+    /**
+     * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html
+     */
+    public PaginationInnerInterceptor paginationInnerInterceptor()
+    {
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        // 设置数据库类型为mysql
+        paginationInnerInterceptor.setDbType(DbType.MYSQL);
+        // 设置最大单页限制数量，默认 500 条，-1 不受限制
+        paginationInnerInterceptor.setMaxLimit(-1L);
+        return paginationInnerInterceptor;
+    }
+
+    /**
+     * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html
+     */
+    public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor()
+    {
+        return new OptimisticLockerInnerInterceptor();
+    }
+
+    /**
+     * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html
+     */
+    public BlockAttackInnerInterceptor blockAttackInnerInterceptor()
+    {
+        return new BlockAttackInnerInterceptor();
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/MybatisInterceptor.java

@@ -0,0 +1,207 @@
+package com.ruoyi.framework.interceptor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.binding.MapperMethod.ParamMap;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.plugin.*;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * mybatis拦截器，自动注入创建人、创建时间、修改人、修改时间
+ *
+ * @Author scott
+ * @Date 2019-01-19
+ */
+@Slf4j
+@Component
+@Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
+public class MybatisInterceptor implements Interceptor {
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
+        String sqlId = mappedStatement.getId();
+        SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
+        Object parameter = invocation.getArgs()[1];
+
+        if (parameter == null) {
+            return invocation.proceed();
+        }
+        if (SqlCommandType.INSERT == sqlCommandType) {
+//            LoginUser sysUser = this.getLoginUser();
+            Field[] fields = getAllFields(parameter);
+            for (Field field : fields) {
+                try {
+                    /*if ("createBy".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object localCreateby = field.get(parameter);
+                        field.setAccessible(false);
+                        if (localCreateby == null || "".equals(localCreateby)) {
+                            String createBy = "king";
+                            if (sysUser != null) {
+                                createBy = sysUser.getUsername();
+                            }
+                            if (StrUtil.isNotBlank(createBy)) {
+                                // 登录人账号
+                                field.setAccessible(true);
+                                field.set(parameter, createBy);
+                                field.setAccessible(false);
+                            }
+                        }
+                    }*/
+                    // 注入创建时间
+                    if ("createTime".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object localCreatedate = field.get(parameter);
+                        field.setAccessible(false);
+                        if (localCreatedate == null || "".equals(localCreatedate)) {
+                            field.setAccessible(true);
+                            field.set(parameter, new Date());
+                            field.setAccessible(false);
+                        }
+                    }
+                    // 注入更新人
+                    /*if ("updateBy".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object localUpdateby = field.get(parameter);
+                        field.setAccessible(false);
+                        if (localUpdateby == null || "".equals(localUpdateby)) {
+                            String updateBy = "king";
+                            if (sysUser != null) {
+                                // 登录账号
+                                updateBy = sysUser.getUsername();
+                            }
+                            if (StrUtil.isNotBlank(updateBy)) {
+                                field.setAccessible(true);
+                                field.set(parameter, updateBy);
+                                field.setAccessible(false);
+                            }
+                        }
+                    }*/
+                    // 注入更新时间
+                    if ("updateTime".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object localUpdatedate = field.get(parameter);
+                        field.setAccessible(false);
+                        if (localUpdatedate == null || "".equals(localUpdatedate)) {
+                            field.setAccessible(true);
+                            field.set(parameter, new Date());
+                            field.setAccessible(false);
+                        }
+                    }
+                    /*// 注入删除标识
+                    if ("delFlag".equals(field.getName())) {
+                        field.setAccessible(true);
+                        field.set(parameter, "0");
+                        field.setAccessible(false);
+                    }
+                    //注入部门编码
+                    if ("sysOrgCode".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object localSysorgcode = field.get(parameter);
+                        field.setAccessible(false);
+                        if (localSysorgcode == null || "".equals(localSysorgcode)) {
+                            // 获取登录用户信息
+                            if (sysUser != null) {
+                                // 登录账号
+                                field.setAccessible(true);
+                                field.set(parameter, sysUser.getOrgCode());
+                                field.setAccessible(false);
+                            }
+                        }
+                    }*/
+                } catch (Exception e) {
+                }
+            }
+        }
+        if (SqlCommandType.UPDATE == sqlCommandType) {
+//            LoginUser sysUser = this.getLoginUser();
+            Field[] fields = null;
+            if (parameter instanceof ParamMap) {
+                ParamMap<?> p = (ParamMap<?>) parameter;
+                //update-begin-author:scott date:20190729 for:批量更新报错issues/IZA3Q--
+                if (p.containsKey("et")) {
+                    parameter = p.get("et");
+                } else {
+                    parameter = p.get("param1");
+                }
+                //update-end-author:scott date:20190729 for:批量更新报错issues/IZA3Q-
+
+                //update-begin-author:scott date:20190729 for:更新指定字段时报错 issues/#516-
+                if (parameter == null) {
+                    return invocation.proceed();
+                }
+                //update-end-author:scott date:20190729 for:更新指定字段时报错 issues/#516-
+
+                fields = getAllFields(parameter);
+            } else {
+                fields = getAllFields(parameter);
+            }
+
+            for (Field field : fields) {
+//                log.debug("------field.name------" + field.getName());
+                try {
+                    /*if ("updateBy".equals(field.getName())) {
+
+                        // 获取登录用户信息
+                        if (sysUser != null) {
+                            // 登录账号
+                            field.setAccessible(true);
+                            field.set(parameter, sysUser.getUsername());
+                            field.setAccessible(false);
+                        }
+                    }*/
+                    if ("updateTime".equals(field.getName())) {
+                        field.setAccessible(true);
+                        field.set(parameter, new Date());
+                        field.setAccessible(false);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return invocation.proceed();
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        return Plugin.wrap(target, this);
+    }
+
+    @Override
+    public void setProperties(Properties properties) {
+        // TODO Auto-generated method stub
+    }
+
+    //update-begin--Author:scott  Date:20191213 for：关于使用Quzrtz 开启线程任务， #465
+    /*private LoginUser getLoginUser() {
+        LoginUser sysUser = null;
+        try {
+            sysUser = SecurityUtils.getSubject().getPrincipal() != null ? (LoginUser) SecurityUtils.getSubject().getPrincipal() : null;
+        } catch (Exception e) {
+            //e.printStackTrace();
+            sysUser = null;
+        }
+        return sysUser;
+    }*/
+
+    public static Field[] getAllFields(Object object) {
+        Class<?> clazz = object.getClass();
+        List<Field> fieldList = new ArrayList<>();
+        while (clazz != null) {
+            fieldList.addAll(new ArrayList<>(Arrays.asList(clazz.getDeclaredFields())));
+            clazz = clazz.getSuperclass();
+        }
+        Field[] fields = new Field[fieldList.size()];
+        fieldList.toArray(fields);
+        return fields;
+    }
+    //update-end--Author:scott  Date:20191213 for：关于使用Quzrtz 开启线程任务， #465
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 
  * @author ruoyi
  */
+@TableName("sys_config")
 public class SysConfig extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -11,6 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 
  * @author ruoyi
  */
+@TableName("sys_logininfo")
 public class SysLogininfor extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -12,6 +14,7 @@ import com.ruoyi.common.xss.Xss;
  * 
  * @author ruoyi
  */
+@TableName("sys_notice")
 public class SysNotice extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -11,6 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 
  * @author ruoyi
  */
+@TableName("sys_oper_log")
 public class SysOperLog extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 
  * @author ruoyi
  */
+@TableName("sys_post")
 public class SysPost extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -8,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 
  * @author ruoyi
  */
+@TableName("sys_role_dept")
 public class SysRoleDept
 {
     /** 角色ID */

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -8,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 
  * @author ruoyi
  */
+@TableName("sys_role_menu")
 public class SysRoleMenu
 {
     /** 角色ID */

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -8,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 
  * @author ruoyi
  */
+@TableName("sys_user_post")
 public class SysUserPost
 {
     /** 用户ID */

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -8,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 
  * @author ruoyi
  */
+@TableName("sys_user_role")
 public class SysUserRole
 {
     /** 用户ID */

ruoyi-system/src/main/java/com/ruoyi/system/domain/TblFacilities.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * 设施对象 tbl_facilities
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-05-25
  */
+@TableName("tbl_facilities")
 @Data
 public class TblFacilities extends BaseEntity
 {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TblFacilitiesMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.TblFacilities;
 
 /**
@@ -9,7 +11,7 @@ import com.ruoyi.system.domain.TblFacilities;
  * @author ruoyi
  * @date 2022-05-25
  */
-public interface TblFacilitiesMapper 
+public interface TblFacilitiesMapper extends BaseMapper<TblFacilities>
 {
     /**
      * 查询设施

ruoyi-system/src/main/java/com/ruoyi/system/service/ITblFacilitiesService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.TblFacilities;
 
 /**
@@ -9,7 +11,7 @@ import com.ruoyi.system.domain.TblFacilities;
  * @author ruoyi
  * @date 2022-05-25
  */
-public interface ITblFacilitiesService 
+public interface ITblFacilitiesService  extends IService<TblFacilities>
 {
     /**
      * 查询设施

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblFacilitiesServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,7 +18,7 @@ import com.ruoyi.system.service.ITblFacilitiesService;
  * @date 2022-05-25
  */
 @Service
-public class TblFacilitiesServiceImpl implements ITblFacilitiesService 
+public class TblFacilitiesServiceImpl extends ServiceImpl<TblFacilitiesMapper, TblFacilities> implements ITblFacilitiesService
 {
     @Autowired
     private TblFacilitiesMapper tblFacilitiesMapper;