Commit f9ec10ef authored by 赵啸非's avatar 赵啸非

修改文件存储路径

parent a332877d
...@@ -509,9 +509,8 @@ export default { ...@@ -509,9 +509,8 @@ export default {
this.pushChart.resize(); this.pushChart.resize();
}, },
syncDeviceStat() { syncDeviceStat() {
this.$post("/device/stat/syncDeviceStat", {siteId:1}) this.$post("/device/stat/syncDeviceStat", {})
.then((res) => { .then((res) => {
console.log(res.data);
if (res.code == 1) { if (res.code == 1) {
this.statData = res.data.data[0]; this.statData = res.data.data[0];
} else { } else {
...@@ -526,7 +525,7 @@ export default { ...@@ -526,7 +525,7 @@ export default {
findDeviceTotalStat(beforeday) { findDeviceTotalStat(beforeday) {
let query = { createTimeStart: this.formatterDate(beforeday) }; let query = { createTimeStart: this.formatterDate(beforeday) };
//当前选择站点id //当前选择站点id
query.siteId=1 //query.siteId=1
console.log(query); console.log(query);
this.$post("/device/stat/list", query) this.$post("/device/stat/list", query)
.then((res) => { .then((res) => {
...@@ -558,7 +557,7 @@ export default { ...@@ -558,7 +557,7 @@ export default {
findDeviceStat(beforeday) { findDeviceStat(beforeday) {
let query = { createTimeStart: this.formatterDate(beforeday) }; let query = { createTimeStart: this.formatterDate(beforeday) };
query.siteId=1 //query.siteId=1
this.$post("/device/stat/list", query) this.$post("/device/stat/list", query)
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
...@@ -588,7 +587,7 @@ export default { ...@@ -588,7 +587,7 @@ export default {
findDeviceAlarm(beforeday) { findDeviceAlarm(beforeday) {
let query = { createTimeStart: this.formatterDate(beforeday) }; let query = { createTimeStart: this.formatterDate(beforeday) };
query.siteId=1 //query.siteId=1
this.$post("/device/stat/list", query) this.$post("/device/stat/list", query)
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
...@@ -617,7 +616,7 @@ export default { ...@@ -617,7 +616,7 @@ export default {
findDevicePush(beforeday) { findDevicePush(beforeday) {
let query = { createTimeStart: this.formatterDate(beforeday) }; let query = { createTimeStart: this.formatterDate(beforeday) };
query.siteId=1 // query.siteId=1
this.$post("/device/stat/list", query) this.$post("/device/stat/list", query)
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
......
...@@ -339,8 +339,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D ...@@ -339,8 +339,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
*/ */
@Override @Override
public void deviceStat(Long siteId,Context context) { public void deviceStat(Long siteId,Context context) {
//查询当天统计,如果有 则更新统计结果,否则新增 //查询当天统计,如果有 则更新统计结果,否则新增
DeviceStatEntity deviceStatEntity = deviceStatService.selectOne(new DeviceStatQuery() DeviceStatEntity deviceStatEntity = deviceStatService.selectOne(new DeviceStatQuery()
.siteId(siteId) .siteId(siteId)
......
...@@ -68,7 +68,7 @@ public class DeviceStatController extends BaseCRUDJsonBodyMappingController<Devi ...@@ -68,7 +68,7 @@ public class DeviceStatController extends BaseCRUDJsonBodyMappingController<Devi
try { try {
if(ObjectUtils.isEmpty(deviceQuery)||ObjectUtils.isEmpty(deviceQuery.getSiteId())) throw new AppException("请求站点Id不能为空!"); if(ObjectUtils.isEmpty(deviceQuery)||ObjectUtils.isEmpty(deviceQuery.getSiteId())) throw new AppException("请求站点Id不能为空!");
//刷新成功,返回列 //刷新成功,返回列
deviceService.deviceStat(deviceQuery.getSiteId(),getContext()); //deviceService.deviceStat(deviceQuery.getSiteId(),getContext());
DeviceStatQuery deviceStatQuery = new DeviceStatQuery(); DeviceStatQuery deviceStatQuery = new DeviceStatQuery();
deviceStatQuery.setYear(DateUtil.year(new Date())); deviceStatQuery.setYear(DateUtil.year(new Date()));
deviceStatQuery.setMonth(DateUtil.month(new Date()) + 1); deviceStatQuery.setMonth(DateUtil.month(new Date()) + 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment