Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgResumeInfoMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.Set;
 
 /**
@@ -15,4 +16,7 @@ import java.util.Set;
 public interface JgResumeInfoMapper extends BaseMapper<JgResumeInfo> {
 
     void deleteBatchByBusinessId(@Param("idList") Set<String> idList);
+
+    Page<JgResumeInfoDto> queryPageListByChangeIds(Page<?> page, @Param("equIds") Set<String> equIds);
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgResumeInfoMapper.xml

@@ -8,4 +8,14 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="queryPageListByChangeIds" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto">
+        SELECT *
+        FROM tzs_jg_resume_info
+        WHERE equ_id IN
+        <foreach collection="equIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        order by rec_date desc
+    </select>
 </mapper>

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.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgBizChangeLogServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/change-log")
+@Api(tags = "设备编辑操作日志控制器")
+@RequiredArgsConstructor
+public class JgBizChangeLogController extends BaseController {
+
+    private final JgBizChangeLogServiceImpl jgBizChangeLogService;
+
+    /**
+     * 根据changeLogId查询详情
+     *
+     * @param changeLogId 主键
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/details")
+    @ApiOperation(httpMethod = "GET", value = "根据changeLogId查询设备编辑详情", notes = "根据changeLogId查询设备编辑详情")
+    public ResponseModel<Map<String, Object>> getDetails(@RequestParam("changeLogId") String changeLogId) {
+        return ResponseHelper.buildResponse(jgBizChangeLogService.getDetails(changeLogId));
+    }
+}

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -127,16 +126,4 @@ public class JgResumeInfoController extends BaseController {
 	    return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.queryForJgResumeInfoList());
 	}
 
-	/**
-	 * 根据changeLogId查询详情
-	 *
-	 * @param changeLogId 主键
-	 * @return ResponseModel
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/details")
-	@ApiOperation(httpMethod = "GET", value = "根据changeLogId查询设备编辑详情", notes = "根据changeLogId查询设备编辑详情")
-	public ResponseModel<JgResumeInfo> getDetails(@RequestParam("changeLogId") String changeLogId) {
-		return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.getDetails(changeLogId));
-	}
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.map.MapBuilder;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.ESDataChangeLogDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgBizChangeLogDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgBizChangeLog;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgBizChangeLogMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgBizChangeLogService;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESDataChangeLogDao;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHit;
+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.rdbms.service.BaseService;
-
-import java.util.List;
-import java.util.Set;
+import java.io.IOException;
+import java.util.*;
 
 /**
  * 服务实现类
@@ -24,21 +38,67 @@ import java.util.Set;
 @RequiredArgsConstructor
 public class JgBizChangeLogServiceImpl extends BaseService<JgBizChangeLogDto, JgBizChangeLog, JgBizChangeLogMapper> implements IJgBizChangeLogService {
 
-
     private final ESDataChangeLogDao esDataChangeLogDao;
+    private final RestHighLevelClient restHighLevelClient;
+    private final JgResumeInfoServiceImpl jgResumeInfoService;
 
     public void save2DbAndEs(JgBizChangeLog changeLog, List<ESDataChangeLogDto> esDataChangeLogDtos) {
         this.save(changeLog);
-        esDataChangeLogDtos.forEach(esDataChangeLogDto -> {
-            esDataChangeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
-        });
+        esDataChangeLogDtos.forEach(esDataChangeLogDto -> esDataChangeLogDto.setBatchId(changeLog.getSequenceNbr() + ""));
         if (!esDataChangeLogDtos.isEmpty()) {
             esDataChangeLogDao.saveAll(esDataChangeLogDtos);
         }
     }
 
     @Override
-    public IPage<?> queryPageListByChangeIds(Set<String> changeIds, int current, int size) {
-        return null;
+    public IPage<JgResumeInfoDto> queryPageListByChangeIds(Set<String> changeIds, int current, int size) {
+        if (CollectionUtils.isEmpty(changeIds)) {
+            return new Page<>(current, size);
+        }
+        Page<JgResumeInfoDto> page = new Page<>(current, size);
+        return jgResumeInfoService.queryPageListByChangeIds(page, changeIds);
+    }
+
+    public Map<String, Object> getDetails(String changeLogId) {
+        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())
+                .build();
+    }
+
+    /**
+     * 根据ids查询设备
+     */
+    public List<JSONObject> queryEquipInIds(String changeLogId) {
+        List<JSONObject> result = new ArrayList<>();
+        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)) {
+            BoolQueryBuilder seqBuilder = QueryBuilders.boolQuery();
+            seqBuilder.must(QueryBuilders.termQuery("batchId", changeLogId));
+            boolMust.must(seqBuilder);
+        }
+        builder.query(boolMust);
+        builder.sort("createDate", SortOrder.DESC);
+        request.source(builder);
+        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);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
     }
 }
\ No newline at end of file

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/JgResumeInfoServiceImpl.java

@@ -29,6 +29,9 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto, JgResu
         return this.queryForPage(page, null, false, equId);
     }
 
+    public Page<JgResumeInfoDto> queryPageListByChangeIds(Page<JgResumeInfoDto> page, Set<String> equIds) {
+        return this.baseMapper.queryPageListByChangeIds(page, equIds);
+    }
     /**
      * 列表查询 示例
      */
@@ -62,9 +65,4 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto, JgResu
     public void deleteBatchByBusinessId(Set<String> idList) {
         this.baseMapper.deleteBatchByBusinessId(idList);
     }
-
-    public JgResumeInfo getDetails(String changeLogId) {
-        return this.baseMapper.selectOne(new LambdaQueryWrapper<JgResumeInfo>()
-                .eq(JgResumeInfo::getChangeLogId, changeLogId));
-    }
 }
\ No newline at end of file