src/main/java/com/cuit/solarenergy/controller/SimulAndPredicController.java

@@ -8,11 +8,9 @@ import com.cuit.solarenergy.entity.TGeoserverinfo;
 import com.cuit.solarenergy.entity.vo.req.SolarPredicReq;
 import com.cuit.solarenergy.entity.vo.ret.RetResponse;
 import com.cuit.solarenergy.entity.vo.ret.RetResult;
-import com.cuit.solarenergy.entity.vo.ret.SituationRet;
 import com.cuit.solarenergy.exception.ParamsException;
 import com.cuit.solarenergy.service.DataImportService;
 import com.cuit.solarenergy.service.GeoServerPubService;
-import com.cuit.solarenergy.service.SituationService;
 import com.cuit.solarenergy.service.SolarenergyService;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.*;
@@ -41,8 +39,6 @@ public class SimulAndPredicController {
     GeoServerPubService geoServerPubService;
     @Autowired
     private DataImportService dataImportService;
-    @Autowired
-    SituationService situationService;
 
     @AopLog
     @AuthToken
@@ -109,36 +105,14 @@ public class SimulAndPredicController {
             //2.发布geoserverter服务并存入数据库
             Long aLong = geoServerPubService.pubGeoServerAndSavetoDB("style_tynday", "EPSG:3857",pathFile, solarReq.getRegionname());
             if (Objects.isNull(aLong)|| aLong == -1){
-                return RetResponse.makeErrRsp("太阳能日总辐射预报服务有误");
+                return RetResponse.makeErrRsp("太阳能日总辐射实时模拟服务有误");
             }
             //3.查询tif
             log.info("Tif查询");
             TGeoserverinfo regionInfo = dataImportService.getTifByRegionAndTime(solarReq.getRegionname());
             return RetResponse.makeOKRsp(regionInfo);
         }catch (RuntimeException e){
-            return RetResponse.makeErrRsp("太阳能日总辐射预报有误！"+e.getMessage());
+            return RetResponse.makeErrRsp("太阳能日总辐射实时模拟有误！"+e.getMessage());
-        }
-    }
-
-    @AopLog
-    @AuthToken
-    @ApiOperation("3、总体影响情况")
-    @PreAuthorize("hasAuthority('minio:upload')")
-    @RequestMapping(value = "/solarenergy/getGerneralSituation", method = {RequestMethod.GET})
-    @ApiResponses({
-            @ApiResponse(code = 200, message = "成功"),
-            @ApiResponse(code = 401, message = "访问未经授权"),
-            @ApiResponse(code = 403, message = "访问被禁止的"),
-            @ApiResponse(code = 404, message = "未找到访问接口"),
-            @ApiResponse(code = 500, message = "服务器内部错误"),
-            @ApiResponse(code = 900, message = "失败")
-    })
-    public RetResult<List<SituationRet>> getGerneralSituation() {
-        try {
-            List<SituationRet> situations = situationService.getSituations();
-            return RetResponse.makeOKRsp(situations);
-        }catch (RuntimeException e){
-            return RetResponse.makeErrRsp("总体影响情况有误！"+e.getMessage());
         }
     }
 

src/main/java/com/cuit/solarenergy/entity/vo/ret/SituationRet.java

@@ -1,22 +0,0 @@
-package com.cuit.solarenergy.entity.vo.ret;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel(description = "总体影响情况返回类")
-public class SituationRet {
-    @ApiModelProperty(value = "起报时间",name = "startpretime")
-    private String startpretime;
-    @ApiModelProperty(value = "预报时间",name = "startpretime")
-    private String startruntime;
-    @ApiModelProperty(value = "运行进度",name = "runprogress")
-    private String runprogress;
-}

src/main/java/com/cuit/solarenergy/service/SituationService.java

@@ -1,9 +0,0 @@
-package com.cuit.solarenergy.service;
-
-import com.cuit.solarenergy.entity.vo.ret.SituationRet;
-
-import java.util.List;
-
-public interface SituationService {
-    public List<SituationRet> getSituations();
-}

src/main/java/com/cuit/solarenergy/service/impl/SituationServiceImpl.java

@@ -1,44 +0,0 @@
-package com.cuit.solarenergy.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.cuit.solarenergy.entity.TDictData;
-import com.cuit.solarenergy.entity.vo.ret.SituationRet;
-import com.cuit.solarenergy.entity.vo.ret.Stream;
-import com.cuit.solarenergy.mapper.*;
-import com.cuit.solarenergy.service.CommonService;
-import com.cuit.solarenergy.service.SituationService;
-import com.cuit.solarenergy.utils.AssertUtil;
-import com.cuit.solarenergy.vo.TDataOriginMethod;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: Tjb
- * @CreateTime: 2023-06-17  09:52
- * @Description: 检测数据实现类
- * @Version: 1.0
- */
-@Service
-@Slf4j
-public class SituationServiceImpl implements SituationService {
-
-    @Override
-    public List<SituationRet> getSituations() {
-        ArrayList<SituationRet> lists = new ArrayList<>();
-        //构造数据
-        lists.add(new SituationRet("11-20 11:23:32","11-20 11:23:32","进行中"));
-        lists.add(new SituationRet("11-21 12:27:31","11-21 12:27:31","进行中"));
-        lists.add(new SituationRet("11-22 13:25:30","11-22 13:25:30","进行中"));
-        lists.add(new SituationRet("11-23 14:26:35","11-23 14:26:35","进行中"));
-        lists.add(new SituationRet("11-24 13:27:36","11-24 13:27:36","进行中"));
-        lists.add(new SituationRet("11-25 16:30:20","11-25 16:30:20","进行中"));
-        lists.add(new SituationRet("11-26 14:32:00","11-26 14:32:00","进行中"));
-        lists.add(new SituationRet("11-27 12:30:39","11-27 12:30:39","进行中"));
-        lists.add(new SituationRet("11-28 17:31:40","11-28 17:31:40","进行中"));
-        return lists;
-    }
-}