...
|
...
|
@@ -14,10 +14,7 @@ import com.synthesize_energy.item.utils.JwtUtil; |
|
|
import com.synthesize_energy.item.vo.CalculateLoadVo;
|
|
|
import com.synthesize_energy.item.vo.EnergyEquipmentVo;
|
|
|
import com.synthesize_energy.item.web.service.*;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
...
|
...
|
@@ -84,16 +81,14 @@ public class ProjectController { |
|
|
@Autowired
|
|
|
private HeatIngDataMapper heatIngDataMapper;
|
|
|
|
|
|
@GetMapping("getindex")
|
|
|
public RestResponse<?> getInfex(String id){
|
|
|
EnergyEquipmentVo energyEquipmentVo = new EnergyEquipmentVo();
|
|
|
Synthesize_no_2_4 synthesize_no_2_4 = synthesize_no_2_4Service.getById(id);
|
|
|
BeanUtils.copyProperties(synthesize_no_2_4,energyEquipmentVo);
|
|
|
Synthesize_no_2_3 synthesize_no_2_3 = synthesize_no_2_3Service.getById(id);
|
|
|
energyEquipmentVo.setColdMsgDto(JSON.parseObject(JSON.parse(synthesize_no_2_3.getColdMsg()).toString(), ColdMsgDto.class));
|
|
|
energyEquipmentVo.setHotMsgDto(JSON.parseObject(JSON.parse(synthesize_no_2_3.getHotMsg()).toString(), HotMsgDto.class));
|
|
|
energyEquipmentVo.setHotWaterDto(JSON.parseObject(JSON.parse(synthesize_no_2_3.getHotWaterMsg()).toString(), HotWaterDto.class));
|
|
|
return RestResponse.success();
|
|
|
@GetMapping("getHeatingDays/{id}")
|
|
|
@ApiOperation(value = "获取供热天数")
|
|
|
public RestResponse<?> getHeatingDays(@PathVariable("id")@ApiParam(value = "id",name = "项目ID") String id){
|
|
|
Synthesize_no_1 synthesize_no_1 = no_1Service.getById(id);
|
|
|
Assert.notNull(synthesize_no_1,"请先保存项目信息!");
|
|
|
CityDict dict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, synthesize_no_1.getProjectSite()));//城市
|
|
|
HeatIngData heatIngData = heatIngDataMapper.selectById(dict.getId());
|
|
|
return RestResponse.success(heatIngData.getNo3());
|
|
|
}
|
|
|
|
|
|
@PostMapping("no_1")
|
...
|
...
|
|