src/main/java/com/whyc/controller/ConditionController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/LockInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/ConditionController.java
@@ -7,6 +7,7 @@ import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -70,4 +71,10 @@ return lockInfService.getScreenProduct(uinf.getUid()); } @ApiOperation(value = "历史界面查询锁(下拉)") @GetMapping("getLockInHis") public Response getLockInHis(@RequestParam Integer stationId, @RequestParam Integer baojiId){ return lockInfService.getLockInHis(stationId,baojiId); } } src/main/java/com/whyc/service/LockInfService.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestParam; import java.util.*; import java.util.stream.Collectors; @@ -232,4 +233,14 @@ PageInfo pageInfo=new PageInfo(list); return new Response().setII(1,list!=null,pageInfo,"查询锁的信息和id卡"); } //历史界面查询锁(下拉) public Response getLockInHis(Integer stationId, Integer baojiId) { //根据dto中stationid和包机组id查询出管理的lockid List<Integer> lockIdList=bjLockMapper.getLocIdByStationidAndBjId(stationId,baojiId); QueryWrapper wrapper=new QueryWrapper(); wrapper.in("lock_id",lockIdList); wrapper.orderByAsc("lock_id"); List<LockInf> list=mapper.selectList(wrapper); return new Response().setII(1,list!=null,list,"历史界面查询锁(下拉)"); } }