Browse Source

Merge pull request 'master' (#10) from master into V3

Reviewed-on: http://git.lrdaiot.cn:9000/thing/thing_api/pulls/10
qingyuan_dev_new
夏超 1 year ago
parent
commit
75dddf212c
  1. 33
      modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
  2. 12
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
  3. 3
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
  4. 3
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
  5. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
  6. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/CqcCarbonConsumablesService.java
  7. 9
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
  8. 7
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java
  9. 3
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
  10. 2
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
  11. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
  12. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/CqcCarbonDiscardService.java
  13. 8
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
  14. 12
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java
  15. 3
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
  16. 3
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
  17. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
  18. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/CqcCarbonDistributionService.java
  19. 9
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
  20. 11
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java
  21. 2
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
  22. 2
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
  23. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
  24. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/CqcCarbonEnergyService.java
  25. 9
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
  26. 11
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java
  27. 2
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java
  28. 2
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java
  29. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/mapper/CqcCarbonMakeMapper.java
  30. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/CqcCarbonMakeService.java
  31. 9
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
  32. 10
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java
  33. 2
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java
  34. 2
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/entity/CqcCarbonRawEntity.java
  35. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/mapper/CqcCarbonRawMapper.java
  36. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/CqcCarbonRawService.java
  37. 8
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
  38. 31
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/controller/CqcCarbonReportController.java
  39. 24
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportDTO.java
  40. 15
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/entity/CqcCarbonReportEntity.java
  41. 4
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java
  42. 6
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/CqcCarbonReportService.java
  43. 109
      modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
  44. 32
      modules/cqc-service/src/main/java/com/thing/cqc/rpcService/JsonCryptoUtils.java
  45. 6
      modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/CqcRpcService.java
  46. 32
      modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/impl/CqcRpcServiceImpl.java
  47. 33
      modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml
  48. 8
      modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumablesMapper.xml
  49. 33
      modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml
  50. 8
      modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscardMapper.xml
  51. 27
      modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml
  52. 7
      modules/cqc-service/src/main/resources/mapper/CqcCarbonDistributionMapper.xml
  53. 25
      modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml
  54. 7
      modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergyMapper.xml
  55. 24
      modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml
  56. 6
      modules/cqc-service/src/main/resources/mapper/CqcCarbonMakeMapper.xml
  57. 33
      modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml
  58. 6
      modules/cqc-service/src/main/resources/mapper/CqcCarbonRawMapper.xml
  59. 80
      modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml
  60. 6
      modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml
  61. 33
      modules/thing/src/main/java/com/thing/sys/biz/utils/HttpClientUtil.java
  62. 7
      modules/thing/src/main/java/com/thing/thing/dict/controller/IotThingDictController.java
  63. 2
      modules/thing/src/main/java/com/thing/thing/dict/service/IotThingDictService.java
  64. 62
      modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java
  65. 7
      modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java
  66. 10
      modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java
  67. 2
      modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java
  68. 14
      modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java

33
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java

@ -1,33 +0,0 @@
package com.thing.cqc.CqcCarbonReport.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
import com.thing.common.orm.service.impl.BaseServiceImpl;
import com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper;
import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService;
import com.thing.sys.security.context.UserContext;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* 申请表基础数据
*
* @author xc
* @since 3.0 2024-08-08
*/
@Service
public class CqcCarbonReportServiceImpl extends BaseServiceImpl<CqcCarbonReportMapper, CqcCarbonReportEntity> implements CqcCarbonReportService {
@Override
public QueryWrapper getWrapper(Map<String, Object> params){
QueryWrapper wrapper = new QueryWrapper();
Long tenantCode = UserContext.getTenantCode();
if(!tenantCode.equals(1001L)){
wrapper.eq(CqcCarbonReportEntity::getTenantCode,tenantCode);
}
return wrapper;
}
}

12
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java

@ -1,21 +1,15 @@
package com.thing.cqc.CqcCarbonConsumables.controller;
package com.thing.cqc.cqcCarbonConsumables.controller;
import com.thing.common.core.annotation.LogOperation;
import com.thing.common.core.constants.Constant;
import com.thing.common.core.validator.AssertUtils;
import com.thing.common.core.validator.ValidatorUtils;
import com.thing.common.core.validator.group.AddGroup;
import com.thing.common.core.validator.group.DefaultGroup;
import com.thing.common.core.validator.group.UpdateGroup;
import com.thing.common.core.web.response.PageData;
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 com.thing.cqc.cqcCarbonConsumables.dto.CqcCarbonConsumablesDTO;
import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

3
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java

@ -1,7 +1,6 @@
package com.thing.cqc.CqcCarbonConsumables.dto;
package com.thing.cqc.cqcCarbonConsumables.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;

3
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java

@ -1,8 +1,7 @@
package com.thing.cqc.CqcCarbonConsumables.entity;
package com.thing.cqc.cqcCarbonConsumables.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonConsumables.mapper;
package com.thing.cqc.cqcCarbonConsumables.mapper;
import com.thing.common.orm.mapper.PowerBaseMapper;
import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
import org.apache.ibatis.annotations.Mapper;
/**

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/CqcCarbonConsumablesService.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonConsumables.service;
package com.thing.cqc.cqcCarbonConsumables.service;
import com.thing.common.orm.service.IBaseService;
import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
/**
* 使用阶段耗材信息

9
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java

@ -1,11 +1,10 @@
package com.thing.cqc.CqcCarbonConsumables.service.impl;
package com.thing.cqc.cqcCarbonConsumables.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
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 com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
import com.thing.cqc.cqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper;
import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

7
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonDiscard.controller;
package com.thing.cqc.cqcCarbonDiscard.controller;
import com.thing.common.core.annotation.LogOperation;
import com.thing.common.core.constants.Constant;
@ -9,9 +9,8 @@ import com.thing.common.core.validator.group.DefaultGroup;
import com.thing.common.core.validator.group.UpdateGroup;
import com.thing.common.core.web.response.PageData;
import com.thing.common.core.web.response.Result;
import com.thing.cqc.CqcCarbonDiscard.dto.CqcCarbonDiscardDTO;
import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService;
import com.thing.cqc.cqcCarbonDiscard.dto.CqcCarbonDiscardDTO;
import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;

3
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java

@ -1,7 +1,6 @@
package com.thing.cqc.CqcCarbonDiscard.dto;
package com.thing.cqc.cqcCarbonDiscard.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;

2
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonDiscard.entity;
package com.thing.cqc.cqcCarbonDiscard.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonDiscard.mapper;
package com.thing.cqc.cqcCarbonDiscard.mapper;
import com.thing.common.orm.mapper.PowerBaseMapper;
import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
import org.apache.ibatis.annotations.Mapper;
/**

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/CqcCarbonDiscardService.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonDiscard.service;
package com.thing.cqc.cqcCarbonDiscard.service;
import com.thing.common.orm.service.IBaseService;
import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
/**
* 废物处置及再利用信息

8
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java

@ -1,10 +1,10 @@
package com.thing.cqc.CqcCarbonDiscard.service.impl;
package com.thing.cqc.cqcCarbonDiscard.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
import com.thing.common.orm.service.impl.BaseServiceImpl;
import com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper;
import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService;
import com.thing.cqc.cqcCarbonDiscard.mapper.CqcCarbonDiscardMapper;
import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService;
import org.springframework.stereotype.Service;
import java.util.Map;

12
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java

@ -1,21 +1,15 @@
package com.thing.cqc.CqcCarbonDistribution.controller;
package com.thing.cqc.cqcCarbonDistribution.controller;
import com.thing.common.core.annotation.LogOperation;
import com.thing.common.core.constants.Constant;
import com.thing.common.core.validator.AssertUtils;
import com.thing.common.core.validator.ValidatorUtils;
import com.thing.common.core.validator.group.AddGroup;
import com.thing.common.core.validator.group.DefaultGroup;
import com.thing.common.core.validator.group.UpdateGroup;
import com.thing.common.core.web.response.PageData;
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 com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO;
import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

3
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java

@ -1,7 +1,6 @@
package com.thing.cqc.CqcCarbonDistribution.dto;
package com.thing.cqc.cqcCarbonDistribution.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;

3
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java

@ -1,8 +1,7 @@
package com.thing.cqc.CqcCarbonDistribution.entity;
package com.thing.cqc.cqcCarbonDistribution.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonDistribution.mapper;
package com.thing.cqc.cqcCarbonDistribution.mapper;
import com.thing.common.orm.mapper.PowerBaseMapper;
import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
import org.apache.ibatis.annotations.Mapper;
/**

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/CqcCarbonDistributionService.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonDistribution.service;
package com.thing.cqc.cqcCarbonDistribution.service;
import com.thing.common.orm.service.IBaseService;
import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
/**
* 产品分销信息

9
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java

@ -1,11 +1,10 @@
package com.thing.cqc.CqcCarbonDistribution.service.impl;
package com.thing.cqc.cqcCarbonDistribution.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
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 com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
import com.thing.cqc.cqcCarbonDistribution.mapper.CqcCarbonDistributionMapper;
import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

11
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java

@ -1,21 +1,16 @@
package com.thing.cqc.CqcCarbonEnergy.controller;
package com.thing.cqc.cqcCarbonEnergy.controller;
import com.thing.common.core.annotation.LogOperation;
import com.thing.common.core.constants.Constant;
import com.thing.common.core.validator.AssertUtils;
import com.thing.common.core.validator.ValidatorUtils;
import com.thing.common.core.validator.group.AddGroup;
import com.thing.common.core.validator.group.DefaultGroup;
import com.thing.common.core.validator.group.UpdateGroup;
import com.thing.common.core.web.response.PageData;
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.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;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

2
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonEnergy.dto;
package com.thing.cqc.cqcCarbonEnergy.dto;
import io.swagger.v3.oas.annotations.media.Schema;

2
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonEnergy.entity;
package com.thing.cqc.cqcCarbonEnergy.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonEnergy.mapper;
package com.thing.cqc.cqcCarbonEnergy.mapper;
import com.thing.common.orm.mapper.PowerBaseMapper;
import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
import org.apache.ibatis.annotations.Mapper;
/**

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/CqcCarbonEnergyService.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonEnergy.service;
package com.thing.cqc.cqcCarbonEnergy.service;
import com.thing.common.orm.service.IBaseService;
import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
/**
* 使用阶段能源信息

9
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java

@ -1,11 +1,10 @@
package com.thing.cqc.CqcCarbonEnergy.service.impl;
package com.thing.cqc.cqcCarbonEnergy.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
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 com.thing.cqc.cqcCarbonEnergy.mapper.CqcCarbonEnergyMapper;
import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
import com.thing.cqc.cqcCarbonEnergy.service.CqcCarbonEnergyService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

11
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java

@ -1,21 +1,16 @@
package com.thing.cqc.CqcCarbonMake.controller;
package com.thing.cqc.cqcCarbonMake.controller;
import com.thing.common.core.annotation.LogOperation;
import com.thing.common.core.constants.Constant;
import com.thing.common.core.validator.AssertUtils;
import com.thing.common.core.validator.ValidatorUtils;
import com.thing.common.core.validator.group.AddGroup;
import com.thing.common.core.validator.group.DefaultGroup;
import com.thing.common.core.validator.group.UpdateGroup;
import com.thing.common.core.web.response.PageData;
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.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;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

2
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonMake.dto;
package com.thing.cqc.cqcCarbonMake.dto;
import io.swagger.v3.oas.annotations.media.Schema;

2
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonMake.entity;
package com.thing.cqc.cqcCarbonMake.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/mapper/CqcCarbonMakeMapper.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonMake.mapper;
package com.thing.cqc.cqcCarbonMake.mapper;
import com.thing.common.orm.mapper.PowerBaseMapper;
import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity;
import org.apache.ibatis.annotations.Mapper;
/**

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/CqcCarbonMakeService.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonMake.service;
package com.thing.cqc.cqcCarbonMake.service;
import com.thing.common.orm.service.IBaseService;
import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity;
/**
* 制造阶段能源消耗信息

9
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java

@ -1,11 +1,10 @@
package com.thing.cqc.CqcCarbonMake.service.impl;
package com.thing.cqc.cqcCarbonMake.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
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 com.thing.cqc.cqcCarbonMake.mapper.CqcCarbonMakeMapper;
import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity;
import com.thing.cqc.cqcCarbonMake.service.CqcCarbonMakeService;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

10
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java

@ -1,19 +1,15 @@
package com.thing.cqc.CqcCarbonRaw.controller;
package com.thing.cqc.cqcCarbonRaw.controller;
import com.thing.common.core.annotation.LogOperation;
import com.thing.common.core.constants.Constant;
import com.thing.common.core.validator.AssertUtils;
import com.thing.common.core.validator.ValidatorUtils;
import com.thing.common.core.validator.group.AddGroup;
import com.thing.common.core.validator.group.DefaultGroup;
import com.thing.common.core.validator.group.UpdateGroup;
import com.thing.common.core.web.response.PageData;
import com.thing.common.core.web.response.Result;
import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
import com.thing.cqc.cqcCarbonRaw.dto.CqcCarbonRawDTO;
import com.thing.cqc.cqcCarbonRaw.service.CqcCarbonRawService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

2
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonRaw.dto;
package com.thing.cqc.cqcCarbonRaw.dto;
import io.swagger.v3.oas.annotations.media.Schema;

2
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/entity/CqcCarbonRawEntity.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonRaw.entity;
package com.thing.cqc.cqcCarbonRaw.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/mapper/CqcCarbonRawMapper.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonRaw.mapper;
package com.thing.cqc.cqcCarbonRaw.mapper;
import com.thing.common.orm.mapper.PowerBaseMapper;
import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
import com.thing.cqc.cqcCarbonRaw.entity.CqcCarbonRawEntity;
import org.apache.ibatis.annotations.Mapper;
/**

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/CqcCarbonRawService.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonRaw.service;
package com.thing.cqc.cqcCarbonRaw.service;
import com.thing.common.orm.service.IBaseService;
import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
import com.thing.cqc.cqcCarbonRaw.entity.CqcCarbonRawEntity;
/**
* 原物料阶段数据

8
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java

@ -1,10 +1,10 @@
package com.thing.cqc.CqcCarbonRaw.service.impl;
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.entity.CqcCarbonRawEntity;
import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper;
import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
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;

31
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/controller/CqcCarbonReportController.java

@ -1,4 +1,4 @@
package com.thing.cqc.CqcCarbonReport.controller;
package com.thing.cqc.cqcCarbonReport.controller;
import com.thing.common.core.annotation.LogOperation;
import com.thing.common.core.constants.Constant;
@ -9,9 +9,10 @@ import com.thing.common.core.validator.group.DefaultGroup;
import com.thing.common.core.validator.group.UpdateGroup;
import com.thing.common.core.web.response.PageData;
import com.thing.common.core.web.response.Result;
import com.thing.cqc.CqcCarbonReport.dto.CqcCarbonReportDTO;
import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService;
import com.thing.cqc.cqcCarbonReport.dto.CqcCarbonReportDTO;
import com.thing.cqc.cqcCarbonReport.service.CqcCarbonReportService;
import com.thing.cqc.rpcService.service.CqcRpcService;
import com.thing.sys.security.context.UserContext;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@ -36,6 +37,8 @@ public class CqcCarbonReportController {
private final CqcCarbonReportService cqcCarbonReportService;
private final CqcRpcService cqcRpcService;
@GetMapping("page")
@Operation(summary="分页")
@Parameters({
@ -50,7 +53,6 @@ public class CqcCarbonReportController {
}
@GetMapping("{id}")
@Operation(summary="信息")
public Result<CqcCarbonReportDTO> get(@PathVariable("id") Long id){
CqcCarbonReportDTO data = cqcCarbonReportService.getByIdAs(id, CqcCarbonReportDTO.class);
return new Result<CqcCarbonReportDTO>().ok(data);
@ -58,18 +60,19 @@ public class CqcCarbonReportController {
@PostMapping
@Operation(summary="保存")
@LogOperation("保存")
public Result<Object> save(@RequestBody CqcCarbonReportDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setApplyNo(String.valueOf(UUID.randomUUID()));
dto.setCreateDate(System.currentTimeMillis());
dto.setCompanyId(UserContext.getCompanyId());
dto.setTenantCode(UserContext.getTenantCode());
cqcCarbonReportService.saveDto(dto);
return new Result<Object>().ok(dto.getApplyNo());
}
@PutMapping
@Operation(summary="修改")
@LogOperation("修改")
public Result<Object> update(@RequestBody CqcCarbonReportDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -79,7 +82,6 @@ public class CqcCarbonReportController {
@DeleteMapping
@Operation(summary="删除")
@LogOperation("删除")
public Result<Void> delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -87,14 +89,9 @@ public class CqcCarbonReportController {
return new Result<>();
}
/**
*@GetMapping("export")
*@Operation(summary="导出")
*@LogOperation("导出")
*public void export(@Parameter(hidden = true) @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
* List<CqcCarbonReportDTO> list = cqcCarbonReportService.listAs(params, CqcCarbonReportDTO.class);
* //ExcelUtils.exportExcelToTarget(response, null, "申请表基础数据", list, CqcCarbonReportExcel.class);
*}
*/
@GetMapping("uploadReport/{id}")
private Result<String> uploadReport(@PathVariable("id") Long id){
return cqcCarbonReportService.uploadReport(id);
}
}

24
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportDTO.java

@ -1,11 +1,18 @@
package com.thing.cqc.CqcCarbonReport.dto;
package com.thing.cqc.cqcCarbonReport.dto;
import com.thing.cqc.cqcCarbonConsumables.dto.CqcCarbonConsumablesDTO;
import com.thing.cqc.cqcCarbonDiscard.dto.CqcCarbonDiscardDTO;
import com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO;
import com.thing.cqc.cqcCarbonEnergy.dto.CqcCarbonEnergyDTO;
import com.thing.cqc.cqcCarbonMake.dto.CqcCarbonMakeDTO;
import com.thing.cqc.cqcCarbonRaw.dto.CqcCarbonRawDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* 申请表基础数据
@ -154,6 +161,21 @@ public class CqcCarbonReportDTO implements Serializable {
private String email;
@Schema(description = "审核状态")
private String status;
@Schema(description = "原物料阶段")
private List<CqcCarbonRawDTO> materialList;
@Schema(description = "制造阶段")
private List<CqcCarbonMakeDTO> makeList;
@Schema(description = "分销阶段")
private List<CqcCarbonDistributionDTO> disList;
@Schema(description = "使用阶段耗材")
private List<CqcCarbonConsumablesDTO> consumeList;
@Schema(description = "使用阶段能源")
private List<CqcCarbonEnergyDTO> energyList;
@Schema(description = "废弃阶段")
private List<CqcCarbonDiscardDTO> wasteList;
@Schema(description = "主键id")
private Long id;
@Schema(description = "租户编码")

15
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/entity/CqcCarbonReportEntity.java

@ -1,8 +1,8 @@
package com.thing.cqc.CqcCarbonReport.entity;
package com.thing.cqc.cqcCarbonReport.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@ -23,7 +23,11 @@ import java.io.Serializable;
public class CqcCarbonReportEntity implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@Id
private Long id;
/**
* 受理机构
*/
@ -288,10 +292,7 @@ public class CqcCarbonReportEntity implements Serializable {
* email
*/
private String email;
/**
* 主键id
*/
private Long id;
/**
* 审核状态
*/

4
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java

@ -1,7 +1,7 @@
package com.thing.cqc.CqcCarbonReport.mapper;
package com.thing.cqc.cqcCarbonReport.mapper;
import com.thing.common.orm.mapper.PowerBaseMapper;
import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity;
import org.apache.ibatis.annotations.Mapper;
/**

6
modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java → modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/CqcCarbonReportService.java

@ -1,7 +1,8 @@
package com.thing.cqc.CqcCarbonReport.service;
package com.thing.cqc.cqcCarbonReport.service;
import com.thing.common.core.web.response.Result;
import com.thing.common.orm.service.IBaseService;
import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity;
/**
* 申请表基础数据
@ -11,4 +12,5 @@ import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
*/
public interface CqcCarbonReportService extends IBaseService<CqcCarbonReportEntity> {
Result<String> uploadReport(Long id);
}

109
modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java

@ -0,0 +1,109 @@
package com.thing.cqc.cqcCarbonReport.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.mybatisflex.core.query.QueryWrapper;
import com.thing.common.core.web.response.Result;
import com.thing.common.orm.service.impl.BaseServiceImpl;
import com.thing.cqc.cqcCarbonConsumables.dto.CqcCarbonConsumablesDTO;
import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService;
import com.thing.cqc.cqcCarbonDiscard.dto.CqcCarbonDiscardDTO;
import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService;
import com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO;
import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService;
import com.thing.cqc.cqcCarbonEnergy.dto.CqcCarbonEnergyDTO;
import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
import com.thing.cqc.cqcCarbonEnergy.service.CqcCarbonEnergyService;
import com.thing.cqc.cqcCarbonMake.dto.CqcCarbonMakeDTO;
import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity;
import com.thing.cqc.cqcCarbonMake.service.CqcCarbonMakeService;
import com.thing.cqc.cqcCarbonRaw.dto.CqcCarbonRawDTO;
import com.thing.cqc.cqcCarbonRaw.service.CqcCarbonRawService;
import com.thing.cqc.cqcCarbonReport.dto.CqcCarbonReportDTO;
import com.thing.cqc.cqcCarbonReport.mapper.CqcCarbonReportMapper;
import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity;
import com.thing.cqc.cqcCarbonReport.service.CqcCarbonReportService;
import com.thing.cqc.rpcService.service.CqcRpcService;
import com.thing.sys.security.context.UserContext;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* 申请表基础数据
*
* @author xc
* @since 3.0 2024-08-08
*/
@Service
public class CqcCarbonReportServiceImpl extends BaseServiceImpl<CqcCarbonReportMapper, CqcCarbonReportEntity> implements CqcCarbonReportService {
@Autowired //原料
private CqcCarbonRawService cqcCarbonRawService;
@Autowired //制造
private CqcCarbonMakeService cqcCarbonMakeService;
@Autowired //分销阶段
private CqcCarbonDistributionService cqcCarbonDistributionService;
@Autowired //使用阶段耗材
private CqcCarbonConsumablesService cqcCarbonConsumablesService;
@Autowired //使用阶段能源
private CqcCarbonEnergyService cqcCarbonEnergyService;
@Autowired //废弃阶段
private CqcCarbonDiscardService cqcCarbonDiscardService;
@Autowired
private CqcRpcService cqcRpcService;
@Override
public QueryWrapper getWrapper(Map<String, Object> params){
QueryWrapper wrapper = new QueryWrapper();
Long tenantCode = UserContext.getTenantCode();
if(!tenantCode.equals(1001L)){
wrapper.eq(CqcCarbonReportEntity::getTenantCode,tenantCode);
}
return wrapper;
}
@Override
public Result<String> uploadReport(Long id) {
Result<String> result = new Result<>();
CqcCarbonReportDTO reportDTO = this.getByIdAs(id,CqcCarbonReportDTO.class);
String applyNo = reportDTO.getApplyNo();
if(ObjectUtils.isNotEmpty(reportDTO.getApplyNo())){
reportDTO.setMaterialList(cqcCarbonRawService.listAs(Map.of("applyNo",applyNo), CqcCarbonRawDTO.class));
reportDTO.setMakeList(cqcCarbonMakeService.listAs(Map.of("applyNo",applyNo), CqcCarbonMakeDTO.class));
reportDTO.setDisList(cqcCarbonDistributionService.listAs(Map.of("applyNo",applyNo), CqcCarbonDistributionDTO.class));
reportDTO.setConsumeList(cqcCarbonConsumablesService.listAs(Map.of("applyNo",applyNo), CqcCarbonConsumablesDTO.class));
reportDTO.setEnergyList(cqcCarbonEnergyService.listAs(Map.of("applyNo",applyNo), CqcCarbonEnergyDTO.class));
reportDTO.setWasteList(cqcCarbonDiscardService.listAs(Map.of("applyNo",applyNo), CqcCarbonDiscardDTO.class));
}
String paramBodyStr = JSONObject.toJSONString(reportDTO);
try {
String reqResult = cqcRpcService.doUploadData(paramBodyStr);
JSONObject object = JSONObject.parseObject(reqResult);
if(ObjectUtils.isNotEmpty(object)){
Integer code = object.getInteger("code");
String data = object.getString("data");
String msg = object.getString("msg");
result.setCode(code);
result.setData(data);
result.setMsg(msg);
}
} catch (Exception e) {
e.printStackTrace();
result.setCode(405);
result.setData("");
result.setMsg("RPC 调用异常!");
}
return result;
}
}

32
modules/cqc-service/src/main/java/com/thing/cqc/rpcService/JsonCryptoUtils.java

@ -0,0 +1,32 @@
package com.thing.cqc.rpcService;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
import java.util.Base64;
public class JsonCryptoUtils {
private static final String ALGORITHM = "AES";
public static final String SECRETKEY = "6276a411ba4fec23"; // 16 characters key for AES
public static String encryptJson(String jsonString, String secretKey) throws Exception {
SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), ALGORITHM);
Cipher cipher = Cipher.getInstance(ALGORITHM);
cipher.init(Cipher.ENCRYPT_MODE, keySpec);
byte[] encryptedBytes = cipher.doFinal(jsonString.getBytes());
return Base64.getEncoder().encodeToString(encryptedBytes);
}
public static String decryptJson(String encryptedJsonString, String secretKey) throws Exception {
SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), ALGORITHM);
Cipher cipher = Cipher.getInstance(ALGORITHM);
cipher.init(Cipher.DECRYPT_MODE, keySpec);
byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedJsonString));
return new String(decryptedBytes);
}
}

6
modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/CqcRpcService.java

@ -0,0 +1,6 @@
package com.thing.cqc.rpcService.service;
public interface CqcRpcService {
public String doUploadData(String param) throws Exception;
}

32
modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/impl/CqcRpcServiceImpl.java

@ -0,0 +1,32 @@
package com.thing.cqc.rpcService.service.impl;
import com.thing.cqc.rpcService.JsonCryptoUtils;
import com.thing.cqc.rpcService.service.CqcRpcService;
import com.thing.sys.biz.utils.HttpClientUtil;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
@Service
public class CqcRpcServiceImpl implements CqcRpcService {
private static final String url = "http://114.249.188.139:8099/";
private static final String uploadDataFix = "api/uploadData";
private static final String token = "6276a411ba4fec238500f8123f89192";
@Override
public String doUploadData(String param) throws Exception {
//数据加密
String encryptParam = JsonCryptoUtils.encryptJson(param,JsonCryptoUtils.SECRETKEY);
Map<String,String> paramMap = new HashMap<>();
paramMap.put("token",token);
paramMap.put("content",encryptParam);
String postUrl = url+uploadDataFix;
String httpResultStr = HttpClientUtil.post(postUrl,paramMap);
//返回结果解析
return httpResultStr;
}
}

33
modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper">
<resultMap type="com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity" id="cqcCarbonConsumablesMap">
<result property="id" column="id"/>
<result property="applyNo" column="apply_no"/>
<result property="cateid" column="cateid"/>
<result property="materialsnamecn" column="materialsnamecn"/>
<result property="materialsnameen" column="materialsnameen"/>
<result property="materialsuse" column="materialsuse"/>
<result property="materialcomponent" column="materialcomponent"/>
<result property="productcapacity" column="productcapacity"/>
<result property="productcapacityunit" column="productcapacityunit"/>
<result property="rawmaterialsinput" column="rawmaterialsinput"/>
<result property="rawmaterialsunit" column="rawmaterialsunit"/>
<result property="suppliername" column="suppliername"/>
<result property="supplieraddress" column="supplieraddress"/>
<result property="transmode" column="transmode"/>
<result property="transloadcapacity" column="transloadcapacity"/>
<result property="transdistance" column="transdistance"/>
<result property="transdistanceunit" column="transdistanceunit"/>
<result property="transdatasource" column="transdatasource"/>
<result property="activitydatasource" column="activitydatasource"/>
<result property="dept" column="dept"/>
<result property="person" column="person"/>
<result property="phone" column="phone"/>
<result property="remake" column="remake"/>
<result property="energyno" column="energyno"/>
</resultMap>
</mapper>

8
modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumablesMapper.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.cqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper">
</mapper>

33
modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper">
<resultMap type="com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity" id="cqcCarbonDiscardMap">
<result property="id" column="id"/>
<result property="applyNo" column="apply_no"/>
<result property="cateid" column="cateid"/>
<result property="materialsnamecn" column="materialsnamecn"/>
<result property="materialsnameen" column="materialsnameen"/>
<result property="materialcomponent" column="materialcomponent"/>
<result property="wastedisposal" column="wastedisposal"/>
<result property="wastedisposalunit" column="wastedisposalunit"/>
<result property="rawmaterialsinput" column="rawmaterialsinput"/>
<result property="rawmaterialsunit" column="rawmaterialsunit"/>
<result property="disposeway" column="disposeway"/>
<result property="disposename" column="disposename"/>
<result property="disposeaddress" column="disposeaddress"/>
<result property="transmode" column="transmode"/>
<result property="transloadcapacity" column="transloadcapacity"/>
<result property="transdistance" column="transdistance"/>
<result property="transdistanceunit" column="transdistanceunit"/>
<result property="transdatasource" column="transdatasource"/>
<result property="activitydatasource" column="activitydatasource"/>
<result property="dept" column="dept"/>
<result property="person" column="person"/>
<result property="phone" column="phone"/>
<result property="remake" column="remake"/>
<result property="wasteno" column="wasteno"/>
</resultMap>
</mapper>

8
modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscardMapper.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.cqcCarbonDiscard.mapper.CqcCarbonDiscardMapper">
</mapper>

27
modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper">
<resultMap type="com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity" id="cqcCarbonDistributionMap">
<result property="id" column="id"/>
<result property="applyNo" column="apply_no"/>
<result property="materialsnamecn" column="materialsnamecn"/>
<result property="productweight" column="productweight"/>
<result property="productweightunit" column="productweightunit"/>
<result property="distributionobject" column="distributionobject"/>
<result property="distributionaddress" column="distributionaddress"/>
<result property="transmode" column="transmode"/>
<result property="transloadcapacity" column="transloadcapacity"/>
<result property="transdistance" column="transdistance"/>
<result property="transdistanceunit" column="transdistanceunit"/>
<result property="transdatasource" column="transdatasource"/>
<result property="activitydatasource" column="activitydatasource"/>
<result property="dept" column="dept"/>
<result property="person" column="person"/>
<result property="phone" column="phone"/>
<result property="remake" column="remake"/>
<result property="disno" column="disno"/>
</resultMap>
</mapper>

7
modules/cqc-service/src/main/resources/mapper/CqcCarbonDistributionMapper.xml

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.cqcCarbonDistribution.mapper.CqcCarbonDistributionMapper">
</mapper>

25
modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper">
<resultMap type="com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity" id="cqcCarbonEnergyMap">
<result property="id" column="id"/>
<result property="applyNo" column="apply_no"/>
<result property="cateid" column="cateid"/>
<result property="useprocedure" column="useprocedure"/>
<result property="emissionsource" column="emissionsource"/>
<result property="materialsuse" column="materialsuse"/>
<result property="energycapacity" column="energycapacity"/>
<result property="energycapacityunit" column="energycapacityunit"/>
<result property="rawmaterialsinput" column="rawmaterialsinput"/>
<result property="rawmaterialsunit" column="rawmaterialsunit"/>
<result property="activitydatasource" column="activitydatasource"/>
<result property="dept" column="dept"/>
<result property="person" column="person"/>
<result property="phone" column="phone"/>
<result property="remake" column="remake"/>
<result property="consumeno" column="consumeno"/>
</resultMap>
</mapper>

7
modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergyMapper.xml

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.cqcCarbonEnergy.mapper.CqcCarbonEnergyMapper">
</mapper>

24
modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper">
<resultMap type="com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity" id="cqcCarbonMakeMap">
<result property="id" column="id"/>
<result property="applyNo" column="apply_no"/>
<result property="cateid" column="cateid"/>
<result property="useplace" column="useplace"/>
<result property="emissionsource" column="emissionsource"/>
<result property="totalelectricity" column="totalelectricity"/>
<result property="totalelectricityunit" column="totalelectricityunit"/>
<result property="specificconsumption" column="specificconsumption"/>
<result property="specificconsumptionunit" column="specificconsumptionunit"/>
<result property="activitydatasource" column="activitydatasource"/>
<result property="dept" column="dept"/>
<result property="person" column="person"/>
<result property="phone" column="phone"/>
<result property="remake" column="remake"/>
<result property="makeno" column="makeno"/>
</resultMap>
</mapper>

6
modules/cqc-service/src/main/resources/mapper/CqcCarbonMakeMapper.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.cqcCarbonMake.mapper.CqcCarbonMakeMapper">
</mapper>

33
modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper">
<resultMap type="com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity" id="cqcCarbonRawMap">
<result property="id" column="id"/>
<result property="applyNo" column="apply_no"/>
<result property="materialno" column="materialno"/>
<result property="cateid" column="cateid"/>
<result property="materialsnamecn" column="materialsnamecn"/>
<result property="materialsnameen" column="materialsnameen"/>
<result property="productionprocesses" column="productionprocesses"/>
<result property="materialcomponent" column="materialcomponent"/>
<result property="productcapacity" column="productcapacity"/>
<result property="productcapacityunit" column="productcapacityunit"/>
<result property="rawmaterialsinput" column="rawmaterialsinput"/>
<result property="rawmaterialsunit" column="rawmaterialsunit"/>
<result property="suppliername" column="suppliername"/>
<result property="supplieraddress" column="supplieraddress"/>
<result property="transmode" column="transmode"/>
<result property="transloadcapacity" column="transloadcapacity"/>
<result property="transdistance" column="transdistance"/>
<result property="transdistanceunit" column="transdistanceunit"/>
<result property="transdatasource" column="transdatasource"/>
<result property="activitydatasource" column="activitydatasource"/>
<result property="dept" column="dept"/>
<result property="person" column="person"/>
<result property="phone" column="phone"/>
<result property="remake" column="remake"/>
</resultMap>
</mapper>

6
modules/cqc-service/src/main/resources/mapper/CqcCarbonRawMapper.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.cqcCarbonRaw.mapper.CqcCarbonRawMapper">
</mapper>

80
modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml

@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper">
<resultMap type="com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity" id="cqcCarbonReportMap">
<result property="deptId" column="dept_id"/>
<result property="applyNo" column="apply_no"/>
<result property="clientNameCn" column="client_name_cn"/>
<result property="clientNameEn" column="client_name_en"/>
<result property="clientAddressCn" column="client_address_cn"/>
<result property="clientAddressEn" column="client_address_en"/>
<result property="clientPostcode" column="client_postcode"/>
<result property="clientContactName" column="client_contact_name"/>
<result property="clientDepartment" column="client_department"/>
<result property="clientPosition" column="client_position"/>
<result property="clientPhone" column="client_phone"/>
<result property="clientFax" column="client_fax"/>
<result property="clientEmail" column="client_email"/>
<result property="relationshipWithChecked" column="relationship_with_checked"/>
<result property="enterpriseNameCn" column="enterprise_name_cn"/>
<result property="enterpriseNameEn" column="enterprise_name_en"/>
<result property="enterpriseAddressCn" column="enterprise_address_cn"/>
<result property="enterpriseAddressEn" column="enterprise_address_en"/>
<result property="enterpriseNature" column="enterprise_nature"/>
<result property="offerProduct" column="offer_product"/>
<result property="annualProduction" column="annual_production"/>
<result property="supplyDataAvailable" column="supply_data_available"/>
<result property="companyUrl" column="company_url"/>
<result property="transportationDataComplete" column="transportation_data_complete"/>
<result property="isUseIso" column="is_use_iso"/>
<result property="currentEnergySource" column="current_energy_source"/>
<result property="currentEnergyOther" column="current_energy_other"/>
<result property="factoryNameCn" column="factory_name_cn"/>
<result property="factoryNameEn" column="factory_name_en"/>
<result property="factoryAddressCn" column="factory_address_cn"/>
<result property="factoryAddressEn" column="factory_address_en"/>
<result property="isCarbonCheck" column="is_carbon_check"/>
<result property="checkType" column="check_type"/>
<result property="expectedCheckLevel" column="expected_check_level"/>
<result property="language" column="language"/>
<result property="productNameCn" column="product_name_cn"/>
<result property="productNameEn" column="product_name_en"/>
<result property="productModelCn" column="product_model_cn"/>
<result property="productModelEn" column="product_model_en"/>
<result property="startDate" column="start_date"/>
<result property="endDate" column="end_date"/>
<result property="fileReviewDate" column="file_review_date"/>
<result property="statementSubmissionDate" column="statement_submission_date"/>
<result property="onSiteCheckDate" column="on_site_check_date"/>
<result property="certificateReleaseDate" column="certificate_release_date"/>
<result property="otherRequirements" column="other_requirements"/>
<result property="ghgInventoryPrepared" column="ghg_inventory_prepared"/>
<result property="ghgInventoryCoveredPeriod" column="ghg_inventory_covered_period"/>
<result property="specialAttention" column="special_attention"/>
<result property="processDescription" column="process_description"/>
<result property="productInfo" column="product_info"/>
<result property="companyInfo" column="company_info"/>
<result property="avgPersonNum" column="avg_person_num"/>
<result property="avgWorkTim" column="avg_work_tim"/>
<result property="measureUnit" column="measure_unit"/>
<result property="waitProductionCapacity" column="wait_production_capacity"/>
<result property="waitProductionUnit" column="wait_production_unit"/>
<result property="pieceWeight" column="piece_weight"/>
<result property="pieceWeightUnit" column="piece_weight_unit"/>
<result property="fullProductionCapacity" column="full_production_capacity"/>
<result property="fullProductionUnit" column="full_production_unit"/>
<result property="checkExecutive" column="check_executive"/>
<result property="phone" column="phone"/>
<result property="email" column="email"/>
<result property="id" column="id"/>
<result property="tenantCode" column="tenant_code"/>
<result property="companyId" column="company_id"/>
<result property="creator" column="creator"/>
<result property="createDate" column="create_date"/>
<result property="updater" column="updater"/>
<result property="updateDate" column="update_date"/>
</resultMap>
</mapper>

6
modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thing.cqc.cqcCarbonReport.mapper.CqcCarbonReportMapper">
</mapper>

33
modules/thing/src/main/java/com/thing/sys/biz/utils/HttpClientUtil.java

@ -53,31 +53,42 @@ public class HttpClientUtil {
* @return
*/
@SuppressWarnings("unchecked")
public static String post(String url, Map<String,String> data){
public static String post(String url, Map<String, String> data) {
StringBuffer sb = new StringBuffer();
HttpPost httpPost = new HttpPost(url);
List<NameValuePair> valuePairs = new ArrayList<>();
if(null != data) {
for (String key : data.keySet()) {
valuePairs.addAll((Collection<? extends NameValuePair>) new BasicNameValuePair(key, data.get(key)));
// Ensure 'data' is not null
if (data != null) {
// Iterate through the map entries
for (Map.Entry<String, String> entry : data.entrySet()) {
// Create a NameValuePair and add it to the list
valuePairs.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
}
}
try {
httpPost.setEntity(new UrlEncodedFormEntity(valuePairs));
// Set the entity of the HttpPost with UrlEncodedFormEntity
httpPost.setEntity(new UrlEncodedFormEntity(valuePairs, "UTF-8"));
HttpResponse response = httpClient.execute(httpPost);
HttpEntity httpEntity = response.getEntity();
BufferedInputStream bis = new BufferedInputStream(httpEntity.getContent());
byte [] buffer;
while (0<bis.read(buffer=new byte[128])){
sb.append(new String(buffer,"utf-8"));
byte[] buffer = new byte[128];
int bytesRead;
// Read the response content
while ((bytesRead = bis.read(buffer)) != -1) {
sb.append(new String(buffer, 0, bytesRead, "UTF-8"));
}
}catch (UnsupportedEncodingException e){//数据格式有误
} catch (UnsupportedEncodingException e) {
// Handle encoding errors
e.printStackTrace();
}catch (IOException e){//请求出错
} catch (IOException e) {
// Handle I/O errors
e.printStackTrace();
}finally {
} finally {
httpPost.releaseConnection();
}
return sb.toString();
}
}

7
modules/thing/src/main/java/com/thing/thing/dict/controller/IotThingDictController.java

@ -168,5 +168,12 @@ public class IotThingDictController {
}
@GetMapping("dragAndDrop/{id}/{toId}/{sort}")
@Operation(summary="字典类型集合")
public Result<Void> dragAndDrop(@PathVariable("id") Long id,@PathVariable("toId") Long toId,@PathVariable("sort")Long sort) {
service.dragAndDrop(id, toId, sort);
return new Result<>();
}
}

2
modules/thing/src/main/java/com/thing/thing/dict/service/IotThingDictService.java

@ -57,4 +57,6 @@ public interface IotThingDictService extends IBaseService<IotThingDictEntity> {
List<Map<String, String>> type();
void dragAndDrop(Long id,Long toId,Long sort);
}

62
modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java

@ -3,11 +3,14 @@ package com.thing.thing.dict.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.mybatisflex.core.constant.SqlConsts;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryCondition;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.row.Db;
import com.mybatisflex.core.update.UpdateChain;
import com.thing.common.core.enumeration.DictTypeEnum;
import com.thing.common.core.enumeration.IsDefaultEnum;
import com.thing.common.core.exception.SysException;
@ -384,4 +387,63 @@ public class IotThingDictServiceImpl extends BaseServiceImpl<IotThingDictMapper,
.toList();
}
@Override
public void dragAndDrop(Long id, Long toId, Long sort) {
IotThingDictEntity iotThingDictEntity = mapper.selectOneById(id);
IotThingDictEntity toDictEntity = mapper.selectOneById(toId);
//自定义字典列表
List<IotThingDictEntity> noDefaultList = mapper.selectListByQuery(QueryWrapper.create().eq(IotThingDictEntity::getTenantCode, UserContext.getRealTenantCode())
.eq(IotThingDictEntity::getIsDefault, 1));
//自定义字典列表
List<IotThingDictEntity> defaultList = mapper.selectListByQuery(QueryWrapper.create()
.eq(IotThingDictEntity::getIsDefault, 0));
List<IotThingDictEntity> iotThingDictEntities = Lists.newArrayList();
iotThingDictEntities.addAll(noDefaultList);
iotThingDictEntities.addAll(defaultList);
//若是大于当前目前序号则更新当前序号之前的排序
AtomicLong aLong = new AtomicLong(0);
if(toDictEntity.getSort()<=sort){
iotThingDictEntities.stream().filter(s -> s.getSort() < sort)
.sorted(Comparator.comparing(IotThingDictEntity::getSort))
.forEach(s -> {
s.setSort(aLong.incrementAndGet());
mapper.update(s);
});
iotThingDictEntity.setSort(aLong.incrementAndGet());
mapper.update(iotThingDictEntity);
iotThingDictEntities.stream()
.sorted(Comparator.comparing(IotThingDictEntity::getSort))
.filter(s -> s.getSort() >= sort).forEach(s -> {
s.setSort(aLong.incrementAndGet());
mapper.update(s);
});
}else{
iotThingDictEntities.stream().filter(s -> s.getSort() >= sort)
.sorted(Comparator.comparing(IotThingDictEntity::getSort))
.forEach(s -> {
s.setSort(aLong.incrementAndGet());
mapper.update(s);
});
iotThingDictEntity.setSort(aLong.incrementAndGet());
iotThingDictEntities.stream().filter(s -> s.getSort() > sort)
.sorted(Comparator.comparing(IotThingDictEntity::getSort))
.forEach(s -> {
s.setSort(aLong.incrementAndGet());
mapper.update(s);
});
}
// Db.executeBatch(iotThingDictEntities.size(), 1000, IotThingDictMapper.class, (mapper, index) -> {
// IotThingDictEntity account = iotThingDictEntities.get(index);
// UpdateChain.of(account).update();
// });
// iotThingDictEntities.forEach(s -> mapper.update(s));
//
// int i = Db.updateEntitiesBatch(iotThingDictEntities, 1000);
// System.out.println(i);
}
}

7
modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java

@ -440,13 +440,6 @@ public class IotGroupInfoServiceImpl extends BaseServiceImpl<IotGroupInfoMapper,
if (GroupTypeEnum.noneMatch(type)) {
throw new SysException("组类型不正确");
}
//如果组已经绑定字典&物实体&物模板,不让其修改组类型
//List<IotThingDictEntity> thingDictEntities = dictService.findAllByGroupId(id);
List<IotGroupRelationEntity> groupRelationEntities = groupRelationService.findAllByGroupId(id);
if (/*(CollectionUtil.isNotEmpty(thingDictEntities) ||*/ CollectionUtil.isNotEmpty(groupRelationEntities))
/*&& !StringUtils.equals(groupInfoEntity.getType(), dto.getType()))*/ {
throw new SysException("当前组关联了字典或者物实体,不能修改组类型");
}
if (!UserContext.isAdmin() && ObjectUtil.equals(groupInfoEntity.getIsDefault(), IsDefaultEnum.Y.getValue())) {
throw new SysException("暂无修改系统默认组的权限");
}

10
modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java

@ -143,6 +143,16 @@ public class IotThingModelController {
return new Result<PageData<TsKvDTO>>().ok(service.latestData(entityCode,attrs,startTime,endTime,page,limit));
}
@GetMapping("latestList")
@Operation(summary="获取code在时序数据库中的时序属性")
@Parameters({
@Parameter(name = "entityCode",description ="物编码"),
@Parameter(name = "attrs",description ="属性编码集合")
})
public Result<List<TsKvDTO>> latestList(String entityCode,String attrs) {
return new Result<List<TsKvDTO>>().ok(service.latestList(entityCode,attrs));
}
@GetMapping("getSequenceAttr")
@Operation(summary="获取code在时序数据库中的时序属性")
@Parameters({

2
modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java

@ -41,6 +41,8 @@ public interface IotThingModelService extends IBaseService<IotThingModelEntity>
PageData<TsKvDTO> latestData(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit);
List<TsKvDTO> latestList(String entityCode, String attrs);
void saveSequenceAttr(List<TsKvDTO> tsKvDTOS);
void deleteSequenceAttr(List<TsKvDTO> tsKvDTOS);

14
modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java

@ -265,6 +265,20 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
return tsKvService.findPageLatestByCodesAndAttrs(Lists.newArrayList(entityCode), attrList, false,page, limit);
}
@Override
public List<TsKvDTO> latestList(String entityCode, String attrs) {
Optional<ModelDetailDTO> optional = findByCode(entityCode);
if (optional.isEmpty()) {
return null;
}
//获取时序属性
List<String> attrList = Lists.newArrayList();
if (StringUtils.isNotBlank(attrs)) {
attrList.addAll(Arrays.stream(attrs.split(",")).distinct().toList());
}
return tsKvService.findLatestByCodeAndAttrs(entityCode, attrList, false);
}
@Override
public void saveSequenceAttr(List<TsKvDTO> tsKvDTOS) {

Loading…
Cancel
Save