111

yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/CrawlTask.java

@@ -29,7 +29,7 @@ public class CrawlTask {
      */
     @Scheduled(cron = "0 30 10 * * ?")
     public void pullZhjData() {
-        String currDay = DateUtil.format(new Date(), "yyyy-MM-dd");
+        String currDay = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd");
         ThreadUtil.execute(() -> crawlSalesAmountService.pullData(currDay));
         ThreadUtil.execute(() -> crawlSalesDishesService.pullData(currDay));
         ThreadUtil.execute(() -> crawlPurchaseService.pullData(currDay));

yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountService.java

@@ -1,6 +1,7 @@
 package com.yxt.supervise.dbcenter.zhj.crawl.biz.crawlSalesAmount;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -40,7 +41,7 @@ public class CrawlSalesAmountService extends ServiceImpl<CrawlSalesAmountMapper,
         CrawlSalesAmountQuery query = pq.getParams();
         QueryWrapper<CrawlSalesAmount> qw = new QueryWrapper<>();
         if (query != null){
-            if (query.getStoreName() != null){
+            if (StrUtil.isNotBlank(query.getStoreName())){
                 qw.eq("a.storeName",query.getStoreName());
             }
             if (query.getFromTime() != null && !query.getFromTime().equals("")){
@@ -54,15 +55,38 @@ public class CrawlSalesAmountService extends ServiceImpl<CrawlSalesAmountMapper,
             }
         }
         IPage<CrawlSalesAmount> page = PagerUtil.queryToPage(pq);
-        IPage<CrawlSalesAmountVo> pagging = baseMapper.selectPageVo(page, qw);
+        IPage<CrawlSalesAmount> crawlSalesAmountIPage = baseMapper.selectPage(page, qw);
-        PagerVo<CrawlSalesAmountVo> pv = PagerUtil.pageToVo(pagging, null);
+        List<CrawlSalesAmount> records = crawlSalesAmountIPage.getRecords();
-        List<CrawlSalesAmountVo> records = pv.getRecords();
+        List<CrawlSalesAmountVo> voList = new ArrayList<>();
-        for (CrawlSalesAmountVo record : records) {
+        for (CrawlSalesAmount csa: records){
-            record.setOils(record.getSalesAmount()*50*0.01);
+            CrawlSalesAmountVo vo = new CrawlSalesAmountVo();
-            record.setRice(record.getSalesAmount()*30*0.01);
+            vo.setEnpName("中鸿记");
-            record.setFace(record.getSalesAmount()*20*0.01);
+            String storeName = csa.getStoreName();
-            record.setTotalCount(record.getOils()+record.getRice()+record.getFace());
+            if("熟溢香振头店".equals(storeName)){
+                vo.setName("熟溢香");
+            }else{
+                vo.setName("馍馍卤");
+            }
+            vo.setOils(csa.getSalesAmount()*50*0.01);
+            vo.setRice(csa.getSalesAmount()*30*0.01);
+            vo.setFace(csa.getSalesAmount()*20*0.01);
+            vo.setTotalCount(vo.getOils()+vo.getRice()+vo.getFace());
+            BeanUtil.copyProperties(csa,vo);
+            voList.add(vo);
         }
+
+        PagerVo<CrawlSalesAmountVo> pvo = new PagerVo<>();
+        pvo.setRecords(voList);
+        PagerVo<CrawlSalesAmountVo> pv = PagerUtil.pageToVo(crawlSalesAmountIPage, pvo);
+//        IPage<CrawlSalesAmountVo> pagging = baseMapper.selectPage();//.selectPageVo(page, qw);
+//        PagerVo<CrawlSalesAmountVo> pv = PagerUtil.pageToVo(pagging, null);
+//        List<CrawlSalesAmountVo> records = pv.getRecords();
+//        for (CrawlSalesAmountVo record : records) {
+//            record.setOils(record.getSalesAmount()*50*0.01);
+//            record.setRice(record.getSalesAmount()*30*0.01);
+//            record.setFace(record.getSalesAmount()*20*0.01);
+//            record.setTotalCount(record.getOils()+record.getRice()+record.getFace());
+//        }
         return pv;
     }
 

yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
    *在大多数情况下，请使用“/”！！！
    *详细信息：https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.NODE_ENV === 'production' ? '/dbcenter/' : '/',
+  publicPath: '/', //process.env.NODE_ENV === 'production' ? '/dbcenter/' : '/',
   outputDir: 'dbcenter-ui',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',