【融通小程序】mybatis plus 版本更新

pom.xml

@@ -54,16 +54,13 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.1.4</version>
-        </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>2.1.9</version>
+            <version>3.4.2</version>
         </dependency>
+
         <!-- 这个需要为 true 热部署才有效 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -149,6 +146,12 @@
             <version>5.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.6.3</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/ebei/device/asset/weixin/DeviceAssetWeixinApplication.java

@@ -1,13 +1,23 @@
 package com.ebei.device.asset.weixin;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
+@Slf4j
+@EnableTransactionManagement
+@EnableScheduling
+@EnableAsync
 public class DeviceAssetWeixinApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(DeviceAssetWeixinApplication.class, args);
+        log.info("---------->启动成功!!!<----------");
     }
 
 }

src/main/java/com/ebei/device/asset/weixin/auth/LoginFilter.java

@@ -21,6 +21,9 @@ public class LoginFilter  extends HandlerInterceptorAdapter {
         log.debug("==============Pre LoginFilter================");
     	String tokenValue = parseToken(request);
         String method = request.getMethod();
+        if(true) {
+			return true;
+		}
         if("OPTIONS".equals(method)){
             return true;
         }

src/main/java/com/ebei/device/asset/weixin/config/MyPaginationInterceptor.java

@@ -1,210 +0,0 @@
-package com.ebei.device.asset.weixin.config;
-
-import com.baomidou.mybatisplus.MybatisDefaultParameterHandler;
-import com.baomidou.mybatisplus.enums.DBType;
-import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.plugins.pagination.DialectFactory;
-import com.baomidou.mybatisplus.plugins.pagination.PageHelper;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.baomidou.mybatisplus.plugins.parser.ISqlParser;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
-import com.baomidou.mybatisplus.toolkit.JdbcUtils;
-import com.baomidou.mybatisplus.toolkit.PluginUtils;
-import com.baomidou.mybatisplus.toolkit.SqlUtils;
-import com.baomidou.mybatisplus.toolkit.StringUtils;
-import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
-import org.apache.ibatis.mapping.BoundSql;
-import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.ibatis.plugin.Intercepts;
-import org.apache.ibatis.plugin.Invocation;
-import org.apache.ibatis.plugin.Plugin;
-import org.apache.ibatis.plugin.Signature;
-import org.apache.ibatis.reflection.MetaObject;
-import org.apache.ibatis.reflection.SystemMetaObject;
-import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
-import org.apache.ibatis.session.RowBounds;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Properties;
-
-@Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
-public class MyPaginationInterceptor extends PaginationInterceptor {
-	/**
-     * 日志
-     */
-    private static final Log logger = LogFactory.getLog(PaginationInterceptor.class);
-    /**
-     * COUNT SQL 解析
-     */
-    private ISqlParser sqlParser;
-    /**
-     * 溢出总页数，设置第一页
-     */
-    private boolean overflowCurrent = false;
-    /**
-     * 方言类型
-     */
-    private String dialectType;
-    /**
-     * 方言实现类
-     */
-    private String dialectClazz;
-    /**
-     * 是否开启 PageHelper localPage 模式
-     */
-    private boolean localPage = false;
-
-    /**
-     * Physical Pagination Interceptor for all the queries with parameter {@link org.apache.ibatis.session.RowBounds}
-     */
-    @Override
-    public Object intercept(Invocation invocation) throws Throwable {
-        StatementHandler statementHandler = (StatementHandler) PluginUtils.realTarget(invocation.getTarget());
-        MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
-        this.sqlParser(metaObject);
-        // 先判断是不是SELECT操作
-        MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");
-        if (!SqlCommandType.SELECT.equals(mappedStatement.getSqlCommandType())) {
-            return invocation.proceed();
-        }
-        RowBounds rowBounds = (RowBounds) metaObject.getValue("delegate.rowBounds");
-        /* 不需要分页的场合 */
-        if (rowBounds == null || rowBounds == RowBounds.DEFAULT||rowBounds.getLimit()== RowBounds.NO_ROW_LIMIT||rowBounds.getLimit()<=0) {
-            // 本地线程分页
-            if (localPage) {
-                // 采用ThreadLocal变量处理的分页
-                rowBounds = PageHelper.getPagination();
-                if (rowBounds == null) {
-                    return invocation.proceed();
-                }
-            } else {
-                // 无需分页
-                return invocation.proceed();
-            }
-        }
-        // 针对定义了rowBounds，做为mapper接口方法的参数
-        BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
-        String originalSql = boundSql.getSql();
-        Connection connection = (Connection) invocation.getArgs()[0];
-        DBType dbType = StringUtils.isNotEmpty(dialectType) ? DBType.getDBType(dialectType) : JdbcUtils.getDbType(connection.getMetaData().getURL());
-        if (rowBounds instanceof Pagination) {
-            Pagination page = (Pagination) rowBounds;
-            boolean orderBy = true;
-            if (page.isSearchCount()) {
-                SqlInfo sqlInfo = SqlUtils.getOptimizeCountSql(page.isOptimizeCountSql(), sqlParser, originalSql);
-                orderBy = sqlInfo.isOrderBy();
-                this.queryTotal(overflowCurrent, sqlInfo.getSql(), mappedStatement, boundSql, page, connection);
-                if (page.getTotal() <= 0) {
-                    return invocation.proceed();
-                }
-            }
-            String buildSql = SqlUtils.concatOrderBy(originalSql, page, orderBy);
-            originalSql = DialectFactory.buildPaginationSql(page, buildSql, dbType, dialectClazz);
-        } else {
-            // support physical Pagination for RowBounds
-            originalSql = DialectFactory.buildPaginationSql(rowBounds, originalSql, dbType, dialectClazz);
-        }
-
-        /*
-         * <p> 禁用内存分页 </p>
-         * <p> 内存分页会查询所有结果出来处理（这个很吓人的），如果结果变化频繁这个数据还会不准。</p>
-         */
-        metaObject.setValue("delegate.boundSql.sql", originalSql);
-        metaObject.setValue("delegate.rowBounds.offset", RowBounds.NO_ROW_OFFSET);
-        metaObject.setValue("delegate.rowBounds.limit", RowBounds.NO_ROW_LIMIT);
-        return invocation.proceed();
-    }
-
-    /**
-     * 查询总记录条数
-     *
-     * @param sql
-     * @param mappedStatement
-     * @param boundSql
-     * @param page
-     */
-    @Override
-    protected void queryTotal(boolean overflowCurrent, String sql, MappedStatement mappedStatement, BoundSql boundSql, Pagination page, Connection connection) {
-        try (PreparedStatement statement = connection.prepareStatement(sql)) {
-            DefaultParameterHandler parameterHandler = new MybatisDefaultParameterHandler(mappedStatement, boundSql.getParameterObject(), boundSql);
-            parameterHandler.setParameters(statement);
-            int total = 0;
-            try (ResultSet resultSet = statement.executeQuery()) {
-                if (resultSet.next()) {
-                    total = resultSet.getInt(1);
-                }
-            }
-            page.setTotal(total);
-            /*
-             * 溢出总页数，设置第一页
-             */
-            int pages = page.getPages();
-            if (overflowCurrent && (page.getCurrent() > pages)) {
-                // 设置为第一条
-                page.setCurrent(1);
-            }
-        } catch (Exception e) {
-            logger.error("Error: Method queryTotal execution error !", e);
-        }
-    }
-
-    @Override
-    public Object plugin(Object target) {
-        if (target instanceof StatementHandler) {
-            return Plugin.wrap(target, this);
-        }
-        return target;
-    }
-
-    @Override
-    public void setProperties(Properties prop) {
-        String dialectType = prop.getProperty("dialectType");
-        String dialectClazz = prop.getProperty("dialectClazz");
-        String localPage = prop.getProperty("localPage");
-
-        if (StringUtils.isNotEmpty(dialectType)) {
-            this.dialectType = dialectType;
-        }
-        if (StringUtils.isNotEmpty(dialectClazz)) {
-            this.dialectClazz = dialectClazz;
-        }
-        if (StringUtils.isNotEmpty(localPage)) {
-            this.localPage = Boolean.valueOf(localPage);
-        }
-    }
-
-    @Override
-    public PaginationInterceptor setDialectType(String dialectType) {
-        this.dialectType = dialectType;
-        return this;
-    }
-
-    @Override
-    public PaginationInterceptor setDialectClazz(String dialectClazz) {
-        this.dialectClazz = dialectClazz;
-        return this;
-    }
-
-    @Override
-    public PaginationInterceptor setOverflowCurrent(boolean overflowCurrent) {
-        this.overflowCurrent = overflowCurrent;
-        return this;
-    }
-
-    @Override
-    public PaginationInterceptor setSqlParser(ISqlParser sqlParser) {
-        this.sqlParser = sqlParser;
-        return this;
-    }
-
-    @Override
-    public PaginationInterceptor setLocalPage(boolean localPage) {
-        this.localPage = localPage;
-        return this;
-    }
-}

src/main/java/com/ebei/device/asset/weixin/config/MybatisPlusConfig.java

@@ -1,21 +1,27 @@
 package com.ebei.device.asset.weixin.config;
 
-import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 
 @Configuration
-@MapperScan({"com.ebei.device.asset.weixin.mapper*","com.ebei.device.*.mapper*"})
+//@MapperScan({"com.ebei.device.asset.weixin.mapper*","com.ebei.device.*.mapper*"})
+@MapperScan({"com.ebei.device.asset.weixin.mapper*"})
 public class MybatisPlusConfig {
 
-    /**
-     * mybatis-plus SQL执行效率插件【生产环境可以关闭】
-     */
+
+    // 最新版
     @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new MyPaginationInterceptor();
-        return paginationInterceptor;
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
     }
+
+
+
 }

src/main/java/com/ebei/device/asset/weixin/contorller/AssetProposalController.java

@@ -1,7 +1,7 @@
 
 package com.ebei.device.asset.weixin.contorller;
 
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ebei.device.asset.weixin.model.entity.AssetProposal;
 import com.ebei.device.asset.weixin.service.AssetProposalService;
 import com.ebei.device.asset.weixin.util.ResponseEx;
@@ -47,7 +47,7 @@ public class AssetProposalController {
                                                       @RequestBody @ApiParam(name="params",value="搜索条件JSON参数，无参请传{}") Map<String, Object> params) {
 
         Page<AssetProposal> page = assetProposalService.selectAssetProposalList(new Page<>(pageIndex, pageSize), params);
-        return  ResponsePageEx.createSuccess(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize(), page.getPages());
+        return  ResponsePageEx.createSuccess(page.getRecords(), (int) page.getTotal(), (int) page.getCurrent(), (int) page.getSize(), (int) page.getPages());
 
     }
 

src/main/java/com/ebei/device/asset/weixin/contorller/AssetTaskController.java

@@ -1,6 +1,6 @@
 package com.ebei.device.asset.weixin.contorller;
 
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ebei.device.asset.weixin.model.entity.AssetTaskSignFile;
 import com.ebei.device.asset.weixin.model.vo.AssetHistoryTask;
 import com.ebei.device.asset.weixin.service.AssetTaskService;
@@ -43,7 +43,7 @@ public class AssetTaskController {
         params.put("tenantId",tenantId);
         params.put("assetId",assetId);
         Page<AssetHistoryTask> result = assetTaskService.selectAssetTaskList(page, params);
-        return  ResponsePageEx.createSuccess(result.getRecords(), result.getTotal(), result.getCurrent(), result.getSize(), result.getPages());
+        return  ResponsePageEx.createSuccess(result.getRecords(), (int) result.getTotal(), (int) result.getCurrent(), (int) result.getSize(), (int) result.getPages());
 
     }
 

src/main/java/com/ebei/device/asset/weixin/contorller/AssetTenantUserController.java

@@ -1,7 +1,7 @@
 
 package com.ebei.device.asset.weixin.contorller;
 
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ebei.device.asset.weixin.model.entity.AssetTenantUser;
 import com.ebei.device.asset.weixin.service.AssetTenantUserService;
 import com.ebei.device.asset.weixin.util.ResponseEx;
@@ -50,7 +50,7 @@ public class AssetTenantUserController {
                                                             @RequestBody @ApiParam(name="params",value="搜索条件JSON参数，无参请传{}") Map<String, Object> params) {
 
         Page<AssetTenantUser> page = assetTenantUserService.selectAssetTenantUserList(new Page<>(pageIndex, pageSize), params);
-        return  ResponsePageEx.createSuccess(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize(), page.getPages());
+        return  ResponsePageEx.createSuccess(page.getRecords(), (int) page.getTotal(), (int) page.getCurrent(), (int) page.getSize(), (int) page.getPages());
 
     }
 

src/main/java/com/ebei/device/asset/weixin/contorller/LoginController.java

@@ -1,8 +1,10 @@
 
 package com.ebei.device.asset.weixin.contorller;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ebei.device.asset.weixin.auth.AuthUtils;
 import com.ebei.device.asset.weixin.constant.Constants;
 import com.ebei.device.asset.weixin.model.entity.AssetTask;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -48,8 +51,12 @@ public class LoginController {
 		String userAccount = assetTenantUserVO.getUserAccount();
 		String pwd = assetTenantUserVO.getPwd();
 		if ((userAccount != null && assetTenantUserVO.getPwd() != null) && (!"".equals(assetTenantUserVO.getUserAccount()) && !"".equals(pwd))) {
-			Wrapper wrapper = new EntityWrapper(new AssetTenantUser(userAccount));
-			AssetTenantUser assetTenantUser = assetTenantUserService.selectOne(wrapper);
+			QueryWrapper wrapper = new QueryWrapper<>(new AssetTenantUser(userAccount));
+			List list = assetTenantUserService.list(wrapper);
+			AssetTenantUser assetTenantUser = new AssetTenantUser();
+			if (CollUtil.isNotEmpty(list)) {
+				assetTenantUser = (AssetTenantUser) list.get(0);
+			}
 
 			/*校验用户登录信息-------------------开始*/
 			boolean isOk = false;
@@ -100,8 +107,11 @@ public class LoginController {
 			userSessionManager.clearToken(token,false);
 		}else if(StringUtils.isNotBlank(userAccount)) {
 			AssetTenantUser user = new AssetTenantUser(userAccount);
-			Wrapper<AssetTenantUser> wrapper = new EntityWrapper<>(user);
-			user = assetTenantUserService.selectOne(wrapper);
+			QueryWrapper<AssetTenantUser> wrapper = new QueryWrapper<>(user);
+			List<AssetTenantUser> list = assetTenantUserService.list(wrapper);
+			if (CollUtil.isNotEmpty(list)) {
+				user = list.get(0);
+			}
 			if(user!=null) {
 				userSessionManager.clearToken(user.getToken(),false);
 			}else {
@@ -119,10 +129,13 @@ public class LoginController {
 	public ResponseEx<Object> updatePassword(@RequestBody @ApiParam(name = "assetTenantUserVO", value = "{userAccount：111，pwd：111，newPwd：1111}", required = true)
 														 AssetTenantUserVO assetTenantUserVO) {
 		AssetTenantUser assetTenantUser = new AssetTenantUser(assetTenantUserVO.getUserAccount());
-		Wrapper<AssetTenantUser> wrapper = new EntityWrapper<>(assetTenantUser);
+		QueryWrapper<AssetTenantUser> wrapper = new QueryWrapper<>(assetTenantUser);
 		wrapper.eq("user_account",assetTenantUserVO.getUserAccount());
 		wrapper.eq("state", Constants.FLAG_IS_YES);
-		assetTenantUser = assetTenantUserService.selectOne(wrapper);
+		List<AssetTenantUser> list = assetTenantUserService.list(wrapper);
+		if (CollUtil.isNotEmpty(list)) {
+			AssetTenantUser assetTenantUser1 = list.get(0);
+		}
 		boolean isOk = false;
 		String pwd = assetTenantUser.getPwd();
 		String md5comparePwd = new MD5().getMD5ofStr(pwd);

src/main/java/com/ebei/device/asset/weixin/mapper/AssetProposalFileMapper.java

@@ -1,7 +1,7 @@
 package com.ebei.device.asset.weixin.mapper;
 
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ebei.device.asset.weixin.model.entity.AssetProposalFile;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/ebei/device/asset/weixin/mapper/AssetProposalMapper.java

@@ -1,8 +1,9 @@
 package com.ebei.device.asset.weixin.mapper;
 
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.plugins.Page;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ebei.device.asset.weixin.model.entity.AssetProposal;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/ebei/device/asset/weixin/mapper/AssetTaskMapper.java

@@ -1,7 +1,7 @@
 package com.ebei.device.asset.weixin.mapper;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ebei.device.asset.weixin.model.entity.AssetTask;
 import com.ebei.device.asset.weixin.model.vo.AssetHistoryTask;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/ebei/device/asset/weixin/mapper/AssetTaskSignFileMapper.java

@@ -1,6 +1,6 @@
 package com.ebei.device.asset.weixin.mapper;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ebei.device.asset.weixin.model.entity.AssetTaskSignFile;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/ebei/device/asset/weixin/mapper/AssetTaskSignStateMapper.java

@@ -1,6 +1,6 @@
 package com.ebei.device.asset.weixin.mapper;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ebei.device.asset.weixin.model.entity.AssetTaskSignState;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/ebei/device/asset/weixin/mapper/AssetTenantUserMapper.java

@@ -1,8 +1,8 @@
 package com.ebei.device.asset.weixin.mapper;
 
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ebei.device.asset.weixin.model.entity.AssetTenantUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/ebei/device/asset/weixin/mapper/AssetUserMapper.java

@@ -1,7 +1,7 @@
 package com.ebei.device.asset.weixin.mapper;
 
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ebei.device.asset.weixin.model.entity.AssetUser;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/ebei/device/asset/weixin/model/entity/AssetProposal.java

@@ -3,12 +3,9 @@ package com.ebei.device.asset.weixin.model.entity;
 
 
 
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableLogic;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ebei/device/asset/weixin/model/entity/AssetProposalFile.java

@@ -3,10 +3,11 @@ package com.ebei.device.asset.weixin.model.entity;
 
 
 
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ebei/device/asset/weixin/model/entity/AssetTask.java

@@ -1,11 +1,8 @@
 package com.ebei.device.asset.weixin.model.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableLogic;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ebei/device/asset/weixin/model/entity/AssetTaskSignFile.java

@@ -1,10 +1,11 @@
 package com.ebei.device.asset.weixin.model.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ebei/device/asset/weixin/model/entity/AssetTaskSignState.java

@@ -1,10 +1,11 @@
 package com.ebei.device.asset.weixin.model.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ebei/device/asset/weixin/model/entity/AssetTenantUser.java

@@ -2,12 +2,9 @@
 package com.ebei.device.asset.weixin.model.entity;
 
 
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableLogic;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ebei/device/asset/weixin/model/entity/AssetUser.java

@@ -3,11 +3,12 @@ package com.ebei.device.asset.weixin.model.entity;
 
 
 
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,6 +42,10 @@ public class AssetUser extends Model<AssetUser> {
     @ApiModelProperty("资产名称")
     private String assetName;
 
+    @TableField("tenant_id")
+    @ApiModelProperty("资产对应租户id")
+    private Long tenantId;
+
 
 
 

src/main/java/com/ebei/device/asset/weixin/model/vo/AssetHistoryTask.java

@@ -1,6 +1,6 @@
 package com.ebei.device.asset.weixin.model.vo;
 
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ebei/device/asset/weixin/model/vo/AssetTenantUserVO.java

@@ -1,13 +1,7 @@
 
 package com.ebei.device.asset.weixin.model.vo;
 
-
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableLogic;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.ebei.device.asset.weixin.model.entity.AssetUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/ebei/device/asset/weixin/service/AssetProposalService.java

@@ -1,7 +1,7 @@
 package com.ebei.device.asset.weixin.service;
 
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ebei.device.asset.weixin.model.entity.AssetProposal;
 
 import java.util.Map;

src/main/java/com/ebei/device/asset/weixin/service/AssetTaskService.java

@@ -1,8 +1,8 @@
 package com.ebei.device.asset.weixin.service;
 
 
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ebei.device.asset.weixin.model.entity.AssetTask;
 import com.ebei.device.asset.weixin.model.entity.AssetTaskSignFile;
 import com.ebei.device.asset.weixin.model.vo.AssetHistoryTask;

src/main/java/com/ebei/device/asset/weixin/service/AssetTenantUserService.java

@@ -1,7 +1,7 @@
 package com.ebei.device.asset.weixin.service;
 
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ebei.device.asset.weixin.model.entity.AssetTenantUser;
 
 import java.util.List;

src/main/java/com/ebei/device/asset/weixin/service/impl/AssetProposalServiceImpl.java

@@ -1,8 +1,8 @@
 package com.ebei.device.asset.weixin.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ebei.device.asset.weixin.auth.AuthUtils;
 import com.ebei.device.asset.weixin.exception.BaseException;
 import com.ebei.device.asset.weixin.mapper.AssetProposalFileMapper;
@@ -59,7 +59,7 @@ public class AssetProposalServiceImpl extends ServiceImpl<AssetProposalMapper, A
 
         if(list != null && list.size()>0){
             for(AssetProposal assetProposal : list){
-                EntityWrapper<AssetProposalFile> wp = new EntityWrapper<>();
+                QueryWrapper<AssetProposalFile> wp = new QueryWrapper<>();
                 wp.eq("proposal_id",assetProposal.getProposalId());
                 List<AssetProposalFile> fileList = assetProposalFileMapper.selectList(wp);
                 if(fileList != null && fileList.size()>0){

src/main/java/com/ebei/device/asset/weixin/service/impl/AssetTaskServiceImpl.java

@@ -1,7 +1,9 @@
 package com.ebei.device.asset.weixin.service.impl;
 
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ebei.device.asset.weixin.auth.AuthUtils;
 import com.ebei.device.asset.weixin.mapper.AssetTaskMapper;
 import com.ebei.device.asset.weixin.mapper.AssetTaskSignFileMapper;
@@ -45,9 +47,10 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
 
         //将该任务已有的同类型签名删除
         AssetTaskSignFile assetTaskSignFile = new AssetTaskSignFile();
-        assetTaskSignFile.setTaskId(taskSignFile.getTaskId());
-        assetTaskSignFile.setFileType(taskSignFile.getFileType());
-        AssetTaskSignFile file = assetTaskSignFileMapper.selectOne(assetTaskSignFile);
+        LambdaQueryWrapper<AssetTaskSignFile> wq = new LambdaQueryWrapper<>();
+        wq.eq(AssetTaskSignFile::getFileType, taskSignFile.getFileType());
+        wq.eq(AssetTaskSignFile::getTaskId, taskSignFile.getTaskId());
+        AssetTaskSignFile file = assetTaskSignFileMapper.selectOne(wq);
         if(file != null){
             assetTaskSignFileMapper.deleteById(file);
         }

src/main/java/com/ebei/device/asset/weixin/service/impl/AssetTenantUserServiceImpl.java

@@ -1,8 +1,8 @@
 package com.ebei.device.asset.weixin.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ebei.device.asset.weixin.auth.AuthUtils;
 import com.ebei.device.asset.weixin.exception.BaseException;
 import com.ebei.device.asset.weixin.mapper.AssetTenantUserMapper;
@@ -53,7 +53,7 @@ public class AssetTenantUserServiceImpl extends ServiceImpl<AssetTenantUserMappe
         }
 
         //判断账号是否唯一
-        EntityWrapper<AssetTenantUser> wrapper = new EntityWrapper<>();
+        QueryWrapper<AssetTenantUser> wrapper = new QueryWrapper<>();
         wrapper.eq("company_id", AuthUtils.getCompanyId());
         wrapper.eq("user_account",assetTenantUser.getUserAccount());
         int num = this.baseMapper.selectCount(wrapper);
@@ -81,7 +81,7 @@ public class AssetTenantUserServiceImpl extends ServiceImpl<AssetTenantUserMappe
         List<AssetTenantUser> list = this.baseMapper.selectAssetTenantUserList(page, params);
         if(list != null && list.size()>0){
             for(AssetTenantUser tenantUser : list){
-                EntityWrapper<AssetUser> wrapper = new EntityWrapper<>();
+                QueryWrapper<AssetUser> wrapper = new QueryWrapper<>();
                 wrapper.eq("user_id",tenantUser.getUserId());
                 List<AssetUser> assetList = assetUserMapper.selectList(wrapper);
                 if(assetList != null && assetList.size()>0){
@@ -98,7 +98,7 @@ public class AssetTenantUserServiceImpl extends ServiceImpl<AssetTenantUserMappe
         if(tenantUser == null){
             throw new BaseException("账号不存在");
         }
-        EntityWrapper<AssetUser> wrapper = new EntityWrapper<>();
+        QueryWrapper<AssetUser> wrapper = new QueryWrapper<>();
         wrapper.eq("user_id",userId);
         List<AssetUser> assetList = assetUserMapper.selectList(wrapper);
         if(assetList != null && assetList.size()>0){
@@ -120,7 +120,7 @@ public class AssetTenantUserServiceImpl extends ServiceImpl<AssetTenantUserMappe
 
         if(!(oldUser.getUserAccount().equals(assetTenantUser.getUserAccount()))){
             //判断账号是否唯一
-            EntityWrapper<AssetTenantUser> wrapper = new EntityWrapper<>();
+            QueryWrapper<AssetTenantUser> wrapper = new QueryWrapper<>();
             wrapper.eq("company_id",AuthUtils.getCompanyId());
             wrapper.eq("user_account",assetTenantUser.getUserAccount());
             int num = this.baseMapper.selectCount(wrapper);
@@ -136,7 +136,7 @@ public class AssetTenantUserServiceImpl extends ServiceImpl<AssetTenantUserMappe
 
         //删除原有与资产的关联关系
         if(assetTenantUser.getAssetList() != null && assetTenantUser.getAssetList().size()>0){
-            EntityWrapper<AssetUser> wrapper = new EntityWrapper<>();
+            QueryWrapper<AssetUser> wrapper = new QueryWrapper<>();
             wrapper.eq("user_id",assetTenantUser.getUserId());
             assetUserMapper.delete(wrapper);
             //保存新的关联关系
@@ -163,7 +163,7 @@ public class AssetTenantUserServiceImpl extends ServiceImpl<AssetTenantUserMappe
         this.baseMapper.updateById(updateUser);
 
         //逻辑删除账号
-        this.deleteById(userId);
+        this.baseMapper.deleteById(userId);
 
     }
 

src/main/java/com/ebei/device/asset/weixin/util/ResponsePageEx.java

@@ -1,7 +1,7 @@
 package com.ebei.device.asset.weixin.util;
 
 
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ebei.device.asset.weixin.constant.ResponseConstants;
 
 /**
@@ -43,7 +43,7 @@ public class ResponsePageEx<T> extends ResponseEx<TPageBean<T>>{
 
    //分页数据
     public static <T> ResponsePageEx<T> createSuccess(Page page) {
-        return createSuccess((T)page.getRecords(),page.getTotal(), page.getCurrent(), page.getSize(), page.getPages());
+        return createSuccess((T)page.getRecords(),(int) page.getTotal(), (int) page.getCurrent(),(int) page.getSize(), (int) page.getPages());
     }
 
     //一页获取全部数据，没用到

src/main/resources/application.yml

@@ -39,7 +39,7 @@ mybatis-plus:
       - classpath:/mapper/**/**Mapper.xml
       - classpath:/mapper/*Mapper.xml
   #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.ebei.device.task.entity
+  typeAliasesPackage: com.ebei.device.asset.weixin.model.entity
   global-config:
     db-config:
       dbType: MYSQL
@@ -48,8 +48,11 @@ mybatis-plus:
       #字段策略IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
       field-strategy: NOT_NULL
       #逻辑删除配置（下面3个配置）
+      logic-delete-field: state
       logic-delete-value: 0
       logic-not-delete-value: 1
+      #自定义sql注入器
+      sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
   configuration:
     #驼峰下划线转换
     map-underscore-to-camel-case: true

src/main/resources/mapper/AssetProposalMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ebei.device.asset.weixin.mapper.AssetProposalMapper">
 
     <select id="selectAssetProposalList" resultType="com.ebei.device.asset.weixin.model.entity.AssetProposal">
-        SELECT
+        SELECT distinct
             p.proposal_id proposalId,
             p.area_id areaId,
             ta.area_name areaName,

src/main/resources/mapper/AssetTaskMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ebei.device.asset.weixin.mapper.AssetTaskMapper">
 
     <select id="selectAssetTaskList" resultType="com.ebei.device.asset.weixin.model.vo.AssetHistoryTask">
-        SELECT
+        SELECT distinct
             task.task_id taskId,
             date_format(task.complete_time,'%Y-%m-%d') completeTime,
             tss.sign_state signState,

src/main/resources/mapper/AssetTenantUserMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ebei.device.asset.weixin.mapper.AssetTenantUserMapper">
 
     <select id="selectAssetTenantUserList" resultType="com.ebei.device.asset.weixin.model.entity.AssetTenantUser">
-        SELECT
+        SELECT distinct
             atu.user_id userId,
             atu.user_account userAccount,
             atu.user_name userName,