diff --git a/pom.xml b/pom.xml index d5e68ce..14c31e0 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,11 @@ UTF-8 + + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq + ${spring-cloud-alibaba.version} + com.zcloud.gbscommon zcloud_gbscommon diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java index 4a67cf7..afcd86c 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java @@ -36,26 +36,26 @@ public class MkmjApprovalUserController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody MkmjApprovalUserAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return mkmjApprovalUserService.add(cmd); } @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@RequestBody MkmjApprovalUserPageQry qry) { + qry.setCorpId(AuthContext.getTenantId()); return mkmjApprovalUserService.listPage(qry); } @ApiOperation("所有数据") @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); + public MultiResponse listAll(MkmjApprovalUserPageQry qry) { + return MultiResponse.of(mkmjApprovalUserService.listAll(qry)); } @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new MkmjApprovalUserCO()); + return SingleResponse.of(mkmjApprovalUserService.getInfoById(id)); } @ApiOperation("删除") @@ -64,14 +64,6 @@ public class MkmjApprovalUserController { mkmjApprovalUserService.remove(id); return SingleResponse.buildSuccess(); } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - mkmjApprovalUserService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - @ApiOperation("修改") @PutMapping("/edit") public SingleResponse edit(@Validated @RequestBody MkmjApprovalUserUpdateCmd mkmjApprovalUserUpdateCmd) { diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java index c02d712..d78e6ef 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java @@ -13,11 +13,14 @@ import com.zcloud.primeport.dto.VehicleApplyPageQry; import com.zcloud.primeport.dto.VehicleApplyUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.ArrayList; /** @@ -33,29 +36,28 @@ import java.util.ArrayList; public class VehicleApplyController { private final VehicleApplyServiceI vehicleApplyService; - @ApiOperation("新增") + @ApiOperation("新增-长期") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody VehicleApplyAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return vehicleApplyService.add(cmd); } + @ApiOperation("新增-临时访客") + @PostMapping("/saveTemporaryVisitors") + public SingleResponse saveTemporaryVisitors(@Validated @RequestBody VehicleApplyAddCmd cmd) { + return null; + } + @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@RequestBody VehicleApplyPageQry qry) { return vehicleApplyService.listPage(qry); } - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new VehicleApplyCO()); + return SingleResponse.of(vehicleApplyService.getInfoById(id)); } @ApiOperation("删除") @@ -65,13 +67,6 @@ public class VehicleApplyController { return SingleResponse.buildSuccess(); } - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - vehicleApplyService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - @ApiOperation("修改") @PutMapping("/edit") public SingleResponse edit(@Validated @RequestBody VehicleApplyUpdateCmd vehicleApplyUpdateCmd) { diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java index 90587f4..bfbfecc 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java @@ -33,50 +33,37 @@ import java.util.ArrayList; public class VehicleAuditController { private final VehicleAuditServiceI vehicleAuditService; - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody VehicleAuditAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return vehicleAuditService.add(cmd); - } +// @ApiOperation("新增") +// @PostMapping("/save") +// public SingleResponse add(@Validated @RequestBody VehicleAuditAddCmd cmd) { +// SSOUser ssoUser = AuthContext.getCurrentUser(); +// return vehicleAuditService.add(cmd); +// } - @ApiOperation("分页") - @PostMapping("/list") + @ApiOperation("待审批数据分页") + @PostMapping("/pendingApprovalList") public PageResponse page(@RequestBody VehicleAuditPageQry qry) { return vehicleAuditService.listPage(qry); } - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); + @ApiOperation("车辆审批记录") + @PostMapping("/carApprovalLogByvehicleApplyIdList") + public PageResponse carApprovalLogByvehicleApplyIdList(@RequestBody VehicleAuditPageQry qry) { + return vehicleAuditService.carApprovalLogByvehicleApplyIdList(qry); + } + + @ApiOperation("审批人审批") + @PostMapping("/audit") + public Response audit(@RequestBody VehicleAuditUpdateCmd cmd) { + vehicleAuditService.audit(cmd); + return Response.buildSuccess(); } @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new VehicleAuditCO()); + return SingleResponse.of(vehicleAuditService.getInfoById(id)); } - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - vehicleAuditService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - vehicleAuditService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody VehicleAuditUpdateCmd vehicleAuditUpdateCmd) { - vehicleAuditService.edit(vehicleAuditUpdateCmd); - return SingleResponse.buildSuccess(); - } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java index 5aa2549..04cf225 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java @@ -1,8 +1,19 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.alibaba.fastjson.JSON; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; +import com.zcloud.gbscommon.todolistmq.event.TodoListAddEvent; +import com.zcloud.primeport.domain.enums.AuditEnum; +import com.zcloud.primeport.domain.enums.VehicleBelongTypeEnum; import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; +import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; +import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; import com.zcloud.primeport.domain.model.VehicleApplyE; +import com.zcloud.primeport.domain.model.VehicleAuditE; +import com.zcloud.primeport.domain.model.VehicleMessageE; import com.zcloud.primeport.dto.VehicleApplyAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -20,20 +31,59 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class VehicleApplyAddExe { private final VehicleApplyGateway vehicleApplyGateway; - + private final VehicleAuditGateway vehicleAuditGateway; + private final VehicleMessageGateway vehicleMessageGateway; + private final TodoListEventPusherUtil todoListEventPusherUtil; @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleApplyAddCmd cmd) { VehicleApplyE examTypeE = new VehicleApplyE(); BeanUtils.copyProperties(cmd, examTypeE); - boolean res = false; - try { - res = vehicleApplyGateway.add(examTypeE); - } catch (Exception e) { - throw new RuntimeException(e); + examTypeE.setStatusFlag(2); + examTypeE.setBlockedFlag(2); + examTypeE.setAuditFlag(AuditEnum.WAITING.getCode()); + SSOUser user = AuthContext.getCurrentUser(); + if (user != null) { + examTypeE.setVehicleCorpId(user.getTenantId()); + examTypeE.setVehicleCorpName(user.getTenantName()); + examTypeE.setVehicleDepartmentId(user.getOrgId()); + examTypeE.setVehicleDepartmentName(user.getOrgName()); + examTypeE.setEmployeeVehicleUserId(user.getUserId()); + examTypeE.setEmployeeVehicleUserName(user.getName()); } - if (!res) { - throw new BizException("保存失败"); + // 检查部门无需审批 + if (examTypeE.getVehicleType().equals(VehicleBelongTypeEnum.CHECK_VEHICLES)) { + examTypeE.setAuditFlag(AuditEnum.NO_APPROVAL_REQUIRED.getCode()); + vehicleApplyGateway.add(examTypeE); + VehicleMessageE build = VehicleMessageE.builder().vehicleApplyId(examTypeE.getId()) + .licenceType(examTypeE.getLicenceType()).licenceTypeName(examTypeE.getLicenceTypeName()) + .licenceNo(examTypeE.getLicenceNo()) + .vehicleType(examTypeE.getVehicleType()).vehicleTypeName(examTypeE.getVehicleTypeName()) + .vehicleBelongType(examTypeE.getVehicleBelongType()).gateLevelAuthArea(examTypeE.getGateLevelAuthArea()) + .visitStartTime(examTypeE.getVisitStartTime()).visitEndTime(examTypeE.getVisitEndTime()).syncStatus(2).build(); + // 进行与门禁系统的对接 + vehicleMessageGateway.add(build); + }else { + vehicleApplyGateway.add(examTypeE); + VehicleAuditE build = + VehicleAuditE.builder() + .vehicleApplyId(examTypeE.getId()) + .batchState(1) + .batchType(1) + .auditUserId(examTypeE.getAuditUserId()) + .auditUserName(examTypeE.getAuditUserName()) + .auditDeptId(examTypeE.getAuditDeptId()) + .auditDeptName(examTypeE.getAuditDeptName()) + .auditCorpId(examTypeE.getAuditCorpId()) + .auditCorpName(examTypeE.getAuditCorpName()) + .auditStatus(AuditEnum.WAITING.getCode()) + .changeAfter(JSON.toJSONString(examTypeE)) + .build(); + // 添加审批信息 + vehicleAuditGateway.add(build); + // 发送待审核消息 + todoListEventPusherUtil.sendMessageAddEvent(build.getSendEventObj()); } + return true; } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java index c071eaa..c97cb5b 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java @@ -1,8 +1,13 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.alibaba.fastjson.JSON; +import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; +import com.zcloud.primeport.domain.enums.AuditEnum; import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; +import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; import com.zcloud.primeport.domain.model.VehicleApplyE; +import com.zcloud.primeport.domain.model.VehicleAuditE; import com.zcloud.primeport.dto.VehicleApplyUpdateCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -20,12 +25,22 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class VehicleApplyUpdateExe { private final VehicleApplyGateway vehicleApplyGateway; + private final VehicleAuditGateway vehicleAuditGateway; + private final TodoListEventPusherUtil todoListEventPusherUtil; @Transactional(rollbackFor = Exception.class) public void execute(VehicleApplyUpdateCmd vehicleApplyUpdateCmd) { VehicleApplyE vehicleApplyE = new VehicleApplyE(); + VehicleApplyE oldV = vehicleApplyGateway.getById(vehicleApplyE.getId()); BeanUtils.copyProperties(vehicleApplyUpdateCmd, vehicleApplyE); + vehicleApplyE.setAuditFlag(AuditEnum.WAITING.getCode()); + boolean res = vehicleApplyGateway.update(vehicleApplyE); + VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(vehicleApplyE.getId()).batchState(1).batchType(2).auditUserId(vehicleApplyE.getAuditUserId()).auditUserName(vehicleApplyE.getAuditUserName()).auditDeptId(vehicleApplyE.getAuditDeptId()).auditDeptName(vehicleApplyE.getAuditDeptName()).auditCorpId(vehicleApplyE.getAuditCorpId()).auditCorpName(vehicleApplyE.getAuditCorpName()).auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(oldV)).changeBefore(JSON.toJSONString(vehicleApplyE)).build(); + // 添加审批信息 + vehicleAuditGateway.add(build); + // 发送待审核待办 + todoListEventPusherUtil.sendMessageAddEvent(build.getSendEventObj()); if (!res) { throw new BizException("修改失败"); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java index 9c359ce..719262d 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java @@ -1,7 +1,9 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; +import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.domain.model.VehicleAuditE; import com.zcloud.primeport.dto.VehicleAuditUpdateCmd; import lombok.AllArgsConstructor; @@ -20,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class VehicleAuditUpdateExe { private final VehicleAuditGateway vehicleAuditGateway; + private final VehicleApplyGateway vehicleApplyGateway; @Transactional(rollbackFor = Exception.class) public void execute(VehicleAuditUpdateCmd vehicleAuditUpdateCmd) { @@ -30,5 +33,18 @@ public class VehicleAuditUpdateExe { throw new BizException("修改失败"); } } + + public void audit(VehicleAuditUpdateCmd cmd) { + if (!(cmd.getAuditStatus().equals(2) || cmd.getAuditStatus().equals(3))) { + throw new BizException("审批状态必须是通过或不通过"); + } + VehicleAuditE vehicleAuditE = new VehicleAuditE(); + BeanUtils.copyProperties(cmd, vehicleAuditE); + VehicleApplyE vehicleApplyE = new VehicleApplyE(); + vehicleApplyE.setId(cmd.getVehicleApplyId()); + vehicleApplyE.setAuditFlag(cmd.getAuditStatus()); + vehicleApplyGateway.update(vehicleApplyE); + vehicleAuditGateway.update(vehicleAuditE); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjApprovalUserCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjApprovalUserCoConvertor.java index 42ad25c..de79eb9 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjApprovalUserCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjApprovalUserCoConvertor.java @@ -20,5 +20,7 @@ public interface MkmjApprovalUserCoConvertor { * @return */ List converDOsToCOs(List mkmjApprovalUserDOs); + + MkmjApprovalUserCO converDOToCO(MkmjApprovalUserDO mkmjApprovalUserDOs); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java index 4de9e4d..0e85897 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java @@ -20,5 +20,6 @@ public interface VehicleApplyCoConvertor { * @return */ List converDOsToCOs(List vehicleApplyDOs); + VehicleApplyCO converDOToCO(VehicleApplyDO vehicleApplyDO); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditCoConvertor.java index b53f930..14182ee 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditCoConvertor.java @@ -20,5 +20,6 @@ public interface VehicleAuditCoConvertor { * @return */ List converDOsToCOs(List vehicleAuditDOs); + VehicleAuditCO converDOToCO(VehicleAuditDO vehicleAuditDO); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java index 81da1d2..443d4fa 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java @@ -1,7 +1,9 @@ package com.zcloud.primeport.command.query; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.command.convertor.MkmjApprovalUserCoConvertor; import com.zcloud.primeport.dto.MkmjApprovalUserPageQry; import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO; @@ -38,5 +40,28 @@ public class MkmjApprovalUserQueryExe { List examCenterCOS = mkmjApprovalUserCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public List listAll(MkmjApprovalUserPageQry qry) { + QueryWrapper mkmjApprovalUserCOQueryWrapper = new QueryWrapper<>(); + mkmjApprovalUserCOQueryWrapper.eq("corp_id", qry.getCorpId()); + mkmjApprovalUserCOQueryWrapper.eq("dept_id", qry.getDeptId()); + if (qry.getPersonnelPermissionFlag() != null) { + mkmjApprovalUserCOQueryWrapper.eq("personnel_permission_flag", qry.getPersonnelPermissionFlag()); + } + if (qry.getVehiclePermissionFlag() != null) { + mkmjApprovalUserCOQueryWrapper.eq("vehicle_permission_flag", qry.getVehiclePermissionFlag()); + } + if (qry.getTemporaryPermissionFlag() != null) { + mkmjApprovalUserCOQueryWrapper.eq("temporary_permission_flag", qry.getTemporaryPermissionFlag()); + + } + List dataList = mkmjApprovalUserRepository.list(mkmjApprovalUserCOQueryWrapper); + return mkmjApprovalUserCoConvertor.converDOsToCOs(dataList); + } + + public MkmjApprovalUserCO getInfoById(Long id) { + MkmjApprovalUserDO byId = mkmjApprovalUserRepository.getById(id); + return mkmjApprovalUserCoConvertor.converDOToCO(byId); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java index a0729e1..513a52f 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java @@ -38,5 +38,9 @@ public class VehicleApplyQueryExe { List examCenterCOS = vehicleApplyCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public VehicleApplyCO getInfoById(Long id) { + return vehicleApplyCoConvertor.converDOToCO(vehicleApplyRepository.getById(id)); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java index ed7c5c5..a7e8fe5 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java @@ -1,6 +1,8 @@ package com.zcloud.primeport.command.query; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.VehicleAuditCoConvertor; import com.zcloud.primeport.dto.VehicleAuditPageQry; @@ -36,7 +38,26 @@ public class VehicleAuditQueryExe { Map parmas = PageQueryHelper.toHashMap(vehicleAuditPageQry); PageResponse pageResponse = vehicleAuditRepository.listPage(parmas); List examCenterCOS = vehicleAuditCoConvertor.converDOsToCOs(pageResponse.getData()); + Long userId = AuthContext.getUserId(); + examCenterCOS.forEach(item -> { + item.setCurrentUserCanAudit(2); + if (item.getAuditUserId().equals(userId)) { + item.setCurrentUserCanAudit(1); + } + }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public PageResponse carApprovalLogByvehicleApplyIdList(VehicleAuditPageQry qry) { + Map parmas = PageQueryHelper.toHashMap(qry); + PageResponse vehicleAuditDOPageResponse = vehicleAuditRepository.carApprovalLogByvehicleApplyIdList(parmas); + List vehicleAuditCOS = vehicleAuditCoConvertor.converDOsToCOs(vehicleAuditDOPageResponse.getData()); + return PageResponse.of(vehicleAuditCOS, vehicleAuditDOPageResponse.getTotalCount(), + vehicleAuditDOPageResponse.getPageSize(), vehicleAuditDOPageResponse.getPageIndex()); + } + + public VehicleAuditCO getInfoById(Long id) { + return vehicleAuditCoConvertor.converDOToCO(vehicleAuditRepository.getById(id)); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjApprovalUserServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjApprovalUserServiceImpl.java index 39f08dc..8db020c 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjApprovalUserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/MkmjApprovalUserServiceImpl.java @@ -14,6 +14,10 @@ import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + /** * web-app * @@ -55,5 +59,15 @@ public class MkmjApprovalUserServiceImpl implements MkmjApprovalUserServiceI { public void removeBatch(Long[] ids) { mkmjApprovalUserRemoveExe.execute(ids); } + + @Override + public List listAll(MkmjApprovalUserPageQry qry) { + return mkmjApprovalUserQueryExe.listAll(qry); + } + + @Override + public MkmjApprovalUserCO getInfoById(Long id) { + return mkmjApprovalUserQueryExe.getInfoById(id); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java index 2862534..e014e1a 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -55,5 +55,10 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { public void removeBatch(Long[] ids) { vehicleApplyRemoveExe.execute(ids); } + + @Override + public VehicleApplyCO getInfoById(Long id) { + return vehicleApplyQueryExe.getInfoById(id); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditServiceImpl.java index 7962016..eff5b33 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditServiceImpl.java @@ -55,5 +55,20 @@ public class VehicleAuditServiceImpl implements VehicleAuditServiceI { public void removeBatch(Long[] ids) { vehicleAuditRemoveExe.execute(ids); } + + @Override + public PageResponse carApprovalLogByvehicleApplyIdList(VehicleAuditPageQry qry) { + return vehicleAuditQueryExe.carApprovalLogByvehicleApplyIdList(qry); + } + + @Override + public void audit(VehicleAuditUpdateCmd cmd) { + vehicleAuditUpdateExe.audit(cmd); + } + + @Override + public VehicleAuditCO getInfoById(Long id) { + return vehicleAuditQueryExe.getInfoById(id); + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjApprovalUserServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjApprovalUserServiceI.java index 83469a1..a907367 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjApprovalUserServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/MkmjApprovalUserServiceI.java @@ -7,6 +7,9 @@ import com.zcloud.primeport.dto.MkmjApprovalUserPageQry; import com.zcloud.primeport.dto.MkmjApprovalUserUpdateCmd; import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO; +import java.util.Collection; +import java.util.List; + /** * web-client * @@ -23,5 +26,9 @@ public interface MkmjApprovalUserServiceI { void remove(Long id); void removeBatch(Long[] ids); + + List listAll(MkmjApprovalUserPageQry qry); + + MkmjApprovalUserCO getInfoById(Long id); } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java index 5b8b5d5..93e7ace 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java @@ -23,5 +23,7 @@ public interface VehicleApplyServiceI { void remove(Long id); void removeBatch(Long[] ids); + + VehicleApplyCO getInfoById(Long id); } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditServiceI.java index 4420472..f067ecf 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditServiceI.java @@ -23,5 +23,11 @@ public interface VehicleAuditServiceI { void remove(Long id); void removeBatch(Long[] ids); + + PageResponse carApprovalLogByvehicleApplyIdList(VehicleAuditPageQry qry); + + void audit(VehicleAuditUpdateCmd cmd); + + VehicleAuditCO getInfoById(Long id); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java index e1d27b6..bed85fd 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java @@ -54,5 +54,7 @@ public class MkmjAddCmd extends Command { private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) private String latitude; + @ApiModelProperty(value = "口门位置", name = "remarks") + private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java index 9a8ab0e..f268e20 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java @@ -21,9 +21,6 @@ import javax.validation.constraints.NotNull; @NoArgsConstructor @AllArgsConstructor public class MkmjApprovalUserAddCmd extends Command { - @ApiModelProperty(value = "主键ID", name = "id", required = true) - @NotNull(message = "主键ID不能为空") - private Long id; @ApiModelProperty(value = "审批人企业id", name = "corpId", required = true) @NotNull(message = "审批人企业id不能为空") private Long corpId; @@ -36,6 +33,13 @@ public class MkmjApprovalUserAddCmd extends Command { @ApiModelProperty(value = "审批人部门名称", name = "deptName", required = true) @NotEmpty(message = "审批人部门名称不能为空") private String deptName; + @ApiModelProperty(value = "审批人岗位Id") + @NotNull(message = "审批人岗位Id不能为空") + private Long postId; + //审批人岗位名称 + @ApiModelProperty(value = "审批人岗位名称") + @NotEmpty(message = "审批人岗位名称不能为空") + private String postName; @ApiModelProperty(value = "审批人id", name = "userId", required = true) @NotNull(message = "审批人id不能为空") private Long userId; @@ -51,9 +55,5 @@ public class MkmjApprovalUserAddCmd extends Command { @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)", name = "temporaryPermissionFlag", required = true) @NotNull(message = "临时审核权限(1-无权限,2-有权限)不能为空") private Integer temporaryPermissionFlag; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; - } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java index 9ef8722..692731e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,6 +24,21 @@ public class MkmjApprovalUserPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private Long likeCorpId; + @ApiModelProperty(value = "审批人企业id必传", name = "corpId", required = true) + private Long corpId; + @ApiModelProperty(value = "审批人部门id必传", name = "deptId") + private Long deptId; + @ApiModelProperty(value = "审批人姓名", name = "userName") + private String userName; + @ApiModelProperty(value = "人员审核权限(1-无权限,2-有权限)") + private Integer personnelPermissionFlag; + //车辆审核权限(1-无权限,2-有权限) + @ApiModelProperty(value = "车辆审核权限(1-无权限,2-有权限)") + private Integer vehiclePermissionFlag; + //临时审核权限(1-无权限,2-有权限) + @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)") + private Integer temporaryPermissionFlag; + + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java index bfc94bc..88a5467 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java @@ -55,14 +55,13 @@ public class MkmjGateAddCmd extends Command { @NotEmpty(message = "闸机位置不能为空") private String gatePosition; @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") +// @NotEmpty(message = "经度不能为空") private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") +// @NotEmpty(message = "纬度不能为空") private String latitude; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") +// @NotEmpty(message = "备注不能为空") private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGatePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGatePageQry.java index b0ca5f7..80477cd 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGatePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGatePageQry.java @@ -15,8 +15,10 @@ public class MkmjGatePageQry extends PageQuery { @ApiModelProperty(value = "闸机名称模糊查询") private String gateName; - @ApiModelProperty(value = "闸机类型") + @ApiModelProperty(value = "闸机类型 数据字典") private String gateType; + @ApiModelProperty(value = "闸机类别 数据字典") + private String gateCategory; @ApiModelProperty(value = "闸机状态") private Integer gateStatus; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageAddCmd.java index 33fe21b..5c4167a 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageAddCmd.java @@ -36,10 +36,10 @@ public class MkmjPassageAddCmd extends Command { @NotNull(message = "口门区域id不能为空") private Long mkmjId; @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") +// @NotEmpty(message = "经度不能为空") private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") +// @NotEmpty(message = "纬度不能为空") private String latitude; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java index 7858a60..7998303 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java @@ -23,7 +23,6 @@ import java.util.Date; @AllArgsConstructor public class VehicleApplyAddCmd extends Command { @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true) - @NotNull(message = "车辆状态(1未启用,2启用)不能为空") private Integer statusFlag; @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) @NotEmpty(message = "车牌类型数据字典不能为空") @@ -47,7 +46,7 @@ public class VehicleApplyAddCmd extends Command { @NotEmpty(message = "授权范围港区与区域不能为空") private String gateLevelAuthArea; @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true) - @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空") +// @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空") private Integer auditFlag; @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) @NotNull(message = "进出港权限(1:有 2：无)不能为空") @@ -58,29 +57,9 @@ public class VehicleApplyAddCmd extends Command { @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) @NotEmpty(message = "访问结束时间不能为空") private Date visitEndTime; - @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId", required = true) - @NotNull(message = "车辆所属企业ID不能为空") - private Long vehicleCorpId; - @ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName", required = true) - @NotEmpty(message = "车辆所属企业名称不能为空") - private String vehicleCorpName; - @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) - @NotNull(message = "车辆所属部门id不能为空") - private Long vehicleDepartmentId; - @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true) - @NotEmpty(message = "车辆所属部门名称不能为空") - private String vehicleDepartmentName; - @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId", required = true) - @NotNull(message = "车辆所属人id(员工车辆/驾驶人id)不能为空") - private Long employeeVehicleUserId; - @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)", name = "employeeVehicleUserName", required = true) - @NotEmpty(message = "车辆所属人姓名(员工车辆/驾驶人名称)不能为空") - private String employeeVehicleUserName; @ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true) - @NotEmpty(message = "排放标准名称不能为空") private String emissionStandards; @ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true) - @NotEmpty(message = "排放标准不能为空") private String emissionStandardsName; @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) @NotNull(message = "行驶证照片不能为空") @@ -89,16 +68,35 @@ public class VehicleApplyAddCmd extends Command { @NotNull(message = "车辆照片不能为空") private Long attachmentId; @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) - @NotNull(message = "告知签字不能为空") private Long informSignId; @ApiModelProperty(value = "项目id", name = "projectId", required = true) - @NotNull(message = "项目id不能为空") private Long projectId; @ApiModelProperty(value = "项目名称", name = "projectName", required = true) - @NotEmpty(message = "项目名称不能为空") private String projectName; @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true) - @NotNull(message = "1被拉黑2未拉黑不能为空") private Integer blockedFlag; + @ApiModelProperty(value = "mkmjId", name = "口门id") + private Long mkmjId; + @ApiModelProperty(value = "lsUserPhone", name = "临时申请驾驶人手机号") + private String lsUserPhone; + @ApiModelProperty(value = "lsUserIdcard", name = "临时申请驾驶人身份证") + private String lsUserIdcard; + + + // 审批 + @ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true) + private Long auditCorpId; + @ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true) + private String auditCorpName; + @ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true) + private Long auditDeptId; + @ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true) + private String auditDeptName; + @ApiModelProperty(value = "审核用户", name = "auditUserId", required = true) + private Long auditUserId; + @ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true) + private String auditUserName; + + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java index cdd1f55..2456564 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java @@ -1,8 +1,12 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; +import java.util.Date; + /** * web-client @@ -23,6 +27,15 @@ public class VehicleApplyPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private Integer likeStatusFlag; + @ApiModelProperty(value = "licenceNo", name = "车牌号") + private String licenceNo; + @ApiModelProperty(value = "auditFlag", name = "审核状态") + private Integer auditFlag; + @ApiModelProperty(value = "visitStartTime ", name = "访问起始时间") + private Date visitStartTime; + @ApiModelProperty(value = "visitEndTime", name = "访问结束时间") + private Date visitEndTime; + @ApiModelProperty(value = "gateLevelAuthAreaId", name = "授权范围港区与区域") + private String gateLevelAuthAreaId; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java index b620acc..45daf3d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java @@ -34,27 +34,15 @@ public class VehicleApplyUpdateCmd extends Command { @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true) @NotEmpty(message = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") private String licenceTypeName; - @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) - @NotEmpty(message = "车牌号不能为空") - private String licenceNo; @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) @NotEmpty(message = "车辆类型不能为空") private String vehicleType; @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) @NotEmpty(message = "车辆类型-名字不能为空") private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆", name = "vehicleBelongType", required = true) - @NotEmpty(message = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆不能为空") - private String vehicleBelongType; @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) @NotEmpty(message = "授权范围港区与区域不能为空") private Object gateLevelAuthArea; - @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true) - @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空") - private Integer auditFlag; - @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) - @NotNull(message = "进出港权限(1:有 2：无)不能为空") - private Integer mkmjPermission; @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) @NotNull(message = "访问起始时间不能为空") private Date visitStartTime; @@ -80,10 +68,8 @@ public class VehicleApplyUpdateCmd extends Command { @NotEmpty(message = "车辆所属人姓名(员工车辆/驾驶人名称)不能为空") private String employeeVehicleUserName; @ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true) - @NotEmpty(message = "排放标准名称不能为空") private String emissionStandards; @ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true) - @NotEmpty(message = "排放标准不能为空") private String emissionStandardsName; @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) @NotNull(message = "行驶证照片不能为空") @@ -95,13 +81,23 @@ public class VehicleApplyUpdateCmd extends Command { @NotNull(message = "告知签字不能为空") private Long informSignId; @ApiModelProperty(value = "项目id", name = "projectId", required = true) - @NotNull(message = "项目id不能为空") private Long projectId; @ApiModelProperty(value = "项目名称", name = "projectName", required = true) - @NotEmpty(message = "项目名称不能为空") private String projectName; - @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true) - @NotNull(message = "1被拉黑2未拉黑不能为空") - private Integer blockedFlag; + + // 审批 + @ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true) + private Long auditCorpId; + @ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true) + private String auditCorpName; + @ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true) + private Long auditDeptId; + @ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true) + private String auditDeptName; + @ApiModelProperty(value = "审核用户", name = "auditUserId", required = true) + private Long auditUserId; + @ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true) + private String auditUserName; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java index 57e617a..7ba1243 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java @@ -23,6 +23,7 @@ public class VehicleAuditPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeVehicleApplyId; + private Long vehicleApplyId; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java index 6fb8e84..6d8369c 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java @@ -26,45 +26,11 @@ public class VehicleAuditUpdateCmd extends Command { private Long id; @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true) @NotEmpty(message = "车辆申请id不能为空") - private String vehicleApplyId; - @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true) - @NotNull(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空") - private Integer batchType; - @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState", required = true) - @NotNull(message = "审批状态(1,申请;2.更新)不能为空") - private Integer batchState; - @ApiModelProperty(value = "审批人id", name = "auditUserId", required = true) - @NotNull(message = "审批人id不能为空") - private Long auditUserId; - @ApiModelProperty(value = "审批人姓名", name = "auditUserName", required = true) - @NotEmpty(message = "审批人姓名不能为空") - private String auditUserName; - @ApiModelProperty(value = "审批部门id", name = "auditDeptId", required = true) - @NotNull(message = "审批部门id不能为空") - private Long auditDeptId; - @ApiModelProperty(value = "审批部门名称", name = "auditDeptName", required = true) - @NotEmpty(message = "审批部门名称不能为空") - private String auditDeptName; - @ApiModelProperty(value = "审批人企业id", name = "auditCorpId", required = true) - @NotNull(message = "审批人企业id不能为空") - private Long auditCorpId; - @ApiModelProperty(value = "审批人企业名称", name = "auditCorpName", required = true) - @NotEmpty(message = "审批人企业名称不能为空") - private String auditCorpName; - @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)", name = "auditStatus", required = true) - @NotNull(message = "审批状态(1,未开始,2通过,3不通过)不能为空") + private Long vehicleApplyId; + @ApiModelProperty(value = "审批状态(2通过,3不通过)", name = "auditStatus", required = true) + @NotNull(message = "审批状态不能为空") private Integer auditStatus; - @ApiModelProperty(value = "待审核信息", name = "changeAfter", required = true) - @NotEmpty(message = "待审核信息不能为空") - private String changeAfter; - @ApiModelProperty(value = "变更前信息", name = "changeBefore", required = true) - @NotEmpty(message = "变更前信息不能为空") - private String changeBefore; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") + @ApiModelProperty(value = "驳回原因", name = "remarks", required = true) private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java index e5c6fb0..e01c7c5 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java @@ -37,10 +37,10 @@ public class VideoAddCmd extends Command { @NotNull(message = "摄像头类型（1-移动 2-平台）不能为空") private Integer videoType; @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") +// @NotEmpty(message = "经度不能为空") private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") +// @NotEmpty(message = "纬度不能为空") private String latitude; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VideoPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VideoPageQry.java index 1e31243..89f3e8a 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VideoPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VideoPageQry.java @@ -23,6 +23,9 @@ public class VideoPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private Long likeForeignId; + // 口门/闸机id 外键id + private Long eqForeignId; + // 设备类型（1-口门 2-闸机） + private Integer eqDeviceType; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java index b79e5a9..e6929f4 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java @@ -22,6 +22,11 @@ public class MkmjApprovalUserCO extends ClientObject { //审批人企业名称 @ApiModelProperty(value = "审批人企业名称") private String corpName; + @ApiModelProperty(value = "审批人岗位Id") + private Long postId; + //审批人企业名称 + @ApiModelProperty(value = "审批人岗位名称") + private String postName; //审批人部门id @ApiModelProperty(value = "审批人部门id") private Long deptId; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java index 41c468c..4ed5cfe 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java @@ -46,6 +46,8 @@ public class MkmjCO extends ClientObject { //经度 @ApiModelProperty(value = "经度") private String longitude; + @ApiModelProperty(value = "口门位置") + private String remarks; @ApiModelProperty(value = "纬度") private String latitude; @ApiModelProperty(value = "摄像头数量") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java index dc96b82..ec605c6 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java @@ -96,5 +96,11 @@ public class VehicleApplyCO extends ClientObject { //1被拉黑2未拉黑 @ApiModelProperty(value = "1被拉黑2未拉黑") private Integer blockedFlag; + @ApiModelProperty(value = "auditUserId", name = "审核用户") + private Long auditUserId; + @ApiModelProperty(value = "currentUserId", name = "当前用户") + private Long currentUserId; + + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java index 00c4f78..65632d7 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * web-client @@ -46,11 +48,58 @@ public class VehicleAuditCO extends ClientObject { //审批状态(1,未开始,2通过,3不通过) @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)") private Integer auditStatus; - //待审核信息 - @ApiModelProperty(value = "待审核信息") - private String changeAfter; - //变更前信息 - @ApiModelProperty(value = "变更前信息") - private String changeBefore; + //审批意见 + @ApiModelProperty(value = "审批意见") + private String remarks; + + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + private Date visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + private Date visitEndTime; + //车辆所属企业ID + @ApiModelProperty(value = "车辆所属企业ID") + private Long vehicleCorpId; + //车辆所属企业名称 + @ApiModelProperty(value = "车辆所属企业名称") + private String vehicleCorpName; + //车辆所属部门id + @ApiModelProperty(value = "车辆所属部门id") + private Long vehicleDepartmentId; + //车辆所属部门名称 + @ApiModelProperty(value = "车辆所属部门名称") + private String vehicleDepartmentName; + //车辆所属人id(员工车辆/驾驶人id) + @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)") + private Long employeeVehicleUserId; + //车辆所属人姓名(员工车辆/驾驶人名称) + @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)") + private String employeeVehicleUserName; + //车牌类型数据字典 + @ApiModelProperty(value = "车牌类型数据字典") + private String licenceType; + //车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + private String licenceTypeName; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //车辆类型 + @ApiModelProperty(value = "车辆类型") + private String vehicleType; + //车辆类型-名字 + @ApiModelProperty(value = "车辆类型-名字") + private String vehicleTypeName; + //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 + @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") + private String vehicleBelongType; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private String gateLevelAuthArea; + + @ApiModelProperty(value = "currentUserCanAudit", name = "当前用户是否能审核") + private Integer currentUserCanAudit; + } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/AuditEnum.java b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/AuditEnum.java new file mode 100644 index 0000000..08e28b3 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/AuditEnum.java @@ -0,0 +1,25 @@ +package com.zcloud.primeport.domain.enums; + +public enum AuditEnum { +// 1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆） + WAITING(1, "Waiting"), + APPROVED(2, "Approved"), + NO_APPROVAL_REQUIRED(4, "NO_APPROVAL_REQUIRED"), + REJECTED(3, "Rejected"); + + private final int code; + private final String description; + + AuditEnum(int code, String description) { + this.code = code; + this.description = description; + } + + public int getCode() { + return code; + } + + public String getDescription() { + return description; + } +} diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java index 0888b8d..11d209e 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java @@ -13,17 +13,17 @@ import java.util.stream.Collectors; */ @Getter public enum MenuEnum { - MKMJ_JGD("/mkmj/jgd", "mkmj_jgd"), - PASSAGE_JGD("/mkmj/jgd", "mkmj_passage_jgd"), - GATE_JGD("/mkmj/jgd", "mkmj_gate_jgd"), - VIDEO_JGD("/mkmj/jgd", "mkmj_video_jgd") - + MKMJ_JGD("/mkmj/jgd1", "mkmj_jgd"), + PASSAGE_JGD("/mkmj/jgd2", "mkmj_passage_jgd"), + GATE_JGD("/mkmj/jgd3", "mkmj_gate_jgd"), + MJSPR_JGD("/mkmj/jgd4", "mkmj_mjspr_jgd") ; private final String path; private final String menuKey; - private static final Map PATH_MAP = Arrays.stream(values()).collect(Collectors.toMap(MenuEnum::getPath, Function.identity())); + private static final Map PATH_MAP = + Arrays.stream(values()).collect(Collectors.toMap(MenuEnum::getPath, Function.identity())); MenuEnum(String path, String menuKey) { this.path = path; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/VehicleBelongTypeEnum.java b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/VehicleBelongTypeEnum.java new file mode 100644 index 0000000..d0354b7 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/VehicleBelongTypeEnum.java @@ -0,0 +1,26 @@ +package com.zcloud.primeport.domain.enums; + +public enum VehicleBelongTypeEnum { + JGD_PRI_VEHICLES("1", "股份员工车辆"), + JGD_PUB_VEHICLES("2", "股份单位车辆"), + FGS_PRI_VEHICLES("3", "分公司员工车辆"), + FGS_PUB_VEHICLES("4", "分公司单位车辆"), + XGF_VEHICLES("5", "相关方车辆"), + TEMP_VEHICLES("6", "临时车辆"), + CHECK_VEHICLES("7", "检查部门车辆"); + private String code; + private String desc; + + VehicleBelongTypeEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + + public String getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java index aa36077..1a31f6e 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java @@ -26,5 +26,6 @@ public interface VehicleApplyGateway { Boolean deletedVehicleApplyById(Long id); Boolean deletedVehicleApplyByIds(Long[] id); + VehicleApplyE getById(Long id); } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjApprovalUserE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjApprovalUserE.java index d58aa94..6180ad9 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjApprovalUserE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjApprovalUserE.java @@ -25,6 +25,8 @@ public class MkmjApprovalUserE extends BaseE { private Long deptId; //审批人部门名称 private String deptName; + private Long postId; + private String postName; //审批人id private Long userId; //审批人名称 diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java index ba2f570..78b9d10 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.domain.model; import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,7 +35,7 @@ public class VehicleApplyE extends BaseE { //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 private String vehicleBelongType; //授权范围港区与区域 - private Object gateLevelAuthArea; + private String gateLevelAuthArea; //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）) private Integer auditFlag; //进出港权限(1:有 2：无) @@ -70,5 +71,17 @@ public class VehicleApplyE extends BaseE { private String projectName; //1被拉黑2未拉黑 private Integer blockedFlag; + + private Long mkmjId; + private String lsUserPhone; + private String lsUserIdcard; + + + private Long auditCorpId; + private String auditCorpName; + private Long auditDeptId; + private String auditDeptName; + private Long auditUserId; + private String auditUserName; } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditE.java index 5e23b65..22cb4d1 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditE.java @@ -1,6 +1,9 @@ package com.zcloud.primeport.domain.model; +import com.alibaba.fastjson.JSONObject; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; +import com.zcloud.gbscommon.todolistmq.event.TodoListAddEvent; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,7 +21,7 @@ import lombok.NoArgsConstructor; @Builder public class VehicleAuditE extends BaseE { //车辆申请id - private String vehicleApplyId; + private Long vehicleApplyId; //审批批次(1.普通车辆.2危险化学品车辆) private Integer batchType; //审批状态(1,申请;2.更新) @@ -41,5 +44,20 @@ public class VehicleAuditE extends BaseE { private String changeAfter; //变更前信息 private String changeBefore; + + public TodoListAddEvent getSendEventObj() { + // 发送待办 + TodoListAddEvent event = new TodoListAddEvent(); + event.setTitle("测试消息"); + event.setContent("测试消息内容"); + event.setForeignKey(this.id); // 业务表ID + event.setForeignSubsidiaryKey(this.id); // 业务附表ID 没有附表时为foreignKey的值 + event.setReceiveUser(getAuditUserId());// user表ID + event.setPcFlag(1); // 是否PC端待办 1是 0否 + event.setAppFlag(1); // 是否APP端待办 1是 0否 + event.setOtherParams(new JSONObject()); + return event; + } + } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java index b525ec9..cea0235 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java @@ -33,7 +33,7 @@ public class VehicleMessageE extends BaseE { //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 private String vehicleBelongType; //授权范围港区与区域 - private Object gateLevelAuthArea; + private String gateLevelAuthArea; //授权访问起始时间 private Date visitStartTime; //授权访问结束时间 diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGatewayImpl.java index 8b90607..fcd8d65 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGatewayImpl.java @@ -62,7 +62,6 @@ public class MkmjGatewayImpl implements MkmjGateway { result.put("passageCount", mkmjPassageRepository.countByMkmjId(mkmjId)); result.put("gateCount", mkmjGateRepository.countByMkmjId(mkmjId)); result.put("videoCount", videoRepository.countByForeignIdAndDeviceType(mkmjId, 1)); - result.put("approvalUserCount", mkmjApprovalUserRepository.countByMkmjId(mkmjId)); return result; } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java index 7e114f4..b0d8193 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java @@ -46,5 +46,16 @@ public class VehicleApplyGatewayImpl implements VehicleApplyGateway { public Boolean deletedVehicleApplyByIds(Long[] ids) { return vehicleApplyRepository.removeByIds(Collections.singletonList(ids)); } + + @Override + public VehicleApplyE getById(Long id) { + VehicleApplyDO vehicleApplyDO = vehicleApplyRepository.getById(id); + if (vehicleApplyDO != null) { + VehicleApplyE vehicleApplyE = new VehicleApplyE(); + BeanUtils.copyProperties(vehicleApplyDO, vehicleApplyE); + return vehicleApplyE; + } + return null; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjApprovalUserDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjApprovalUserDO.java index 4a7071a..5a8e98b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjApprovalUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjApprovalUserDO.java @@ -31,6 +31,10 @@ public class MkmjApprovalUserDO extends BaseDO { //审批人部门名称 @ApiModelProperty(value = "审批人部门名称") private String deptName; + @ApiModelProperty(value = "审批人岗位id") + private Long postId; + @ApiModelProperty(value = "审批人岗位名称") + private String postName; //审批人id @ApiModelProperty(value = "审批人id") private Long userId; @@ -47,6 +51,5 @@ public class MkmjApprovalUserDO extends BaseDO { @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)") private Integer temporaryPermissionFlag; - } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjPassageDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjPassageDO.java index c0bb22f..b35b43f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjPassageDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjPassageDO.java @@ -20,7 +20,7 @@ public class MkmjPassageDO extends BaseDO { @ApiModelProperty(value = "通道状态 1-停用 2-正常") private Integer passageStatus; @ApiModelProperty(value = "口门区域id") - private String mkmjId; + private Long mkmjId; @ApiModelProperty(value = "经度") private String longitude; @ApiModelProperty(value = "纬度") diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java index e4b733a..92b5108 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.persistence.dataobject; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; @@ -98,5 +99,31 @@ public class VehicleApplyDO extends BaseDO { //1被拉黑2未拉黑 @ApiModelProperty(value = "1被拉黑2未拉黑") private Integer blockedFlag; + + + @ApiModelProperty(value = "审核企业") + @TableField(exist = false) + private Long auditCorpId; + + @ApiModelProperty(value = "审核企业名称") + @TableField(exist = false) + private String auditCorpName; + + @ApiModelProperty(value = "审核部门") + @TableField(exist = false) + private Long auditDeptId; + + @ApiModelProperty(value = "审核部门名称") + @TableField(exist = false) + private String auditDeptName; + + @ApiModelProperty(value = "审核用户") + @TableField(exist = false) + private Long auditUserId; + + @ApiModelProperty(value = "审核用户名称") + @TableField(exist = false) + private String auditUserName; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java index 2dcdaad..eab70c6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.persistence.dataobject; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; @@ -8,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * web-infrastructure * @@ -56,5 +59,66 @@ public class VehicleAuditDO extends BaseDO { @ApiModelProperty(value = "变更前信息") private String changeBefore; + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + @TableField(exist = false) + private Date visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + @TableField(exist = false) + private Date visitEndTime; + //车辆所属企业ID + @ApiModelProperty(value = "车辆所属企业ID") + @TableField(exist = false) + private Long vehicleCorpId; + //车辆所属企业名称 + @ApiModelProperty(value = "车辆所属企业名称") + @TableField(exist = false) + private String vehicleCorpName; + //车辆所属部门id + @ApiModelProperty(value = "车辆所属部门id") + @TableField(exist = false) + private Long vehicleDepartmentId; + //车辆所属部门名称 + @ApiModelProperty(value = "车辆所属部门名称") + @TableField(exist = false) + private String vehicleDepartmentName; + //车辆所属人id(员工车辆/驾驶人id) + @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)") + @TableField(exist = false) + private Long employeeVehicleUserId; + //车辆所属人姓名(员工车辆/驾驶人名称) + @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)") + @TableField(exist = false) + private String employeeVehicleUserName; + //车牌类型数据字典 + @ApiModelProperty(value = "车牌类型数据字典") + @TableField(exist = false) + private String licenceType; + //车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + @TableField(exist = false) + private String licenceTypeName; + //车牌号 + @ApiModelProperty(value = "车牌号") + @TableField(exist = false) + private String licenceNo; + //车辆类型 + @ApiModelProperty(value = "车辆类型") + @TableField(exist = false) + private String vehicleType; + //车辆类型-名字 + @ApiModelProperty(value = "车辆类型-名字") + @TableField(exist = false) + private String vehicleTypeName; + //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 + @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") + @TableField(exist = false) + private String vehicleBelongType; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + @TableField(exist = false) + private String gateLevelAuthArea; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java index 89b04eb..1efdf35 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java @@ -1,9 +1,15 @@ package com.zcloud.primeport.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Map; + /** * web-infrastructure * @@ -11,7 +17,11 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2026-03-05 11:33:17 */ @Mapper +@DataScopes( + @DataScope(method = "listPage", menuPerms = "") +) public interface MkmjApprovalUserMapper extends BaseMapper { + IPage listPage(Page> page, Map parmas, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java index edb2a16..fe61578 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java @@ -1,9 +1,13 @@ package com.zcloud.primeport.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Map; + /** * web-infrastructure * @@ -13,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface VehicleApplyMapper extends BaseMapper { + IPage listPage(Page> page, Map parmas, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java index bd3c8e7..af2da3e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java @@ -1,9 +1,15 @@ package com.zcloud.primeport.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Map; + /** * web-infrastructure * @@ -11,7 +17,11 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2026-03-05 11:33:25 */ @Mapper +@DataScopes( + @DataScope(method = "listPage", menuPerms = "") +) public interface VehicleAuditMapper extends BaseMapper { + IPage listPage(Page> page, Map parmas, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java index 41c5528..6df5d87 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java @@ -13,5 +13,8 @@ import java.util.Map; */ public interface VehicleAuditRepository extends BaseRepository { PageResponse listPage(Map parmas); + + PageResponse carApprovalLogByvehicleApplyIdList( Map parmas); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java index 4e2a4a0..88628c6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java @@ -3,9 +3,12 @@ package com.zcloud.primeport.persistence.repository.impl; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.domain.enums.MenuEnum; import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; +import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; import com.zcloud.primeport.persistence.mapper.MkmjApprovalUserMapper; import com.zcloud.primeport.persistence.repository.MkmjApprovalUserRepository; import lombok.RequiredArgsConstructor; @@ -22,11 +25,14 @@ public class MkmjApprovalUserRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("create_time"); - IPage result = mkmjApprovalUserMapper.selectPage(iPage, queryWrapper); + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), + Integer.parseInt(parmas.get("pageSize").toString())); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + } + IPage result = mkmjApprovalUserMapper.listPage(page, parmas,menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java index f1f30c7..25062fd 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java @@ -3,10 +3,12 @@ package com.zcloud.primeport.persistence.repository.impl; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; +import com.zcloud.primeport.domain.enums.MenuEnum; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.mapper.VehicleApplyMapper; import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; @@ -28,11 +30,13 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("create_time"); - IPage result = vehicleApplyMapper.selectPage(iPage, queryWrapper); + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), + Integer.parseInt(parmas.get("pageSize").toString())); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + } + IPage result = vehicleApplyMapper.listPage(page, parmas,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java index e1530a4..000c04a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java @@ -3,8 +3,11 @@ package com.zcloud.primeport.persistence.repository.impl; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.domain.enums.MenuEnum; +import com.zcloud.primeport.persistence.dataobject.PersonMessageDO; import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; import com.zcloud.primeport.persistence.mapper.VehicleAuditMapper; import com.zcloud.primeport.persistence.repository.VehicleAuditRepository; @@ -29,12 +32,24 @@ public class VehicleAuditRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + } + IPage result = vehicleAuditMapper.listPage(page, parmas, menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public PageResponse carApprovalLogByvehicleApplyIdList(Map parmas) { IPage iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper.eq("vehicle_apply_id", parmas.get("vehicleApplyId")); queryWrapper.orderByDesc("create_time"); IPage result = vehicleAuditMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + } diff --git a/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml index de9226e..4458d5d 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml @@ -4,5 +4,17 @@ + diff --git a/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml b/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml index 54a47e6..cd60c99 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml @@ -43,6 +43,10 @@ AND g.gate_type = #{parmas.gateType} + + AND g.gate_category = #{parmas.gateCategory} + + AND g.gate_status = #{parmas.gateStatus} diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index e5d21e3..0f9c148 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -4,5 +4,63 @@ + diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml index 1756243..6ac4ce3 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -4,5 +4,55 @@ +