Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-08-27 f73dbcd6c21d28ab1e98840eee73c6d09bd0f929

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java

@@ -3,9 +3,12 @@
import cn.gistack.sm.jcsb.entity.DbReport;
import cn.gistack.sm.jcsb.entity.DbReport;
import cn.gistack.sm.jcsb.entity.DeviceReport;
import cn.gistack.sm.jcsb.entity.ExtremumDO;
import cn.gistack.sm.jcsb.service.IDbReportService;
import cn.gistack.sm.jcsb.service.IExtremumService;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DbReportVO;
import cn.gistack.sm.sg.DO.SgDeviceDO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,7 +36,7 @@
public class DbReportController extends BladeController {

   private final IDbReportService dbReportService;

   private final IExtremumService extremumService;
   @GetMapping("/page")
   @ApiOperation(value = "列表", notes = "传入实体类参数")
   public R<IPage<DbReportVO>> pageList(DbReportVO dbReport, Query query) {
@@ -76,4 +79,45 @@
   public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
      return R.data(dbReportService.removeBatchByIds(Func.toLongList(ids)));
   }


   //获取最新上报数据
   @GetMapping("/getLatestList")
   public R getLatestList(DbReportVO dbReport){
      return R.data(dbReportService.getLatestList(dbReport));
   }


   /**
    * 新增或修改 类型极值
    */
   @PostMapping("/addExtremum")
   @ApiOperation(value = "新增或修改类型极值", notes = "传入实体类参数")
   public R submit(@RequestBody ExtremumDO extremumDO) {

      if(extremumDO!=null&&extremumDO.getId()!=null){
         return R.data(extremumService.updateById(extremumDO));
      }else {

         String type = extremumDO.getType();
         String skId = extremumDO.getSkId();
         ExtremumDO extremum = extremumService.getExtremum(type, skId);
         if(extremum!=null){
            extremumDO.setId(extremum.getId());
            return R.data(extremumService.updateById(extremumDO));
         }

         return R.data(extremumService.saveOrUpdate(extremumDO));
      }



   }


   @GetMapping(value = "/getExtremum")
   public R getExtremumList(@RequestParam(name="skId",required=true) String skId,String type) {
      List<ExtremumDO> page = extremumService.getExtremumList(skId,type);
      return R.data(page);
   }
}