yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

山海数据大屏

master
wangpengfei 7 months ago
parent
ce8862ee94
commit
0f7b581ba4
5 changed files with 122 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java
  2. 13
      yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java
  3. 162
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java
  4. 16
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
  5. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java

11
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java
View File

@ -259,6 +259,17 @@ public class ProjectCreditBalanceService extends MybatisBaseService<ProjectCredi
dtos.add(projectCreditFileDto); dtos.add(projectCreditFileDto);
} }
projectCreditFileService.insertByDto(dtos); projectCreditFileService.insertByDto(dtos);
// ProjectInformation projectInformation=projectInformationService.getOne(new QueryWrapper<ProjectInformation>().eq("sid",dto.getProjectsid()));
// if("2".equals(dto.getType())){
// BigDecimal bigDecimal=new BigDecimal(projectInformation.getUseLimit());
// bigDecimal=bigDecimal.subtract(new BigDecimal(dto.getMoney()));
// projectInformation.setUseLimit(bigDecimal.toString());
// }else if("1".equals(dto.getType())){
// BigDecimal bigDecimal=new BigDecimal(projectInformation.getUseLimit());
// bigDecimal=bigDecimal.add(new BigDecimal(dto.getMoney()));
// projectInformation.setUseLimit(bigDecimal.toString());
// }
// projectInformationService.updateById(projectInformation);
} }
public ProjectCreditBalanceDetailsVo fetchDetailsVoBySid(String sid){ public ProjectCreditBalanceDetailsVo fetchDetailsVoBySid(String sid){

13
yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java
View File

@ -84,13 +84,14 @@ public class ProjectCreditFileService extends MybatisBaseService<ProjectCreditFi
// } // }
public void insertByDto(List<ProjectCreditFileDto> dtos){ public void insertByDto(List<ProjectCreditFileDto> dtos){
baseMapper.delete(new QueryWrapper<ProjectCreditFile>().eq("mainsid", dtos.get(0).getMainsid())); if(dtos.size()!=0){
for (ProjectCreditFileDto dto : dtos) { baseMapper.delete(new QueryWrapper<ProjectCreditFile>().eq("mainsid", dtos.get(0).getMainsid()));
ProjectCreditFile entity = new ProjectCreditFile(); for (ProjectCreditFileDto dto : dtos) {
BeanUtil.copyProperties(dto, entity, "id", "sid"); ProjectCreditFile entity = new ProjectCreditFile();
baseMapper.insert(entity); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
} }
} }
public void updateByDto(ProjectCreditFileDto dto){ public void updateByDto(ProjectCreditFileDto dto){

162
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java
View File

@ -218,8 +218,24 @@ public class DataCenterRest {
List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
sendBodyMM.put("orgPath",projectInfo.get(0).getEnterpriseSid()); sendBodyMM.put("orgPath",projectInfo.get(0).getEnterpriseSid());
List<ProjectDetailsVo> projectDetailsVos=c.getList(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class); List<ProjectDetailsVo> projectDetailsVos=c.getList(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class);
for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) {
ProjectInfo info= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); return rb.success().setData(projectDetailsVos);
}
//@Todo 山海光伏大屏数据接口
@ApiOperation("获取仓库地址及经纬度")
@PostMapping("/getWarehouseAddressDetail/{shSid}")
public ResultBean getWarehouseAddressDetail(@PathVariable("shSid") String shSid){
ResultBean rb= new ResultBean().fail();
A c=new A();
String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/getWarehouseBySid/"+shSid;
// String a ="http://192.168.0.105:6023/apiadmin/warehouseinfo/list";
ProjectDetailsVo projectDetailsVo= (ProjectDetailsVo) c.getObject(new RestTemplate().getForEntity(a, String.class),ProjectDetailsVo.class);
List<ProjectInfo> infos= crmMapper.getProjectByShSid(projectDetailsVo.getSid());
List<String> sids=new ArrayList<>();
for (ProjectInfo info : infos) {
if(info!=null){ if(info!=null){
String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid());
projectDetailsVo.setCreditStage(nodde); projectDetailsVo.setCreditStage(nodde);
@ -227,11 +243,12 @@ public class DataCenterRest {
if(null!=info){ if(null!=info){
List<ShCreditBalanceCrmVo> vos=crmMapper.getBalanceByProjectSid(info.getProjectSid()); List<ShCreditBalanceCrmVo> vos=crmMapper.getBalanceByProjectSid(info.getProjectSid());
List<String> s=new ArrayList<>(); List<String> s=new ArrayList<>();
for (ShCreditBalanceCrmVo vo : vos) { for (ShCreditBalanceCrmVo vo : vos) {
if(vo.getType().equals("1")){ if(vo.getType().equals("1")){
// String nodde=crmMapper.getNodeValueByProjectSid(info.getSid()); // String nodde=crmMapper.getNodeValueByProjectSid(info.getSid());
projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate()); projectDetailsVo.setExpectedCompletionDate(DateUtil.parse(vo.getExpectedCompletionDate()));
projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate()); projectDetailsVo.setExpectedDeliveryDate(DateUtil.parse(vo.getExpectedDeliveryDate()));
// projectDetailsVo.setCreditStage(nodde); // projectDetailsVo.setCreditStage(nodde);
projectDetailsVo.setCreditNature(vo.getCreditNature()); projectDetailsVo.setCreditNature(vo.getCreditNature());
projectDetailsVo.setTbdate(vo.getTbdate()); projectDetailsVo.setTbdate(vo.getTbdate());
@ -258,32 +275,29 @@ public class DataCenterRest {
projectEngineeringProgressVo.setUrls(urlVos); projectEngineeringProgressVo.setUrls(urlVos);
} }
} }
IndexQuery query2 =new IndexQuery(); sids.add(info.getProjectSid());
query2.setPage("1"); }
query2.setLimit("10"); IndexQuery query2 =new IndexQuery();
query2.setOrder_type("10"); query2.setPage("1");
query2.setOrder_id(projectDetailsVo.getWarehouseCode()); query2.setLimit("10");
BaseResponse<BaseResponseListObj<OrderIndexVo>> vos=ShRequester.getsystem$order$index(query2); query2.setOrder_type("10");
IndexQuery query1=new IndexQuery(); query2.setOrder_id(projectDetailsVo.getWarehouseCode());
query1.setLimit("20"); BaseResponse<BaseResponseListObj<OrderIndexVo>> vos=ShRequester.getsystem$order$index(query2);
query1.setPage("1"); IndexQuery query1=new IndexQuery();
query1.setSearch_no(vos.getData().getList().get(0).getOrder_no()); query1.setLimit("20");
BaseResponseListObj<OrderIndexVo> indexVoBaseResponseListObj =ShRequester.get_order_list(query1).getData(); query1.setPage("1");
if(indexVoBaseResponseListObj.getCount()!=0){ query1.setSearch_no(vos.getData().getList().get(0).getOrder_no());
projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); BaseResponseListObj<OrderIndexVo> indexVoBaseResponseListObj =ShRequester.get_order_list(query1).getData();
} if(indexVoBaseResponseListObj.getCount()!=0){
if(info!=null){ projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power());
List<UrlsVo> list=crmMapper.getProjectFilesByMainSid(info.getProjectSid()); }
if(list.size()!=0){ List<UrlsVo> list=crmMapper.getProjectFilesByMainSid(sids.toArray());
projectDetailsVo.setUrlsVos(list); if(list.size()!=0){
} projectDetailsVo.setUrlsVos(list);
}
} }
return rb.success().setData(projectDetailsVos);
}
return rb.success().setData(projectDetailsVo);
}
@ApiOperation("项目概况") @ApiOperation("项目概况")
@ -607,48 +621,52 @@ public class DataCenterRest {
projectDetailsVos.add(d); projectDetailsVos.add(d);
} }
for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) { for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) {
ProjectInfo info= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); List<ProjectInfo> infos= crmMapper.getProjectByShSid(projectDetailsVo.getSid());
if(null!=info){ List<String> sids=new ArrayList<>();
List<ShCreditBalanceCrmVo> vos=crmMapper.getBalanceByProjectSid(info.getProjectSid()); for (ProjectInfo info : infos) {
if(info!=null){ if(null!=info){
String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); List<ShCreditBalanceCrmVo> vos=crmMapper.getBalanceByProjectSid(info.getProjectSid());
projectDetailsVo.setCreditStage(nodde); if(info!=null){
} String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid());
List<String> s=new ArrayList<>(); projectDetailsVo.setCreditStage(nodde);
for (ShCreditBalanceCrmVo vo : vos) { }
if(vo.getType().equals("1")){ List<String> s=new ArrayList<>();
projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate()); for (ShCreditBalanceCrmVo vo : vos) {
projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate()); if(vo.getType().equals("1")){
projectDetailsVo.setCreditNature(vo.getCreditNature()); projectDetailsVo.setExpectedCompletionDate(DateUtil.parse(vo.getExpectedCompletionDate()));
projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney())); projectDetailsVo.setExpectedDeliveryDate(DateUtil.parse(vo.getExpectedDeliveryDate()));
projectDetailsVo.setTbdate(vo.getTbdate()); projectDetailsVo.setCreditNature(vo.getCreditNature());
}else{ projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney())); projectDetailsVo.setTbdate(vo.getTbdate());
}else{
projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
}
s.add(vo.getSid());
}
if(s.size()!=0){
List<String> vos9=projectCreditFileFeign.getUrlsByMainsid(s).getData();
projectDetailsVo.setUrls(vos9);
}
List<ProjectEngineeringProgressVo> vos1=crmMapper.getEngineeringByProject(info.getProjectSid());
for (ProjectEngineeringProgressVo projectEngineeringProgressVo : vos1) {
List<UrlsVo> urlVos=crmMapper.getEnginProgFile(projectEngineeringProgressVo.getSid());
projectEngineeringProgressVo.setUrls(urlVos);
}
projectDetailsVo.setProjectEngineeringList(vos1);
if(vos1.size()!=0){
projectDetailsVo.setProjectEngineeringProgress(vos1.get(0));
}
List<ProjectSupervisionLogVo> vo33=crmMapper.getLogByProject(info.getProjectSid());
for (ProjectSupervisionLogVo projectSupervisionLogVo : vo33) {
List<UrlsVo> urlVos=crmMapper.getSupervisionLogFile(projectSupervisionLogVo.getSid());
projectSupervisionLogVo.setUrls(urlVos);
}
projectDetailsVo.setProjectSupervisionLogList(vo33);
if(vo33.size()!=0){
projectDetailsVo.setProjectSupervisionLog(vo33.get(0));
} }
s.add(vo.getSid());
}
if(s.size()!=0){
List<String> vos9=projectCreditFileFeign.getUrlsByMainsid(s).getData();
projectDetailsVo.setUrls(vos9);
}
List<ProjectEngineeringProgressVo> vos1=crmMapper.getEngineeringByProject(info.getProjectSid());
for (ProjectEngineeringProgressVo projectEngineeringProgressVo : vos1) {
List<UrlsVo> urlVos=crmMapper.getEnginProgFile(projectEngineeringProgressVo.getSid());
projectEngineeringProgressVo.setUrls(urlVos);
}
projectDetailsVo.setProjectEngineeringList(vos1);
if(vos1.size()!=0){
projectDetailsVo.setProjectEngineeringProgress(vos1.get(0));
}
List<ProjectSupervisionLogVo> vo33=crmMapper.getLogByProject(info.getProjectSid());
for (ProjectSupervisionLogVo projectSupervisionLogVo : vo33) {
List<UrlsVo> urlVos=crmMapper.getSupervisionLogFile(projectSupervisionLogVo.getSid());
projectSupervisionLogVo.setUrls(urlVos);
}
projectDetailsVo.setProjectSupervisionLogList(vo33);
if(vo33.size()!=0){
projectDetailsVo.setProjectSupervisionLog(vo33.get(0));
} }
sids.add(info.getProjectSid());
} }
IndexQuery query2 =new IndexQuery(); IndexQuery query2 =new IndexQuery();
query2.setPage("1"); query2.setPage("1");
@ -664,11 +682,9 @@ public class DataCenterRest {
if(indexVoBaseResponseListObj.getCount()!=0){ if(indexVoBaseResponseListObj.getCount()!=0){
projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":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<UrlsVo> list=crmMapper.getProjectFilesByMainSid(sids.toArray());
List<UrlsVo> list=crmMapper.getProjectFilesByMainSid(info.getProjectSid()); if(list.size()!=0){
if(list.size()!=0){ projectDetailsVo.setUrlsVos(list);
projectDetailsVo.setUrlsVos(list);
}
} }
} }
js1.setRecords(projectDetailsVos); js1.setRecords(projectDetailsVos);

16
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
View File

@ -185,7 +185,7 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
@Select("select * from enterprise_project where projectSid=#{projectSid}") @Select("select * from enterprise_project where projectSid=#{projectSid}")
List<ProjectInfo> getEnterByProjetSid(@Param("projectSid") String projectSid); List<ProjectInfo> getEnterByProjetSid(@Param("projectSid") String projectSid);
@Select("select * from storehouse_project where shSid=#{shSid}") @Select("select * from storehouse_project where shSid=#{shSid}")
ProjectInfo getProjectByShSid(@Param("shSid") String shSid); List<ProjectInfo> getProjectByShSid(@Param("shSid") String shSid);
@Select("select type,money ,tbdate ,expectedCompletionDate ,expectedDeliveryDate,creditNature,creditStage from project_credit_balance where projectSid=#{projectSid} and type='1'") @Select("select type,money ,tbdate ,expectedCompletionDate ,expectedDeliveryDate,creditNature,creditStage from project_credit_balance where projectSid=#{projectSid} and type='1'")
List<ShCreditBalanceCrmVo> getBalanceByProjectSid(@Param("projectSid") String projectSid); List<ShCreditBalanceCrmVo> getBalanceByProjectSid(@Param("projectSid") String projectSid);
@Select("select * from project_engineering_progress where projectSid=#{projectSid} order by orderDate desc") @Select("select * from project_engineering_progress where projectSid=#{projectSid} order by orderDate desc")
@ -203,6 +203,16 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
List<UrlsVo> getSupervisionLogFile(@Param("mainSid") String mainSid); List<UrlsVo> getSupervisionLogFile(@Param("mainSid") String mainSid);
@Select("select * from project_engin_prog_file where mainSid=#{mainSid}") @Select("select * from project_engin_prog_file where mainSid=#{mainSid}")
List<UrlsVo> getEnginProgFile(@Param("mainSid") String mainSid); List<UrlsVo> getEnginProgFile(@Param("mainSid") String mainSid);
@Select("select * from project_files where mainSid=#{mainSid}") @Select({
List<UrlsVo> getProjectFilesByMainSid(@Param("mainSid") String mainSid); "<script>",
"select",
" *",
"from project_files",
"where mainSid in",
"<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach> ",
"</script>"
})
List<UrlsVo> getProjectFilesByMainSid(@Param("ids") Object[] ids);
} }

4
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java
View File

@ -19,8 +19,8 @@ public class ShCreditBalanceCrmVo {
private String projectname; private String projectname;
private String enterpriseSid; private String enterpriseSid;
private String enterpriseName; private String enterpriseName;
private Date expectedCompletionDate;//预计完工日期 private String expectedCompletionDate;//预计完工日期
private Date expectedDeliveryDate;//预计到货日期 private String expectedDeliveryDate;//预计到货日期
private String creditNature;//用信性质 private String creditNature;//用信性质
private String creditStage;//用信阶段 private String creditStage;//用信阶段
private String pzfile; private String pzfile;

Write Preview
Loading…
Cancel
Save