diff --git a/fuintAdmin_zt/src/assets/images/phone.png b/fuintAdmin_zt/src/assets/images/phone.png new file mode 100644 index 000000000..acacad110 Binary files /dev/null and b/fuintAdmin_zt/src/assets/images/phone.png differ diff --git a/fuintAdmin_zt/src/views/Service/details.vue b/fuintAdmin_zt/src/views/Service/details.vue index d6d177881..4ed7320e8 100644 --- a/fuintAdmin_zt/src/views/Service/details.vue +++ b/fuintAdmin_zt/src/views/Service/details.vue @@ -4,7 +4,7 @@
-
+
{{item.title}}
@@ -109,7 +109,7 @@ - diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue index 7582196ae..f38904645 100644 --- a/fuintAdmin_zt/src/views/homeComponents/agent.vue +++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue @@ -42,7 +42,7 @@
通知中心
-
更多
+
更多
【{{ item.notificationType }}】{{ item.templateContent }}
@@ -124,7 +124,22 @@
-
硬件设备
+ +
+
硬件设备
+
+ +
+ 联系人：张总
+ 联系电话：15666665287 +
+ + +
+
@@ -241,6 +256,9 @@ export default { // this.initChart() }, methods:{ + goRoute(){ + this.$router.push("system/notify/page/getNotify") + }, getNoticeList(){ getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => { this.noticeList = res.data.records @@ -341,24 +359,25 @@ export default { let tradeAmountList = [] let tradeNumList = [] if (this.storeList.length>0) { - for (let i = 0; i < 24; i++) { - let flag = false; - let hour = i.toString().padStart(2, '0') + ":00"; // 转换为两位数格式 + // for (let i = 0; i < 24; i++) { + // let flag = false; + // let hour = i.toString().padStart(2, '0') + ":00"; // 转换为两位数格式 this.storeList.forEach(item => { - if (item.tradeTime == hour){ - flag = true + // if (item.tradeTime == hour){ + // flag = true + hourList.push(item.tradeTime); storeNumList.push(item.storeNum) tradeAmountList.push(item.tradeAmount) tradeNumList.push(item.tradeNum) - } + // } }) - hourList.push(hour); - if (!flag) { - storeNumList.push(0) - tradeAmountList.push(0) - tradeNumList.push(0) - } - } + // hourList.push(hour); + // if (!flag) { + // storeNumList.push(0) + // tradeAmountList.push(0) + // tradeNumList.push(0) + // } + // } }else { hourList = ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'] storeNumList = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] @@ -399,8 +418,10 @@ export default { show: false }, data: [ - { value: 1548, name: '非七日活跃' }, - { value: 775, name: '七日活跃' } + // { value: 1548, name: '非七日活跃' }, + // { value: 775, name: '七日活跃' } + { value: Number(this.storeAmount.noWeekStoreTotal), name: '本月新增非七日活跃油站' }, + { value: Number(this.storeAmount.weekStoreTotal), name: '本月新增七日活跃油站' } ] }, { @@ -428,8 +449,10 @@ export default { } }, data: [ - { value: 1048, name: '本月新增' }, - { value: 335, name: '非本月新增' } + // { value: 1048, name: '本月新增' }, + // { value: 335, name: '非本月新增' } + { value: Number(this.storeAmount.noAddStoreTotal), name: '非本月新增' }, + { value: Number(this.storeAmount.addStoreTotal), name: '本月新增' }, ] } ] @@ -491,10 +514,10 @@ export default { }, data: [ - { value: 50, name: '富友交易金额占比 ' }, - { value: 50, name: '拉卡拉交易金额占比' } - // { value: this.countPercentage(Number(this.storeAmount.fuYouAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '富友占比' }, - // { value: this.countPercentage(Number(this.storeAmount.laKaLaAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '拉卡拉占比' } + // { value: 50, name: '富友交易金额占比 ' }, + // { value: 50, name: '拉卡拉交易金额占比' } + { value: this.countPercentage(Number(this.storeAmount.fuYouAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '富友交易金额占比' }, + { value: this.countPercentage(Number(this.storeAmount.laKaLaAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '拉卡拉交易金额占比' } ], label: { show: true, @@ -633,10 +656,10 @@ export default { }, data: [ - { value: 50, name: '富友交易金额占比 ' }, - { value: 50, name: '拉卡拉交易金额占比' } - // { value: this.countPercentage(Number(this.storeAmount.fuYouAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '富友占比' }, - // { value: this.countPercentage(Number(this.storeAmount.laKaLaAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '拉卡拉占比' } + // { value: 50, name: '7日活跃油站 ' }, + // { value: 50, name: '非7日活跃油站' } + { value: this.countPercentage(Number(this.storeAmount.storeTotal),Number(this.storeAmount.storeTotal) + Number(this.storeAmount.noStoreTotal)), name: '7日活跃油站' }, + { value: this.countPercentage(Number(this.storeAmount.noStoreTotal),Number(this.storeAmount.storeTotal) + Number(this.storeAmount.noStoreTotal)), name: '非7日活跃油站' } ], label: { show: true, diff --git a/fuintAdmin_zt/src/views/homeComponents/manage.vue b/fuintAdmin_zt/src/views/homeComponents/manage.vue index 6665ac0ff..12b5ab6b4 100644 --- a/fuintAdmin_zt/src/views/homeComponents/manage.vue +++ b/fuintAdmin_zt/src/views/homeComponents/manage.vue @@ -131,7 +131,22 @@
-
硬件设备
+ +
+
硬件设备
+
+ +
+ 联系人：张总
+ 联系电话：15666665287 +
+ + +
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java index b5cd6fc88..23c1095a9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java @@ -53,5 +53,27 @@ public interface MtStoreMapper extends BaseMapper { List selectStoreList(@Param("storeVo") MtStore store,@Param("ownDeptStr") String ownDeptStr); + /** + * 查询今日时间段内数据信息 + * @param store + * @param storeIds + * @return + */ List selectStoreNum(@Param("storeVo") MtStore store,@Param("storeIds") List storeIds); + + /** + * 查询周/月内天数数据信息 + * @param store + * @param storeIds + * @return + */ + List selectStoreNumByDay(@Param("storeVo") MtStore store,@Param("storeIds") List storeIds); + + /** + * 查询年内月数数据信息 + * @param store + * @param storeIds + * @return + */ + List selectStoreNumByMonth(@Param("storeVo") MtStore store,@Param("storeIds") List storeIds); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml index dbac0907f..3a88fd08f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml @@ -100,4 +100,48 @@ tradeTime) t GROUP BY t.tradeTime + + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java index d5ecf4bb7..f0812ba30 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java @@ -58,6 +58,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.temporal.ChronoUnit; @@ -737,7 +738,7 @@ public class StoreServiceImpl extends ServiceImpl implem } @Override - public List getStoreAmountByTime(MtStore store) { + public List getStoreAmountByTime(MtStore store){ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); SysDept sysDept = deptService.getById(nowAccountInfo.getDeptId()); String ancestors = sysDept.getAncestors(); @@ -751,7 +752,38 @@ public class StoreServiceImpl extends ServiceImpl implem for (MtStore mtStore : mtStores) { storeIds.add(mtStore.getId()); } - return baseMapper.selectStoreNum(store,storeIds); + List storeNumVos = null; + if (ObjectUtil.isNotEmpty(store.getParams()) && ObjectUtil.isNotEmpty(store.getParams().get("beginTime")) + && ObjectUtil.isNotEmpty(store.getParams().get("endTime"))){ + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + + Date today = calendar.getTime(); + Calendar calendar1 = Calendar.getInstance(); + calendar1.add(Calendar.YEAR, -1); // 将年份减去1 + long oneYearAgo = calendar1.getTimeInMillis(); + Date yearDay = new Date(oneYearAgo); + + try { + if (!today.after( dateFormat.parse(store.getParams().get("beginTime").toString()) )){ + storeNumVos = baseMapper.selectStoreNum(store, storeIds); + }else { + if (yearDay.before(dateFormat.parse(store.getParams().get("beginTime").toString()))){ + storeNumVos = baseMapper.selectStoreNumByDay(store, storeIds); + }else { + storeNumVos = baseMapper.selectStoreNumByMonth(store, storeIds); + } + } + }catch (Exception e){ + e.printStackTrace(); + } + + } + return storeNumVos; } @Override diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml index e9c2327de..e4a1d6499 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml @@ -3,9 +3,14 @@