From e0356d400428ad93bfc9b4b8b9956bc04ead4261 Mon Sep 17 00:00:00 2001 From: sliang <1589399930@qq.com> Date: Sat, 23 Mar 2024 18:49:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=A1=94=E6=A3=80=E6=B5=8B-=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E8=AE=B0=E5=BD=95=EF=BC=8C=E9=A2=84=E8=AD=A6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=9B=E6=96=BD=E5=B7=A5=E8=B4=A8=E9=87=8F-?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EarlyWarningsRecordController.java | 9 ++ .../mapper/EarlyWarningsRecordMapper.java | 3 + .../service/EarlyWarningsRecordService.java | 3 + .../impl/EarlyWarningsRecordServiceImpl.java | 23 +++ .../vo/EarlyWarningsRecordVo.java | 9 +- .../vo/QualityRecordVo.java | 19 ++- .../vo/EarlyWarningRecordVo.java | 2 +- .../towerDetection/vo/TowerRecordVo.java | 2 + .../controller/VehicleController.java | 134 ++++++++++++++++ .../mapper/VehicleMapper.java | 38 +++++ .../service/VehicleService.java | 40 +++++ .../service/impl/VehicleServiceImpl.java | 149 ++++++++++++++++++ .../vehicleManagement/vo/VehicleDto.java | 40 +++++ .../vehicleManagement/vo/VehicleVo.java | 57 +++++++ .../EarlyWarningsRecordMapper.xml | 18 ++- .../QualityRecordMapper.xml | 21 ++- .../EarlyWarningRecordMapper.xml | 9 +- .../towerDetection/TowerRecordMapper.xml | 18 ++- .../vehicleManagement/VehicleMapper.xml | 80 ++++++++++ 19 files changed, 638 insertions(+), 36 deletions(-) create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/controller/VehicleController.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/mapper/VehicleMapper.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/VehicleService.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/impl/VehicleServiceImpl.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleDto.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleVo.java create mode 100644 securitycontrol-model/securitycontrol-background/src/main/resources/mapper/vehicleManagement/VehicleMapper.xml diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/EarlyWarningsRecordController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/EarlyWarningsRecordController.java index 53b332f..fcd46bf 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/EarlyWarningsRecordController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/EarlyWarningsRecordController.java @@ -5,7 +5,9 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.securitycontrol.background.constructionQuality.service.EarlyWarningsRecordService; import com.securitycontrol.background.constructionQuality.vo.EarlyWarningsRecordVo; +import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; @@ -47,6 +49,13 @@ public class EarlyWarningsRecordController extends BaseController { return getDataTable(list); } + @ApiOperation(value = "预警处置") + @PostMapping("updEarly") + @Log(title = "施工质量", menu = "施工质量->预警处置", grade = OperationType.UPDATE_BUSINESS, details = "预警处置", type = "业务日志") + public AjaxResult addEarly(@RequestBody EarlyWarningsRecordVo vo) { + return service.updEarly(vo); + } + @GetMapping("exportProData") @Log(title = "施工质量", menu = "施工质量->预警记录", grade = OperationType.EXPORT_BUSINESS, details = "导出列表", type = "业务日志") public void exportData(HttpServletRequest request, HttpServletResponse response, EarlyWarningsRecordVo dto) { diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/EarlyWarningsRecordMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/EarlyWarningsRecordMapper.java index 852f44b..88b20b2 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/EarlyWarningsRecordMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/EarlyWarningsRecordMapper.java @@ -1,6 +1,7 @@ package com.securitycontrol.background.constructionQuality.mapper; import com.securitycontrol.background.constructionQuality.vo.EarlyWarningsRecordVo; +import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; import org.springframework.stereotype.Repository; import java.util.List; @@ -18,4 +19,6 @@ public interface EarlyWarningsRecordMapper { * @return */ List getEarlyWarningsRecordLists(EarlyWarningsRecordVo dto); + + void updEarly(EarlyWarningsRecordVo vo); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/EarlyWarningsRecordService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/EarlyWarningsRecordService.java index 6c39c87..4bef8f7 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/EarlyWarningsRecordService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/EarlyWarningsRecordService.java @@ -2,6 +2,7 @@ package com.securitycontrol.background.constructionQuality.service; import com.securitycontrol.background.constructionQuality.vo.EarlyWarningsRecordVo; +import com.securitycontrol.common.core.web.domain.AjaxResult; import java.util.List; @@ -17,4 +18,6 @@ public interface EarlyWarningsRecordService { * @return */ List getEarlyWarningRecordLists(EarlyWarningsRecordVo dto); + + AjaxResult updEarly(EarlyWarningsRecordVo vo); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/EarlyWarningsRecordServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/EarlyWarningsRecordServiceImpl.java index c92264a..8f7fb93 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/EarlyWarningsRecordServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/EarlyWarningsRecordServiceImpl.java @@ -3,8 +3,16 @@ package com.securitycontrol.background.constructionQuality.service.impl; import com.securitycontrol.background.constructionQuality.mapper.EarlyWarningsRecordMapper; import com.securitycontrol.background.constructionQuality.service.EarlyWarningsRecordService; import com.securitycontrol.background.constructionQuality.vo.EarlyWarningsRecordVo; +import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; +import com.securitycontrol.common.core.utils.StringUtils; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.security.utils.SecurityUtils; +import com.securitycontrol.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; + import javax.annotation.Resource; import java.util.*; @@ -26,4 +34,19 @@ public class EarlyWarningsRecordServiceImpl implements EarlyWarningsRecordServic return list; } + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult updEarly(EarlyWarningsRecordVo vo) { + String userId = SecurityUtils.getLoginUser().getUserid() +""; + vo.setUserId(userId); + try { + mapper.updEarly(vo); + } catch (Exception e) { + log.error("预警处置", e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } + } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/EarlyWarningsRecordVo.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/EarlyWarningsRecordVo.java index 7aa1b86..db51bbc 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/EarlyWarningsRecordVo.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/EarlyWarningsRecordVo.java @@ -27,5 +27,12 @@ public class EarlyWarningsRecordVo { @ApiModelProperty(value = "监测时间") private String createTime; - private String keyWord; + @ApiModelProperty(value = "预警处置") + @Excel(name = "预警处置", width = 10.0, orderNum = "3") + private String status; + + + private String date; + private String warnId; + private String userId; } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/QualityRecordVo.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/QualityRecordVo.java index d6f34d8..174e817 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/QualityRecordVo.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/QualityRecordVo.java @@ -22,25 +22,28 @@ public class QualityRecordVo { @Excel(name = "区域名称", width = 10.0, orderNum = "2") private String areaName; - @ApiModelProperty(value = "监测点名称") - @Excel(name = "监测点名称", width = 10.0, orderNum = "3") + @ApiModelProperty(value = "施工工艺") + @Excel(name = "施工工艺", width = 10.0, orderNum = "3") private String modeName; + @ApiModelProperty(value = "标准值") + @Excel(name = "标准值", width = 10.0, orderNum = "4") + private String standardValue; + @ApiModelProperty(value = "检测值") - @Excel(name = "检测值", width = 10.0, orderNum = "4") + @Excel(name = "检测值", width = 10.0, orderNum = "5") private String val; - @ApiModelProperty(value = "累计变化") - @Excel(name = "累计变化", width = 10.0, orderNum = "5") - private String changeVal; @ApiModelProperty(value = "状态") - @Excel(name = "状态", width = 10.0, orderNum = "6") + @Excel(name = "状态", width = 10.0, orderNum = "7") private String isWarn; @ApiModelProperty(value = "监测时间") - @Excel(name = "监测时间", width = 10.0, orderNum = "7") + @Excel(name = "监测时间", width = 10.0, orderNum = "6") private String createTime; private String keyWord; + private String proIds; + private String date; } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/EarlyWarningRecordVo.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/EarlyWarningRecordVo.java index cf6a47a..5f2cf01 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/EarlyWarningRecordVo.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/EarlyWarningRecordVo.java @@ -26,5 +26,5 @@ public class EarlyWarningRecordVo { @ApiModelProperty(value = "监测时间") private String createTime; - private String keyWord; + private String date; } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/TowerRecordVo.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/TowerRecordVo.java index 9a815ce..c6c63f4 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/TowerRecordVo.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/TowerRecordVo.java @@ -42,4 +42,6 @@ public class TowerRecordVo { private String createTime; private String keyWord; + private String proIds; + private String date; } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/controller/VehicleController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/controller/VehicleController.java new file mode 100644 index 0000000..f847f3a --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/controller/VehicleController.java @@ -0,0 +1,134 @@ +package com.securitycontrol.background.vehicleManagement.controller; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import com.securitycontrol.background.vehicleManagement.service.VehicleService; +import com.securitycontrol.background.vehicleManagement.vo.VehicleDto; +import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; +import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.core.web.page.TableDataInfo; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.system.base.dto.GxPlanDto; +import com.securitycontrol.entity.system.base.vo.GxPlanVo; +import com.securitycontrol.system.export.util.ExcelStyleUtil; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.List; + +/** + * 人车管理 - 车辆管理 + */ +@RestController +@RequestMapping("/vehicle/") +@Slf4j +public class VehicleController extends BaseController { + + @Resource(name = "VehicleService") + private VehicleService service; + + @ApiOperation(value = "获取车辆管理列表") + @GetMapping("getVehicleLists") + @Log(title = "人车管理", menu = "人车管理->车辆管理", grade = OperationType.QUERY_BUSINESS, details = "查询列表", type = "业务日志") + public TableDataInfo getVehicleLists(VehicleVo dto) { + startPage(); + List list = service.getVehicleLists(dto); + return getDataTable(list); + } + + @ApiOperation(value = "新增") + @PostMapping("addVehicle") + @Log(title = "人车管理", menu = "人车管理->车辆管理", grade = OperationType.ADD_BUSINESS, details = "新增", type = "业务日志") + public AjaxResult addVehicle(@RequestBody VehicleVo vo) { + return service.addOrUpdateVehicle(vo); + } + + @ApiOperation(value = "修改") + @PostMapping("editVehicle") + @Log(title = "人车管理", menu = "人车管理->车辆管理", grade = OperationType.UPDATE_BUSINESS, details = "修改", type = "业务日志") + public AjaxResult editVehicle(@RequestBody VehicleVo vo) { + return service.addOrUpdateVehicle(vo); + } + + @ApiOperation(value = "删除") + @PostMapping("delVehicleById") + @Log(title = "人车管理", menu = "人车管理->车辆管理", grade = OperationType.DELETE_BUSINESS, details = "删除", type = "业务日志") + public AjaxResult delVehicleById(@RequestBody VehicleVo dto) { + return service.delVehicleById(dto); + } + + @ApiOperation(value = "获取进出场记录列表") + @GetMapping("getLists") + @Log(title = "人车管理", menu = "人车管理->车辆管理", grade = OperationType.QUERY_BUSINESS, details = "查询进出场记录", type = "业务日志") + public TableDataInfo getLists(VehicleVo dto) { + startPage(); + List list = service.getLists(dto); + return getDataTable(list); + } + + + @GetMapping("exportVehicleData") + @Log(title = "人车管理", menu = "人车管理->车辆管理", grade = OperationType.EXPORT_BUSINESS, details = "导出列表", type = "业务日志") + public void exportData(HttpServletRequest request, HttpServletResponse response, VehicleVo dto) { + try { + List proExportVoList = new ArrayList<>(); + List proLists = service.getVehicleLists(dto); + for (int i = 0; i < proLists.size(); i++) { + proLists.get(i).setProId((i + 1) + ""); + VehicleVo exportVo = new VehicleVo(); + BeanUtils.copyProperties(proLists.get(i), exportVo); + proExportVoList.add(exportVo); + } + ExportParams exportParams = new ExportParams("车辆管理", "车辆管理", ExcelType.XSSF); + exportParams.setStyle(ExcelStyleUtil.class); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, VehicleVo.class, proExportVoList); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("车辆管理" + ".xlsx", "UTF-8")); + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + outputStream.close(); + workbook.close(); + } catch (Exception e) { + log.error("导出车辆管理", e); + } + } + + @GetMapping("exportListData") + @Log(title = "人车管理", menu = "人车管理->车辆管理", grade = OperationType.EXPORT_BUSINESS, details = "导出出入场列表", type = "业务日志") + public void exportListData(HttpServletRequest request, HttpServletResponse response, VehicleDto dto) { + try { + List proExportVoList = new ArrayList<>(); + List proLists = service.getListsDto(dto); + for (int i = 0; i < proLists.size(); i++) { + proLists.get(i).setProId((i + 1) + ""); + VehicleDto exportVo = new VehicleDto(); + BeanUtils.copyProperties(proLists.get(i), exportVo); + proExportVoList.add(exportVo); + } + ExportParams exportParams = new ExportParams("车辆管理出入场"+proLists.get(0).getCarNum(), "车辆管理出入场"+proLists.get(0).getCarNum(), ExcelType.XSSF); + exportParams.setStyle(ExcelStyleUtil.class); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, VehicleDto.class, proExportVoList); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("车辆管理出入场"+proLists.get(0).getCarNum() + ".xlsx", "UTF-8")); + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + outputStream.close(); + workbook.close(); + } catch (Exception e) { + log.error("导出出入场", e); + } + } +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/mapper/VehicleMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/mapper/VehicleMapper.java new file mode 100644 index 0000000..ff53e61 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/mapper/VehicleMapper.java @@ -0,0 +1,38 @@ +package com.securitycontrol.background.vehicleManagement.mapper; + +import com.securitycontrol.background.vehicleManagement.vo.VehicleDto; +import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; +import com.securitycontrol.entity.system.base.dto.GxPlanDto; +import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; +import com.securitycontrol.entity.system.base.vo.GxPlanVo; +import com.securitycontrol.entity.system.vo.ResourceFileVo; +import org.apache.ibatis.annotations.MapKey; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * 车辆管理 + */ +@Repository(value = "VehicleMapper") +public interface VehicleMapper { + /** + * 获取 + */ + List getVehicleLists(VehicleVo dto); + + /** + * 新增/修改 + */ + void addOrUpdateVehicle(VehicleVo vo); + + /** + * 删除 + */ + void delVehicleById(VehicleVo dto); + + List getLists(VehicleVo dto); + + List getListsDto(VehicleDto dto); +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/VehicleService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/VehicleService.java new file mode 100644 index 0000000..e29098a --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/VehicleService.java @@ -0,0 +1,40 @@ +package com.securitycontrol.background.vehicleManagement.service; + +import com.securitycontrol.background.vehicleManagement.vo.VehicleDto; +import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.system.base.dto.GxPlanDto; +import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; +import com.securitycontrol.entity.system.base.vo.GxPlanVo; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 车辆管理 + */ +public interface VehicleService { + + /** + * 获取车辆列表 + */ + List getVehicleLists(VehicleVo dto); + + + /** + * 新增/修改 + * + */ + AjaxResult addOrUpdateVehicle(VehicleVo vo); + + + /** + * 删除 + */ + AjaxResult delVehicleById(VehicleVo dto); + + List getLists(VehicleVo dto); + + List getListsDto(VehicleDto dto); +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/impl/VehicleServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/impl/VehicleServiceImpl.java new file mode 100644 index 0000000..a1721d7 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/impl/VehicleServiceImpl.java @@ -0,0 +1,149 @@ +package com.securitycontrol.background.vehicleManagement.service.impl; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; +import com.securitycontrol.background.vehicleManagement.mapper.VehicleMapper; +import com.securitycontrol.background.vehicleManagement.service.VehicleService; +import com.securitycontrol.background.vehicleManagement.vo.VehicleDto; +import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; +import com.securitycontrol.common.core.constant.Constant; +import com.securitycontrol.common.core.constant.HttpStatus; +import com.securitycontrol.common.core.constant.SecurityConstants; +import com.securitycontrol.common.core.domain.Result; +import com.securitycontrol.common.core.utils.ImportExcelUtils; +import com.securitycontrol.common.core.utils.StringUtils; +import com.securitycontrol.common.core.utils.aes.DateTimeHelper; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.security.utils.ValidatorsUtils; +import com.securitycontrol.entity.system.base.dto.GxPlanDto; +import com.securitycontrol.entity.system.base.dto.ProDto; +import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; +import com.securitycontrol.entity.system.base.vo.GxPlanVo; +import com.securitycontrol.entity.system.base.vo.ProImportVo; +import com.securitycontrol.entity.system.base.vo.ProVo; +import com.securitycontrol.entity.system.vo.ResourceFileVo; +import com.securitycontrol.system.api.RemoteFileService; +import com.securitycontrol.system.api.domain.SysFile; +import com.securitycontrol.system.base.mapper.IProMapper; +import com.securitycontrol.system.base.service.IProService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.util.*; + +/** + *车辆管理 + */ +@Service(value = "VehicleService") +@Slf4j +public class VehicleServiceImpl implements VehicleService { + + @Resource(name = "VehicleMapper") + private VehicleMapper mapper; + + /** + * 列表 + * @param dto + * @return + */ + @Override + public List getVehicleLists(VehicleVo dto) { + List list = new ArrayList<>(); + try { + list = mapper.getVehicleLists(dto); + } catch (Exception e) { + log.error("获取车辆列表",e); + } + return list; + } + + /** + * 新增修改 + * @param vo + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult addOrUpdateVehicle(VehicleVo vo) { + try { + if (StringUtils.isEmpty(vo.getId())) { + String ids = UUID.randomUUID().toString().replace("-", ""); + vo.setId(ids); + vo.setType(1); + } else { + vo.setType(2); + } + mapper.addOrUpdateVehicle(vo); + } catch (Exception e) { + log.error("车辆新增/修改", e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } + + /** + * 删除 + * @param dto + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult delVehicleById(VehicleVo dto) { + try { + mapper.delVehicleById(dto); + } catch (Exception e) { + log.error("车辆删除", e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } + + @Override + public List getLists(VehicleVo dto) { + List list = new ArrayList<>(); + String date = dto.getDate(); + if (!StringUtils.isEmpty(date)) { + String[] arr = date.split("@"); + dto.setStartDate(arr[0]); + dto.setEndDate(arr[1]); + } + try { + list = mapper.getLists(dto); + } catch (Exception e) { + log.error("获取进出场记录列表",e); + } + return list; + } + + @Override + public List getListsDto(VehicleDto dto) { + List list = new ArrayList<>(); + String date = dto.getDate(); + if (!StringUtils.isEmpty(date)) { + String[] arr = date.split("@"); + dto.setStartDate(arr[0]); + dto.setEndDate(arr[1]); + } + try { + list = mapper.getListsDto(dto); + } catch (Exception e) { + log.error("获取进出场记录列表",e); + } + return list; + } + +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleDto.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleDto.java new file mode 100644 index 0000000..e5f2488 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleDto.java @@ -0,0 +1,40 @@ +package com.securitycontrol.background.vehicleManagement.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 车辆管理-出入场 + * @author lsun + */ +@Data +public class VehicleDto { + private String id; + + @ApiModelProperty(value = "工程ID") + @Excel(name = "序号", width = 10.0, orderNum = "0") + private String proId; + + + @ApiModelProperty(value = "时间") + @Excel(name = "时间", width = 10.0, orderNum = "1") + private String accesssTime; + + @ApiModelProperty(value = "状态") + @Excel(name = "状态", width = 10.0, orderNum = "2") + private String accessType; + + private String bidCode; + + private String date; + + private String carNum; + + private String startDate; + private String endDate; + + +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleVo.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleVo.java new file mode 100644 index 0000000..03cb514 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleVo.java @@ -0,0 +1,57 @@ +package com.securitycontrol.background.vehicleManagement.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.util.List; + + +/** + * 车辆管理 + * @author lsun + */ +@Data +public class VehicleVo { + private String id; + + @ApiModelProperty(value = "工程ID") + @Excel(name = "序号", width = 10.0, orderNum = "0") + private String proId; + + @ApiModelProperty(value = "车牌号") + @Excel(name = "车牌号", width = 10.0, orderNum = "1") + private String carNum; + + @ApiModelProperty(value = "司机姓名") + @Excel(name = "司机姓名", width = 10.0, orderNum = "2") + private String userName; + + @ApiModelProperty(value = "电话") + @Excel(name = "电话", width = 10.0, orderNum = "3") + private String phone; + + @ApiModelProperty(value = "1. 新增 2.修改") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Integer type; + + @ApiModelProperty(value = "时间") + @Excel(name = "时间", width = 10.0, orderNum = "1") + private String accesssTime; + + @ApiModelProperty(value = "状态") + @Excel(name = "状态", width = 10.0, orderNum = "2") + private String accessType; + + private String bidCode; + + private String date; + + private String startDate; + private String endDate; + + +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/EarlyWarningsRecordMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/EarlyWarningsRecordMapper.xml index 9f058d1..1975cb9 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/EarlyWarningsRecordMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/EarlyWarningsRecordMapper.xml @@ -1,21 +1,23 @@ + + + UPDATE tb_warn SET status = #{status}, update_time = NOW(), user_id = #{userId} WHERE `warn_id` = #{warnId} + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/QualityRecordMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/QualityRecordMapper.xml index b9a13fb..17e8b3c 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/QualityRecordMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/QualityRecordMapper.xml @@ -3,21 +3,30 @@ \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/EarlyWarningRecordMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/EarlyWarningRecordMapper.xml index 52534ce..52c9718 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/EarlyWarningRecordMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/EarlyWarningRecordMapper.xml @@ -9,13 +9,8 @@ LEFT JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id LEFT JOIN sys_dict sd ON sd.dict_id = tbd.devic_type WHERE sd.dict_code ='6663' - - AND ( - INSTR(tp.pro_name,#{keyWord}) > 0 OR - INSTR(tp.jl_unit,#{keyWord}) > 0 OR - INSTR(tp.sg_unit,#{keyWord}) > 0 OR - INSTR(tp.manager,#{keyWord}) > 0 - ) + + and date (tw.warn_time) = #{date} \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/TowerRecordMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/TowerRecordMapper.xml index 10c1251..42322fe 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/TowerRecordMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/TowerRecordMapper.xml @@ -4,20 +4,28 @@ \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/vehicleManagement/VehicleMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/vehicleManagement/VehicleMapper.xml new file mode 100644 index 0000000..86890a0 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/vehicleManagement/VehicleMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + INSERT INTO tb_car + + id, + bid_code, + car_num, + user_name, + phone, + create_time,del_flag, + + + #{id}, + #{bidCode}, + #{carNum}, + #{userName}, + #{phone}, + NOW(),0, + + + + UPDATE tb_car + + bid_code = #{bidCode}, + car_num = #{carNum}, + user_name = #{userName}, + phone = #{phone}, + update_time = NOW() + + WHERE id = #{id} + + + + + + UPDATE tb_car set del_flag = '1' where id = #{id} + + \ No newline at end of file