opt:增加主从同步功能1

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java

@@ -1,5 +1,6 @@
 package org.nl.wms.sch.service;
 
+import org.nl.common.TableDataInfo;
 import org.springframework.data.domain.Pageable;
 
 import java.util.Map;
@@ -18,7 +19,7 @@ public interface TaskService {
      * @param page      分页参数
      * @return Map<String, Object>
      */
-    Map<String, Object> queryAll(Map whereJson, Pageable page);
+    TableDataInfo queryAll(Map whereJson, Pageable page);
 
     /**
      * 任务操作

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java

@@ -8,9 +8,12 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
 import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
@@ -52,7 +55,7 @@ public class TaskServiceImpl implements TaskService {
     private final RedissonClient redissonClient;
 
     @Override
-    public Map<String, Object> queryAll(Map form, Pageable page) {
+    public TableDataInfo queryAll(Map form, Pageable page) {
 
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "1");
@@ -104,18 +107,12 @@ public class TaskServiceImpl implements TaskService {
         if (ObjectUtil.isNotEmpty(in_area_id)) {
             map.put("in_area_id", in_area_id);
         }
-        JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
-        JSONArray content = json.getJSONArray("content");
-        JSONArray res = new JSONArray();
-
-        //点位基础表【SCH_BASE_Point】
-        WQLObject schBasePointService = WQLObject.getWQLObject("SCH_BASE_Point");
-        for (int i = 0; i < content.size(); i++) {
-            JSONObject taskObj = content.getJSONObject(i);
-            res.add(taskObj);
-        }
-        json.put("content", res);
-        return json;
+        Page<Object> startPage = PageHelper.startPage(page.getPageNumber(), page.getPageSize());
+        PageHelper.orderBy("update_time desc");
+        JSONArray content = WQL.getWO("QSCH_TASK_01").addParamMap(map).process().getResultJSONArray(0);
+        TableDataInfo<Object> build = TableDataInfo.build(content);
+        build.setTotalElements(startPage.getTotal());
+        return build;
     }
 
     @Override

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql

@@ -50,14 +50,13 @@
 	##########################################
 
     IF 输入.flag = "1"
-		PAGEQUERY
+		QUERY
             SELECT * FROM (
             SELECT
                 task.*,
                 md.class_name task_type_name,
                 user.person_name AS create_name1,
-                dict.label task_status_name,
-                case when task.task_type like '0105%' then 'LK' when task.task_type like '0107%' then 'LK' ELSE task.product_area end AS final_product_area
+                dict.label task_status_name
             FROM
                 sch_base_task task
                 LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
@@ -104,8 +103,8 @@
              ) a
          WHERE 1=1
             OPTION 输入.in_area_id <> ""
-                a.final_product_area IN 输入.in_area_id
+                a.product_area IN 输入.in_area_id
             ENDOPTION
 			ENDSELECT
-		ENDPAGEQUERY
+		ENDQUERY
 	ENDIF