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

9/7

master
wangpengfei 2 years ago
parent
852f4f732a
commit
e04d214d10
8 changed files with 162 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.java
  2. 3
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.xml
  3. 6
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportRest.java
  4. 138
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportService.java
  5. 60
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
  6. 2
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java
  7. 38
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java
  8. 5
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordService.java

16
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.java
View File

@ -20,6 +20,18 @@ import java.util.Map;
*/
@Mapper
public interface DailySalesReportMapper extends BaseMapper<DailySalesReport> {
@Select("select * from daily_sales_report")
List<DailySalesReport> getSalesByDate();
@Select("select * from daily_sales_report where orderDate>#{endDate} and orderDate<=#{startDate}")
List<DailySalesReport> getSalesByDate(@Param("endDate")String endDate,@Param("startDate")String startDate);
double lwlsdTotalSales(@Param("orderDate")String orderDate);
@Select("select lsnjnTotalSales from daily_sales_report where orderDate=#{orderDate} ")
double lsnjnTotalSales(@Param("orderDate")String orderDate);
@Select("select pszxTotalSales from daily_sales_report where orderDate=#{orderDate} ")
double pszxTotalSales(@Param("orderDate")String orderDate);
@Select("select lswjmTotalSales from daily_sales_report where orderDate=#{orderDate} ")
double lswjmTotalSales(@Param("orderDate")String orderDate);
@Select("select bymdcTotalSales from daily_sales_report where orderDate=#{orderDate} ")
double bymdcTotalSales(@Param("orderDate")String orderDate);
@Select("select yclswjmTotalSales from daily_sales_report where orderDate=#{orderDate} ")
double yclswjmTotalSales(@Param("orderDate")String orderDate);
}

3
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.xml
View File

@ -5,4 +5,7 @@
<!-- ${ew.customSqlSegment} -->
<select id="lwlsdTotalSales" resultType="double">
select lwlsdTotalSales from daily_sales_report where orderDate=#{orderDate}
</select>
</mapper>

6
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportRest.java
View File

@ -27,10 +27,10 @@ public class DailySalesReportRest {
ResultBean rb = ResultBean.fireFail();
return DailySalesReportService.saveSales(orderDate);
}
@PostMapping("/getSalesByDate")
public ResultBean<DailySalesReportVo> getSalesByDate(@RequestBody DailySalesReportQuery pq){
@GetMapping("/getSalesByDate/{orderDate}")
public ResultBean<DailySalesReportVo> getSalesByDate(@PathVariable("orderDate") String orderDate){
ResultBean rb = ResultBean.fireFail();
return DailySalesReportService.getSalesByDate(pq);
return DailySalesReportService.getSalesByDate(orderDate);
}
@PostMapping("/test")
public ResultBean test( ) throws ParseException {

138
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportService.java
View File

@ -1,8 +1,11 @@
package com.yxt.supervise.report.biz.dailysalesreport;
import cn.hutool.Hutool;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.report.api.dailysalesreport.DailySalesReport;
import com.yxt.supervise.report.api.dailysalesreport.DailySalesReportQuery;
@ -54,64 +57,72 @@ public class DailySalesReportService extends MybatisBaseService<DailySalesReport
return rb;
}
public ResultBean getSalesByDate(DailySalesReportQuery pq) {
public ResultBean getSalesByDate(String orderDate) {
ResultBean rb=new ResultBean<>();
List<DailySalesReport> dailySalesReports=baseMapper.getSalesByDate();
List<List<String>> financialAnalysisChartData=convert(dailySalesReports);
String startDate="";
String endDate="";
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
if(StringUtils.isNull(orderDate)){
startDate=ft.format(DateUtil.yesterday());
endDate=ft.format(DateUtil.offset(DateUtil.yesterday(), DateField.DAY_OF_MONTH,-7));
}else {
startDate=ft.format(DateUtil.parse(orderDate));
Date ent=DateUtil.parse(orderDate);
endDate=ft.format(DateUtil.offset(ent, DateField.DAY_OF_MONTH,-7));
}
List<DailySalesReport> dailySalesReports=baseMapper.getSalesByDate(endDate,startDate);
List<String[]> financialAnalysisChartData=convert(dailySalesReports);
Map<String,Object> map=new HashMap<>();
map.put("financialAnalysisChartData",financialAnalysisChartData);
List<ListSalesChannelData> listSalesChannelData=salesChanne(pq.getOrderDate());
List<ListSalesChannelData> listSalesChannelData=salesChanne(startDate);
map.put("listSalesChannelData",listSalesChannelData);
// List<FinancialData> financialData=new ArrayList<>();
// FinancialData financialData1=new FinancialData();
// financialData1.setName("销售商品收到的现金(元)");
// financialData1.setTotalPrice("637774.16");
// FinancialData financialData2=new FinancialData();
// financialData2.setName("销售商品收到的现金(元)");
// financialData2.setTotalPrice("637774.16");
// financialData.add(financialData1);
// financialData.add(financialData2);
// map.put("financialData",financialData);
return rb.success().setData(map);
}
public List<ListSalesChannelData> salesChanne(String orderDate){
List<ListSalesChannelData> list=new ArrayList<>();
double lwlsdTotalSales=baseMapper.selectOne(new QueryWrapper<DailySalesReport>().eq("orderDate",orderDate)).getLwlsdTotalSales();
ListSalesChannelData lwlsd=new ListSalesChannelData();
lwlsd.setDeductionAccountsReceivable(String.valueOf(lwlsdTotalSales));
lwlsd.setSalesChannelCategory("连网连锁店");
lwlsd.setTotalAmount(String.valueOf(lwlsdTotalSales));
lwlsd.setAccountsReceivable("0");
double lsnjnTotalSales=baseMapper.selectOne(new QueryWrapper<DailySalesReport>().eq("orderDate",orderDate)).getLsnjnTotalSales();
ListSalesChannelData lsnjn=new ListSalesChannelData();
lsnjn.setDeductionAccountsReceivable(String.valueOf(lsnjnTotalSales));
lsnjn.setSalesChannelCategory("连锁内加盟");
lsnjn.setTotalAmount(String.valueOf(lsnjnTotalSales));
lsnjn.setAccountsReceivable("0");
double pszxTotalSales=baseMapper.selectOne(new QueryWrapper<DailySalesReport>().eq("orderDate",orderDate)).getPszxTotalSales();
ListSalesChannelData pszx=new ListSalesChannelData();
pszx.setDeductionAccountsReceivable(String.valueOf(pszxTotalSales));
pszx.setSalesChannelCategory("配送中心");
pszx.setTotalAmount(String.valueOf(pszxTotalSales));
pszx.setAccountsReceivable("0");
double lswjmTotalSales=baseMapper.selectOne(new QueryWrapper<DailySalesReport>().eq("orderDate",orderDate)).getLswjmTotalSales();
ListSalesChannelData lswjm=new ListSalesChannelData();
lswjm.setDeductionAccountsReceivable(String.valueOf(lswjmTotalSales));
lswjm.setSalesChannelCategory("连锁外加盟");
lswjm.setTotalAmount(String.valueOf(lswjmTotalSales));
lswjm.setAccountsReceivable("0");
double bymdcTotalSales=baseMapper.selectOne(new QueryWrapper<DailySalesReport>().eq("orderDate",orderDate)).getBymdcTotalSales();
ListSalesChannelData bymdc=new ListSalesChannelData();
bymdc.setDeductionAccountsReceivable(String.valueOf(bymdcTotalSales));
bymdc.setSalesChannelCategory("36524集团报烟门店仓");
bymdc.setTotalAmount(String.valueOf(bymdcTotalSales));
bymdc.setAccountsReceivable("0");
double yclswjmTotalSales=baseMapper.selectOne(new QueryWrapper<DailySalesReport>().eq("orderDate",orderDate)).getYclswjmTotalSales();
ListSalesChannelData yclswjm=new ListSalesChannelData();
yclswjm.setDeductionAccountsReceivable(String.valueOf(yclswjmTotalSales));
yclswjm.setSalesChannelCategory("烟草连锁外加盟");
yclswjm.setTotalAmount(String.valueOf(yclswjmTotalSales));
yclswjm.setAccountsReceivable("0");
double lwlsdTotalSales=0;
double lsnjnTotalSales=0;
double pszxTotalSales=0;
double lswjmTotalSales=0;
double bymdcTotalSales=0;
double yclswjmTotalSales=0;
lwlsdTotalSales=baseMapper.lwlsdTotalSales(orderDate);
ListSalesChannelData lwlsd=new ListSalesChannelData();
lwlsd.setDeductionAccountsReceivable(String.valueOf(lwlsdTotalSales));
lwlsd.setSalesChannelCategory("连网连锁店");
lwlsd.setTotalAmount(String.valueOf(lwlsdTotalSales));
lwlsd.setAccountsReceivable("0");
lsnjnTotalSales=baseMapper.lsnjnTotalSales(orderDate);
ListSalesChannelData lsnjn=new ListSalesChannelData();
lsnjn.setDeductionAccountsReceivable(String.valueOf(lsnjnTotalSales));
lsnjn.setSalesChannelCategory("连锁内加盟");
lsnjn.setTotalAmount(String.valueOf(lsnjnTotalSales));
lsnjn.setAccountsReceivable("0");
pszxTotalSales=baseMapper.pszxTotalSales(orderDate);
ListSalesChannelData pszx=new ListSalesChannelData();
pszx.setDeductionAccountsReceivable(String.valueOf(pszxTotalSales));
pszx.setSalesChannelCategory("配送中心");
pszx.setTotalAmount(String.valueOf(pszxTotalSales));
pszx.setAccountsReceivable("0");
lswjmTotalSales=baseMapper.lswjmTotalSales(orderDate);
ListSalesChannelData lswjm=new ListSalesChannelData();
lswjm.setDeductionAccountsReceivable(String.valueOf(lswjmTotalSales));
lswjm.setSalesChannelCategory("连锁外加盟");
lswjm.setTotalAmount(String.valueOf(lswjmTotalSales));
lswjm.setAccountsReceivable("0");
bymdcTotalSales=baseMapper.bymdcTotalSales(orderDate);
ListSalesChannelData bymdc=new ListSalesChannelData();
bymdc.setDeductionAccountsReceivable(String.valueOf(bymdcTotalSales));
bymdc.setSalesChannelCategory("36524集团报烟门店仓");
bymdc.setTotalAmount(String.valueOf(bymdcTotalSales));
bymdc.setAccountsReceivable("0");
yclswjmTotalSales=baseMapper.yclswjmTotalSales(orderDate);
ListSalesChannelData yclswjm=new ListSalesChannelData();
yclswjm.setDeductionAccountsReceivable(String.valueOf(yclswjmTotalSales));
yclswjm.setSalesChannelCategory("烟草连锁外加盟");
yclswjm.setTotalAmount(String.valueOf(yclswjmTotalSales));
yclswjm.setAccountsReceivable("0");
list.add(lwlsd);
list.add(lsnjn);
list.add(pszx);
@ -120,25 +131,16 @@ public class DailySalesReportService extends MybatisBaseService<DailySalesReport
list.add(yclswjm);
return list;
}
public List<List<String>> convert(List<DailySalesReport> list){
List<List<String>> lists=new ArrayList<>();
List<String> date=new ArrayList<>();
date.add("日期");
date.add("连网连锁店");
date.add("连锁内加盟");
date.add("配送中心");
date.add("连锁外加盟");
date.add("36524集团报烟门店仓");
date.add("烟草连锁外加盟");
lists.add(date);
public List<String[]> convert(List<DailySalesReport> list){
List<String[]> lists=new ArrayList<>();
//List<String> date=new ArrayList<>();
String [] strings={"日期","连网连锁店","连锁内加盟","配送中心","连锁外加盟","36524集团报烟门店仓","烟草连锁外加盟"};
lists.add(strings);
for(DailySalesReport dailySalesReport:list){
date.add(dailySalesReport.getOrderDate());
date.add(String.valueOf(dailySalesReport.getLwlsdTotalSales()));
date.add(String.valueOf(dailySalesReport.getLsnjnTotalSales()));
date.add(String.valueOf(dailySalesReport.getPszxTotalSales()));
date.add(String.valueOf(dailySalesReport.getLswjmTotalSales()));
date.add(String.valueOf(dailySalesReport.getBymdcTotalSales()));
date.add(String.valueOf(dailySalesReport.getYclswjmTotalSales()));
String [] strings1={dailySalesReport.getOrderDate(),String.valueOf(dailySalesReport.getLwlsdTotalSales()),String.valueOf(dailySalesReport.getLsnjnTotalSales()),
String.valueOf(dailySalesReport.getPszxTotalSales()),String.valueOf(dailySalesReport.getLswjmTotalSales()),String.valueOf(dailySalesReport.getBymdcTotalSales()),
String.valueOf(dailySalesReport.getYclswjmTotalSales())};
lists.add(strings1);
}
return lists;
}

60
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
View File

@ -314,16 +314,16 @@ public class WechatRest {
List<String> mobiles=new ArrayList<>();
openIds.add("oA-GE69cBwiWG5Tx5R3vvy60o8qk");
mobiles.add("15932270269");
openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs");
mobiles.add("18603312020");
openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo");
mobiles.add("13513219196");
openIds.add("oA-GE67j581HgEsim_waItx2KOzE");
mobiles.add("13513211777");
openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y");
mobiles.add("13623307393");
openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE");
mobiles.add("13131170271");
// openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs");
// mobiles.add("18603312020");
// openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo");
// mobiles.add("13513219196");
// openIds.add("oA-GE67j581HgEsim_waItx2KOzE");
// mobiles.add("13513211777");
// openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y");
// mobiles.add("13623307393");
// openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE");
// mobiles.add("13131170271");
// for(UserProject u:user){
// SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid());
// if(null!=sysUser) {
@ -351,16 +351,16 @@ public class WechatRest {
List<String> mobiles=new ArrayList<>();
openIds.add("oA-GE69cBwiWG5Tx5R3vvy60o8qk");
mobiles.add("15932270269");
openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs");
mobiles.add("18603312020");
openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo");
mobiles.add("13513219196");
openIds.add("oA-GE67j581HgEsim_waItx2KOzE");
mobiles.add("13513211777");
openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y");
mobiles.add("13623307393");
openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE");
mobiles.add("13131170271");
// openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs");
// mobiles.add("18603312020");
// openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo");
// mobiles.add("13513219196");
// openIds.add("oA-GE67j581HgEsim_waItx2KOzE");
// mobiles.add("13513211777");
// openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y");
// mobiles.add("13623307393");
// openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE");
// mobiles.add("13131170271");
// for(UserProject u:user){
// SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid());
// if(null!=sysUser) {
@ -387,16 +387,16 @@ public class WechatRest {
List<String> mobiles=new ArrayList<>();
openIds.add("oA-GE69cBwiWG5Tx5R3vvy60o8qk");
mobiles.add("15932270269");
openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs");
mobiles.add("18603312020");
openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo");
mobiles.add("13513219196");
openIds.add("oA-GE67j581HgEsim_waItx2KOzE");
mobiles.add("13513211777");
openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y");
mobiles.add("13623307393");
openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE");
mobiles.add("13131170271");
// openIds.add("oA-GE68JFODQucAXkJQYHPoFOAgs");
// mobiles.add("18603312020");
// openIds.add("oA-GE68gus7lbb-oy4iqCF0ZhNgo");
// mobiles.add("13513219196");
// openIds.add("oA-GE67j581HgEsim_waItx2KOzE");
// mobiles.add("13513211777");
// openIds.add("oA-GE67P_1xD1uKBcexK3wWtFO5Y");
// mobiles.add("13623307393");
// openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE");
// mobiles.add("13131170271");
// for(UserProject u:user){
// SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid());
// if(null!=sysUser) {

2
yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java
View File

@ -52,4 +52,6 @@ public class RiskAlarmRest implements RiskAlarmFeign {
// public ResultBean sendVerificationCode(@PathVariable("mobile") String mobile,@PathVariable("type") String type){
// return riskAlarmService.sendVerificationCode(mobile, type);
// }
}

38
yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java
View File

@ -123,7 +123,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
RiskAlarm riskAlarm = new RiskAlarm();
BeanUtil.copyProperties(dto, riskAlarm);
//最后提交时间
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd hh:mm");
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String date=ft.format(new Date());
RiskRecordDto riskRecord=new RiskRecordDto();
//riskRecord.setCode("030405");
@ -198,4 +198,40 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
Date newDate = c.getTime();
return newDate;
}
//@Scheduled(cron = "0/30 * * * * ?")
public void build() throws InterruptedException {
System.out.println("设备状态");
RiskAlarmDto dto=new RiskAlarmDto();
List<Device> list=new ArrayList<>();
Device device=new Device();
device.setName("东北角的摄像头");
device.setSerialNumber("L28475439");
device.setStatus("断网");
list.add(device);
dto.setSid("19eea5cc-005d-494b-b52b-4e948bc35345");
dto.setSendTime("2023-09-03 11:20:36");
dto.setName("中通樊家屯仓");
dto.setErrorCount("1");
dto.setDevices(list);
saveRisk(dto);
}
//@Scheduled(cron = "0/30 * * * * ?")
public void build1() throws InterruptedException {
System.out.println("图片对比");
RiskAlarmDto dto=new RiskAlarmDto();
List<DeviceImages> list=new ArrayList<>();
DeviceImages deviceImages=new DeviceImages();
deviceImages.setName("东北角的摄像头");
deviceImages.setStartImage("202309031430433.png");
deviceImages.setEndImage("202309031431563.png");
deviceImages.setSimilarity("80%");
deviceImages.setStartTime("2023-09-03 14:30:44");
deviceImages.setEndTime("2023-09-03 14:31:56");
list.add(deviceImages);
dto.setSid("19eea5cc-005d-494b-b52b-4e948bc35345");
dto.setSendTime("2023-09-03 11:20:36");
dto.setName("中通樊家屯仓");
dto.setDeviceImages(list);
contrast(dto);
}
}

5
yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordService.java
View File

@ -49,10 +49,11 @@ public class RiskRecordService extends MybatisBaseService<RiskRecordMapper, Risk
/**
* 定时查询推送情况
*/
@Scheduled(cron = "57 * * * * ?")
@Scheduled(cron = "55 * * * * ?")
public void build() throws InterruptedException {
//Thread.sleep(58000);
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
System.out.println("查询推送情况");
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String date=ft.format(new Date());
RiskAlarm riskAlarm = new RiskAlarm();
System.out.println(date);

Write Preview
Loading…
Cancel
Save