From 5dadfc06f19cc7f94a52674cecbc44de64c626ed Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Tue, 6 Jan 2026 13:51:12 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E9=97=A8?= =?UTF-8?q?=E7=A6=81=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++ .../com/zcloud/primeport/Application.java | 3 +- start/src/main/resources/bootstrap.yml | 1 + start/src/main/resources/nacos.yml | 2 + .../web/GatePersonAuthLevelOneController.java | 72 +++++++++++++++++++ .../web/MkmjApprovalUserController.java | 24 ++++++- .../web/VehicleMessageController.java | 4 -- .../command/GatePersonAuthLevelOneAddExe.java | 41 +++++++++++ .../GatePersonAuthLevelOneRemoveExe.java | 40 +++++++++++ .../GatePersonAuthLevelOneUpdateExe.java | 35 +++++++++ .../command/MkmjApprovalUserAddExe.java | 2 + .../command/VehicleMessageAddExe.java | 37 +++++----- .../GatePersonAuthLevelOneCoConvertor.java | 25 +++++++ .../query/GatePersonAuthLevelOneQueryExe.java | 47 ++++++++++++ .../query/MkmjApprovalUserQueryExe.java | 41 +++++++---- .../GatePersonAuthLevelOneServiceImpl.java | 62 ++++++++++++++++ .../service/MkmjApprovalUserServiceImpl.java | 20 ++++-- .../api/GatePersonAuthLevelOneServiceI.java | 28 ++++++++ .../api/MkmjApprovalUserServiceI.java | 3 + .../dto/GatePersonAuthLevelOneAddCmd.java | 42 +++++++++++ .../dto/GatePersonAuthLevelOnePageQry.java | 28 ++++++++ .../dto/GatePersonAuthLevelOneUpdateCmd.java | 42 +++++++++++ .../primeport/dto/MkmjApprovalUserAddCmd.java | 41 +++-------- .../dto/MkmjApprovalUserPageQry.java | 26 +++---- .../primeport/dto/MkmjApprovalUserQry.java | 19 +++++ .../dto/VehicleMessageForCorpAddCmd.java | 33 +++------ .../GatePersonAuthLevelOneCO.java | 61 ++++++++++++++++ .../dto/clientobject/MkmjApprovalUserCO.java | 9 +-- .../GatePersonAuthLevelOneGateway.java | 28 ++++++++ .../domain/gateway/VehicleMessageGateway.java | 1 - .../domain/model/GatePersonAuthLevelOneE.java | 34 +++++++++ .../domain/model/MkmjApprovalUserE.java | 2 +- .../domain/model/VehicleAuditLogE.java | 11 +-- .../GatePersonAuthLevelOneGatewayImpl.java | 58 +++++++++++++++ .../MkmjApprovalUserGatewayImpl.java | 9 +++ .../VehicleMessageGatewayImpl.java | 1 - .../dataobject/GatePersonAuthLevelOneDO.java | 62 ++++++++++++++++ .../dataobject/MkmjApprovalUserDO.java | 24 ++++--- .../persistence/dataobject/UserViewDO.java | 64 ++++++++--------- .../mapper/GatePersonAuthLevelOneMapper.java | 24 +++++++ .../mapper/MkmjApprovalUserMapper.java | 7 ++ .../GatePersonAuthLevelOneRepository.java | 18 +++++ .../MkmjApprovalUserRepository.java | 2 + .../GatePersonAuthLevelOneRepositoryImpl.java | 40 +++++++++++ .../impl/MkmjApprovalUserRepositoryImpl.java | 45 +++++++++--- .../mapper/GatePersonAuthLevelOneMapper.xml | 28 ++++++++ .../mapper/MkmjApprovalUserMapper.xml | 37 ++++++++++ 47 files changed, 1107 insertions(+), 183 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/primeport/web/GatePersonAuthLevelOneController.java create mode 100644 web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneAddExe.java create mode 100644 web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneRemoveExe.java create mode 100644 web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneUpdateExe.java create mode 100644 web-app/src/main/java/com/zcloud/primeport/command/convertor/GatePersonAuthLevelOneCoConvertor.java create mode 100644 web-app/src/main/java/com/zcloud/primeport/command/query/GatePersonAuthLevelOneQueryExe.java create mode 100644 web-app/src/main/java/com/zcloud/primeport/service/GatePersonAuthLevelOneServiceImpl.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/api/GatePersonAuthLevelOneServiceI.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneAddCmd.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOnePageQry.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserQry.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/clientobject/GatePersonAuthLevelOneCO.java create mode 100644 web-domain/src/main/java/com/zcloud/primeport/domain/gateway/GatePersonAuthLevelOneGateway.java create mode 100644 web-domain/src/main/java/com/zcloud/primeport/domain/model/GatePersonAuthLevelOneE.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/GatePersonAuthLevelOneGatewayImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/GatePersonAuthLevelOneDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/GatePersonAuthLevelOneMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/GatePersonAuthLevelOneRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/GatePersonAuthLevelOneRepositoryImpl.java create mode 100644 web-infrastructure/src/main/resources/mapper/GatePersonAuthLevelOneMapper.xml diff --git a/pom.xml b/pom.xml index 115b18b..d5e68ce 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,13 @@ zcloud_gbscommon 1.0.0-SNAPSHOT + + + org.postgresql + postgresql + 42.6.0 + + diff --git a/start/src/main/java/com/zcloud/primeport/Application.java b/start/src/main/java/com/zcloud/primeport/Application.java index 26b45e2..43b5769 100644 --- a/start/src/main/java/com/zcloud/primeport/Application.java +++ b/start/src/main/java/com/zcloud/primeport/Application.java @@ -2,6 +2,8 @@ package com.zcloud.primeport; import com.jjb.saas.base.starter.bootstart.JJBSpringbootApplication; import org.springframework.boot.SpringApplication; +import org.springframework.boot.actuate.autoconfigure.jdbc.DataSourceHealthContributorAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; /** * Spring Boot Starter @@ -12,7 +14,6 @@ import org.springframework.boot.SpringApplication; mapperPackages = {"com.zcloud.primeport.persistence.mapper"} ) public class Application { - public static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index d921869..198d9ab 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -4,3 +4,4 @@ spring: - classpath:nacos.yml - classpath:sdk.yml - classpath:swagger.yml +# - classpath:ds.yml diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index 6f6f0c8..c1e36cd 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -31,6 +31,8 @@ spring: - config-actuator.yml - config-job.yml - config-mysql.yml +# - config-pgsql.yml +# - config-mysql-copy.yml - config-redis.yml - config-cache.yml - config-spring.yml diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/GatePersonAuthLevelOneController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/GatePersonAuthLevelOneController.java new file mode 100644 index 0000000..0965576 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/GatePersonAuthLevelOneController.java @@ -0,0 +1,72 @@ +package com.zcloud.primeport.web; + + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.GatePersonAuthLevelOneServiceI; +import com.zcloud.primeport.dto.GatePersonAuthLevelOneAddCmd; +import com.zcloud.primeport.dto.GatePersonAuthLevelOnePageQry; +import com.zcloud.primeport.dto.GatePersonAuthLevelOneUpdateCmd; +import com.zcloud.primeport.dto.clientobject.GatePersonAuthLevelOneCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author dearLin + * @Date 2025-12-31 10:51:44 + */ +@Api(tags = "进出港信息管理-人员及车辆") +@RequestMapping("/${application.gateway}/gatePersonAuthLevelOne") +@RestController +@AllArgsConstructor +public class GatePersonAuthLevelOneController { + private final GatePersonAuthLevelOneServiceI gatePersonAuthLevelOneService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody GatePersonAuthLevelOneAddCmd cmd) { + return gatePersonAuthLevelOneService.add(cmd); + } + + @ApiOperation("分页") + @GetMapping("/list") + public PageResponse page(GatePersonAuthLevelOnePageQry qry) { + return gatePersonAuthLevelOneService.listPage(qry); + } + + @ApiOperation("人员进出记录") + @GetMapping("/personnelEntryAndExitRecords") + public PageResponse personnelEntryAndExitRecords(GatePersonAuthLevelOnePageQry qry) { + return gatePersonAuthLevelOneService.listPage(qry); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(gatePersonAuthLevelOneService.getInfoById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + gatePersonAuthLevelOneService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody GatePersonAuthLevelOneUpdateCmd gatePersonAuthLevelOneUpdateCmd) { + gatePersonAuthLevelOneService.edit(gatePersonAuthLevelOneUpdateCmd); + return SingleResponse.buildSuccess(); + } + +} + 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 f7b7855..0442b47 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 @@ -9,16 +9,22 @@ import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.primeport.api.MkmjApprovalUserServiceI; import com.zcloud.primeport.dto.MkmjApprovalUserAddCmd; import com.zcloud.primeport.dto.MkmjApprovalUserPageQry; +import com.zcloud.primeport.dto.MkmjApprovalUserQry; import com.zcloud.primeport.dto.MkmjApprovalUserUpdateCmd; import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationContext; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.sql.DataSource; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * web-adapter @@ -37,16 +43,21 @@ public class MkmjApprovalUserController { public SingleResponse add(@Validated @RequestBody MkmjApprovalUserAddCmd cmd) { return mkmjApprovalUserService.add(cmd); } + @ApiOperation("审批人列表-根据部门查询") + @GetMapping("/listDeptUser") + public MultiResponse listDeptUser(MkmjApprovalUserQry qry) { + return mkmjApprovalUserService.listDeptUser(qry); + } @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody MkmjApprovalUserPageQry qry) { + @GetMapping("/list") + public PageResponse page(MkmjApprovalUserPageQry qry) { return mkmjApprovalUserService.listPage(qry); } @ApiOperation("所有数据") @GetMapping("/listAll") - public MultiResponse listAll(@RequestBody MkmjApprovalUserPageQry qry) { + public MultiResponse listAll(MkmjApprovalUserPageQry qry) { List mkmjApprovalUserCOS = mkmjApprovalUserService.listAll(qry); return MultiResponse.of(mkmjApprovalUserCOS); } @@ -58,5 +69,12 @@ public class MkmjApprovalUserController { mkmjApprovalUserService.remove(id); return SingleResponse.buildSuccess(); } + @Autowired + private ApplicationContext applicationContext; + @GetMapping("/getDataSource") + public Response getDataSource() { + Map dataSources = applicationContext.getBeansOfType(DataSource.class); + return SingleResponse.buildSuccess(); + } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java index db98d73..07e908a 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java @@ -81,15 +81,11 @@ public class VehicleMessageController { public PageResponse listFromCorp(@RequestBody VehicleMessagePageQry qry) { return vehicleMessageService.listFromCorp(qry); } - @ApiOperation("根据车牌号获取车辆信息") @GetMapping("/{licenceNo}") public SingleResponse getInfoByLicenceNo(@PathVariable("licenceNo") String licenceNo) { VehicleMessageCO infoById = vehicleMessageService.infoByLicenceNo(licenceNo); return SingleResponse.of(infoById); } - - - } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneAddExe.java new file mode 100644 index 0000000..534b87a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneAddExe.java @@ -0,0 +1,41 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.GatePersonAuthLevelOneGateway; +import com.zcloud.primeport.domain.model.GatePersonAuthLevelOneE; +import com.zcloud.primeport.dto.GatePersonAuthLevelOneAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + + + +/** +* web-app +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +@Component +@AllArgsConstructor +public class GatePersonAuthLevelOneAddExe { + private final GatePersonAuthLevelOneGateway gatePersonAuthLevelOneGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(GatePersonAuthLevelOneAddCmd cmd) { + GatePersonAuthLevelOneE examTypeE = new GatePersonAuthLevelOneE(); + BeanUtils.copyProperties(cmd, examTypeE); + boolean res = false; + try { + res = gatePersonAuthLevelOneGateway.add(examTypeE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneRemoveExe.java new file mode 100644 index 0000000..1a683af --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneRemoveExe.java @@ -0,0 +1,40 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.GatePersonAuthLevelOneGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + + + +/** +* web-app +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +@Component +@AllArgsConstructor +public class GatePersonAuthLevelOneRemoveExe { + private final GatePersonAuthLevelOneGateway gatePersonAuthLevelOneGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = gatePersonAuthLevelOneGateway.deletedGatePersonAuthLevelOneById(id); + if(!res){ + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = gatePersonAuthLevelOneGateway.deletedGatePersonAuthLevelOneByIds(ids); + if(!res){ + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneUpdateExe.java new file mode 100644 index 0000000..e464943 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneUpdateExe.java @@ -0,0 +1,35 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.GatePersonAuthLevelOneGateway; +import com.zcloud.primeport.domain.model.GatePersonAuthLevelOneE; +import com.zcloud.primeport.dto.GatePersonAuthLevelOneUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + + + +/** +* web-app +* @Author dearLin +* @Date 2025-12-31 10:51:45 +*/ +@Component +@AllArgsConstructor +public class GatePersonAuthLevelOneUpdateExe { + private final GatePersonAuthLevelOneGateway gatePersonAuthLevelOneGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(GatePersonAuthLevelOneUpdateCmd gatePersonAuthLevelOneUpdateCmd) { + GatePersonAuthLevelOneE gatePersonAuthLevelOneE = new GatePersonAuthLevelOneE(); + BeanUtils.copyProperties(gatePersonAuthLevelOneUpdateCmd, gatePersonAuthLevelOneE); + boolean res = gatePersonAuthLevelOneGateway.update(gatePersonAuthLevelOneE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserAddExe.java index 9734f7d..64c6d14 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserAddExe.java @@ -24,6 +24,8 @@ public class MkmjApprovalUserAddExe { @Transactional(rollbackFor = Exception.class) public boolean execute(MkmjApprovalUserAddCmd cmd) { + // 查询下当前人是否已经存在，如存在无法新增 + MkmjApprovalUserE examTypeE = new MkmjApprovalUserE(); BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java index 045be61..451a906 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java @@ -7,7 +7,7 @@ import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; import com.zcloud.primeport.domain.model.VehicleAuditLogE; import com.zcloud.primeport.domain.model.VehicleMessageE; -import com.zcloud.primeport.dto.VehicleAddCheckResultDTO; +//import com.zcloud.primeport.dto.VehicleAddCheckResultDTO; import com.zcloud.primeport.dto.VehicleMessageAddCmd; import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; import lombok.AllArgsConstructor; @@ -17,20 +17,19 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; - - - /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-15 11:41:21 + */ @Component @AllArgsConstructor public class VehicleMessageAddExe { private final VehicleMessageGateway vehicleMessageGateway; private final VehicleAuditLogGateway vehicleAuditLogGateway; private final VehicleBlackGateway vehicleBlackGateway; + @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleMessageAddCmd cmd) { VehicleMessageE examTypeE = new VehicleMessageE(); @@ -66,18 +65,18 @@ public class VehicleMessageAddExe { // if (infoByLicenceNo != null){ // throw new BizException("车辆已存在"); // } - - Integer licenceNoCount = vehicleMessageGateway.countEnabledByLicenceNo(examTypeE.getLicenceNo()); - if (licenceNoCount > 0){ - throw new BizException("车辆已存在"); - } +// Integer licenceNoCount = vehicleMessageGateway.countEnabledByLicenceNo(examTypeE.getLicenceNo()); +// if (licenceNoCount > 0){ +// throw new BizException("车辆已存在"); +// } VehicleMessageE add = vehicleMessageGateway.add(examTypeE); - if (!Tools.isEmpty(cmd.getApprovalUserId())){ - VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); - BeanUtils.copyProperties(cmd, vehicleAuditLogE); - vehicleAuditLogE.addFroVehicleLog(vehicleAuditLogE,add.getId(),1); // 添加审批信息 - res = vehicleAuditLogGateway.add(vehicleAuditLogE); // 添加审批信息 - } + if (Tools.isEmpty(cmd.getApprovalUserId())) throw new BizException("请选择审批人"); + VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); + BeanUtils.copyProperties(cmd, vehicleAuditLogE); + vehicleAuditLogE.addFroVehicleLog(vehicleAuditLogE, add.getId(), 1); + // 添加审批信息 + res = vehicleAuditLogGateway.add(vehicleAuditLogE); + // 添加审批信息 } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/GatePersonAuthLevelOneCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/GatePersonAuthLevelOneCoConvertor.java new file mode 100644 index 0000000..7195dd7 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/GatePersonAuthLevelOneCoConvertor.java @@ -0,0 +1,25 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.GatePersonAuthLevelOneCO; +import com.zcloud.primeport.persistence.dataobject.GatePersonAuthLevelOneDO; +import org.mapstruct.Mapper; + +import java.util.List; + + + +/** +* web-app +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +@Mapper(componentModel = "spring") +public interface GatePersonAuthLevelOneCoConvertor { + /** + * @param gatePersonAuthLevelOneDOs + * @return + */ + List converDOsToCOs(List gatePersonAuthLevelOneDOs); + GatePersonAuthLevelOneCO converDOToCO(GatePersonAuthLevelOneDO gatePersonAuthLevelOneDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/GatePersonAuthLevelOneQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/GatePersonAuthLevelOneQueryExe.java new file mode 100644 index 0000000..c796cfa --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/GatePersonAuthLevelOneQueryExe.java @@ -0,0 +1,47 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.GatePersonAuthLevelOneCoConvertor; +import com.zcloud.primeport.dto.GatePersonAuthLevelOnePageQry; +import com.zcloud.primeport.dto.clientobject.GatePersonAuthLevelOneCO; +import com.zcloud.primeport.persistence.dataobject.GatePersonAuthLevelOneDO; +import com.zcloud.primeport.persistence.repository.GatePersonAuthLevelOneRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author dearLin + * @Date 2025-12-31 10:51:44 + */ +@Component +@AllArgsConstructor +public class GatePersonAuthLevelOneQueryExe { + private final GatePersonAuthLevelOneRepository gatePersonAuthLevelOneRepository; + private final GatePersonAuthLevelOneCoConvertor gatePersonAuthLevelOneCoConvertor; + + /** + * 分页 + * + * @param gatePersonAuthLevelOnePageQry + * @return + */ + public PageResponse execute(GatePersonAuthLevelOnePageQry gatePersonAuthLevelOnePageQry) { + Map parmas = PageQueryHelper.toHashMap(gatePersonAuthLevelOnePageQry); + PageResponse pageResponse = gatePersonAuthLevelOneRepository.listPage(parmas); + List examCenterCOS = gatePersonAuthLevelOneCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public GatePersonAuthLevelOneCO getInfoById(Long id) { + GatePersonAuthLevelOneDO byId = gatePersonAuthLevelOneRepository.getById(id); + return gatePersonAuthLevelOneCoConvertor.converDOToCO(byId); + } +} + 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 6118f7f..ef1a728 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,26 +1,29 @@ package com.zcloud.primeport.command.query; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.MkmjApprovalUserCoConvertor; import com.zcloud.primeport.dto.MkmjApprovalUserPageQry; +import com.zcloud.primeport.dto.MkmjApprovalUserQry; import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO; import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; import com.zcloud.primeport.persistence.repository.MkmjApprovalUserRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import java.util.HashMap; import java.util.List; import java.util.Map; - /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-14 10:09:22 + */ @Component @AllArgsConstructor public class MkmjApprovalUserQueryExe { @@ -28,24 +31,32 @@ public class MkmjApprovalUserQueryExe { private final MkmjApprovalUserCoConvertor mkmjApprovalUserCoConvertor; /** - * 分页 - * - * @param mkmjApprovalUserPageQry - * @return - */ + * 分页 + * + * @param mkmjApprovalUserPageQry + * @return + */ public PageResponse execute(MkmjApprovalUserPageQry mkmjApprovalUserPageQry) { - Map parmas = PageQueryHelper.toHashMap(mkmjApprovalUserPageQry); + Map parmas = PageQueryHelper.toHashMap(mkmjApprovalUserPageQry); PageResponse pageResponse = mkmjApprovalUserRepository.listPage(parmas); - List examCenterCOS = mkmjApprovalUserCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + List examCenterCOS = mkmjApprovalUserCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } public List executeList(MkmjApprovalUserPageQry mkmjApprovalUserPageQry) { - Map parmas = PageQueryHelper.toHashMap(mkmjApprovalUserPageQry); - List examCenterDOs = mkmjApprovalUserRepository.listAll( parmas); + Map parmas = PageQueryHelper.toHashMap(mkmjApprovalUserPageQry); + List examCenterDOs = mkmjApprovalUserRepository.listAll(parmas); List examCenterCOS = mkmjApprovalUserCoConvertor.converDOsToCOs(examCenterDOs); return examCenterCOS; } + + public List listDeptUser(MkmjApprovalUserQry qry) { + HashMap parmasMap = new HashMap<>(); + parmasMap.put("department_id",qry.getDepartmentId()); + List dataList = mkmjApprovalUserRepository.listDeptUser(parmasMap); + List mkmjApprovalUserCOS = mkmjApprovalUserCoConvertor.converDOsToCOs(dataList); + return mkmjApprovalUserCOS; + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/GatePersonAuthLevelOneServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/GatePersonAuthLevelOneServiceImpl.java new file mode 100644 index 0000000..d0fb23e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/GatePersonAuthLevelOneServiceImpl.java @@ -0,0 +1,62 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.GatePersonAuthLevelOneServiceI; +import com.zcloud.primeport.command.GatePersonAuthLevelOneAddExe; +import com.zcloud.primeport.command.GatePersonAuthLevelOneRemoveExe; +import com.zcloud.primeport.command.GatePersonAuthLevelOneUpdateExe; +import com.zcloud.primeport.command.query.GatePersonAuthLevelOneQueryExe; +import com.zcloud.primeport.dto.GatePersonAuthLevelOneAddCmd; +import com.zcloud.primeport.dto.GatePersonAuthLevelOnePageQry; +import com.zcloud.primeport.dto.GatePersonAuthLevelOneUpdateCmd; +import com.zcloud.primeport.dto.clientobject.GatePersonAuthLevelOneCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* web-app +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +@Service +@AllArgsConstructor +public class GatePersonAuthLevelOneServiceImpl implements GatePersonAuthLevelOneServiceI { + private final GatePersonAuthLevelOneAddExe gatePersonAuthLevelOneAddExe; + private final GatePersonAuthLevelOneUpdateExe gatePersonAuthLevelOneUpdateExe; + private final GatePersonAuthLevelOneRemoveExe gatePersonAuthLevelOneRemoveExe; + private final GatePersonAuthLevelOneQueryExe gatePersonAuthLevelOneQueryExe; + + @Override + public PageResponse listPage(GatePersonAuthLevelOnePageQry qry){ + + return gatePersonAuthLevelOneQueryExe.execute(qry); + } + + @Override + public SingleResponse add(GatePersonAuthLevelOneAddCmd cmd) { + gatePersonAuthLevelOneAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(GatePersonAuthLevelOneUpdateCmd gatePersonAuthLevelOneUpdateCmd) { + gatePersonAuthLevelOneUpdateExe.execute(gatePersonAuthLevelOneUpdateCmd); + } + + @Override + public void remove(Long id) { + gatePersonAuthLevelOneRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + gatePersonAuthLevelOneRemoveExe.execute(ids); + } + + @Override + public GatePersonAuthLevelOneCO getInfoById(Long id) { + return gatePersonAuthLevelOneQueryExe.getInfoById(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 636da26..3b29d86 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 @@ -1,5 +1,6 @@ package com.zcloud.primeport.service; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.api.MkmjApprovalUserServiceI; @@ -9,6 +10,7 @@ import com.zcloud.primeport.command.MkmjApprovalUserUpdateExe; import com.zcloud.primeport.command.query.MkmjApprovalUserQueryExe; import com.zcloud.primeport.dto.MkmjApprovalUserAddCmd; import com.zcloud.primeport.dto.MkmjApprovalUserPageQry; +import com.zcloud.primeport.dto.MkmjApprovalUserQry; import com.zcloud.primeport.dto.MkmjApprovalUserUpdateCmd; import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO; import lombok.AllArgsConstructor; @@ -17,10 +19,11 @@ import org.springframework.stereotype.Service; import java.util.List; /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-14 10:09:22 + */ @Service @AllArgsConstructor public class MkmjApprovalUserServiceImpl implements MkmjApprovalUserServiceI { @@ -30,14 +33,13 @@ public class MkmjApprovalUserServiceImpl implements MkmjApprovalUserServiceI { private final MkmjApprovalUserQueryExe mkmjApprovalUserQueryExe; @Override - public PageResponse listPage(MkmjApprovalUserPageQry qry){ + public PageResponse listPage(MkmjApprovalUserPageQry qry) { return mkmjApprovalUserQueryExe.execute(qry); } @Override public SingleResponse add(MkmjApprovalUserAddCmd cmd) { - mkmjApprovalUserAddExe.execute(cmd); return SingleResponse.buildSuccess(); } @@ -62,5 +64,11 @@ public class MkmjApprovalUserServiceImpl implements MkmjApprovalUserServiceI { return mkmjApprovalUserQueryExe.executeList(qry); } + @Override + public MultiResponse listDeptUser(MkmjApprovalUserQry qry) { + List mkmjApprovalUserCOS = mkmjApprovalUserQueryExe.listDeptUser(qry); + return MultiResponse.of(mkmjApprovalUserCOS); + } + } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/GatePersonAuthLevelOneServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/GatePersonAuthLevelOneServiceI.java new file mode 100644 index 0000000..41ad3e3 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/GatePersonAuthLevelOneServiceI.java @@ -0,0 +1,28 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.GatePersonAuthLevelOneAddCmd; +import com.zcloud.primeport.dto.GatePersonAuthLevelOnePageQry; +import com.zcloud.primeport.dto.GatePersonAuthLevelOneUpdateCmd; +import com.zcloud.primeport.dto.clientobject.GatePersonAuthLevelOneCO; + +/** +* web-client +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +public interface GatePersonAuthLevelOneServiceI { + PageResponse listPage(GatePersonAuthLevelOnePageQry qry); + + SingleResponse add(GatePersonAuthLevelOneAddCmd cmd); + + void edit(GatePersonAuthLevelOneUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + GatePersonAuthLevelOneCO getInfoById(Long 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 e4b5b1f..0e9c105 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 @@ -1,8 +1,10 @@ package com.zcloud.primeport.api; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.dto.MkmjApprovalUserAddCmd; import com.zcloud.primeport.dto.MkmjApprovalUserPageQry; +import com.zcloud.primeport.dto.MkmjApprovalUserQry; import com.zcloud.primeport.dto.MkmjApprovalUserUpdateCmd; import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO; @@ -26,5 +28,6 @@ public interface MkmjApprovalUserServiceI { List listAll(MkmjApprovalUserPageQry qry); + MultiResponse listDeptUser(MkmjApprovalUserQry qry); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneAddCmd.java new file mode 100644 index 0000000..772bc4e --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneAddCmd.java @@ -0,0 +1,42 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** +* web-client +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class GatePersonAuthLevelOneAddCmd extends Command { + @ApiModelProperty(value = "用户身份证号", name = "userCard", required = true) + @NotEmpty(message = "用户身份证号不能为空") + private String userCard; + @ApiModelProperty(value = "用户id", name = "userId") + private Long userId; + @ApiModelProperty(value = "相关方项目id") + private Long projectId; + @ApiModelProperty(value = "门禁头像", name = "userFacePic", required = true) + @NotEmpty(message = "门禁头像不能为空") + private String userFacePic; + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @NotEmpty(message = "授权范围港区与区域不能为空") + private String gateLevelAuthArea; + @ApiModelProperty(value = "授权时间范围开始时间", name = "gateAuthTimeStart", required = true) + @NotEmpty(message = "授权时间范围开始时间不能为空") + private String gateAuthTimeStart; + @ApiModelProperty(value = "授权时间范围结束时间", name = "gateAuthTimeEnd", required = true) + @NotEmpty(message = "授权时间范围结束时间不能为空") + private String gateAuthTimeEnd; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOnePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOnePageQry.java new file mode 100644 index 0000000..dac2b49 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOnePageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author dearLin + * @Date 2025-12-31 10:51:44 + */ +@Data +public class GatePersonAuthLevelOnePageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeUserCard; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneUpdateCmd.java new file mode 100644 index 0000000..67ae696 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneUpdateCmd.java @@ -0,0 +1,42 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** +* web-client +* @Author dearLin +* @Date 2025-12-31 10:51:45 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class GatePersonAuthLevelOneUpdateCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotNull(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "门禁头像", name = "userFacePic") +// @NotEmpty(message = "门禁头像不能为空") + private String userFacePic; + @ApiModelProperty(value = "口门授权状态0没有1有", name = "gateLevelAuthFlag") + @NotNull(message = "口门授权状态0没有1有不能为空") + private Integer gateLevelAuthFlag; + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea") +// @NotEmpty(message = "授权范围港区与区域不能为空") + private String gateLevelAuthArea; + @ApiModelProperty(value = "授权时间范围开始时间", name = "gateAuthTimeStart") +// @NotEmpty(message = "授权时间范围开始时间不能为空") + private String gateAuthTimeStart; + @ApiModelProperty(value = "授权时间范围结束时间", name = "gateAuthTimeEnd") +// @NotEmpty(message = "授权时间范围结束时间不能为空") + private String gateAuthTimeEnd; +} + 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 f528ebf..6b37f7d 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 @@ -22,42 +22,17 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class MkmjApprovalUserAddCmd extends Command { - - - @ApiModelProperty(value = "审批人部门ID", name = "deptName", required = true) - @NotEmpty(message = "审批人部门ID不能为空") - private String deptName; - @ApiModelProperty(value = "审批人部门", name = "deptId", required = true) - @NotNull(message = "审批人部门不能为空") - private Long deptId; - @ApiModelProperty(value = "审批人姓名", name = "name", required = true) - @NotEmpty(message = "审批人姓名不能为空") - private String name; - @ApiModelProperty(value = "审批人", name = "userName", required = true) - @NotEmpty(message = "审批人不能为空") - private String userName; - @ApiModelProperty(value = "审批人名字", name = "userId", required = true) - @NotNull(message = "审批人名字不能为空") + @ApiModelProperty(value = "审批人", name = "userId", required = true) + @NotNull(message = "审批人不能为空") private Long userId; - @ApiModelProperty(value = "岗位名称", name = "postName", required = true) - @NotEmpty(message = "岗位名称不能为空") - private String postName; - @ApiModelProperty(value = "岗位id", name = "postId", required = true) - @NotNull(message = "岗位id不能为空") - private Long postId; - @ApiModelProperty(value = "企业id", name = "corpId", required = true) - @NotNull(message = "企业id不能为空") - private Long corpId; @ApiModelProperty( name = "isPersonnelPermission") - @NotEmpty(message = "人员审核权限") - Integer isPersonnelPermission; + @NotNull(message = "人员审核权限") + private Integer isPersonnelPermission; @ApiModelProperty( name = "isVehiclePermission") - @NotEmpty(message = "车辆审核权限") - Integer isVehiclePermission; + @NotNull(message = "车辆审核权限") + private Integer isVehiclePermission; @ApiModelProperty( name = "isTemporaryPermission") - @NotEmpty(message = "临时审核权限") - Integer isTemporaryPermission; - - + @NotNull(message = "临时审核权限") + private Integer isTemporaryPermission; } 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 67a1113..51fc478 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 @@ -5,25 +5,15 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; - /** -* web-client -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-14 10:09:22 + */ @Data public class MkmjApprovalUserPageQry extends PageQuery { -/** -* 查询条件操作前缀,支持以下几种数据库查询操作： -* - `like`: 模糊匹配查询，对应SQL的LIKE操作符 -* - `eq`: 等值查询，对应SQL的=操作符 -* - `gt`: 大于比较查询 -* - `lt`: 小于比较查询 -* - `ge`: 大于等于比较查询 -* - `le`: 小于等于比较查询 -* - `ne`: 不等比较查询，对应SQL的!=操作符 -*/ private String likeDeptName; public String likeUserName; @@ -33,4 +23,10 @@ public class MkmjApprovalUserPageQry extends PageQuery { public String eqDeptId; public String eqCorpId; + public String deptId; + public String name; + + public Integer isPersonnelPermission; + public Integer isVehiclePermission; + public Integer isTemporaryPermission; } \ No newline at end of file diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserQry.java new file mode 100644 index 0000000..d55f0c5 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserQry.java @@ -0,0 +1,19 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 审批人查询参数 + * + * @Author guoyuepeng + * @Date 2025-11-14 10:09:22 + */ +@Data +public class MkmjApprovalUserQry extends PageQuery { + @ApiModelProperty(value = "部门ID",required = true) + private Long departmentId; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java index 038c1df..63c5d57 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java @@ -22,69 +22,58 @@ import javax.validation.constraints.NotNull; @NoArgsConstructor @AllArgsConstructor public class VehicleMessageForCorpAddCmd extends Command { - - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) @NotNull(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") private Integer vehicleBelongType; - @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 = "车辆访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "车辆访问起始时间") + private String visitStartTime; + @ApiModelProperty(value = "车辆访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "车辆访问结束时间") + private String visitEndTime; @ApiModelProperty(value = "车辆所属人id(员工车辆)", name = "employeeVehicleUserId", required = true) -// @NotEmpty(message = "车辆所属人id(员工车辆)不能为空") private Long employeeVehicleUserId; @ApiModelProperty(value = "车辆所属人姓名(员工车辆)", name = "employeeVehicleUserName", required = true) -// @NotEmpty(message = "车辆所属人姓名(员工车辆)不能为空") private String employeeVehicleUserName; - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) @NotNull(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") private Integer licenceType; - @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 = "通行港区(0-全部 1-东港区 2-西港区)", name = "portId", required = true) @NotNull(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") private Integer portId; - @ApiModelProperty(value = "企业ID", name = "corpinfoId", required = true) -// @NotNull(message = "企业ID不能为空") private Long corpId; - @ApiModelProperty(value = "附件地址", name = "attachmentUrl", required = true) - private String attachmentUrl; - - + @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) + private Long drivingLicenseId; + @ApiModelProperty(value = "车辆照片", name = "attachmentUrl", required = true) + private Long attachmentUrl; /** * 审批信息 */ @ApiModelProperty(value = "审核人ID", name = "approvalUserId") + @NotNull(message = "审核人不能为空") public Long approvalUserId; - @ApiModelProperty(value = "审核人名字", name = "approvalUserName") public String approvalUserName; - @ApiModelProperty(value = "审核人部门ID", name = "approvalDeptId") public Long approvalDeptId; - @ApiModelProperty(value = "审核人部门名字", name = "approvalDeptName") public String approvalDeptName; - - public void addLongiUserCorp( String tenantParentIds){ if (tenantParentIds != null){ String [] corpIds = tenantParentIds.split(","); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/GatePersonAuthLevelOneCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/GatePersonAuthLevelOneCO.java new file mode 100644 index 0000000..2c4300a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/GatePersonAuthLevelOneCO.java @@ -0,0 +1,61 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + +/** +* web-client +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +@Data +public class GatePersonAuthLevelOneCO extends ClientObject { + private Long id; + //用户身份证号 + @ApiModelProperty(value = "用户身份证号") + private String userCard; + //0临时人员，1长期人员。临时人没有userid + @ApiModelProperty(value = "0临时人员，1长期人员。临时人没有userid") + private Integer userType; + //用户id + @ApiModelProperty(value = "用户id") + private Long userId; + //门禁头像 + @ApiModelProperty(value = "门禁头像") + private String userFacePic; + //口门授权状态0没有1有 + @ApiModelProperty(value = "口门授权状态0没有1有") + private Integer gateLevelAuthFlag; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private String gateLevelAuthArea; + //授权时间范围开始时间 + @ApiModelProperty(value = "授权时间范围开始时间") + private String gateAuthTimeStart; + //授权时间范围结束时间 + @ApiModelProperty(value = "授权时间范围结束时间") + private String gateAuthTimeEnd; + //三方系统id，用于对接 + @ApiModelProperty(value = "三方系统id，用于对接") + private String gateId; + @ApiModelProperty(value = "部门名") + private String departmentName; + @ApiModelProperty(value = "岗位名") + private String postName; + @ApiModelProperty(value = "用户名") + private String userName; + @ApiModelProperty(value = "手机号") + private String phone; + @ApiModelProperty(value = "车辆数") + private Integer carCount; + @ApiModelProperty(value = "相关方id") + private Integer projectId; + @ApiModelProperty(value = "相关方名称") + private String projectName; + +} + 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 95ac3b4..3951295 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 @@ -19,10 +19,10 @@ public class MkmjApprovalUserCO extends ClientObject { private Long id; //审批人部门ID @ApiModelProperty(value = "审批人部门ID") - private String deptName; + private String departmentName; //审批人部门 @ApiModelProperty(value = "审批人部门") - private Long deptId; + private Long departmentId; //审批人姓名 @ApiModelProperty(value = "审批人姓名") private String name; @@ -40,7 +40,7 @@ public class MkmjApprovalUserCO extends ClientObject { private Long postId; //企业id @ApiModelProperty(value = "企业id") - private Long corpId; + private Long corpinfoId; //删除标识 @ApiModelProperty(value = "删除标识") private String deleteEnum; @@ -53,5 +53,6 @@ public class MkmjApprovalUserCO extends ClientObject { //临时审核权限(0-无权限,1-有权限) @ApiModelProperty(value = "临时审核权限(0-无权限,1-有权限)") private Integer isTemporaryPermission; - + @ApiModelProperty(value = "待审批数量") + private Integer pendingApprovalQuantity; } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/GatePersonAuthLevelOneGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/GatePersonAuthLevelOneGateway.java new file mode 100644 index 0000000..e2a8cf4 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/GatePersonAuthLevelOneGateway.java @@ -0,0 +1,28 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.GatePersonAuthLevelOneE; + +/** +* web-domain +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +public interface GatePersonAuthLevelOneGateway { + + /** + * 新增 + */ + Boolean add(GatePersonAuthLevelOneE gatePersonAuthLevelOneE) ; + + /** + * 修改 + */ + Boolean update(GatePersonAuthLevelOneE gatePersonAuthLevelOneE); + + /** + * 删除 + */ + Boolean deletedGatePersonAuthLevelOneById(Long id); + Boolean deletedGatePersonAuthLevelOneByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java index 1298f67..72c109e 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java @@ -1,7 +1,6 @@ package com.zcloud.primeport.domain.gateway; import com.zcloud.primeport.domain.model.VehicleMessageE; -import com.zcloud.primeport.dto.VehicleAddCheckResultDTO; /** * web-domain diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/GatePersonAuthLevelOneE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/GatePersonAuthLevelOneE.java new file mode 100644 index 0000000..a3930b2 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/GatePersonAuthLevelOneE.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +/** +* web-domain +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +@Data +public class GatePersonAuthLevelOneE extends BaseE { + private Long id; + //用户身份证号 + private String userCard; + //0临时人员，1长期人员。临时人没有userid + private Integer userType; + //用户id + private Long userId; + //门禁头像 + private String userFacePic; + //口门授权状态0没有1有 + private Integer gateLevelAuthFlag; + //授权范围港区与区域 + private String gateLevelAuthArea; + //授权时间范围开始时间 + private String gateAuthTimeStart; + //授权时间范围结束时间 + private String gateAuthTimeEnd; + //三方系统id，用于对接 + private String gateId; + +} + 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 589ff09..f63bc16 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 @@ -28,7 +28,7 @@ public class MkmjApprovalUserE extends BaseE { //岗位id private Long postId; //企业id - private Long corpId; + private Long corpinfoId; //删除标识 private String deleteEnum; //人员审核权限(0-无权限,1-有权限) diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java index 0d4fabd..8c8df64 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java @@ -52,11 +52,13 @@ public class VehicleAuditLogE extends BaseE { public Long approvalDeptId; public String approvalDeptName; - /** 监管端申请 + /** + * 监管端申请 * 申请车辆的时候,审批信息. + * * @param examTypeE */ - public void addFroVehicleLog ( VehicleAuditLogE examTypeE,Long vehicleMessageId,Integer batchState) { + public void addFroVehicleLog(VehicleAuditLogE examTypeE, Long vehicleMessageId, Integer batchState) { this.userId = approvalUserId; this.userName = approvalUserName; this.deptId = approvalDeptId; @@ -70,12 +72,13 @@ public class VehicleAuditLogE extends BaseE { } - public VehicleAuditLogE approvalTongguo (Long id) { + public VehicleAuditLogE approvalTongguo(Long id) { this.id = id; this.status = 2; return this; } - public VehicleAuditLogE approvalNoTongguo (Long id, String comments) { + + public VehicleAuditLogE approvalNoTongguo(Long id, String comments) { this.id = id; this.status = 3; this.comments = comments; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/GatePersonAuthLevelOneGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/GatePersonAuthLevelOneGatewayImpl.java new file mode 100644 index 0000000..4810f42 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/GatePersonAuthLevelOneGatewayImpl.java @@ -0,0 +1,58 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.primeport.domain.gateway.GatePersonAuthLevelOneGateway; +import com.zcloud.primeport.domain.model.GatePersonAuthLevelOneE; +import com.zcloud.primeport.persistence.dataobject.GatePersonAuthLevelOneDO; +import com.zcloud.primeport.persistence.repository.GatePersonAuthLevelOneRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; + +/** + * web-infrastructure + * + * @Author dearLin + * @Date 2025-12-31 10:51:44 + */ +@Service +@AllArgsConstructor +public class GatePersonAuthLevelOneGatewayImpl implements GatePersonAuthLevelOneGateway { + private final GatePersonAuthLevelOneRepository gatePersonAuthLevelOneRepository; + + @Override + public Boolean add(GatePersonAuthLevelOneE gatePersonAuthLevelOneE) { + GatePersonAuthLevelOneDO d = new GatePersonAuthLevelOneDO(); + BeanUtils.copyProperties(gatePersonAuthLevelOneE, d); + // 口门授权状态0没有1有 + d.setGateLevelAuthFlag(1); + // 0临时人员，1长期人员 + d.setUserType(1); + if (Tools.isEmpty(d.getUserId())) { + d.setUserType(0); + } + gatePersonAuthLevelOneRepository.save(d); + return true; + } + + @Override + public Boolean update(GatePersonAuthLevelOneE gatePersonAuthLevelOneE) { + GatePersonAuthLevelOneDO d = new GatePersonAuthLevelOneDO(); + BeanUtils.copyProperties(gatePersonAuthLevelOneE, d); + gatePersonAuthLevelOneRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedGatePersonAuthLevelOneById(Long id) { + return gatePersonAuthLevelOneRepository.removeById(id); + } + + @Override + public Boolean deletedGatePersonAuthLevelOneByIds(Long[] ids) { + return gatePersonAuthLevelOneRepository.removeByIds(Arrays.asList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjApprovalUserGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjApprovalUserGatewayImpl.java index 040be00..c84e58d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjApprovalUserGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjApprovalUserGatewayImpl.java @@ -1,5 +1,7 @@ package com.zcloud.primeport.gatewayimpl; +import com.alibaba.cola.exception.BizException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.primeport.domain.gateway.MkmjApprovalUserGateway; import com.zcloud.primeport.domain.model.MkmjApprovalUserE; import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; @@ -9,6 +11,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.List; /** * web-infrastructure @@ -24,6 +27,12 @@ public class MkmjApprovalUserGatewayImpl implements MkmjApprovalUserGateway { @Override public Boolean add(MkmjApprovalUserE mkmjApprovalUserE) { MkmjApprovalUserDO d = new MkmjApprovalUserDO(); + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("user_id",mkmjApprovalUserE.getUserId()); + List list = mkmjApprovalUserRepository.list(objectQueryWrapper); + if (!list.isEmpty()) { + throw new BizException("该审批人已存在。"); + } BeanUtils.copyProperties(mkmjApprovalUserE, d); mkmjApprovalUserRepository.save(d); return true; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java index e4a20c6..6191364 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java @@ -2,7 +2,6 @@ package com.zcloud.primeport.gatewayimpl; import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; import com.zcloud.primeport.domain.model.VehicleMessageE; -import com.zcloud.primeport.dto.VehicleAddCheckResultDTO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; import lombok.AllArgsConstructor; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/GatePersonAuthLevelOneDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/GatePersonAuthLevelOneDO.java new file mode 100644 index 0000000..a46371d --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/GatePersonAuthLevelOneDO.java @@ -0,0 +1,62 @@ +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; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-infrastructure + * + * @Author dearLin + * @Date 2025-12-31 10:51:44 + */ +@Data +@TableName("gate_person_auth_level_one") +@EqualsAndHashCode(callSuper = true) +public class GatePersonAuthLevelOneDO extends BaseDO { + //用户身份证号 + @ApiModelProperty(value = "用户身份证号") + private String userCard; + //0临时人员，1长期人员。临时人没有userid + @ApiModelProperty(value = "0临时人员，1长期人员。临时人没有userid") + private Integer userType; + //用户id + @ApiModelProperty(value = "用户id") + private Long userId; + //门禁头像 + @ApiModelProperty(value = "门禁头像") + private String userFacePic; + //口门授权状态0没有1有 + @ApiModelProperty(value = "口门授权状态0没有1有") + private Integer gateLevelAuthFlag; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private String gateLevelAuthArea; + //授权时间范围开始时间 + @ApiModelProperty(value = "授权时间范围开始时间") + private String gateAuthTimeStart; + //授权时间范围结束时间 + @ApiModelProperty(value = "授权时间范围结束时间") + private String gateAuthTimeEnd; + //三方系统id，用于对接 + @ApiModelProperty(value = "三方系统id，用于对接") + private String gateId; + @TableField(exist = false) + private String departmentName; + @TableField(exist = false) + private String postName; + @TableField(exist = false) + private String userName; + @TableField(exist = false) + private String phone; + @TableField(exist = false) + @ApiModelProperty(value = "车辆数") + private Integer carCount; + +} + 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 b3859ab..73bfe17 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 @@ -2,6 +2,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; @@ -21,34 +22,37 @@ import java.util.Date; @TableName("mkmj_approval_user") @EqualsAndHashCode(callSuper = true) public class MkmjApprovalUserDO extends BaseDO { - //主键ID - @ApiModelProperty(value = "主键ID") - @TableId(type = IdType.ASSIGN_ID) - private Long id; //审批人部门ID @ApiModelProperty(value = "审批人部门ID") - private String deptName; + @TableField(exist = false) + private String departmentName; //审批人部门 @ApiModelProperty(value = "审批人部门") - private Long deptId; + @TableField(exist = false) + private Long departmentId; //审批人姓名 @ApiModelProperty(value = "审批人姓名") + @TableField(exist = false) private String name; //审批人 @ApiModelProperty(value = "审批人") + @TableField(exist = false) private String userName; //审批人名字 @ApiModelProperty(value = "审批人名字") private Long userId; //岗位名称 @ApiModelProperty(value = "岗位名称") + @TableField(exist = false) private String postName; //岗位id @ApiModelProperty(value = "岗位id") + @TableField(exist = false) private Long postId; //企业id @ApiModelProperty(value = "企业id") - private Long corpId; + @TableField(exist = false) + private Long corpinfoId; //人员审核权限(0-无权限,1-有权限) @ApiModelProperty(value = "人员审核权限(0-无权限,1-有权限)") private Integer isPersonnelPermission; @@ -61,7 +65,7 @@ public class MkmjApprovalUserDO extends BaseDO { //删除标识 @ApiModelProperty(value = "删除标识") private String deleteEnum; - - - + @TableField(exist = false) + @ApiModelProperty(value = "待审批的数量") + private Integer pendingApprovalQuantity; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/UserViewDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/UserViewDO.java index d3f2724..c6b5bf9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/UserViewDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/UserViewDO.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.util.Date; + /** * web-infrastructure * User视图DO类 @@ -90,39 +92,35 @@ public class UserViewDO extends BaseDO { @ApiModelProperty(value = "版本") private Integer version; - - @ApiModelProperty(value = "创建人ID") - private Long createId; - - @ApiModelProperty(value = "创建人姓名") - private String createName; - - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - - @ApiModelProperty(value = "更新人ID") - private Long updateId; - - @ApiModelProperty(value = "更新人姓名") - private String updateName; - - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "删除标识") - private String deleteEnum; - - @ApiModelProperty(value = "租户ID") - private String tenantId; - - @ApiModelProperty(value = "组织ID") - private String orgId; - - @ApiModelProperty(value = "环境") - private String env; +// +// @ApiModelProperty(value = "创建人ID") +// private Long createId; +// +// @ApiModelProperty(value = "创建人姓名") +// private String createName; +// +// +// @ApiModelProperty(value = "更新人ID") +// private Long updateId; +// +// @ApiModelProperty(value = "更新人姓名") +// private String updateName; +// +// +// @ApiModelProperty(value = "备注") +// private String remarks; +// +// @ApiModelProperty(value = "删除标识") +// private String deleteEnum; +// +// @ApiModelProperty(value = "租户ID") +// private String tenantId; +// +// @ApiModelProperty(value = "组织ID") +// private String orgId; +// +// @ApiModelProperty(value = "环境") +// private String env; @ApiModelProperty(value = "部门负责人标识") private String departmentLeaderFlag; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/GatePersonAuthLevelOneMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/GatePersonAuthLevelOneMapper.java new file mode 100644 index 0000000..10f97c9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/GatePersonAuthLevelOneMapper.java @@ -0,0 +1,24 @@ +package com.zcloud.primeport.persistence.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zcloud.primeport.persistence.dataobject.GatePersonAuthLevelOneDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author dearLin + * @Date 2025-12-31 10:51:44 + */ +@Mapper +public interface GatePersonAuthLevelOneMapper extends BaseMapper { + + IPage listPage(IPage page, @Param("parmas") Map parmas); + +} + 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 f6e4611..33a0fcb 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,13 @@ package com.zcloud.primeport.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * web-infrastructure * @@ -13,5 +17,8 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MkmjApprovalUserMapper extends BaseMapper { + List listDeptUser(Map qry); + + IPage listPage(IPage iPage, Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/GatePersonAuthLevelOneRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/GatePersonAuthLevelOneRepository.java new file mode 100644 index 0000000..e571154 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/GatePersonAuthLevelOneRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.GatePersonAuthLevelOneDO; + +import java.util.Map; + +/** +* web-infrastructure +* @Author dearLin +* @Date 2025-12-31 10:51:44 +*/ +public interface GatePersonAuthLevelOneRepository extends BaseRepository { + PageResponse listPage(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjApprovalUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjApprovalUserRepository.java index 80aced5..097c39c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjApprovalUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjApprovalUserRepository.java @@ -16,5 +16,7 @@ public interface MkmjApprovalUserRepository extends BaseRepository listPage(Map parmas); List listAll(Map parmas); + + List listDeptUser(Map qry); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/GatePersonAuthLevelOneRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/GatePersonAuthLevelOneRepositoryImpl.java new file mode 100644 index 0000000..b3febc9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/GatePersonAuthLevelOneRepositoryImpl.java @@ -0,0 +1,40 @@ +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.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.persistence.dataobject.GatePersonAuthLevelOneDO; +import com.zcloud.primeport.persistence.mapper.GatePersonAuthLevelOneMapper; +import com.zcloud.primeport.persistence.repository.GatePersonAuthLevelOneRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author dearLin + * @Date 2025-12-31 10:51:44 + */ +@Service +@RequiredArgsConstructor +public class GatePersonAuthLevelOneRepositoryImpl extends BaseRepositoryImpl implements GatePersonAuthLevelOneRepository { + private final GatePersonAuthLevelOneMapper gatePersonAuthLevelOneMapper; + + @Override + public PageResponse listPage(Map parmas) { + IPage iPage = new Query().getPage(parmas); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper.orderByDesc("create_time"); +// IPage result = gatePersonAuthLevelOneMapper.selectPage(iPage, queryWrapper); + IPage result = gatePersonAuthLevelOneMapper.listPage(iPage,parmas); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + 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 910dfaa..4609475 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,37 +3,42 @@ 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.jjb.saas.framework.auth.utils.AuthContext; 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.gbscommon.utils.Tools; import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; import com.zcloud.primeport.persistence.mapper.MkmjApprovalUserMapper; import com.zcloud.primeport.persistence.repository.MkmjApprovalUserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.Map; /** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-14 10:09:22 + */ @Service @RequiredArgsConstructor public class MkmjApprovalUserRepositoryImpl extends BaseRepositoryImpl implements MkmjApprovalUserRepository { private final MkmjApprovalUserMapper mkmjApprovalUserMapper; @Override - public PageResponse listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("dept_id"); - queryWrapper.orderByDesc("create_time"); - IPage result = mkmjApprovalUserMapper.selectPage(iPage, queryWrapper); + public PageResponse listPage(Map parmas) { + IPage iPage = new Query().getPage(parmas); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); +// queryWrapper.orderByDesc("dept_id"); +// queryWrapper.orderByDesc("create_time"); + IPage result = mkmjApprovalUserMapper.listPage(iPage, parmas); +// IPage result = mkmjApprovalUserMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -41,9 +46,27 @@ public class MkmjApprovalUserRepositoryImpl extends BaseRepositoryImpl listAll(Map parmas) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper.eq("tenant_id", AuthContext.getTenantId()); + if (Tools.notEmpty(String.valueOf(parmas.get("isPersonnelPermission")))) { + queryWrapper.eq("is_personnel_permission", parmas.get("isPersonnelPermission")); + } + if (Tools.notEmpty(String.valueOf(parmas.get("isVehiclePermission")))) { + queryWrapper.eq("is_vehicle_permission", parmas.get("isVehiclePermission")); + } + if (Tools.notEmpty(String.valueOf(parmas.get("isTemporaryPermission")))) { + queryWrapper.eq("is_temporary_permission", parmas.get("isTemporaryPermission")); + } + queryWrapper.eq("tenant_id", AuthContext.getTenantId()); + queryWrapper.orderByDesc("dept_id"); queryWrapper.orderByDesc("create_time"); return mkmjApprovalUserMapper.selectList(queryWrapper); } + @Override + public List listDeptUser(Map qry) { + List data = mkmjApprovalUserMapper.listDeptUser(qry); + return data; + } + } diff --git a/web-infrastructure/src/main/resources/mapper/GatePersonAuthLevelOneMapper.xml b/web-infrastructure/src/main/resources/mapper/GatePersonAuthLevelOneMapper.xml new file mode 100644 index 0000000..ab6ac78 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/GatePersonAuthLevelOneMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserMapper.xml index de9226e..dfe42fa 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserMapper.xml @@ -4,5 +4,42 @@ + +