fix(jg):证打印标记功能开发

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgBizChangeLogController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgBizChangeLogServiceImpl;
 import io.swagger.annotations.Api;
@@ -32,4 +34,12 @@ public class JgBizChangeLogController extends BaseController {
     public ResponseModel<Map<String, Object>> getDetails(@RequestParam("changeLogId") String changeLogId) {
         return ResponseHelper.buildResponse(jgBizChangeLogService.getDetails(changeLogId));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "字段列表", notes = "字段列表")
+    @GetMapping(value = "/getTableColumnPage")
+    public ResponseModel<Page<JSONObject>> getTableColumnPage(@RequestParam Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        return ResponseHelper.buildResponse(jgBizChangeLogService.queryEquipInIds(jsonObject));
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgBizChangeLogServiceImpl.java

@@ -24,6 +24,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import java.io.IOException;
 import java.util.*;
@@ -63,38 +64,49 @@ public class JgBizChangeLogServiceImpl extends BaseService<JgBizChangeLogDto, Jg
         JgBizChangeLog log = baseMapper.selectById(changeLogId);
         if (log == null) return Collections.emptyMap();
         return MapBuilder.<String, Object>create()
-                .put("operateLogList", this.queryEquipInIds(changeLogId))
                 .put("changeReason", log.getChangeReason())
                 .put("changeAttachment", JSONObject.parseArray(log.getChangeAttachment()))
                 .put("unitName", log.getUnitName())
                 .put("recUserName", log.getRecUserName())
+                .put("changeLogId", log.getSequenceNbr())
                 .build();
     }
 
     /**
      * 根据ids查询设备
      */
-    public List<JSONObject> queryEquipInIds(String changeLogId) {
-        List<JSONObject> result = new ArrayList<>();
+    public Page<JSONObject> queryEquipInIds(JSONObject map) {
+        Page<JSONObject> result = new Page<>(map.getInteger("number"), map.getInteger("size"));
         SearchRequest request = new SearchRequest();
         request.indices("biz_data_operate_log");
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.trackTotalHits(true);
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
-        if (!ObjectUtils.isEmpty(changeLogId)) {
+        if (!ObjectUtils.isEmpty(map.get("changeLogId"))) {
             BoolQueryBuilder seqBuilder = QueryBuilders.boolQuery();
-            seqBuilder.must(QueryBuilders.termQuery("batchId", changeLogId));
+            seqBuilder.must(QueryBuilders.termQuery("batchId", map.get("changeLogId")));
             boolMust.must(seqBuilder);
         }
         builder.query(boolMust);
         builder.sort("createDate", SortOrder.DESC);
+        builder.from((map.getInteger("number") - 1) * map.getInteger("size"));
+        builder.size(map.getInteger("size"));
         request.source(builder);
+        long totle = 0;
+        List<JSONObject> list = new LinkedList<>();
         try {
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
             for (SearchHit hit : response.getHits().getHits()) {
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
                 JSONObject source = jsonObject.getJSONObject("sourceAsMap");
-                result.add(source);
+                if (!ValidationUtil.isEmpty(source.get("columnType")) && !source.get("columnType").equals("String")) {
+                    source.put("beforeData", JSONObject.parseArray(Objects.toString(source.get("beforeData"),"")));
+                    source.put("afterData", JSONObject.parseArray(Objects.toString(source.get("beforeData"),"")));
+                }
+                list.add(source);
+                totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;
+                result.setRecords(list);
+                result.setTotal(totle);
             }
         } catch (IOException e) {
             throw new RuntimeException(e);