diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenter.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenter.java new file mode 100644 index 00000000..d74576c4 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenter.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.report.biz.datacenter; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/13 18:14 + */ +@Data +public class DataCenter { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterDto.java new file mode 100644 index 00000000..6796cf0a --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterDto.java @@ -0,0 +1,12 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/13 18:15 + */ +@Data +public class DataCenterDto implements Dto { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.java new file mode 100644 index 00000000..e1e8ba98 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.supervise.report.api.dailysalesreport.DailySalesReport; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author wangpengfei + * @date 2023/11/13 18:16 + */ +@Mapper +public interface DataCenterMapper extends BaseMapper { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.xml new file mode 100644 index 00000000..3cbf78df --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java new file mode 100644 index 00000000..13dea99f --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java @@ -0,0 +1,12 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/13 18:15 + */ +@Data +public class DataCenterQuery implements Query { +} 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 new file mode 100644 index 00000000..e2ecad2e --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java @@ -0,0 +1,72 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.report.biz.projectdaily.ProjectDailyQuery; +import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService; +import com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos; +import com.yxt.supervise.report.biz.projectdaily.ProjectDailys; +import com.yxt.supervise.report.feign.monitor.YDeviceFeign; +import com.yxt.supervise.report.feign.monitor.YDeviceImageFeign; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/11/13 18:15 + */ +@RestController +@RequestMapping("/datacenter") +public class DataCenterRest { + @Autowired + ProjectDailyService projectDailyService; + @Autowired + YDeviceImageFeign yDeviceImageFeign; + @Autowired + YDeviceFeign yDeviceFeign; + //数据总览 + @PostMapping("/getProjectDaily") + public ResultBean getProjectDaily(@RequestBody ProjectDailys ProjectDailys) { + ResultBean rb = ResultBean.fireFail(); +// ResultBean b=projectDailyService.ww(ProjectDailys); +// if(!b.getCode().equals("200")){ +// return b; +// } + ProjectDailyVos pv = projectDailyService.fetchByProjectAndDay("983eefd8-6109-4e8e-bc1b-71e16e644170", ProjectDailys.getOrderDate()); + return rb.success().setData(pv); + } + + //仓库安防 + @ApiOperation("获取正常视频流") + @GetMapping("/getVedioPcLiveById") + public ResultBean getVedioPcLiveById(@RequestParam String id){ + + return yDeviceImageFeign.getVedioPcLiveById(id); + } + @ApiOperation("获取回放视频流") + @GetMapping("/getVedioPcRecById") + public ResultBean getVedioPcRecById(@RequestParam String id){ + return yDeviceImageFeign.getVedioPcRecById(id); + } + @ApiOperation("获取指定设备列表") + @GetMapping("/getOtherList") + public ResultBean getOtherList(@RequestParam(value = "type") String type, @RequestParam(value = "ckId") String ckId){ + return yDeviceFeign.getOtherList(type, ckId); + } + //库存分析图 +// @PostMapping("/getProjectDailys") +// public ResultBean getProjectDailys(@RequestBody ProjectDailyQuery ProjectDailys) { +// ResultBean rb = ResultBean.fireFail(); +//// ResultBean b=projectDailyService.ww(ProjectDailys); +//// if(!b.getCode().equals("200")){ +//// return b; +//// } +// ProjectDailyVos pv = projectDailyService.fetchByProjectAndDay2(ProjectDailys); +// return rb.success().setData(pv); +// } + //告警消息 + + + + //仓库库存表 +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java new file mode 100644 index 00000000..f943b69b --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java @@ -0,0 +1,14 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.supervise.report.api.dailysalesreport.DailySalesReport; +import com.yxt.supervise.report.biz.dailysalesreport.DailySalesReportMapper; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/11/13 18:16 + */ +@Service +public class DataCenterService extends MybatisBaseService { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java index b19c40ea..c16e4fcc 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java @@ -17,4 +17,5 @@ public interface ProjectDailyMapper extends BaseMapper { IPage listPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); @Select("select * from project_daily where orderDate=#{orderDate} and projectSid=#{projectSid}") ProjectDailyVos getProjectDaily( @Param("orderDate") String orderDate, @Param("projectSid") String projectSid); + List getProjectDailys( @Param(Constants.WRAPPER) Wrapper ew); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index f87f855e..5f9d320e 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -35,6 +35,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; import java.util.*; @Service @@ -258,6 +259,29 @@ public class ProjectDailyService extends ServiceImpl qw = new QueryWrapper<>(); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +// +// params.setDataDateStart(sdf.format(DateUtil.yesterday())); +// qw.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getDataDateStart()); +// params.setDataDateEnd(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-14))); ; +// qw.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getDataDateEnd()); +// +// List projectDaily=baseMapper.getProjectDailys(qw); +// ProjectInfo projectInfo= crmMapper.getProjectBySid(params.getProjectSid()); +// if(null!=projectDaily){ +// if(null!=projectInfo) { +// projectDaily.setCreditLimit(projectInfo.getCreditLimit()); +// projectDaily.setUseLimit(projectInfo.getUseLimit()); +// projectDaily.setBankPledgeRate(projectInfo.getBankPledgeRate()); +// if (projectInfo.getBankPledgeRate() >Double.valueOf(projectDaily.getPledgeRatePercent())) { +// projectDaily.setState("1"); +// } +// } +// } +// return projectDaily; +// } public ResultBean> getAccountByProjectSid(String projectSid) { ResultBean rb=new ResultBean(); List projectStateBySid=crmMapper.getAccountByProjectSid(projectSid); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml index e5d9c0b5..929065e6 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml @@ -15,4 +15,10 @@ order by orderDate desc + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/monitor/YDeviceFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/monitor/YDeviceFeign.java new file mode 100644 index 00000000..f0c92354 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/monitor/YDeviceFeign.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.report.feign.monitor; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author wangpengfei + * @date 2023/11/14 9:36 + */ +@Api(tags = "安防系统") +@FeignClient( + contextId = "supervise-monitor-Device", + name = "supervise-monitor", + path = "device") +public interface YDeviceFeign { + @ApiOperation("获取指定设备列表") + @GetMapping("/getOtherList") + public ResultBean getOtherList(@RequestParam(value = "type") String type, @RequestParam(value = "ckId") String ckId); +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/monitor/YDeviceImageFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/monitor/YDeviceImageFeign.java new file mode 100644 index 00000000..68ef0168 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/monitor/YDeviceImageFeign.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.report.feign.monitor; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author wangpengfei + * @date 2023/11/14 9:11 + */ +@Api(tags = "安防系统") +@FeignClient( + contextId = "supervise-monitor-DeviceImgae", + name = "supervise-monitor", + path = "deviceImage") +public interface YDeviceImageFeign { + @ApiOperation("获取正常视频流") + @GetMapping("/getVedioPcLiveById") + public ResultBean getVedioPcLiveById(@RequestParam(value = "id") String id); + + @ApiOperation("获取回放视频流") + @GetMapping("/getVedioPcRecById") + public ResultBean getVedioPcRecById(@RequestParam(value = "id")String id); +}