diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/JiLinPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/JiLinPlatformController.java index dfa7629ff..e9cc0a662 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/JiLinPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/JiLinPlatformController.java @@ -420,6 +420,43 @@ public class JiLinPlatformController extends ThirdPartyBaseController{ + /** + * 查询补贴发放信息 + * query_subsidy_grant_info + * @param request + * @param dto + * @return + */ + @PostMapping("/v1/query_subsidy_grant_info") + public CommonResult query_subsidy_grant_info(HttpServletRequest request , @RequestBody CommonParamsDTO dto) { + logger.info("{}-查询补贴发放信息 params:{}" , platformName , JSON.toJSONString(dto)); + try { + // 校验令牌 + if (!verifyToken(request.getHeader("Authorization"))) { + // 校验失败 + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); + } + + // 校验签名 + if (!verifySignature(dto)) { + // 签名错误 + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); + } + + // 解析入参 + QueryStationInfoDTO querySubsidyGrantInfoDTO = parseParamsDTO(dto , QueryStationInfoDTO.class); + + // 执行逻辑 + Map map = platformLogic.querySubsidyGrantInfo(querySubsidyGrantInfoDTO); + logger.info("{}-查询补贴发放信息 result:{}" , platformName , map); + return CommonResult.success(0 , "查询补贴发放信息成功！" , map.get("Data") , map.get("Sig")); + } catch (Exception e) { + logger.info("{}-查询补贴发放信息 error:" , platformName , e); + } + return CommonResult.failed("查询补贴发放信息发生异常"); + } + + diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentAccidentInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentAccidentInfo.java new file mode 100644 index 000000000..0dfe7b6c7 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentAccidentInfo.java @@ -0,0 +1,91 @@ +package com.jsowell.thirdparty.lianlian.domain; + +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class EquipmentAccidentInfo { + + /** + * 区划代码 + */ + @JSONField(name = "AreaCode") + private String areaCode; + + /** + * 事故地点 + */ + @JSONField(name = "Address") + private String address; + + /** + * 事故主体 + * 1.运营商 + * 2.车企 + * 3.设备制造商 + */ + @JSONField(name = "AccidentEntity") + private int accidentEntity; + + /** + * 事故类型 + * 1.充电设备质量问题 + * 2.电动车电池故障 + * 3.电网故障 + * 4.充电站管理问题 + * 99.其他 + */ + @JSONField(name = "Type") + private int type; + + /** + * 事故原因 + */ + @JSONField(name = "AccidentReason") + private String accidentReason; + + /** + * 事故分级 + * 1.造成经济损失且有人员伤亡 + * 2.造成经济损失但未造成人员伤亡 + * 3.造成经济损失且无人员伤亡 + * 4.未造成经济损失且无人员伤亡 + */ + @JSONField(name = "Level") + private int level; + + /** + * 发生时间 + * 格式：yyyy-MM-dd HH:mm:ss + */ + @JSONField(name = "AccidentTime") + private String accidentTime; + + /** + * 事故文字描述 + */ + @JSONField(name = "Description") + private String description; + + /** + * 现场图片 + * 可访问的图片URL数组 + */ + @JSONField(name = "Pictures") + private List pictures; + + /** + * 事故分析报告 + * 可访问的文件URL数组 + */ + @JSONField(name = "AnalysisReport") + private List analysisReport; +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/SubsidyGrantInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/SubsidyGrantInfo.java new file mode 100644 index 000000000..6e2c61ab0 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/SubsidyGrantInfo.java @@ -0,0 +1,95 @@ +package com.jsowell.thirdparty.lianlian.domain; + +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class SubsidyGrantInfo { + + /** + * 站点id + */ + @JSONField(name = "StationID") + private String stationId; + + /** + * 补贴唯一编码 + * 地区码（6 位）+开 始建设日期 (yyyyMMdd)+顺序编 码(6 位 + */ + @JSONField(name = "UniqueNumber") + private String uniqueNumber; + + /** + * 补贴地区码 + */ + @JSONField(name = "AreaCode") + private String areaCode; + + /** + * 服务运营商id + */ + @JSONField(name = "EquipmentOwnerID") + private String EquipmentOwnerID; + + /** + * 站点建设场所 + * 1：居民区 2：公共机构 3：企事业单位 4：写字楼 5：工业园区 6：交通枢纽 7：大型文体设施 8：城市绿地 + * 9：大型建筑配建停车 场10：路边停车位 11：城际高速服务区 12：风景区 13：公交场站 14：加油加气站 15：出租车 255：其他 + */ + @JSONField(name = "Construction") + private int construction; + + /** + * 设备类型 + * 1：直流设备 2：交流设备 3：交直流一体设备 4：无线设备 5：其他 + * 注：站点分类为 1 或 3 时，此字段为必 填项；站点分类为 2 时，此字段为 非必填项 + */ + @JSONField(name = "EquipmentType") + private List equipmentType; + + /** + * 设备补贴数量 + */ + @JSONField(name = "Quantity") + private int quantity; + + /** + * 补贴类型 + */ + @JSONField(name = "SubsidyType") + private int subsidyType; + + /** + * 补贴金额 + */ + @JSONField(name = "Amount") + private BigDecimal amount; + + /** + * 发放时间 + */ + @JSONField(name = "SubsidyTime") + private String subsidyTime; + + /** + * 发放单位 + */ + @JSONField(name = "Department") + private String Department; + + /** + * 政策文件 + */ + @JSONField(name = "Papers") + private String Papers; + +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java index 3812d5d8d..fa29abda0 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java @@ -289,6 +289,14 @@ public interface ThirdPartyPlatformService extends InitializingBean { throw new UnsupportedOperationException("This method is not yet implemented"); } + /** + * 查询充电事故信息 + * query_accident_info + */ + default Map queryAccidentInfo(QueryStationInfoDTO dto) { + throw new UnsupportedOperationException("This method is not yet implemented"); + } + // =================================================================================== // // ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ 由对方平台实现此接口，我方平台调用的通知接口 ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ // diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java index eec697330..04b9c7672 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java @@ -376,7 +376,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { .electricityType(Constants.one) //1：商业用电 2：普通工业用电 3：大工业用电 4：其他用电 .businessExpandType(Constants.one) .videoMonitor(Constants.zero) - .equipmentOwnerName(Constants.Equipment_Owner_Name) + .equipmentOwnerName("通榆县公路客运总站（通榆县开通客运服务有限公司)") .supplyType(Constants.one) .build(); @@ -1587,7 +1587,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { * @param dto * @return */ - @Override +/* @Override public Map queryParkingLock(QueryParkingLockDTO dto) { JSONObject result = new JSONObject(); ThirdPartySecretInfoVO thirdPartySecretInfoVO = getJiLinSecretInfo(); @@ -1618,6 +1618,47 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { } finally { return ThirdPartyPlatformUtils.generateResultMap(result, thirdPartySecretInfoVO); } + }*/ + + /** + * 查询补贴发放信息 + * @param dto + * @return + */ + @Override + public Map querySubsidyGrantInfo (QueryStationInfoDTO dto){ + int pageNo = dto.getPageNo()== null? 1 : dto.getPageNo(); + int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize(); + + ThirdPartySecretInfoVO thirdPartySecretInfoVO = getJiLinSecretInfo(); + JSONObject result = new JSONObject(); + List subsidyGrantInfos = new ArrayList<>(); + + result.put("PageNo", pageNo); + result.put("PageSize", pageSize); + result.put("ItemSize", 0); + result.put("SubsidyGrantInfos", subsidyGrantInfos); + + return ThirdPartyPlatformUtils.generateResultMap(result, thirdPartySecretInfoVO); + } + + + + @Override + public Map queryAccidentInfo (QueryStationInfoDTO dto){ + int pageNo = dto.getPageNo()== null? 1 : dto.getPageNo(); + int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize(); + + ThirdPartySecretInfoVO thirdPartySecretInfoVO = getJiLinSecretInfo(); + JSONObject result = new JSONObject(); + List equipmentAccidentInfos = new ArrayList<>(); + + result.put("PageNo", pageNo); + result.put("PageSize", pageSize); + result.put("ItemSize", 0); + result.put("EquipmentAccidentInfo", equipmentAccidentInfos); + + return ThirdPartyPlatformUtils.generateResultMap(result, thirdPartySecretInfoVO); }