diff --git a/cjy-project/src/main/java/com/cjy/parking/controller/ParkingTurnoverDataController.java b/cjy-project/src/main/java/com/cjy/parking/controller/ParkingTurnoverDataController.java index 76932c9e..af94407d 100644 --- a/cjy-project/src/main/java/com/cjy/parking/controller/ParkingTurnoverDataController.java +++ b/cjy-project/src/main/java/com/cjy/parking/controller/ParkingTurnoverDataController.java @@ -7,6 +7,7 @@ import com.cjy.common.groups.AddGroup; import com.cjy.common.groups.UpdaeGroup; import com.cjy.parking.domain.CarParkData; import com.cjy.parking.domain.InParkRecords; +import com.cjy.parking.domain.ParkingLotMsgEntity; import com.cjy.parking.util.AdmissionDataprocessFactory; import com.cjy.parking.util.ProcessFactory; import com.cjy.parking.vo.ParkingLotAccessSummaryVO; @@ -30,195 +31,207 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 停车场流水数据Controller - * + * * @author ruoyi * @date 2023-03-02 */ @RestController @RequestMapping("/parking/turnoverData") -public class ParkingTurnoverDataController extends BaseController -{ - @Autowired - private IParkingTurnoverDataService parkingTurnoverDataService; - @Autowired - ProcessFactory processFactory; - @Autowired - AdmissionDataprocessFactory admissionDataprocessFactory; - - @Autowired - private ISysConfigService configService; - /** - * 查询停车场流水数据列表 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:list')") - @GetMapping("/list") - public TableDataInfo list(ParkingTurnoverData parkingTurnoverData) - { - startPage(); - parkingTurnoverData.setOrganCode(getUserOrganCode()); - List list = parkingTurnoverDataService.selectParkingTurnoverDataList(parkingTurnoverData); - return getDataTable(list); - } - - /** - * 导出停车场流水数据列表 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:export')") - @Log(title = "停车场流水数据", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ParkingTurnoverData parkingTurnoverData) - { - parkingTurnoverData.setOrganCode(getUserOrganCode()); - List list = parkingTurnoverDataService.selectParkingTurnoverDataList(parkingTurnoverData); - ExcelUtil util = new ExcelUtil(ParkingTurnoverData.class); - util.exportExcel(response, list, "停车场流水数据数据"); - } - - /** - * 获取停车场流水数据详细信息 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(parkingTurnoverDataService.selectParkingTurnoverDataById(id)); - } - - /** - * 新增停车场流水数据 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:add')") - @Log(title = "停车场流水数据", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated(AddGroup.class) @RequestBody ParkingTurnoverData parkingTurnoverData) - { - parkingTurnoverData.setOrganCode(getUserOrganCode()); - parkingTurnoverData.setCreateBy(getUserId().toString()); - int returnValue =parkingTurnoverDataService.insertParkingTurnoverData(parkingTurnoverData); - if(returnValue>0){ - return AjaxResult.success("创建成功"); - }else { - return AjaxResult.error("请输入合法车牌号"); - } - - } - - /** - * 修改停车场流水数据 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:edit')") - @Log(title = "停车场流水数据", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit( @Validated(UpdaeGroup.class) @RequestBody ParkingTurnoverData parkingTurnoverData) - { - parkingTurnoverData.setDelFlag("1"); - parkingTurnoverData.setUpdateBy(getUserId().toString()); - int returnValue =parkingTurnoverDataService.updateParkingTurnoverData(parkingTurnoverData); - if(returnValue>0){ - return AjaxResult.success("修改成功"); - }else { - return AjaxResult.error("请输入合法车牌号"); - } - } - - /** - * 删除停车场流水数据 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:remove')") - @Log(title = "停车场流水数据", businessType = BusinessType.DELETE) +public class ParkingTurnoverDataController extends BaseController { + @Autowired + private IParkingTurnoverDataService parkingTurnoverDataService; + @Autowired + ProcessFactory processFactory; + @Autowired + AdmissionDataprocessFactory admissionDataprocessFactory; + + @Autowired + private ISysConfigService configService; + + /** + * 查询停车场流水数据列表 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:list')") + @GetMapping("/list") + public TableDataInfo list(ParkingTurnoverData parkingTurnoverData) { + startPage(); + parkingTurnoverData.setOrganCode(getUserOrganCode()); + List list = parkingTurnoverDataService.selectParkingTurnoverDataList(parkingTurnoverData); + return getDataTable(list); + } + + /** + * 导出停车场流水数据列表 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:export')") + @Log(title = "停车场流水数据", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ParkingTurnoverData parkingTurnoverData) { + parkingTurnoverData.setOrganCode(getUserOrganCode()); + List list = parkingTurnoverDataService.selectParkingTurnoverDataList(parkingTurnoverData); + ExcelUtil util = new ExcelUtil(ParkingTurnoverData.class); + util.exportExcel(response, list, "停车场流水数据数据"); + } + + /** + * 获取停车场流水数据详细信息 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(parkingTurnoverDataService.selectParkingTurnoverDataById(id)); + } + + /** + * 新增停车场流水数据 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:add')") + @Log(title = "停车场流水数据", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated(AddGroup.class) @RequestBody ParkingTurnoverData parkingTurnoverData) { + parkingTurnoverData.setOrganCode(getUserOrganCode()); + parkingTurnoverData.setCreateBy(getUserId().toString()); + int returnValue = parkingTurnoverDataService.insertParkingTurnoverData(parkingTurnoverData); + if (returnValue > 0) { + return AjaxResult.success("创建成功"); + } else { + return AjaxResult.error("请输入合法车牌号"); + } + + } + + /** + * 修改停车场流水数据 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:edit')") + @Log(title = "停车场流水数据", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated(UpdaeGroup.class) @RequestBody ParkingTurnoverData parkingTurnoverData) { + parkingTurnoverData.setDelFlag("1"); + parkingTurnoverData.setUpdateBy(getUserId().toString()); + int returnValue = parkingTurnoverDataService.updateParkingTurnoverData(parkingTurnoverData); + if (returnValue > 0) { + return AjaxResult.success("修改成功"); + } else { + return AjaxResult.error("请输入合法车牌号"); + } + } + + /** + * 删除停车场流水数据 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:remove')") + @Log(title = "停车场流水数据", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(parkingTurnoverDataService.deleteParkingTurnoverDataByIds(ids)); - } - - /** - * 获取车辆归属地 - */ - - @GetMapping("/vehicleAttributionList") - public TableDataInfo vehicleAttributionList() - { - List list = parkingTurnoverDataService.vehicleAttributionList(); - return getDataTable(list); - } - /** - *停车场出入明细 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:parkingInAndOutDetails')") - @PostMapping("/parkingInAndOutDetails") - public TableDataInfo parkingInAndOutDetails(@RequestBody ParkingTurnoverDataVO parkingTurnoverDataVO) - { - startPage(); - parkingTurnoverDataVO.setOrganCode(getUserOrganCode()); - List list = parkingTurnoverDataService.parkingInAndOutDetails(parkingTurnoverDataVO); - return getDataTable(list); - } - - /** - * 导出停车场出入明细 - */ - @Log(title = "停车场出入明细数据", businessType = BusinessType.EXPORT) - @PostMapping("/parkingInAndOutDetailsExport") - public void parkingInAndOutDetailsExport(HttpServletResponse response, @RequestBody ParkingTurnoverDataVO parkingTurnoverDataVO) - { - parkingTurnoverDataVO.setOrganCode(getUserOrganCode()); - List list = parkingTurnoverDataService.parkingInAndOutDetails(parkingTurnoverDataVO); - ExcelUtil util = new ExcelUtil(ParkingTurnoverDataVO.class); - util.exportExcel(response, list, "停车场出入明细数据"); - } - /** - *停车场出入汇总 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:parkingLotAccessSummary')") - @PostMapping("/parkingLotAccessSummary") - public TableDataInfo parkingLotAccessSummary(@RequestBody ParkingLotAccessSummaryVO parkingLotAccessSummaryVO) - { - parkingLotAccessSummaryVO.setOrganCode(getUserOrganCode()); - List list = parkingTurnoverDataService.parkingLotAccessSummary(parkingLotAccessSummaryVO); - return getDataTable(list); - } - /** - *停车场时长汇总 - */ - @PreAuthorize("@ss.hasPermi('parking:turnoverData:parkingLotDurationSummary')") - @PostMapping("/parkingLotDurationSummary") - public TableDataInfo parkingLotDurationSummary(@RequestBody ParkingLotDurationSummaryVO parkingLotDurationSummaryVO) - { - parkingLotDurationSummaryVO.setOrganCode(getUserOrganCode()); - List list = parkingTurnoverDataService.parkingLotDurationSummary(parkingLotDurationSummaryVO); - return getDataTable(list); - } - - /** - * 出 - * @param list - * @return - */ - @RequestMapping("/parkingLotSynchronousData") - public AjaxResult parkingLotSynchronousData(@RequestBody List list) { - String appearanceTime = configService.selectConfigByKey("car.park.appearance.time"); - try { - processFactory.startProcess( list); - return AjaxResult.success("接收成功",Long.parseLong(appearanceTime)); - }catch (Exception e){ - return AjaxResult.error("接收数据异常",Long.parseLong(appearanceTime)); - } - } - - /** - * 入 - * @param list - * @return - */ - @RequestMapping("/parkingLotSynchronousAdmissionData") - public AjaxResult parkingLotSynchronousAdmissionData(@RequestBody List list) { - String admissionTime = configService.selectConfigByKey("car.park.admission.time"); - try { - admissionDataprocessFactory.startAdmissionDataProcess( list); - return AjaxResult.success("接收成功",admissionTime); - }catch (Exception e){ - return AjaxResult.error("接收数据异常",admissionTime); - } - } + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(parkingTurnoverDataService.deleteParkingTurnoverDataByIds(ids)); + } + + /** + * 获取车辆归属地 + */ + + @GetMapping("/vehicleAttributionList") + public TableDataInfo vehicleAttributionList() { + List list = parkingTurnoverDataService.vehicleAttributionList(); + return getDataTable(list); + } + + /** + * 停车场出入明细 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:parkingInAndOutDetails')") + @PostMapping("/parkingInAndOutDetails") + public TableDataInfo parkingInAndOutDetails(@RequestBody ParkingTurnoverDataVO parkingTurnoverDataVO) { + startPage(); + parkingTurnoverDataVO.setOrganCode(getUserOrganCode()); + List list = parkingTurnoverDataService.parkingInAndOutDetails(parkingTurnoverDataVO); + return getDataTable(list); + } + + /** + * 导出停车场出入明细 + */ + @Log(title = "停车场出入明细数据", businessType = BusinessType.EXPORT) + @PostMapping("/parkingInAndOutDetailsExport") + public void parkingInAndOutDetailsExport(HttpServletResponse response, @RequestBody ParkingTurnoverDataVO parkingTurnoverDataVO) { + parkingTurnoverDataVO.setOrganCode(getUserOrganCode()); + List list = parkingTurnoverDataService.parkingInAndOutDetails(parkingTurnoverDataVO); + ExcelUtil util = new ExcelUtil(ParkingTurnoverDataVO.class); + util.exportExcel(response, list, "停车场出入明细数据"); + } + + /** + * 停车场出入汇总 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:parkingLotAccessSummary')") + @PostMapping("/parkingLotAccessSummary") + public TableDataInfo parkingLotAccessSummary(@RequestBody ParkingLotAccessSummaryVO parkingLotAccessSummaryVO) { + parkingLotAccessSummaryVO.setOrganCode(getUserOrganCode()); + List list = parkingTurnoverDataService.parkingLotAccessSummary(parkingLotAccessSummaryVO); + return getDataTable(list); + } + + /** + * 停车场时长汇总 + */ + @PreAuthorize("@ss.hasPermi('parking:turnoverData:parkingLotDurationSummary')") + @PostMapping("/parkingLotDurationSummary") + public TableDataInfo parkingLotDurationSummary(@RequestBody ParkingLotDurationSummaryVO parkingLotDurationSummaryVO) { + parkingLotDurationSummaryVO.setOrganCode(getUserOrganCode()); + List list = parkingTurnoverDataService.parkingLotDurationSummary(parkingLotDurationSummaryVO); + return getDataTable(list); + } + + /** + * 启动服务日志 + * + * @return + */ + @RequestMapping("/projectBeginingMsg") + public AjaxResult projectBeginingMsg() { + ParkingLotMsgEntity parkingLotMsgEntity = new ParkingLotMsgEntity(); + parkingLotMsgEntity.setName("停车场同步服务"); + parkingLotMsgEntity.setMsg("服务启动"); + try { + parkingTurnoverDataService.saveProjectBeginingMsg(parkingLotMsgEntity); + return AjaxResult.success("接收成功"); + } catch (Exception e) { + return AjaxResult.error("接收数据异常"); + } + } + + /** + * 出 + * + * @param list + * @return + */ + @RequestMapping("/parkingLotSynchronousData") + public AjaxResult parkingLotSynchronousData(@RequestBody List list) { + String appearanceTime = configService.selectConfigByKey("car.park.appearance.time"); + try { + processFactory.startProcess(list); + return AjaxResult.success("接收成功", Long.parseLong(appearanceTime)); + } catch (Exception e) { + return AjaxResult.error("接收数据异常", Long.parseLong(appearanceTime)); + } + } + + /** + * 入 + * + * @param list + * @return + */ + @RequestMapping("/parkingLotSynchronousAdmissionData") + public AjaxResult parkingLotSynchronousAdmissionData(@RequestBody List list) { + String admissionTime = configService.selectConfigByKey("car.park.admission.time"); + try { + admissionDataprocessFactory.startAdmissionDataProcess(list); + return AjaxResult.success("接收成功", admissionTime); + } catch (Exception e) { + return AjaxResult.error("接收数据异常", admissionTime); + } + } } diff --git a/cjy-project/src/main/java/com/cjy/parking/domain/ParkingLotMsgEntity.java b/cjy-project/src/main/java/com/cjy/parking/domain/ParkingLotMsgEntity.java new file mode 100644 index 00000000..79f87ec5 --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/parking/domain/ParkingLotMsgEntity.java @@ -0,0 +1,26 @@ +package com.cjy.parking.domain; + +/** + * @author liangjiawei + * @createDate 2023/9/6 + */ +public class ParkingLotMsgEntity { + private String msg; + private String name; + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/cjy-project/src/main/java/com/cjy/parking/mapper/ParkingTurnoverDataMapper.java b/cjy-project/src/main/java/com/cjy/parking/mapper/ParkingTurnoverDataMapper.java index 3106be1c..5fdb4bf7 100644 --- a/cjy-project/src/main/java/com/cjy/parking/mapper/ParkingTurnoverDataMapper.java +++ b/cjy-project/src/main/java/com/cjy/parking/mapper/ParkingTurnoverDataMapper.java @@ -3,6 +3,7 @@ package com.cjy.parking.mapper; import java.util.List; import com.cjy.parking.domain.AttributionEntity; +import com.cjy.parking.domain.ParkingLotMsgEntity; import com.cjy.parking.domain.ParkingTurnoverData; import com.cjy.parking.vo.ParkingLotAccessSummaryVO; import com.cjy.parking.vo.ParkingLotDurationSummaryVO; @@ -11,119 +12,138 @@ import com.cjy.parking.vo.VehicleAttributionVO; /** * 停车场流水数据Mapper接口 - * + * * @author ruoyi * @date 2023-03-02 */ -public interface ParkingTurnoverDataMapper -{ - /** - * 查询停车场流水数据 - * - * @param id 停车场流水数据主键 - * @return 停车场流水数据 - */ - public ParkingTurnoverData selectParkingTurnoverDataById(Long id); - - /** - * 查询停车场流水数据列表 - * - * @param parkingTurnoverData 停车场流水数据 - * @return 停车场流水数据集合 - */ - public List selectParkingTurnoverDataList(ParkingTurnoverData parkingTurnoverData); - - ParkingTurnoverData selectParkingTurnoverDataBy(String licensePlateNumber); - - /** - * 停车场出入明细 - * @param parkingTurnoverDataVO - * @return - */ - public List parkingInAndOutDetails(ParkingTurnoverDataVO parkingTurnoverDataVO); - - /** - * 停车场出入汇总 - * @param parkingLotAccessSummaryVO - * @return - */ - public List parkingLotAccessSummary(ParkingLotAccessSummaryVO parkingLotAccessSummaryVO); - - /** - * 停车场时长汇总 - * @param parkingLotDurationSummaryVO - * @return - */ - public List parkingLotDurationSummary(ParkingLotDurationSummaryVO parkingLotDurationSummaryVO); - /** - * 新增停车场流水数据 - * - * @param parkingTurnoverData 停车场流水数据 - * @return 结果 - */ - public int insertParkingTurnoverData(ParkingTurnoverData parkingTurnoverData); - - /** - * 获取归属地 - * @return - */ - ListgetAttribution(); - - /** - * 获取父级编码 - * @param regionId - * @return - */ - String getRegionCode(String regionId); - /** - * 修改停车场流水数据 - * - * @param parkingTurnoverData 停车场流水数据 - * @return 结果 - */ - public int updateParkingTurnoverData(ParkingTurnoverData parkingTurnoverData); - - /** - * 删除停车场流水数据 - * - * @param id 停车场流水数据主键 - * @return 结果 - */ - public int deleteParkingTurnoverDataById(Long id); - - /** - * 批量删除停车场流水数据 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteParkingTurnoverDataByIds(Long[] ids); - - /** - * 获取车辆归属地 - * @return - */ - List vehicleAttributionList(); - - /** - * 查询是否有该停车场的 剩余车位信息 - * @param parkingTurnoverData - * @return - */ - int getParkingLotParkingSpaceInfoCount(ParkingTurnoverData parkingTurnoverData); - - /** - * 修改该停车场的 剩余车位信息 - * @param parkingTurnoverData - * @return - */ - int updateParkingLotParkingSpaceInfoCount(ParkingTurnoverData parkingTurnoverData); - int updateParkingLotParkingSpaceInfoCountReduce(ParkingTurnoverData parkingTurnoverData); - - /** - * 添加该停车场的 剩余车位信息 - * @param parkingTurnoverData - * @return - */ - int installPkingLotParkingSpaceInfoCount(ParkingTurnoverData parkingTurnoverData); +public interface ParkingTurnoverDataMapper { + /** + * 查询停车场流水数据 + * + * @param id 停车场流水数据主键 + * @return 停车场流水数据 + */ + public ParkingTurnoverData selectParkingTurnoverDataById(Long id); + + /** + * 查询停车场流水数据列表 + * + * @param parkingTurnoverData 停车场流水数据 + * @return 停车场流水数据集合 + */ + public List selectParkingTurnoverDataList(ParkingTurnoverData parkingTurnoverData); + + ParkingTurnoverData selectParkingTurnoverDataBy(String licensePlateNumber); + + /** + * 停车场出入明细 + * + * @param parkingTurnoverDataVO + * @return + */ + public List parkingInAndOutDetails(ParkingTurnoverDataVO parkingTurnoverDataVO); + + /** + * 停车场出入汇总 + * + * @param parkingLotAccessSummaryVO + * @return + */ + public List parkingLotAccessSummary(ParkingLotAccessSummaryVO parkingLotAccessSummaryVO); + + /** + * 停车场时长汇总 + * + * @param parkingLotDurationSummaryVO + * @return + */ + public List parkingLotDurationSummary(ParkingLotDurationSummaryVO parkingLotDurationSummaryVO); + + /** + * 新增停车场流水数据 + * + * @param parkingTurnoverData 停车场流水数据 + * @return 结果 + */ + public int insertParkingTurnoverData(ParkingTurnoverData parkingTurnoverData); + + /** + * 获取归属地 + * + * @return + */ + List getAttribution(); + + /** + * 获取父级编码 + * + * @param regionId + * @return + */ + String getRegionCode(String regionId); + + /** + * 修改停车场流水数据 + * + * @param parkingTurnoverData 停车场流水数据 + * @return 结果 + */ + public int updateParkingTurnoverData(ParkingTurnoverData parkingTurnoverData); + + /** + * 删除停车场流水数据 + * + * @param id 停车场流水数据主键 + * @return 结果 + */ + public int deleteParkingTurnoverDataById(Long id); + + /** + * 批量删除停车场流水数据 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteParkingTurnoverDataByIds(Long[] ids); + + /** + * 获取车辆归属地 + * + * @return + */ + List vehicleAttributionList(); + + /** + * 查询是否有该停车场的 剩余车位信息 + * + * @param parkingTurnoverData + * @return + */ + int getParkingLotParkingSpaceInfoCount(ParkingTurnoverData parkingTurnoverData); + + /** + * 修改该停车场的 剩余车位信息 + * + * @param parkingTurnoverData + * @return + */ + int updateParkingLotParkingSpaceInfoCount(ParkingTurnoverData parkingTurnoverData); + + int updateParkingLotParkingSpaceInfoCountReduce(ParkingTurnoverData parkingTurnoverData); + + /** + * 添加该停车场的 剩余车位信息 + * + * @param parkingTurnoverData + * @return + */ + int installPkingLotParkingSpaceInfoCount(ParkingTurnoverData parkingTurnoverData); + + /** + * 启动服务日志 + * + * @param parkingLotMsgEntity + * @return + */ + int saveProjectBeginingMsg(ParkingLotMsgEntity parkingLotMsgEntity); } diff --git a/cjy-project/src/main/java/com/cjy/parking/service/IParkingTurnoverDataService.java b/cjy-project/src/main/java/com/cjy/parking/service/IParkingTurnoverDataService.java index ffe14c6f..6bc2f15f 100644 --- a/cjy-project/src/main/java/com/cjy/parking/service/IParkingTurnoverDataService.java +++ b/cjy-project/src/main/java/com/cjy/parking/service/IParkingTurnoverDataService.java @@ -4,6 +4,7 @@ import java.util.List; import com.cjy.parking.domain.CarParkData; import com.cjy.parking.domain.InParkRecords; +import com.cjy.parking.domain.ParkingLotMsgEntity; import com.cjy.parking.domain.ParkingTurnoverData; import com.cjy.parking.vo.ParkingLotAccessSummaryVO; import com.cjy.parking.vo.ParkingLotDurationSummaryVO; @@ -13,98 +14,111 @@ import org.springframework.web.bind.annotation.RequestBody; /** * 停车场流水数据Service接口 - * + * * @author ruoyi * @date 2023-03-02 */ -public interface IParkingTurnoverDataService -{ - /** - * 查询停车场流水数据 - * - * @param id 停车场流水数据主键 - * @return 停车场流水数据 - */ - public ParkingTurnoverData selectParkingTurnoverDataById(Long id); - - /** - * 查询停车场流水数据列表 - * - * @param parkingTurnoverData 停车场流水数据 - * @return 停车场流水数据集合 - */ - public List selectParkingTurnoverDataList(ParkingTurnoverData parkingTurnoverData); - - /** - * 停车场出入明细 - * @param parkingTurnoverDataVO - * @return - */ - public List parkingInAndOutDetails(ParkingTurnoverDataVO parkingTurnoverDataVO); - - /** - * 停车场出入汇总 - * @param parkingLotAccessSummaryVO - * @return - */ - public List parkingLotAccessSummary(ParkingLotAccessSummaryVO parkingLotAccessSummaryVO); - - /** - * 停车场时长汇总 - * @param parkingLotDurationSummaryVO - * @return - */ - public List parkingLotDurationSummary(ParkingLotDurationSummaryVO parkingLotDurationSummaryVO); - - /** - * 新增停车场流水数据 - * - * @param parkingTurnoverData 停车场流水数据 - * @return 结果 - */ - public int insertParkingTurnoverData(ParkingTurnoverData parkingTurnoverData); - - /** - * 修改停车场流水数据 - * - * @param parkingTurnoverData 停车场流水数据 - * @return 结果 - */ - public int updateParkingTurnoverData(ParkingTurnoverData parkingTurnoverData); - - /** - * 批量删除停车场流水数据 - * - * @param ids 需要删除的停车场流水数据主键集合 - * @return 结果 - */ - public int deleteParkingTurnoverDataByIds(Long[] ids); - - /** - * 删除停车场流水数据信息 - * - * @param id 停车场流水数据主键 - * @return 结果 - */ - public int deleteParkingTurnoverDataById(Long id); - - /** - * 获取车辆归属地 - * @return - */ - List vehicleAttributionList(); - - - /** - * 批量同步处理数据 出 - * @param list - * @return - */ - void saveParkingLotSynchronousData(List list); - - /** - * 同步入场数据 - * @param list - */ - void parkingLotSynchronousAdmissionData(List list); +public interface IParkingTurnoverDataService { + /** + * 查询停车场流水数据 + * + * @param id 停车场流水数据主键 + * @return 停车场流水数据 + */ + public ParkingTurnoverData selectParkingTurnoverDataById(Long id); + + /** + * 查询停车场流水数据列表 + * + * @param parkingTurnoverData 停车场流水数据 + * @return 停车场流水数据集合 + */ + public List selectParkingTurnoverDataList(ParkingTurnoverData parkingTurnoverData); + + /** + * 停车场出入明细 + * + * @param parkingTurnoverDataVO + * @return + */ + public List parkingInAndOutDetails(ParkingTurnoverDataVO parkingTurnoverDataVO); + + /** + * 停车场出入汇总 + * + * @param parkingLotAccessSummaryVO + * @return + */ + public List parkingLotAccessSummary(ParkingLotAccessSummaryVO parkingLotAccessSummaryVO); + + /** + * 停车场时长汇总 + * + * @param parkingLotDurationSummaryVO + * @return + */ + public List parkingLotDurationSummary(ParkingLotDurationSummaryVO parkingLotDurationSummaryVO); + + /** + * 启动服务日志 + * + * @param parkingLotMsgEntity + * @return + */ + int saveProjectBeginingMsg(ParkingLotMsgEntity parkingLotMsgEntity); + + /** + * 新增停车场流水数据 + * + * @param parkingTurnoverData 停车场流水数据 + * @return 结果 + */ + public int insertParkingTurnoverData(ParkingTurnoverData parkingTurnoverData); + + /** + * 修改停车场流水数据 + * + * @param parkingTurnoverData 停车场流水数据 + * @return 结果 + */ + public int updateParkingTurnoverData(ParkingTurnoverData parkingTurnoverData); + + /** + * 批量删除停车场流水数据 + * + * @param ids 需要删除的停车场流水数据主键集合 + * @return 结果 + */ + public int deleteParkingTurnoverDataByIds(Long[] ids); + + /** + * 删除停车场流水数据信息 + * + * @param id 停车场流水数据主键 + * @return 结果 + */ + public int deleteParkingTurnoverDataById(Long id); + + /** + * 获取车辆归属地 + * + * @return + */ + List vehicleAttributionList(); + + + /** + * 批量同步处理数据 出 + * + * @param list + * @return + */ + void saveParkingLotSynchronousData(List list); + + /** + * 同步入场数据 + * + * @param list + */ + void parkingLotSynchronousAdmissionData(List list); } diff --git a/cjy-project/src/main/java/com/cjy/parking/service/impl/ParkingTurnoverDataServiceImpl.java b/cjy-project/src/main/java/com/cjy/parking/service/impl/ParkingTurnoverDataServiceImpl.java index 332701a5..9927c355 100644 --- a/cjy-project/src/main/java/com/cjy/parking/service/impl/ParkingTurnoverDataServiceImpl.java +++ b/cjy-project/src/main/java/com/cjy/parking/service/impl/ParkingTurnoverDataServiceImpl.java @@ -7,9 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import com.cjy.parking.domain.AttributionEntity; -import com.cjy.parking.domain.CarParkData; -import com.cjy.parking.domain.InParkRecords; +import com.cjy.parking.domain.*; import com.cjy.parking.util.GetAttribution; import com.cjy.parking.vo.ParkingLotAccessSummaryVO; import com.cjy.parking.vo.ParkingLotDurationSummaryVO; @@ -23,7 +21,6 @@ import com.ruoyi.system.service.ISysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cjy.parking.mapper.ParkingTurnoverDataMapper; -import com.cjy.parking.domain.ParkingTurnoverData; import com.cjy.parking.service.IParkingTurnoverDataService; /** @@ -42,6 +39,7 @@ public class ParkingTurnoverDataServiceImpl implements IParkingTurnoverDataServi private ISysDictDataService sysDictDataService; @Autowired private SysDictDataMapper sysDictDataMapper; + /** * 查询停车场流水数据 * @@ -186,16 +184,16 @@ public class ParkingTurnoverDataServiceImpl implements IParkingTurnoverDataServi //判断是否有数据 如果有install 如果没有install if (parkingTurnoverDataMapper.getParkingLotParkingSpaceInfoCount(parkingTurnoverData) > 0) { //如果是入场 - if(parkingTurnoverData.getCutsceneType().equals("1")){ + if (parkingTurnoverData.getCutsceneType().equals("1")) { // 占用车位+1 parkingTurnoverDataMapper.updateParkingLotParkingSpaceInfoCount(parkingTurnoverData); - }else { + } else { // 占用车位-1 parkingTurnoverDataMapper.updateParkingLotParkingSpaceInfoCountReduce(parkingTurnoverData); } } else { //如果是入场 - if(parkingTurnoverData.getCutsceneType().equals("1")){ + if (parkingTurnoverData.getCutsceneType().equals("1")) { parkingTurnoverData.setOccupyParkingSpace(1); parkingTurnoverDataMapper.installPkingLotParkingSpaceInfoCount(parkingTurnoverData); } @@ -237,18 +235,18 @@ public class ParkingTurnoverDataServiceImpl implements IParkingTurnoverDataServi if (parkingTurnoverDataMapper.getParkingLotParkingSpaceInfoCount(parkingTurnoverData) > 0) { //如果是入场 - if(parkingTurnoverData.getCutsceneType().equals("1")){ + if (parkingTurnoverData.getCutsceneType().equals("1")) { // 占用车位+1 parkingTurnoverDataMapper.updateParkingLotParkingSpaceInfoCount(parkingTurnoverData); - }else { + } else { // 占用车位-1 parkingTurnoverDataMapper.updateParkingLotParkingSpaceInfoCountReduce(parkingTurnoverData); } } else { //如果是入场 - if(parkingTurnoverData.getCutsceneType().equals("1")){ - parkingTurnoverData.setOccupyParkingSpace(1); - parkingTurnoverDataMapper.installPkingLotParkingSpaceInfoCount(parkingTurnoverData); + if (parkingTurnoverData.getCutsceneType().equals("1")) { + parkingTurnoverData.setOccupyParkingSpace(1); + parkingTurnoverDataMapper.installPkingLotParkingSpaceInfoCount(parkingTurnoverData); } } @@ -299,6 +297,7 @@ public class ParkingTurnoverDataServiceImpl implements IParkingTurnoverDataServi /** * 出 + * * @param list */ @Override @@ -336,10 +335,10 @@ public class ParkingTurnoverDataServiceImpl implements IParkingTurnoverDataServi parkingTurnoverData.setLicensePlateNumber(item.getPlateNumber()); //车牌颜色 List toiletTypes = sysDictDataMapper.selectDictDataByType("license_plate_color"); - SysDictData sysDictData = toiletTypes.stream().filter(i ->i.getDictLabel().equals(item.getPlateColor())).findAny().orElse(null); - if(sysDictData==null){ + SysDictData sysDictData = toiletTypes.stream().filter(i -> i.getDictLabel().equals(item.getPlateColor())).findAny().orElse(null); + if (sysDictData == null) { parkingTurnoverData.setLicensePlateColor("99"); - }else { + } else { parkingTurnoverData.setLicensePlateColor(sysDictData.getDictValue()); } @@ -354,6 +353,7 @@ public class ParkingTurnoverDataServiceImpl implements IParkingTurnoverDataServi /** * 入 + * * @param list */ @Override @@ -380,10 +380,10 @@ public class ParkingTurnoverDataServiceImpl implements IParkingTurnoverDataServi parkingTurnoverData.setLicensePlateNumber(item.getPlateNumber()); //车牌颜色 List toiletTypes = sysDictDataMapper.selectDictDataByType("license_plate_color"); - SysDictData sysDictData = toiletTypes.stream().filter(i ->i.getDictLabel().equals(item.getPlateColor())).findAny().orElse(null); - if(sysDictData==null){ + SysDictData sysDictData = toiletTypes.stream().filter(i -> i.getDictLabel().equals(item.getPlateColor())).findAny().orElse(null); + if (sysDictData == null) { parkingTurnoverData.setLicensePlateColor("99"); - }else { + } else { parkingTurnoverData.setLicensePlateColor(sysDictData.getDictValue()); } //企业标识 @@ -392,4 +392,14 @@ public class ParkingTurnoverDataServiceImpl implements IParkingTurnoverDataServi this.insertParkingTurnoverData(parkingTurnoverData); }); } + + /*** + * 启动服务日志 + * @param parkingLotMsgEntity + * @return + */ + @Override + public int saveProjectBeginingMsg(ParkingLotMsgEntity parkingLotMsgEntity) { + return parkingTurnoverDataMapper.saveProjectBeginingMsg(parkingLotMsgEntity); + } } diff --git a/cjy-project/src/main/resources/mapper/parking/ParkingTurnoverDataMapper.xml b/cjy-project/src/main/resources/mapper/parking/ParkingTurnoverDataMapper.xml index 56719378..0d46258f 100644 --- a/cjy-project/src/main/resources/mapper/parking/ParkingTurnoverDataMapper.xml +++ b/cjy-project/src/main/resources/mapper/parking/ParkingTurnoverDataMapper.xml @@ -310,6 +310,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" VALUES ( #{parkingLotId}, #{remainingParkingSpace}, #{occupyParkingSpace}, #{organCode}) + + INSERT INTO parking_lot_msg (`name`, msg) VALUES (#{name},#{msg}) + update parking_turnover_data diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index f2bb624d..dc73e57b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // 过滤请求 .authorizeRequests() // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - .antMatchers("/parking/turnoverData/parkingLotSynchronousAdmissionData","/parking/turnoverData/parkingLotSynchronousData","/device/**","/login", "/register", "/captchaImage","/enterprise/loginPageConfig","/app/login","/douyin/**","/weibo/**","/reservationdata/appointmentrecord/synchronousData","/reservationdata/appointmentrecord/synchronousWriteOffData","/reservationdata/appointmentrecord/synchronousCancelData","/marketingData/complaint/synchronous").permitAll() + .antMatchers("/parking/turnoverData/parkingLotSynchronousAdmissionData","/parking/turnoverData/parkingLotSynchronousData","/device/**","/login", "/register", "/captchaImage","/enterprise/loginPageConfig","/app/login","/douyin/**","/weibo/**","/reservationdata/appointmentrecord/synchronousData","/reservationdata/appointmentrecord/synchronousWriteOffData","/reservationdata/appointmentrecord/synchronousCancelData","/marketingData/complaint/synchronous","/parking/turnoverData/projectBeginingMsg").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**","/**/*.xlsx").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()