diff --git a/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java b/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java index 406f5c8..ad95b65 100644 --- a/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java +++ b/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUnitUseStatisticsDTO.java @@ -38,19 +38,6 @@ public class SecurityUnitUseStatisticsDTO { @Schema(description = "公安单位名称") private String policeUnitName; - @Schema(description = "保安单位id") - private Long securityUnitId; - @Schema(description = "保安单位名称") - private String securityUnitName; - @Schema(description = "保安单位法人信息") - private LegalPersonInfo securityUnitLegalPersonInfo; - - @Schema(description = "项目经理") - private String serviceProjectManager; - @Schema(description = "项目经理联系方式") - private String serviceProjectManagerTelephone; - - @Data static class _ServiceProjectVo { @Schema(description = "服务项目id") @@ -74,6 +61,18 @@ public class SecurityUnitUseStatisticsDTO { @Schema(description = "持证保安数量") private Integer haveCardSecurityUserCount; + @Schema(description = "保安单位id") + private Long securityUnitId; + @Schema(description = "保安单位名称") + private String securityUnitName; + @Schema(description = "保安单位法人信息") + private LegalPersonInfo securityUnitLegalPersonInfo; + + @Schema(description = "项目经理") + private String serviceProjectManager; + @Schema(description = "项目经理联系方式") + private String serviceProjectManagerTelephone; + } } diff --git a/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml b/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml index 5b788ad..af35578 100644 --- a/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml +++ b/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml @@ -29,10 +29,6 @@ order by eu.create_time desc - { const accessKey = "w2wzi0wefmmo6s735z2el8tfzitya5gj" const secretKey = "db1b5214-02ee-497f-957c-88323b4351bf" const now = Date.now() - // const params = { - // name: 'zhangsan', - // age: 14, - // addr: '湖南省长沙市' - // } - - // const sign = generatedSign(params, now, accessKey, secretKey) - - // const headers = { - // 'Access-Key': accessKey, - // 'Time-Stamp': now, - // 'Sign': sign - // } - // axios.get('http://127.0.0.1:8765/open/dataView', { - // params, - // headers - // }) - - const params2 = { + const params = { code: 'SSP001', level: 5 } - const sign2 = generatedSign(params2, now, accessKey, secretKey) + const sign = generatedSign(params, now, accessKey, secretKey) const headers2 = { 'Access-Key': accessKey, 'Time-Stamp': now, - 'Sign': sign2 + 'Sign': sign } + console.log(headers2); axios.get('http://127.0.0.1:8765/open/dataView', { - params: params2, + params: params, headers: { ...headers2 }