moral.git - Gitblit

			@@ -2,29 +2,18 @@

			import com.moral.api.config.properties.SpecialCitiesProperties;
			import com.moral.api.entity.SysArea;
			import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
			import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;
			import com.moral.api.pojo.dto.cityAQI.DataPercentRange;
			import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
			import com.moral.api.pojo.dto.cityAQI.*;
			import com.moral.api.pojo.form.aqi.*;
			import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;
			import com.moral.api.pojo.vo.cityAQI.BarChartOfPollutionLevelVO;
			import com.moral.api.pojo.vo.cityAQI.BarChartTableOfPollutionLevelVO;
			import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO;
			import com.moral.api.pojo.vo.cityAQI.*;
			import com.moral.api.service.CityAqiDailyService;

			import com.moral.api.service.CityAqiYearlyService;
			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 org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Required;
			import org.springframework.format.annotation.DateTimeFormat;
			import org.springframework.util.ObjectUtils;
			import org.springframework.web.bind.annotation.CrossOrigin;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RestController;
			import org.springframework.web.bind.annotation.*;

			import java.util.*;

			@@ -35,7 +24,6 @@
			import com.moral.constant.ResponseCodeEnum;
			import com.moral.constant.ResultMessage;
			import com.moral.util.WebUtils;
			import sun.security.util.Resources_sv;

			@RestController
			@RequestMapping("/aqi")
			@@ -47,6 +35,10 @@
			private CityAqiService cityAqiService;
			@Autowired
			private CityAqiDailyService cityAqiDailyService;
			@Autowired
			SpecialCitiesProperties specialCitiesProperties;
			@Autowired
			CityAqiYearlyService cityAqiYearlyService;

			@GetMapping("compareO3")
			@ApiOperation(value = "预测和实测臭氧对比", notes = "预测和实测臭氧对比")
			@@ -59,6 +51,28 @@
			return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
			}
			List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3(params);
			return ResultMessage.ok(response);
			}

			@GetMapping("compareO3New")
			@ApiOperation(value = "预测和实测臭氧对比New", notes = "预测和实测臭氧对比New")
			public ResultMessage compareO3New(@RequestParam @ApiParam(value = "regionCode",name = "城市code") String regionCode,
			@RequestParam @ApiParam(value = "time",name = "日期") String time) {
			Map<String, Object> params = new HashMap<>();
			params.put("regionCode",regionCode);
			params.put("time",time);
			List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3(params);
			return ResultMessage.ok(response);
			}

			@GetMapping("getO38H")
			@ApiOperation(value = "预测和实测臭氧对比New", notes = "预测和实测臭氧对比New")
			public ResultMessage getO38H(@RequestParam @ApiParam(value = "regionCode",name = "城市code") String regionCode,
			@RequestParam @ApiParam(value = "time",name = "日期") String time) {
			Map<String, Object> params = new HashMap<>();
			params.put("regionCode",regionCode);
			params.put("time",time);
			List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3_8H(params);
			return ResultMessage.ok(response);
			}

			@@ -282,10 +296,6 @@
			return ResultMessage.ok(datas);
			}

			@Autowired
			SpecialCitiesProperties specialCitiesProperties;
			@Autowired
			CityAqiYearlyService cityAqiYearlyService;
			/**
			* @Description: 优良天变化率分析
			* @Param: [year, cityCode]
			@@ -302,4 +312,57 @@
			return ResultMessage.ok(result);
			}

			@GetMapping("queryComplianceDaysAnalysis")
			public ResultMessage queryComplianceDaysAnalysis( String year, Integer cityCode){
			if(year==null\|\|cityCode==null)
			return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
			ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
			List<ComplianceDaysDTO> dtos = cityAqiYearlyService.analysisComplianceDays(year, cityCode);
			return ResultMessage.ok(ComplianceDaysVO.convert(dtos));
			}

			@GetMapping("momDate")
			public ResultMessage momDate(Integer regionCode, Integer size, Integer current, Integer orgId){
			if(regionCode==null \|\| size==null \|\| current==null){
			return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
			ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
			}
			Map<String, Object> result = cityAqiService.momData(regionCode, size, current, orgId);
			return ResultMessage.ok(result);
			}

			/**
			* @Description: 查询市内所有县的排名附件7
			* @Param: [regionCode, time]
			* @return: com.moral.constant.ResultMessage
			* @Author: 陈凯裕
			* @Date: 2022/3/16
			*/
			@GetMapping("cityAreaRange")
			public ResultMessage cityAreaRange(Integer regionCode,@DateTimeFormat(pattern = "yyyy-MM-dd") Date time){
			if(regionCode==null \|\| time==null){
			return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
			ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
			}
			List<CityAreaRangeVO> vos = cityAqiDailyService.cityAreaRange(regionCode,time);
			return ResultMessage.ok(vos);
			}

			/**
			*@Description: 县市区数据
			*@Param: [regionCode]
			*@return: com.moral.constant.ResultMessage
			*@Author: lizijie
			*@Date: 2022/3/16 16:54
			**/
			@GetMapping("countyData")
			public ResultMessage countyData(Integer regionCode){
			if(regionCode==null){
			return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
			ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
			}
			Map<String, Object> resultMap = cityAqiService.countyData(regionCode);
			return ResultMessage.ok(resultMap);
			}

			}