diff --git a/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java b/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java index 55476fae..3647b9e0 100644 --- a/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java +++ b/src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java @@ -12,6 +12,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; +/** + * 闸机车辆管理 + * LLX + * 2024-01-23 + */ @RestController @RequestMapping("/gateCar") public class GateCarIOController extends BaseController { @@ -20,11 +25,9 @@ public class GateCarIOController extends BaseController { private GateCarIOService gateCarIOService; /** - * @Description: 车辆进出记录列表 - * @Author: dearLin - * @Date: 2024/1/23/023 8:45 - * @Param: [com.zcloud.entity.Page] [page] - * @Return: com.zcloud.util.ReturnMap + * 出入闸机车辆记录 + * @param page + * @return 记录 */ @RequestMapping(value = "/page") public ReturnMap page(Page page) { @@ -38,11 +41,8 @@ public class GateCarIOController extends BaseController { } /** - * @Description: TODO - * @Author: dearLin - * @Date: 2024/1/23/023 8:46 - * @Param: [] [] - * @Return: com.zcloud.util.ReturnMap + * 编辑出入闸机车辆记录 + * @return */ @RequestMapping(value = "/edit") @DockAnnotation @@ -52,6 +52,10 @@ public class GateCarIOController extends BaseController { return ReturnMap.ok(); } + /** + * 删除出入闸机车辆记录 + * @return + */ @RequestMapping(value = "/removeByIds") @DockAnnotation public ReturnMap removeByIds() { @@ -60,6 +64,10 @@ public class GateCarIOController extends BaseController { return ReturnMap.ok(); } + /** + * 添加出入闸机车辆记录 + * @return + */ @RequestMapping(value = "/add") @DockAnnotation public ReturnMap add() { @@ -68,15 +76,22 @@ public class GateCarIOController extends BaseController { return ReturnMap.ok(); } + /** + * 根据条件获取杂货/矿区闸机出入记录 + * @return + */ @RequestMapping(value = "/getIORecords") public ReturnMap getIORecord() { return ReturnMap.ok().put("data", gateCarIOService.getIORecord(this.getPageData())); } + /** + * 获取在场,离场,总量计数 + * @return + */ @RequestMapping(value = "/getEQCount") public ReturnMap getTodayEQCount() { - PageData page = this.getPageData(); - return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(page)); + return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(this.getPageData())); } } diff --git a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java index 3283a837..c78688a6 100644 --- a/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java +++ b/src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java @@ -23,46 +23,62 @@ public class GateCarIOServiceImpl implements GateCarIOService { @Resource private InitPageDataUtil initPageDataUtil; + /** + * 出入闸机车辆记录 + * @param page + * @return 记录 + */ @Override public List getDatalistpage(Page page) { return czksGateCarIOMapper.getDatalistPage(page); } + /** + * 根据条件获取杂货/矿区闸机出入记录 + * @return + */ @Override public List getIORecord(PageData page) { - if (page.get("areaType") != null && "1".equals(page.get("areaType").toString())) { - return czksGateCarIOMapper.getGroceryIORecords(page); - } else { - return czksGateCarIOMapper.getMineralIORecords(page); - } + return czksGateCarIOMapper.getMineralIORecords(page); } + /** + * 编辑出入闸机车辆记录 + * @return + */ @Override - @Transactional(rollbackFor = Throwable.class) + @Transactional(rollbackFor = Exception.class) public void edit(PageData pd) { initPageDataUtil.initEdit(pd); czksGateCarIOMapper.edit(pd); } + /** + * 删除出入闸机车辆记录 + * @return + */ @Override - @Transactional(rollbackFor = Throwable.class) + @Transactional(rollbackFor = Exception.class) public void removeByIds(PageData pageData) { initPageDataUtil.initEdit(pageData); czksGateCarIOMapper.removeByIds(pageData); } + /** + * 添加出入闸机车辆记录 + * @return + */ @Override @Transactional(rollbackFor = Exception.class) public void save(PageData pageData) { initPageDataUtil.initSave(pageData, "RECORD_ID"); - if ("".equals(pageData.get(""))) { - czksGateCarIOMapper.saveMineral(pageData); - } else { - - } - + czksGateCarIOMapper.saveMineral(pageData); } + /** + * 获取在场,离场,总量计数 + * @return + */ @Override public PageData getTodayEQCount(PageData page) { PageData pageData = new PageData();