调整设备增量添加接口及实现

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/utils/TechParamUtil.java

@@ -41,7 +41,7 @@ public class TechParamUtil {
     }
 
     public static void main(String[] args) {
-        List<TechParamItem> techParamItems = getParamMetaList("2000", "2300", "23T0", "vehicleCylinder");
+        List<TechParamItem> techParamItems = getParamMetaList("3000", "3300", "3320");
         System.out.println(techParamItems);
     }
 

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

@@ -256,8 +256,9 @@ public class DataHandlerController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "增量添加ORG_BRANCH_CODE为50X综合搜索数据-设备", notes = "增量添加ORG_BRANCH_CODE为50X综合搜索数据-设备")
     @PutMapping(value = "/equip/addStatistData2Es")
-    public ResponseModel<Integer> addStatistData2EsBatch() {
-        return ResponseHelper.buildResponse(dataHandlerService.addStatistData2EsBatch());
+    public ResponseModel<Object> addStatistData2EsBatch() {
+        dataHandlerService.addStatistData2EsBatch();
+        return ResponseHelper.buildResponse(true);
     }
 
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgUseInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipWaitRefreshDataQualityScore;
 import com.yeejoin.amos.boot.module.ymt.api.dto.RefreshDataDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
@@ -34,5 +35,7 @@ public interface IdxBizJgUseInfoMapper extends BaseMapper<IdxBizJgUseInfo> {
 
     List<Map<String,Object>> queryDetailBatch(@Param("records") List<String> records);
 
-    List<String> selectAddDataRecords();
+    Page<String> selectAddDataRecords(Page<String> page);
+
+    Integer selectAddDataRecordsCount();
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgUseInfoMapper.xml

@@ -149,7 +149,10 @@
             </foreach>
     </select>
     <select id="selectAddDataRecords" resultType="java.lang.String">
-        select "RECORD" from amos_tzs_biz.idx_biz_jg_supervision_info where "ORG_BRANCH_CODE" = '50*X'
+        select "RECORD" from amos_tzs_biz.idx_biz_jg_supervision_info where "ORG_BRANCH_CODE" = '50*X' order by "RECORD"
+    </select>
+    <select id="selectAddDataRecordsCount" resultType="java.lang.Integer">
+        select count(1) from amos_tzs_biz.idx_biz_jg_supervision_info where "ORG_BRANCH_CODE" = '50*X'
     </select>
 
 </mapper>