fix(jg):榆林气瓶对接接口修改

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/YuLinDataDockController.java

 package com.yeejoin.amos.api.openapi.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.api.openapi.face.model.ElevatorModel;
 import com.yeejoin.amos.api.openapi.feign.TzsJgServiceFeignClient;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
 import io.swagger.annotations.Api;
@@ -17,8 +15,6 @@ 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.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 特种设备监管controller
@@ -42,11 +38,11 @@ public class YuLinDataDockController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getElevatorInfo")
 	@ApiOperation(httpMethod = "GET", value = "查询电梯信息列表", notes = "查询电梯信息列表")
-	public ResponseModel<IPage<ElevatorModel>> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
+	public ResponseModel<Object> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
 												 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
 												 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
 											     PageParam pageParam) {
-		return ResponseHelper.buildResponse(jgServiceFeignClient.getElevatorInfo(equCode, startTime, endTime, pageParam));
+		return ResponseHelper.buildResponse(jgServiceFeignClient.getElevatorInfo(equCode, startTime, endTime, pageParam.getCurrent(), pageParam.getSize()));
 	}
 
 	/**
@@ -60,11 +56,11 @@ public class YuLinDataDockController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getCylinderInfo")
 	@ApiOperation(httpMethod = "GET", value = "根据时间范围查询液化石油气瓶档案", notes = "根据时间范围查询液化石油气瓶档案")
-	public ResponseModel<IPage<ElevatorModel>> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
+	public ResponseModel<Object> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
 											     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
 											     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
 											     PageParam pageParam) {
-		return ResponseHelper.buildResponse(jgServiceFeignClient.getCylinderInfo(equCode, startTime, endTime, pageParam));
+		return ResponseHelper.buildResponse(jgServiceFeignClient.getCylinderInfo(equCode, startTime, endTime, pageParam.getCurrent(), pageParam.getSize()));
 	}
 
 	/**
@@ -75,7 +71,7 @@ public class YuLinDataDockController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getVehicleCylinderInfo")
 	@ApiOperation(httpMethod = "GET", value = "车用气气瓶档案", notes = "车用气气瓶档案")
-	public ResponseModel<List<Map<String, Object>>> getVehicleCylinderInfo(@RequestParam(value = "useCode") String useCode) {
+	public ResponseModel<Object> getVehicleCylinderInfo(@RequestParam(value = "useCode") String useCode) {
 		return ResponseHelper.buildResponse(jgServiceFeignClient.getVehicleCylinderInfo(useCode));
 	}
 
@@ -86,7 +82,7 @@ public class YuLinDataDockController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getCylinderStationInfo")
 	@ApiOperation(httpMethod = "GET", value = "查询气站信息", notes = "查询气站信息")
-	public ResponseModel<List<Map<String, Object>>> getCylinderStationInfo() {
+	public ResponseModel<Object> getCylinderStationInfo() {
 		return ResponseHelper.buildResponse(jgServiceFeignClient.getCylinderStationInfo());
 	}
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsJgServiceFeignClient.java

 package com.yeejoin.amos.api.openapi.feign;
 
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.api.openapi.dto.XiAnEquipInfoExcelDto;
-import com.yeejoin.amos.api.openapi.face.model.ElevatorModel;
 import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -44,11 +41,13 @@ public interface TzsJgServiceFeignClient {
      * @param endTime   结束时间
      * @return 电梯数据
      */
-    @RequestMapping(value = "/equipment-register/getElevatorInfo", method = RequestMethod.GET)
-    IPage<ElevatorModel> getElevatorInfo(@RequestParam("equCode") String equCode,
-                                         @RequestParam("startTime") Date startTime,
-                                         @RequestParam("startTime") Date endTime,
-                                         PageParam pageParam);
+    @GetMapping(value = "/equipment-register/getElevatorInfo")
+    ResponseModel<Page<Map<String, Object>>> getElevatorInfo(@RequestParam("equCode") String equCode,
+                                                             @RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+                                                             @RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+                                                             @RequestParam(value = "current") int current,
+                                                             @RequestParam(value = "size") int size
+    );
 
     /**
      * 根据时间范围查询液化石油气瓶档案
@@ -58,11 +57,13 @@ public interface TzsJgServiceFeignClient {
      * @param endTime   结束时间
      * @return 电梯数据
      */
-    @RequestMapping(value = "/equipment-register/getCylinderInfo", method = RequestMethod.GET)
-    IPage<ElevatorModel> getCylinderInfo(@RequestParam("equCode") String equCode,
-                                         @RequestParam("startTime") Date startTime,
-                                         @RequestParam("startTime") Date endTime,
-                                         PageParam pageParam);
+    @GetMapping(value = "/equipment-register/getCylinderInfo")
+    ResponseModel<Page<Map<String, Object>>> getCylinderInfo(@RequestParam("equCode") String equCode,
+                                                             @RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+                                                             @RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+                                                             @RequestParam(value = "current") int current,
+                                                             @RequestParam(value = "size") int size
+    );
 
     /**
      * 查询气站信息
@@ -70,10 +71,12 @@ public interface TzsJgServiceFeignClient {
      * @return
      */
     @RequestMapping(value = "/equipment-register/getCylinderStationInfo", method = RequestMethod.GET)
-    List<Map<String, Object>> getCylinderStationInfo();
+    ResponseModel<List<Map<String, Object>>> getCylinderStationInfo();
+
+
+    @GetMapping(value = "/equipment-register/getVehicleCylinderInfo")
+    ResponseModel<List<Map<String, Object>>> getVehicleCylinderInfo(@RequestParam("useCode") String useCode);
 
-    @RequestMapping(value = "/equipment-register/getVehicleCylinderInfo", method = RequestMethod.GET)
-    List<Map<String, Object>> getVehicleCylinderInfo(String useCode);
 
     /**
      * 批量保存西安上传的设备数据

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

@@ -995,7 +995,7 @@
     </select>
     <select id="getCylinderInfoList" resultType="java.util.Map">
         <include refid="list-cylinder"/>
-        WHERE ri."EQU_CATEGORY" = '2300' and ui."DATA_SOURCE" like 'jg%'
+        WHERE ri."EQU_CATEGORY" = '2300'
         and ui.record in
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{record}

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 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.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,7 +20,6 @@ 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 javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
@@ -301,12 +298,12 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getElevatorInfo")
     @ApiOperation(httpMethod = "GET", value = "查询电梯信息列表", notes = "查询电梯信息列表")
-    public ResponseModel<IPage<Map<String, Object>>> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
+    public ResponseModel<Page<Map<String, Object>>> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
                                                                     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
                                                                     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
-                                                                     PageParam pageParam) {
-
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getElevatorInfo(equCode, startTime, endTime, pageParam));
+                                                                    @RequestParam(value = "current") int current,
+                                                                    @RequestParam(value = "size") int size) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getElevatorInfo(equCode, startTime, endTime, current, size));
     }
 
     /**
@@ -344,12 +341,12 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getCylinderInfo")
     @ApiOperation(httpMethod = "GET", value = "根据时间范围查询液化石油气瓶档案", notes = "根据时间范围查询液化石油气瓶档案")
-    public ResponseModel<IPage<Map<String, Object>>> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
+    public ResponseModel<Page<Map<String, Object>>> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
                                                                      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
                                                                      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
-                                                                     PageParam pageParam) {
-
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getCylinderInfo(equCode, startTime, endTime, pageParam));
+                                                                     @RequestParam(value = "current") int current,
+                                                                     @RequestParam(value = "size") int size) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getCylinderInfo(equCode, startTime, endTime, current, size));
     }
 
     /**

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

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 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.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -60,13 +58,13 @@ public interface IIdxBizJgRegisterInfoService {
      */
     List<Map<String, Object>> getProjectContraptionList(String useUnitCreditCode);
 
-    Page<Map<String, Object>> getElevatorInfo(String equCode, Date startTime, Date endTime, PageParam pageParam);
+    Page<Map<String, Object>> getElevatorInfo(String equCode, Date startTime, Date endTime, int current, int size);
 
     List<Map<String, Object>> getCylinderStationInfo();
 
     List<Map<String, Object>> getVehicleCylinderInfo(String useCode);
 
-    IPage<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, PageParam pageParam);
+    Page<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, int current, int size);
 
     void initUserExpirationReminderOnce();
 

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

@@ -4409,9 +4409,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public Page<Map<String, Object>> getElevatorInfo(String equCode, Date startTime, Date endTime, PageParam
-            pageParam) {
-        Page<Map<String, Object>> result = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+    public Page<Map<String, Object>> getElevatorInfo(String equCode, Date startTime, Date endTime, int current, int size) {
+        Page<Map<String, Object>> result = new Page<>(current, size);
         SearchRequest request = new SearchRequest();
         request.indices("idx_biz_view_jg_all");
         SearchSourceBuilder builder = new SearchSourceBuilder();
@@ -4442,8 +4441,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
-        builder.from((pageParam.getCurrent() - 1) * pageParam.getSize());
-        builder.size(pageParam.getSize());
+        builder.from((current - 1) * size);
+        builder.size(size);
         request.source(builder);
         List<Map<String, Object>> elevatorModelVoList = Collections.emptyList();
         try {
@@ -4460,7 +4459,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 elevatorModelVoList = jgUseRegistrationMapper.getElevatorModeList(equIds);
             }
             result.setRecords(convertKeysToCamelCase(elevatorModelVoList));
-            result.setTotal(response.getHits().getTotalHits().value);
+            result.setTotal(Objects.requireNonNull(response.getHits().getTotalHits()).value);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -4478,9 +4477,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public IPage<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, PageParam
-            pageParam) {
-        Page<Map<String, Object>> result = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+    public Page<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, int current, int size) {
+        Page<Map<String, Object>> result = new Page<>(current, size);
         SearchRequest request = new SearchRequest();
         request.indices("idx_biz_view_jg_all");
         SearchSourceBuilder builder = new SearchSourceBuilder();
@@ -4511,8 +4509,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
-        builder.from((pageParam.getCurrent() - 1) * pageParam.getSize());
-        builder.size(pageParam.getSize());
+        builder.from((current - 1) * size);
+        builder.size(size);
         request.source(builder);
         List<Map<String, Object>> cylinderInfoList = Collections.emptyList();
         try {
@@ -4535,7 +4533,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 cylinderInfoList.forEach(i -> i.computeIfPresent("chargingMedium", (key, value) -> fillingMediumMap.get(value)));
             }
             result.setRecords(convertKeysToCamelCase(cylinderInfoList));
-            result.setTotal(response.getHits().getTotalHits().value);
+            result.setTotal(Objects.requireNonNull(response.getHits().getTotalHits()).value);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }