diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGm.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGm.java index f551de1d..9a08b590 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGm.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGm.java @@ -5,6 +5,8 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import lombok.Data; +import java.util.Date; + /** * @author wangpengfei * @date 2023/7/19 15:37 @@ -13,7 +15,7 @@ import lombok.Data; @ApiModel(value = "项目规模 ", description = "项目规模") @TableName("project_sh_gm") public class ProjectShGm extends BaseEntity { - private String orderDate; + private Date orderDate; private String ztz; private String ztzCount; private String dkzc; diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGmDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGmDto.java index 50d150c0..46362211 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGmDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGmDto.java @@ -3,6 +3,8 @@ package com.yxt.supervise.crm.api.projectshgm; import com.yxt.common.core.dto.Dto; import lombok.Data; +import java.util.Date; + /** * @author wangpengfei * @date 2023/7/19 15:37 @@ -10,7 +12,7 @@ import lombok.Data; @Data public class ProjectShGmDto implements Dto { private String sid; - private String orderDate; + private Date orderDate; private String ztz; private String ztzCount; private String dkzc; diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java index 21db26d1..25db201b 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java @@ -17,6 +17,7 @@ import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.List; /** @@ -53,7 +54,8 @@ public class ProjectShGmService extends MybatisBaseService().like("orderDate",dto.getOrderDate())); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM"); + baseMapper.delete(new QueryWrapper().apply("date_format(orderDate,'%Y-%m') like '%"+sdf.format(dto.getOrderDate())+"%'")); ProjectShGm entity=new ProjectShGm(); BeanUtil.copyProperties(dto, entity, "id", "sid"); baseMapper.insert(entity); 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 67c38d9a..3bdd2f0f 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 @@ -258,13 +258,19 @@ public class DataCenterRest { projectEngineeringProgressVo.setUrls(urlVos); } } + IndexQuery query2 =new IndexQuery(); + query2.setPage("1"); + query2.setLimit("10"); + query2.setOrder_type("10"); + query2.setOrder_id(projectDetailsVo.getWarehouseCode()); + BaseResponse> vos=ShRequester.getsystem$order$index(query2); IndexQuery query1=new IndexQuery(); query1.setLimit("20"); query1.setPage("1"); - query1.setSearch_no(projectDetailsVo.getWarehouseCode()); + query1.setSearch_no(vos.getData().getList().get(0).getOrder_no()); BaseResponseListObj indexVoBaseResponseListObj =ShRequester.get_order_list(query1).getData(); if(indexVoBaseResponseListObj.getCount()!=0){ - projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); + projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); } if(info!=null){ List list=crmMapper.getProjectFilesByMainSid(info.getProjectSid()); @@ -496,10 +502,10 @@ public class DataCenterRest { Map map=new HashMap<>(); List title=new ArrayList<>(); - title.add("贷款支持-折"); - title.add("贷款支持-柱"); - title.add("总投资-折"); title.add("总投资-柱"); + title.add("总投资-折"); + title.add("贷款支持-柱"); + title.add("贷款支持-折"); map.put("titile",title); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String EndDate=sdf.format(DateUtil.offsetMonth(DateUtil.parse(query.getDate()),-7)); @@ -511,21 +517,25 @@ public class DataCenterRest { List ztz=new ArrayList<>(); for(int k=0;k> vos=ShRequester.getsystem$order$index(query2); IndexQuery query1=new IndexQuery(); query1.setLimit("20"); query1.setPage("1"); - query1.setSearch_no(projectDetailsVo.getWarehouseCode()); + query1.setSearch_no(vos.getData().getList().get(0).getOrder_no()); BaseResponseListObj indexVoBaseResponseListObj =ShRequester.get_order_list(query1).getData(); if(indexVoBaseResponseListObj.getCount()!=0){ - projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); + projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); } if(info!=null){ List list=crmMapper.getProjectFilesByMainSid(info.getProjectSid()); @@ -673,7 +689,7 @@ public class DataCenterRest { @Scheduled(cron = "1 0 0 * * ? ") public void rr(){ //山海系统 - String a ="63_17_0_2069_1,63_17_0_2048_1,63_17_0_2049_1,63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1,63_17_0_2078_1,63_17_0_2080_1,63_17_0_2087_1,63_17_0_2090_1"; + String a ="63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1"; List list=new ArrayList<>(); SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); String format = sdf.format(new Date()); @@ -692,13 +708,15 @@ public class DataCenterRest { List c =vos.getData().getList(); for (OrderIndexVo orderIndexVo : c) { String d=""; - if(orderIndexVo.getAll_power().substring(orderIndexVo.getAll_power().length()-2).equals("MW")){ +// if(orderIndexVo.getAll_power().substring(orderIndexVo.getAll_power().length()-2).equals("MW")){ + if(orderIndexVo.getAll_power().contains("MW")){ d =orderIndexVo.getAll_power().replace("MW",""); BigDecimal bigDecimal=new BigDecimal(d); bigDecimal=bigDecimal.multiply(new BigDecimal(1000000)); bigDecimal=bigDecimal.multiply(new BigDecimal(3)); ztz=ztz.add(bigDecimal); - }else if(orderIndexVo.getAll_power().substring(orderIndexVo.getAll_power().length()-2).equals("KW")){ +// }else if(orderIndexVo.getAll_power().substring(orderIndexVo.getAll_power().length()-2).equals("KW")){ + }else if(orderIndexVo.getAll_power().contains("KW")){ d =orderIndexVo.getAll_power().replace("KW",""); BigDecimal bigDecimal=new BigDecimal(d); bigDecimal=bigDecimal.multiply(new BigDecimal(1000)); @@ -713,7 +731,7 @@ public class DataCenterRest { String url ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list"; RestTemplate restTemplate = new RestTemplate(); Map sendBodyMM = new HashMap<>(); - sendBodyMM.put("engTime",format); + sendBodyMM.put("endTime",format); sendBodyMM.put("orgPath","0d19bc72-9370-45d3-bfda-5662eab34e4b"); ResponseEntity forEntity = restTemplate.postForEntity(url,sendBodyMM,String.class); List vos= d.getList(forEntity,ProjectDetailsVo.class); @@ -721,20 +739,20 @@ public class DataCenterRest { Integer dkzcCount =0; for (ProjectDetailsVo orderIndexVo : vos) { String g=""; - if(orderIndexVo.getSquareMeter().substring(orderIndexVo.getSquareMeter().length()-2).equals("MW")){ + if(orderIndexVo.getSquareMeter().contains("MW")){ g =orderIndexVo.getSquareMeter().replace("MW",""); BigDecimal bigDecimal=new BigDecimal(g); bigDecimal=bigDecimal.multiply(new BigDecimal(1000000)); bigDecimal=bigDecimal.multiply(new BigDecimal(1)); dkzc=dkzc.add(bigDecimal); - }else if(orderIndexVo.getSquareMeter().substring(orderIndexVo.getSquareMeter().length()-2).equals("KW")){ + }else if(orderIndexVo.getSquareMeter().contains("KW")){ g =orderIndexVo.getSquareMeter().replace("KW",""); BigDecimal bigDecimal=new BigDecimal(g); bigDecimal=bigDecimal.multiply(new BigDecimal(1000)); bigDecimal=bigDecimal.multiply(new BigDecimal(1)); dkzc=dkzc.add(bigDecimal); }else{ -// g =orderIndexVo.getSquareMeter().replace("MW",""); + g =orderIndexVo.getSquareMeter(); BigDecimal bigDecimal=new BigDecimal(g); bigDecimal=bigDecimal.multiply(new BigDecimal(1000000)); bigDecimal=bigDecimal.multiply(new BigDecimal(1)); @@ -757,7 +775,7 @@ public class DataCenterRest { @GetMapping("/rr1") public void rr(@RequestParam("orderDate")String orderDate){ //山海系统 - String a ="63_17_0_2069_1,63_17_0_2048_1,63_17_0_2049_1,63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1,63_17_0_2078_1,63_17_0_2080_1,63_17_0_2087_1,63_17_0_2090_1"; + String a ="63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1"; List list=new ArrayList<>(); // SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); // String format = sdf.format(new Date()); @@ -799,7 +817,8 @@ public class DataCenterRest { String url ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list"; RestTemplate restTemplate = new RestTemplate(); Map sendBodyMM = new HashMap<>(); - sendBodyMM.put("engTime",orderDate); + sendBodyMM.put("endTime",orderDate); + sendBodyMM.put("orgPath","0d19bc72-9370-45d3-bfda-5662eab34e4b"); ResponseEntity forEntity = restTemplate.postForEntity(url,sendBodyMM,String.class); List vos= d.getList(forEntity,ProjectDetailsVo.class); BigDecimal dkzc=new BigDecimal(0); @@ -822,7 +841,7 @@ public class DataCenterRest { bigDecimal=bigDecimal.multiply(new BigDecimal(1)); dkzc=dkzc.add(bigDecimal); }else{ -// g =orderIndexVo.getSquareMeter().replace("MW",""); + g =orderIndexVo.getSquareMeter(); BigDecimal bigDecimal=new BigDecimal(g); bigDecimal=bigDecimal.multiply(new BigDecimal(1000000)); bigDecimal=bigDecimal.multiply(new BigDecimal(1)); 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 63030f29..ab41950d 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 @@ -48,6 +48,6 @@ public class ProjectDetailsVo { List projectSupervisionLogList=new ArrayList<>(); ProjectSupervisionLogVo projectSupervisionLog=new ProjectSupervisionLogVo(); List urls=new ArrayList<>(); - private String totalDayPower; //发电量 + private String totalDayPower="0"; //发电量 List urlsVos=new ArrayList<>(); //监管报告 } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java index edf5e9c0..22e679fd 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java @@ -16,6 +16,7 @@ public class IndexQuery implements Query { private String order_type; private String page; private String workflow; + private String order_id; //-------------------------------------- private String nodeValue;//在建 在途 竣工 private String projectSid;// diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java index 7cc0fcc6..94099403 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java @@ -10,4 +10,5 @@ import lombok.Data; public class OrderIndexVo { private String all_power; private String total_day_power; + private String order_no; }