shenyijian
2024-06-14 c0d555bcd9ff0e8fa35e5a8636bc4c05743dc1e9
Merge remote-tracking branch 'origin/jtdev' into jtdev
4 files modified
31 ■■■■■ changed files
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java 7 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgDeviceService.java 9 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java 14 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
@@ -72,6 +72,7 @@
    /**
     * 创建人
     */
    @TableField(exist = false)
    private Long createUser;
    /**
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
@@ -15,6 +15,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
 * <p>
@@ -107,4 +108,10 @@
        SgDeviceDO sgDeviceDO = sgDeviceService.getById(id);
        return R.data(sgDeviceDO);
    }
    @GetMapping(value = "/getDeviceList")
    public R queryPageList(@RequestParam(name="programId",required=true) String programId) {
        List<SgDeviceDO> page = sgDeviceService.getDeviceList(programId);
        return R.data(page);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgDeviceService.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
 * <p>
 * 施工子设备表 服务类
@@ -16,4 +18,11 @@
public interface SgDeviceService extends IService<SgDeviceDO> {
    IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO);
    /**
     * 根据项目id查询下下面的设备list
     * @param programId
     * @return
     */
    List<SgDeviceDO> getDeviceList(String programId);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
@@ -4,6 +4,7 @@
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import cn.gistack.sm.sg.mapper.SgDeviceMapper;
import cn.gistack.sm.sg.service.SgDeviceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -26,4 +27,17 @@
        List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(searchDTO);
        return page.setRecords(sgDeviceDOS);
    }
    /**
     * 根据项目id查询下下面的设备list
     *
     * @param programId
     * @return
     */
    @Override
    public List<SgDeviceDO> getDeviceList(String programId) {
        QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("program_id",programId);
        return baseMapper.selectList(queryWrapper);
    }
}