|
@@ -10,6 +10,7 @@ import cn.fastfun.service.entity.AppAssetConf;
|
|
import cn.fastfun.service.entity.AppDevice;
|
|
import cn.fastfun.service.entity.AppDevice;
|
|
import cn.fastfun.service.impl.AppAssetConfServiceImpl;
|
|
import cn.fastfun.service.impl.AppAssetConfServiceImpl;
|
|
import cn.fastfun.service.impl.AppAssetProfitServiceImpl;
|
|
import cn.fastfun.service.impl.AppAssetProfitServiceImpl;
|
|
|
|
+import cn.fastfun.service.mapper.AppAssetConfMapper;
|
|
import cn.fastfun.util.IrrUtil;
|
|
import cn.fastfun.util.IrrUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -51,6 +52,9 @@ public class ApiAssetProfitController {
|
|
@Autowired
|
|
@Autowired
|
|
AppDeviceService appDeviceService;
|
|
AppDeviceService appDeviceService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ AppAssetConfMapper appAssetConfMapper;
|
|
|
|
+
|
|
|
|
|
|
@ApiOperation(value = "基础信息")
|
|
@ApiOperation(value = "基础信息")
|
|
@RequestMapping(value = "getBaseInfo", method = RequestMethod.POST)
|
|
@RequestMapping(value = "getBaseInfo", method = RequestMethod.POST)
|
|
@@ -782,6 +786,8 @@ public class ApiAssetProfitController {
|
|
}
|
|
}
|
|
|
|
|
|
Page<AppAssetConf> appAssetConfPage = appAssetConfService.page(page, appAssetConfQueryWrapper);
|
|
Page<AppAssetConf> appAssetConfPage = appAssetConfService.page(page, appAssetConfQueryWrapper);
|
|
|
|
+ appAssetConfMapper.getAssetConf(param.getSn(), param.getTableOrder(), param.getType().split(","),
|
|
|
|
+ new SimpleDateFormat("yyyy-MM-dd").format(param.getTimeStart()), new SimpleDateFormat("yyyy-MM-dd").format(param.getTimeEnd()));
|
|
List<Map<String, Object>> data = new ArrayList<>();
|
|
List<Map<String, Object>> data = new ArrayList<>();
|
|
if (appAssetConfPage.getTotal() > 0) {
|
|
if (appAssetConfPage.getTotal() > 0) {
|
|
appAssetConfPage.getRecords().forEach(p -> {
|
|
appAssetConfPage.getRecords().forEach(p -> {
|