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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java

@@ -1,6 +1,7 @@
package cn.gistack.sm.sg.controller;

import cn.gistack.sm.sg.DO.SgDeviceDO;
import cn.gistack.sm.sg.DO.SgGxStepDO;
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import cn.gistack.sm.sg.service.SgDeviceService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,7 +53,7 @@
         sgDeviceDO.setCreateTime(now);
      }
      sgDeviceDO.setUpdateTime(now);
      return R.data(sgDeviceService.save(sgDeviceDO));
      return R.data(sgDeviceService.saveById(sgDeviceDO));
   }

   /**
@@ -102,16 +103,22 @@
    * @param id
    * @return
    */
   @ApiOperation(value="巡查记录-通过id查询", notes="子设备-通过id查询")
   @ApiOperation(value="子设备-通过id查询", notes="子设备-通过id查询")
   @GetMapping(value = "/queryById")
   public R queryById(@RequestParam(name="id",required=true) String id) {
      SgDeviceDO sgDeviceDO = sgDeviceService.getById(id);
      SgDeviceDO sgDeviceDO = sgDeviceService.getSgDeviceById(id);
      return R.data(sgDeviceDO);
   }

   @GetMapping(value = "/getDeviceList")
   public R queryPageList(@RequestParam(name="programId",required=true) String programId) {
   public R getDeviceList(@RequestParam(name="programId",required=true) String programId) {
      List<SgDeviceDO> page = sgDeviceService.getDeviceList(programId);
      return R.data(page);
   }

   @GetMapping(value = "/getStepList")
   public R queryStepList(@RequestParam(name="deviceId",required=true) String deviceId) {
      List<SgGxStepDO> page = sgDeviceService.queryStepList(deviceId);
      return R.data(page);
   }
}