add

新增小程序心跳接口

tr-framework/src/main/java/cn/tr/core/pojo/PageDomain.java

@@ -1,5 +1,6 @@
 package cn.tr.core.pojo;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.db.sql.Order;
 import lombok.Data;
 
@@ -30,4 +31,14 @@ public class PageDomain
         this.size = size;
         this.orders=orders;
     }
+
+    public PageDomain(Integer current, Integer size,List<Order> orders,Boolean reasonable) {
+        this.current = current;
+        this.size = size;
+        this.orders=orders;
+        if(ObjectUtil.isNotNull(reasonable)){
+            this.reasonable=reasonable;
+
+        }
+    }
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizQuestionAnswerPO.java

@@ -2,7 +2,6 @@ package cn.tr.module.smart.common.po;
 
 import cn.tr.module.smart.common.entity.BizQuestionEntity;
 import cn.tr.module.smart.common.entity.BizWxAppletQuestionAnswerEntity;
-import cn.tr.module.smart.wx.controller.vo.BizWxDeptQuestionVO;
 import cn.tr.plugin.mybatis.config.handler.JsonbTypeHandler;
 import cn.tr.plugin.mybatis.pojo.TenantPO;
 import com.baomidou.mybatisplus.annotation.TableField;

tr-plugins/tr-spring-boot-starter-plugin-mybatis/src/main/java/cn/tr/plugin/mybatis/config/handler/JsonbTypeHandler.java

@@ -14,10 +14,14 @@ import java.sql.SQLException;
 
 @MappedJdbcTypes(JdbcType.OTHER)
 @MappedTypes(Object.class)
-public class JsonbTypeHandler extends BaseTypeHandler<Object> {
+public class JsonbTypeHandler<T> extends BaseTypeHandler<Object> {
 
     private static final ObjectMapper mapper = new ObjectMapper();
+    private final Class<T> type;
 
+    public JsonbTypeHandler(Class<T> type) {
+        this.type = type;
+    }
     @Override
     public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException {
         try {
@@ -31,26 +35,26 @@ public class JsonbTypeHandler extends BaseTypeHandler<Object> {
     }
 
     @Override
-    public Object getNullableResult(ResultSet rs, String columnName) throws SQLException {
+    public T getNullableResult(ResultSet rs, String columnName) throws SQLException {
         return parseJson(rs.getString(columnName));
     }
 
     @Override
-    public Object getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+    public T getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
         return parseJson(rs.getString(columnIndex));
     }
 
     @Override
-    public Object getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+    public T getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
         return parseJson(cs.getString(columnIndex));
     }
 
-    private Object parseJson(String json) throws SQLException {
+    private T parseJson(String json) throws SQLException {
         if (json == null) {
             return null;
         }
         try {
-            return mapper.readValue(json, Object.class);
+            return mapper.readValue(json, type);
         } catch (JsonProcessingException e) {
             throw new SQLException("Error parsing JSONB string", e);
         }

tr-plugins/tr-spring-boot-starter-plugin-mybatis/src/main/java/cn/tr/plugin/mybatis/config/page/PageConfig.java

@@ -33,6 +33,7 @@ public class PageConfig {
             if(StrUtil.isNotBlank(orderBy)){
                 page.setOrderBy(orderBy);
             }
+            page.setReasonable(pageDomain.getReasonable());
             PageContextHolder.setPage(page);
         };
 

tr-plugins/tr-spring-boot-starter-plugin-web/src/main/java/cn/tr/plugin/web/config/PageStrategyConfig.java

@@ -23,15 +23,17 @@ public class PageStrategyConfig {
             Integer current=0;
             Integer size=10;
             List<Order> orders=null;
+            Boolean reasonable=true;
             try {
                 Map<String, Object> pageMap = JsonUtils.parseMap(JsonUtils.toJsonString(JsonUtils.parseMap(body).get("page")));
                 current= ObjectUtil.isNull(pageMap.get("current"))?1:Integer.valueOf(String.valueOf(pageMap.get("current")));
                 size=ObjectUtil.isNull(pageMap.get("size"))?10:Integer.valueOf(String.valueOf(pageMap.get("size")));
                 orders=JsonUtils.parseArray(JsonUtils.toJsonString(pageMap.get("orders")), Order.class);
+                reasonable= ObjectUtil.isNull(pageMap.get("reasonable"))?Boolean.TRUE:Boolean.valueOf(String.valueOf(pageMap.get("current")));
             }catch (Exception e){
 
             }
-            return new PageDomain(current,size,orders);
+            return new PageDomain(current,size,orders,reasonable);
         };
 
     }

tr-test/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 server:
   shutdown: graceful
-  port: 8083
+  port: 8084
   servlet:
     context-path: /api