root
/
thing_api
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

物属性遥测数据历史查询bug修复

thing_master
xiachao 1 year ago
parent
b61ccfc320
commit
3278d4712b
13 changed files with 145 additions and 60 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. 33
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
  2. 5
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
  3. 33
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java
  4. 5
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
  5. 33
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java
  6. 5
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
  7. 33
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java
  8. 5
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
  9. 35
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java
  10. 6
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
  11. 3
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java
  12. 5
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java
  13. 4
      modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java

33
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
View File

@ -12,6 +12,7 @@ import com.thing.common.core.web.response.Result;
import com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO;
import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService;
import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@ -19,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -35,19 +37,28 @@ public class CqcCarbonConsumablesController {
private final CqcCarbonConsumablesService cqcCarbonConsumablesService;
@GetMapping("page")
@Operation(summary="分页")
@Parameters({
@Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
@Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
@Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
@Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
})
public Result<PageData<CqcCarbonConsumablesDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
PageData<CqcCarbonConsumablesDTO> page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class);
return new Result<PageData<CqcCarbonConsumablesDTO>>().ok(page);
// @GetMapping("page")
// @Operation(summary="分页")
// @Parameters({
// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
// })
// public Result<PageData<CqcCarbonConsumablesDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
// PageData<CqcCarbonConsumablesDTO> page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class);
// return new Result<PageData<CqcCarbonConsumablesDTO>>().ok(page);
// }
@GetMapping("list/{applyNo}")
@Operation(summary="信息")
public Result<List<CqcCarbonConsumablesDTO>> list(@PathVariable("applyNo") String applyNo){
List<CqcCarbonConsumablesDTO> datas = cqcCarbonConsumablesService.listAs(Map.of("applyNo",applyNo), CqcCarbonConsumablesDTO.class);
return new Result<List<CqcCarbonConsumablesDTO> >().ok(datas);
}
@GetMapping("{id}")
@Operation(summary="信息")
public Result<CqcCarbonConsumablesDTO> get(@PathVariable("id") Long id){

5
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
View File

@ -5,6 +5,9 @@ import com.thing.common.orm.service.impl.BaseServiceImpl;
import com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper;
import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService;
import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@ -21,6 +24,8 @@ public class CqcCarbonConsumablesServiceImpl extends BaseServiceImpl<CqcCarbonCo
@Override
public QueryWrapper getWrapper(Map<String, Object> params){
QueryWrapper wrapper = new QueryWrapper();
String applyNo = MapUtils.getString(params,"applyNo");
wrapper.eq(CqcCarbonConsumablesEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo));
return wrapper;
}

33
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java
View File

@ -12,6 +12,7 @@ import com.thing.common.core.web.response.Result;
import com.thing.cqc.CqcCarbonDistribution.dto.CqcCarbonDistributionDTO;
import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService;
import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@ -19,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -35,19 +37,28 @@ public class CqcCarbonDistributionController {
private final CqcCarbonDistributionService cqcCarbonDistributionService;
@GetMapping("page")
@Operation(summary="分页")
@Parameters({
@Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
@Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
@Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
@Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
})
public Result<PageData<CqcCarbonDistributionDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
PageData<CqcCarbonDistributionDTO> page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class);
return new Result<PageData<CqcCarbonDistributionDTO>>().ok(page);
// @GetMapping("page")
// @Operation(summary="分页")
// @Parameters({
// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
// })
// public Result<PageData<CqcCarbonDistributionDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
// PageData<CqcCarbonDistributionDTO> page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class);
// return new Result<PageData<CqcCarbonDistributionDTO>>().ok(page);
// }
@GetMapping("list/{applyNo}")
@Operation(summary="信息")
public Result<List<CqcCarbonDistributionDTO>> list(@PathVariable("applyNo") String applyNo){
List<CqcCarbonDistributionDTO> datas = cqcCarbonDistributionService.listAs(Map.of("applyNo",applyNo), CqcCarbonDistributionDTO.class);
return new Result<List<CqcCarbonDistributionDTO> >().ok(datas);
}
@GetMapping("{id}")
@Operation(summary="信息")
public Result<CqcCarbonDistributionDTO> get(@PathVariable("id") Long id){

5
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
View File

@ -5,6 +5,9 @@ import com.thing.common.orm.service.impl.BaseServiceImpl;
import com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper;
import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService;
import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@ -21,6 +24,8 @@ public class CqcCarbonDistributionServiceImpl extends BaseServiceImpl<CqcCarbonD
@Override
public QueryWrapper getWrapper(Map<String, Object> params){
QueryWrapper wrapper = new QueryWrapper();
String applyNo = MapUtils.getString(params,"applyNo");
wrapper.eq(CqcCarbonDistributionEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo));
return wrapper;
}

33
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java
View File

@ -12,6 +12,7 @@ import com.thing.common.core.web.response.Result;
import com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO;
import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService;
import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@ -19,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -29,23 +31,30 @@ import java.util.Map;
*/
@RestController
@RequestMapping("v2/cqccarbonenergy")
@Tag(name=" 碳足迹认证核查-使用阶段")
@Tag(name=" 碳足迹认证核查-使用阶段能源")
@RequiredArgsConstructor
public class CqcCarbonEnergyController {
private final CqcCarbonEnergyService cqcCarbonEnergyService;
@GetMapping("page")
@Operation(summary="分页")
@Parameters({
@Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
@Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
@Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
@Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
})
public Result<PageData<CqcCarbonEnergyDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
PageData<CqcCarbonEnergyDTO> page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class);
return new Result<PageData<CqcCarbonEnergyDTO>>().ok(page);
// @GetMapping("page")
// @Operation(summary="分页")
// @Parameters({
// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
// })
// public Result<PageData<CqcCarbonEnergyDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
// PageData<CqcCarbonEnergyDTO> page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class);
// return new Result<PageData<CqcCarbonEnergyDTO>>().ok(page);
// }
@GetMapping("list/{applyNo}")
@Operation(summary="信息")
public Result<List<CqcCarbonEnergyDTO>> list(@PathVariable("applyNo") String applyNo){
List<CqcCarbonEnergyDTO> datas = cqcCarbonEnergyService.listAs(Map.of("applyNo",applyNo), CqcCarbonEnergyDTO.class);
return new Result<List<CqcCarbonEnergyDTO> >().ok(datas);
}
@GetMapping("{id}")

5
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
View File

@ -5,6 +5,9 @@ import com.thing.common.orm.service.impl.BaseServiceImpl;
import com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper;
import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService;
import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@ -21,6 +24,8 @@ public class CqcCarbonEnergyServiceImpl extends BaseServiceImpl<CqcCarbonEnergyM
@Override
public QueryWrapper getWrapper(Map<String, Object> params){
QueryWrapper wrapper = new QueryWrapper();
String applyNo = MapUtils.getString(params,"applyNo");
wrapper.eq(CqcCarbonEnergyEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo));
return wrapper;
}

33
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java
View File

@ -12,6 +12,7 @@ import com.thing.common.core.web.response.Result;
import com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO;
import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService;
import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@ -19,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -35,19 +37,28 @@ public class CqcCarbonMakeController {
private final CqcCarbonMakeService cqcCarbonMakeService;
@GetMapping("page")
@Operation(summary="分页")
@Parameters({
@Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
@Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
@Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
@Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
})
public Result<PageData<CqcCarbonMakeDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
PageData<CqcCarbonMakeDTO> page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class);
return new Result<PageData<CqcCarbonMakeDTO>>().ok(page);
// @GetMapping("page")
// @Operation(summary="分页")
// @Parameters({
// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
// })
// public Result<PageData<CqcCarbonMakeDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
// PageData<CqcCarbonMakeDTO> page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class);
// return new Result<PageData<CqcCarbonMakeDTO>>().ok(page);
// }
@GetMapping("list/{applyNo}")
@Operation(summary="信息")
public Result<List<CqcCarbonMakeDTO>> list(@PathVariable("applyNo") String applyNo){
List<CqcCarbonMakeDTO> datas = cqcCarbonMakeService.listAs(Map.of("applyNo",applyNo), CqcCarbonMakeDTO.class);
return new Result<List<CqcCarbonMakeDTO> >().ok(datas);
}
@GetMapping("{id}")
@Operation(summary="信息")
public Result<CqcCarbonMakeDTO> get(@PathVariable("id") Long id){

5
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
View File

@ -5,6 +5,9 @@ import com.thing.common.orm.service.impl.BaseServiceImpl;
import com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper;
import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService;
import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@ -21,6 +24,8 @@ public class CqcCarbonMakeServiceImpl extends BaseServiceImpl<CqcCarbonMakeMappe
@Override
public QueryWrapper getWrapper(Map<String, Object> params){
QueryWrapper wrapper = new QueryWrapper();
String applyNo = MapUtils.getString(params,"applyNo");
wrapper.eq(CqcCarbonMakeEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo));
return wrapper;
}

35
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java
View File

@ -18,6 +18,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -28,25 +29,35 @@ import java.util.Map;
*/
@RestController
@RequestMapping("v2/cqccarbonraw")
@Tag(name="碳足迹认证喝茶-原物料阶段")
@Tag(name="碳足迹认证核查-原物料阶段")
@RequiredArgsConstructor
public class CqcCarbonRawController {
private final CqcCarbonRawService cqcCarbonRawService;
@GetMapping("page")
@Operation(summary="分页")
@Parameters({
@Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
@Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
@Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
@Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
})
public Result<PageData<CqcCarbonRawDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
PageData<CqcCarbonRawDTO> page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class);
return new Result<PageData<CqcCarbonRawDTO>>().ok(page);
// @GetMapping("page")
// @Operation(summary="分页")
// @Parameters({
// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
// })
// public Result<PageData<CqcCarbonRawDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
// PageData<CqcCarbonRawDTO> page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class);
// return new Result<PageData<CqcCarbonRawDTO>>().ok(page);
// }
@GetMapping("list/{applyNo}")
@Operation(summary="信息")
public Result<List<CqcCarbonRawDTO>> list(@PathVariable("applyNo") String applyNo){
List<CqcCarbonRawDTO> datas = cqcCarbonRawService.listAs(Map.of("applyNo",applyNo), CqcCarbonRawDTO.class);
return new Result<List<CqcCarbonRawDTO> >().ok(datas);
}
@GetMapping("{id}")
@Operation(summary="信息")
public Result<CqcCarbonRawDTO> get(@PathVariable("id") Long id){

6
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
View File

@ -2,9 +2,11 @@ package com.thing.cqc.CqcCarbonRaw.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
import com.thing.common.orm.service.impl.BaseServiceImpl;
import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper;
import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper;
import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
@ -21,6 +23,8 @@ public class CqcCarbonRawServiceImpl extends BaseServiceImpl<CqcCarbonRawMapper,
@Override
public QueryWrapper getWrapper(Map<String, Object> params){
QueryWrapper wrapper = new QueryWrapper();
String applyNo = MapUtils.getString(params,"applyNo");
wrapper.eq(CqcCarbonRawEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo));
return wrapper;
}

3
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java
View File

@ -123,6 +123,9 @@ public class CqcCarbonReportDTO implements Serializable {
private String processDescription;
@Schema(description = "产品信息")
private String productInfo;
@Schema(description = "产品图片")
private String productUrl;
@Schema(description = "公司简介")
private String companyInfo;
@Schema(description = "盘查期间场内平均人数")

5
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java
View File

@ -2,6 +2,7 @@ package com.thing.cqc.CqcCarbonReport.entity;
import com.mybatisflex.annotation.Table;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@ -231,6 +232,10 @@ public class CqcCarbonReportEntity implements Serializable {
* 产品信息
*/
private String productInfo;
/**
* 产品图片
*/
private String productUrl;
/**
* 公司简介
*/

4
modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java
View File

@ -880,8 +880,8 @@ public class IotThingEntityServiceImpl extends BaseServiceImpl<IotThingEntityMap
if(StringUtils.isBlank(beginTime) || StringUtils.isBlank(endTime)){
return tsKvService.findPageLatestByMultiMap(Map.of(entityDTO.getCode(),dictCodes),false,page,limit);
}else{
Long startTime = DateTimeUtils.dateToTimestamp(beginTime, DateTimeUtils.DATE_TIME_PATTERN_STR);
Long overTime = DateTimeUtils.dateToTimestamp(endTime, DateTimeUtils.DATE_TIME_PATTERN_STR);
Long startTime =Long.parseLong(beginTime);
Long overTime = Long.parseLong(endTime);
return tsKvService.findPageTsKvByMultiMap(Map.of(entityDTO.getCode(),dictCodes),startTime,overTime,false,page,limit);
}
}

Write Preview
Loading…
Cancel
Save