From 6f6f54cb30a28c08dc935c1b8c48cf25a7a5243a Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 19 Nov 2024 09:07:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E6=B5=B7=E6=95=B0=E6=8D=AE=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/biz/datacenter/DataCenterRest.java | 49 ++++++++++++++++--- .../report/biz/datacenter/GoodsDetailsVo.java | 14 ++++++ .../biz/datacenter/ProjectDetailsVo.java | 1 + .../biz/datacenter/WarehouseInfoVoSheng.java | 1 + .../biz/datacenter/WarehouseInfoVoSheng1.java | 1 + .../supervise/report/ds/crm/CrmMapper.java | 2 +- .../supervise/report/shanhai/ShRequester.java | 46 ++++++++++++++++- .../report/shanhai/resp/IndexVo.java | 5 +- .../report/shanhai/resp/MonitorGetInfo.java | 22 +++++++++ .../supervise/report/shanhai/resp/NearVo.java | 1 + 10 files changed, 131 insertions(+), 11 deletions(-) create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/GoodsDetailsVo.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/MonitorGetInfo.java diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java index df2235a2..d295b539 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java @@ -227,19 +227,22 @@ public class DataCenterRest { list.add(nodde); } } - if(list.stream().anyMatch(s->s.equals("在途"))){ - projectDetailsVo.setCreditStage("在途"); - }else if(list.stream().anyMatch(s->s.equals("在建"))){ - projectDetailsVo.setCreditStage("在建"); - }else { - projectDetailsVo.setCreditStage("竣工"); + if(list.size()!=0){ + if(list.stream().anyMatch(s->s.equals("在途"))){ + projectDetailsVo.setCreditStage("在途"); + }else if(list.stream().anyMatch(s->s.equals("在建"))){ + projectDetailsVo.setCreditStage("在建"); + }else if(list.stream().anyMatch(s->s.equals("竣工"))) { + projectDetailsVo.setCreditStage("竣工"); + }else if(list.stream().anyMatch(s->s.equals("结清"))){ + projectDetailsVo.setCreditStage("结清"); + } } } return rb.success().setData(projectDetailsVos); } - //@Todo 山海光伏大屏数据接口 @ApiOperation("获取仓库明细") @PostMapping("/getWarehouseAddressDetail/{shSid}") public ResultBean getWarehouseAddressDetail(@PathVariable("shSid") String shSid){ @@ -444,6 +447,7 @@ public class DataCenterRest { int dd=0; int zj=0; int jg=0; + int jq=0; for (ProjectInfo infoList : projectInfoList) { if(StringUtils.isNotBlank(infoList.getNodeValue())){ if (infoList.getNodeValue().equals("在途")){ @@ -455,6 +459,9 @@ public class DataCenterRest { if (infoList.getNodeValue().equals("竣工")){ jg++; } + if (infoList.getNodeValue().equals("结清")){ + jq++; + } } // int a=crmMapper.getPhaseByProject(projectInfo.getSid(),infoList.getNodeValue()); } @@ -472,6 +479,9 @@ public class DataCenterRest { if (shPhaseRecordVo.getNodeValue().equals("竣工")){ vo.setJg(vo.getDd()+1); } + if (shPhaseRecordVo.getNodeValue().equals("结清")){ + vo.setJq(vo.getDd()+1); + } } } if(c.size()!=0){ @@ -480,6 +490,7 @@ public class DataCenterRest { warehouseInfoVoSheng1.setJg(vo.getJg()); warehouseInfoVoSheng1.setDd(vo.getDd()); warehouseInfoVoSheng1.setZj(vo.getZj()); + warehouseInfoVoSheng1.setJq(vo.getJq()); warehouseInfoVoSheng1.setValue(warehouseInfoVoSheng1.getDd()+warehouseInfoVoSheng1.getJg()+warehouseInfoVoSheng1.getZj()); warehouseInfoVoSheng1s.add(warehouseInfoVoSheng1); } @@ -487,6 +498,7 @@ public class DataCenterRest { map.put("dd",dd); map.put("zj",zj); map.put("jg",jg); + map.put("jq",jq); map.put("zs",projectInfoList.size()); map.put("map",warehouseInfoVoSheng1s); return rb.success().setData(map); @@ -514,18 +526,26 @@ public class DataCenterRest { ResultBean rb=new ResultBean(); Map map=new HashMap<>(); IndexVo vo=ShRequester.getscreen$enterprise$index(query); + IndexVo vo1=ShRequester.screen$screenIndex(query); // map.put("enterprise_month",vo.getEnterprise_month()); // map.put("enterprise_year",vo.getEnterprise_year()); map.put("enterprise_month",new BigDecimal(vo.getEnterprise_month()).setScale(0,RoundingMode.HALF_UP)); map.put("enterprise_year",new BigDecimal(vo.getEnterprise_year()).setScale(0, RoundingMode.HALF_UP)); + map.put("person_month",new BigDecimal(vo1.getPerson_month()).setScale(0,RoundingMode.HALF_UP)); + map.put("person_year",new BigDecimal(vo1.getPerson_year()).setScale(0, RoundingMode.HALF_UP)); List name =new ArrayList<>(); List enterprise_power =new ArrayList<>(); + List person_power =new ArrayList<>(); for (NearVo nearVo : vo.getNear_day()) { name.add(nearVo.getName()); enterprise_power.add(nearVo.getEnterprise_power()); } + for (NearVo nearVo : vo1.getNear_day()) { + person_power.add(nearVo.getPerson_power()); + } map.put("name",name); map.put("enterprise_power",enterprise_power); + map.put("person_power",person_power); return rb.success().setData(map); } @ApiOperation("项目规格") @@ -721,7 +741,20 @@ public class DataCenterRest { LoginVo vo=ShRequester.loginTZ(); return rb.success().setData(vo); } - + @ApiOperation("监控根据") + @GetMapping("/getMonitorToken") + public ResultBean token( ){ + ResultBean rb=new ResultBean(); + BaseResponse vos=ShRequester.monitor$get_token(); + return rb.success().setData(vos.getData()); + } + @ApiOperation("监控根据") + @GetMapping("/getMonitorInfo") + public ResultBean getMonitorInfo(@RequestParam("orderSid") String orderSid){ + ResultBean rb=new ResultBean(); + BaseResponse> vos=ShRequester.monitor$get_info(orderSid); + return rb.success().setData(vos.getData().getList()); + } @ApiOperation("dingshi") @GetMapping("/rr") @Scheduled(cron = "1 0 0 * * ? ") diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/GoodsDetailsVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/GoodsDetailsVo.java new file mode 100644 index 00000000..20686949 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/GoodsDetailsVo.java @@ -0,0 +1,14 @@ +package com.yxt.supervise.report.biz.datacenter; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/11/8 16:56 + */ +@Data +public class GoodsDetailsVo { + private String goodsDetail; + private String supplierName; + private String supplierType; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java index bfd98df6..e4c10c90 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java @@ -33,6 +33,7 @@ public class ProjectDetailsVo { private String supplierName; private String supplierType; private String goodsDetail; + private List goodsDetails=new ArrayList<>(); private String tbdate;//放款日期 private BigDecimal money=new BigDecimal(0);//用信金额 @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng.java index e6b51c67..d0f66fb9 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng.java @@ -17,5 +17,6 @@ public class WarehouseInfoVoSheng { private Integer dd=0; private Integer zj=0; private Integer jg=0; + private Integer jq=0; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng1.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng1.java index 4956d367..3a39ad50 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng1.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng1.java @@ -17,5 +17,6 @@ public class WarehouseInfoVoSheng1 { private Integer dd=0; private Integer zj=0; private Integer jg=0; + private Integer jq=0; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index 78ebe071..e63a8ec5 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java @@ -103,7 +103,7 @@ public interface CrmMapper extends BaseMapper { "where a.enterpriseSid=#{enterpriseSid} and a.projectSid!='d8bf7556-6db4-46b1-87eb-f3e9f93d330f' ") List getProjectcs(@Param("enterpriseSid") String enterpriseSid); @Select("select a.* from project_phase_dictionary a " + - "where a.enterpriseSid=#{enterpriseSid}") + "where a.enterpriseSid=#{enterpriseSid} and nodeKey!='结清'") List getNodeValue(@Param("enterpriseSid") String enterpriseSid); @Select("select count(sid) from enterprise_project where enterpriseSid=#{enterpriseSid}") diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java index bf8979fe..6bae0b92 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java @@ -19,6 +19,9 @@ public class ShRequester { private static String system$order$index = "/api/system/order/index"; //工商业数据大屏 private static String system$index$login = "/api/system/index/login"; //工商业数据大屏 private static String get_order_list = "/api/screen/enterprise/get_order_list"; //工商业数据大屏 + private static String monitor$get_info = "/api/system/monitor/get_info"; //项目监控设备列表 + private static String monitor$get_token = "/api/system/monitor/get_token"; //项目监控设备列表 + private static String screen$screenIndex = "/api/screen/screen/index"; //户用 /** * 1.工商业数据大屏 * @@ -36,6 +39,19 @@ public class ShRequester { return applyMaterial; } + + public static IndexVo screen$screenIndex(IndexQuery reqParams) { + Map param = null; + A c =new A(); + if (reqParams != null) + param = BeanUtil.beanToMap(reqParams); + BaseResponse> resp = new BaseResponse<>(); + String s = ShHttp.dopost(screen$screenIndex, param); + JSONObject jsonObject=new JSONObject(s); + IndexVo applyMaterial = JSONUtil.toBean(jsonObject, IndexVo.class); + + return applyMaterial; + } public static BaseResponse> getsystem$order$index(IndexQuery reqParams) { BaseResponse> resp = new BaseResponse<>(); BaseResponseListObj respObj = new BaseResponseListObj<>(); @@ -72,7 +88,35 @@ public class ShRequester { resp.setData(respObj); return resp; } - + public static BaseResponse monitor$get_token() { + BaseResponse> resp = new BaseResponse<>(); + BaseResponseListObj respObj = new BaseResponseListObj<>(); + Map param = null; + String s = ShHttp.doGet(monitor$get_token, param); + JSONObject jsonObject=new JSONObject(s); + BaseResponse baseResponse = JSONUtil.toBean(jsonObject, BaseResponse.class); +// BaseResponse baseResponse = toBean(s, resp, respObj); + return baseResponse; + } + public static BaseResponse> monitor$get_info(String orderSid) { + BaseResponse> resp = new BaseResponse<>(); + BaseResponseListObj respObj = new BaseResponseListObj<>(); + Map param = new HashMap<>(); + param.put("order_id",orderSid); + String s = ShHttp.doGet(monitor$get_info, param); + BaseResponse> baseResponse = toBean(s, resp, respObj); + List list = baseResponse.getData().getList(); + List outStocks = new ArrayList<>(); + if(list!=null){ + for (JSONObject jsonObject : list) { + MonitorGetInfo outStock = JSONUtil.toBean(jsonObject, MonitorGetInfo.class); + outStocks.add(outStock); + } + } + respObj.setList(outStocks); + resp.setData(respObj); + return resp; + } // BaseResponse> resp = new BaseResponse<>(); // BaseResponseListObj respObj = new BaseResponseListObj<>(); // Map param = null; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/IndexVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/IndexVo.java index b8503e14..f32c5fa6 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/IndexVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/IndexVo.java @@ -6,13 +6,16 @@ import lombok.Data; import java.util.List; @Data -@ApiModel(value = "待配货列表") +@ApiModel(value = "电站发电量") public class IndexVo { private String enterprise_month; // 月 private String enterprise_year; // 年, private String enterprise_day; //日 + private String person_month; // 月 + private String person_year; // 年, + private String person_day; //日 private List near_day; // "", diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/MonitorGetInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/MonitorGetInfo.java new file mode 100644 index 00000000..2fcfac11 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/MonitorGetInfo.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.report.shanhai.resp; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/11/15 14:00 + */ +@Data +public class MonitorGetInfo { + private String channelNo; + private String deviceSerial; + private String name; + private String ptz_45; + private String ptz_left_right; + private String ptz_top_bottom; + private String ptz_zoom; + private String signal; + private String status; + private String support_sensibility_adjust; + private String url; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/NearVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/NearVo.java index 39dab912..57c15817 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/NearVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/NearVo.java @@ -12,4 +12,5 @@ import java.math.BigDecimal; public class NearVo { private String name; private BigDecimal enterprise_power=new BigDecimal(0);// + private BigDecimal person_power=new BigDecimal(0);// }