新增个工序下拉

gonglilong

2024-06-18 4fae1b86fe0b4772a3dacd33701011694fe92ddd

新增个工序下拉

 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;
@@ -110,8 +111,14 @@
    }

    @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);
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java

@@ -29,4 +29,6 @@
     * @return
     */
    List<SgDeviceGxStepDO> getDeviceGXList(@Param("deviceId") Long deviceId);

    List<SgGxStepDO> queryStepList(@Param("deviceId")String deviceId);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml

@@ -30,4 +30,10 @@


    </select>
    <select id="queryStepList" resultType="cn.gistack.sm.sg.DO.SgGxStepDO">
        select * from YWXT.SG_GX_STEP step   inner join  YWXT.SG_GX sg     on sg.id=step.gx_info_id
        left join  YWXT.SG_DEVICE sd on sd.device_type=sg.gx_type
        where sd.id= #{deviceId}
    </select>

</mapper>

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

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

import cn.gistack.sm.sg.DO.SgDeviceDO;
import cn.gistack.sm.sg.DO.SgGxStepDO;
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -27,4 +28,6 @@
    List<SgDeviceDO> getDeviceList(String programId);

    SgDeviceDO getSgDeviceById(String id);

    List<SgGxStepDO> queryStepList(String deviceId);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java

@@ -1,12 +1,15 @@
package cn.gistack.sm.sg.service.impl;

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.mapper.SgDeviceMapper;
import cn.gistack.sm.sg.mapper.SgGxStepMapper;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -21,7 +24,8 @@
 */
@Service
public class SgDeviceServiceImpl extends ServiceImpl<SgDeviceMapper, SgDeviceDO> implements SgDeviceService {

    @Autowired
    private SgGxStepMapper sgGxStepMapper;
    @Override
    public IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO) {
        List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(page,searchDTO);
@@ -45,4 +49,9 @@
    public SgDeviceDO getSgDeviceById(String id) {
        return baseMapper.getSgDeviceById(id);
    }

    @Override
    public List<SgGxStepDO> queryStepList(String deviceId) {
        return sgGxStepMapper.queryStepList(deviceId);
    }
}