diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index c1e36cd..bd2faca 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -7,7 +7,7 @@ application: gateway: primeport cn-name: 一级口门管理 server: - port: 801 + port: 80 debug: true spring: diff --git a/start/src/main/resources/nacos/config-actuator.yml b/start/src/main/resources/nacos/config-actuator.yml deleted file mode 100644 index a538ab2..0000000 --- a/start/src/main/resources/nacos/config-actuator.yml +++ /dev/null @@ -1,36 +0,0 @@ -management: - endpoints: - web: - base-path: /${application.gateway}${application.version}/actuator - enabled-by-default: true - endpoint: - health: - enabled: true - info: - enabled: false - auditevents: - enabled: false - metrics: - enabled: false - loggers: - enabled: false - logfile: - enabled: false - httptrace: - enabled: false - env: - enabled: false - flyway: - enabled: false - liquidbase: - enabled: false - shutdown: - enabled: false - mappings: - enabled: false - scheduledtasks: - enabled: false - threaddump: - enabled: false - heapdump: - enabled: false \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-cache.yml b/start/src/main/resources/nacos/config-cache.yml deleted file mode 100644 index 7d6ab7d..0000000 --- a/start/src/main/resources/nacos/config-cache.yml +++ /dev/null @@ -1,39 +0,0 @@ -spring: - cache: - redis: - time-to-live: 1800s - - -# 二级缓存配置 -# 注：caffeine 不适用于数据量大，并且缓存命中率极低的业务场景，如用户维度的缓存。请慎重选择。 -l2cache: - config: - # 是否存储空值，默认true，防止缓存穿透 - allowNullValues: true - # 组合缓存配置 - composite: - # 是否全部启用一级缓存，默认false - l1AllOpen: false - # 一级缓存 - caffeine: - # 是否自动刷新过期缓存 true 是 false 否 - autoRefreshExpireCache: false - # 缓存刷新调度线程池的大小 - refreshPoolSize: 2 - # 缓存刷新的频率(秒) - refreshPeriod: 10 - # 写入后过期时间(秒) - expireAfterWrite: 180 - # 访问后过期时间(秒) - expireAfterAccess: 180 - # 初始化大小 - initialCapacity: 1 - # 最大缓存对象个数，超过此数量时之前放入的缓存将失效 - maximumSize: 3 - - # 二级缓存 - redis: - # 全局过期时间，单位毫秒，默认不过期 - defaultExpiration: 1800000 - # 缓存更新时通知其他节点的topic名称 默认 cache:redis:caffeine:topic - topic: cache:redis:caffeine:topic \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-common.yml b/start/src/main/resources/nacos/config-common.yml deleted file mode 100644 index 810ccf5..0000000 --- a/start/src/main/resources/nacos/config-common.yml +++ /dev/null @@ -1,44 +0,0 @@ -common: - mysql: - host: 192.168.2.166 - port: 3306 - username: root - password: root - redis: - host: 10.43.253.4 - password: jjb123456 - port: 6379 - mq: - host: 10.43.163.23:9876 - xxl-job: - address: http://10.43.98.135:8080/xxl-job-admin/ - username: admin - password: jjb123456 - gateway: - network: - http: - #网关的外网访问地址 必须配置为HTTPS协议 - external: https://testdragon.cqjjb.cn - #网关的内网访问地址 固定配置为http://jjb-saas-gateway - intranet: http://10.43.250.65 - wx: - #webSocket外网地址 - external: wx://testdragon.cqjjb.cn - swagger: - #是否打开swagger 测试及UAT配置为true,生产环境配置为false - enabled: true - base: - # base应用访问外网访问地址 - host-url: http://10.43.12.158 - desk: - # desk工程的外网地址 - host-url: http://10.43.12.158 - login: - # login工程的外网访问地址 - host-url: http://10.43.12.158 - - #所有的前端域名配置 避免iframe跨域 - x-frame-options: ${common.desk.host-url}/ ${common.login.host-url}/ ${common.base.host-url}/ ${common.gateway.network.http.external}/ http://10.43.250.65/ - -k8s: - namespace: test-dragon \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-job.yml b/start/src/main/resources/nacos/config-job.yml deleted file mode 100644 index 1428887..0000000 --- a/start/src/main/resources/nacos/config-job.yml +++ /dev/null @@ -1,8 +0,0 @@ -# JOB 配置 -xxl-job: - admin: - address: ${common.xxl-job.address} - username: ${common.xxl-job.username} - password: ${common.xxl-job.password} - executor: - app-name: ${spring.application.name} \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-log.yml b/start/src/main/resources/nacos/config-log.yml deleted file mode 100644 index 9d8ab6c..0000000 --- a/start/src/main/resources/nacos/config-log.yml +++ /dev/null @@ -1,11 +0,0 @@ -common: - log: - jjb-saas-system: - - com.jjb:info - jjb-saas-auth1: - - com.jjb:info - jjb-saas-user: - - com.jjb:info -gray: - log: - host: 192.168.1.1 diff --git a/start/src/main/resources/nacos/config-mq.yml b/start/src/main/resources/nacos/config-mq.yml deleted file mode 100644 index 9e1b0b3..0000000 --- a/start/src/main/resources/nacos/config-mq.yml +++ /dev/null @@ -1,21 +0,0 @@ -mq: - topic: springcloudStream-jjb-dragon-test - server: ${common.mq.host} -spring: - cloud: - stream: - bindings: - input: - destination: springcloudStream-jjb-dragon-test - group: ${spring.application.name}-${spring.profiles.active} - output: - destination: springcloudStream-jjb-dragon-test - group: ${spring.application.name}-${spring.profiles.active} - rocketmq: - binder: - name-server: ${common.mq.host} - group: ${spring.application.name}-${spring.profiles.active} - bindings: - input: - consumer: - tags: a \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-mybatis.yml b/start/src/main/resources/nacos/config-mybatis.yml deleted file mode 100644 index f756cb6..0000000 --- a/start/src/main/resources/nacos/config-mybatis.yml +++ /dev/null @@ -1,11 +0,0 @@ -mybatis-plus: - mapper-locations: classpath*:mapper/*.xml,classpath*:mapper/**/*Mapper.xml - type-handlers-package: com.jjb.saas.framework.datascope.handler - global-config: - banner: false - db-config: - id-type: assign_id - logic-delete-value: 1 - logic-not-delete-value: 0 - configuration: - log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-mysql.yml b/start/src/main/resources/nacos/config-mysql.yml deleted file mode 100644 index 4365a53..0000000 --- a/start/src/main/resources/nacos/config-mysql.yml +++ /dev/null @@ -1,79 +0,0 @@ -mysql: - db: ${spring.application.name} -spring: - shardingsphere: - druid: - username: admin - password: jjb123456 - allows: - denys: - props: - sql: - show: true - enabled: true - masterslave: - name: ms # 名字，任意，需要保证唯一 - master-data-source-name: master # 主库数据源 - slave-data-source-names: slave-1 # 从库数据源 - datasource: - names: master,slave-1 - master: - #url: jdbc:mysql://10.43.123.226:3306/${spring.application.name}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai - url: jdbc:mysql://${common.mysql.host}:${common.mysql.port}/${mysql.db}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai - username: ${common.mysql.username} - password: ${common.mysql.password} - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - initial-size: 6 - min-idle: 4 - maxActive: 40 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - #Oracle需要打开注释 - #validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - # 打开PSCache，并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: slf4j - # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 - connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 - wall: - multi-statement-allow: true - slave-1: - # url: jdbc:mysql://10.43.123.226:3306/${spring.application.name}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai - url: jdbc:mysql://${common.mysql.host}:${common.mysql.port}/${mysql.db}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai - username: ${common.mysql.username} - password: ${common.mysql.password} - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - initial-size: 6 - min-idle: 4 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - #Oracle需要打开注释 - #validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - # 打开PSCache，并且指定每个连接上PSCache的大小 - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙,stat已去掉 - filters: slf4j - # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 - connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 - wall: - multi-statement-allow: true \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-port.yml b/start/src/main/resources/nacos/config-port.yml deleted file mode 100644 index 4ed22a4..0000000 --- a/start/src/main/resources/nacos/config-port.yml +++ /dev/null @@ -1,3 +0,0 @@ -server: - port: 801 -debug: true diff --git a/start/src/main/resources/nacos/config-redis.yml b/start/src/main/resources/nacos/config-redis.yml deleted file mode 100644 index 0b4cc30..0000000 --- a/start/src/main/resources/nacos/config-redis.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - redis: - host: ${common.redis.host} - password: ${common.redis.password} - port: ${common.redis.port} - timeout: 15000 - database: 0 - prefix: dragon - jedis: - pool: - max-active: 600 - max-idle: 300 - max-wait: 15000 - min-idle: 10 \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-sdk.yml b/start/src/main/resources/nacos/config-sdk.yml deleted file mode 100644 index e352c19..0000000 --- a/start/src/main/resources/nacos/config-sdk.yml +++ /dev/null @@ -1,19 +0,0 @@ -sdk: - server: - symmetry-url: jjb-saas-application/application/applications/server/secure/ - app-key: jjb-saas-dragon - client: - security: - gateway: ${gateway.network.http.external} - appKey: ${sdk.client.app-key} - desensitization: - symmetric-key: 1234567887654321 - logging: - gateway: ${sdk.client.security.gateway} - appKey: ${sdk.client.security.app-key} - clientLoggingEnable: true - level: debug - username: user - password: 123456 - showConsoleLog: true - formatConsoleLogJson: true \ No newline at end of file diff --git a/start/src/main/resources/nacos/config-spring.yml b/start/src/main/resources/nacos/config-spring.yml deleted file mode 100644 index 284ddb4..0000000 --- a/start/src/main/resources/nacos/config-spring.yml +++ /dev/null @@ -1,89 +0,0 @@ -spring: - zipkin: - #zipkin服务所在地址 - base-url: http://jjb-saas-zipkin/ - sender: - type: web #使用http的方式传输数据 - #配置采样百分比 - sleuth: - sampler: - probability: 1 # 将采样比例设置为 1.0，也就是全部都需要。默认是0.1也就是10%，一般情况下，10%就够用了 - web: - resources: - cache: - cachecontrol: - no-store: false - max-age: 10000 - no-cache: false - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - main: - allow-bean-definition-overriding: true - mvc: - pathmatch: - matching-strategy: ant_path_matcher - messages: - basename: i18n.message - encoding: UTF-8 - flyway: - # 是否启用flyway - enabled: true - # 编码格式，默认UTF-8 - encoding: UTF-8 - # 迁移sql脚本文件存放路径，默认db/migration - locations: classpath:db/migration - # 迁移sql脚本文件名称的前缀，默认V - sql-migration-prefix: V - # 迁移sql脚本文件名称的分隔符，默认2个下划线__ - sql-migration-separator: __ - # 迁移sql脚本文件名称的后缀 - sql-migration-suffixes: .sql - # 迁移时是否进行校验，默认true - validate-on-migrate: true - # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表 - baseline-on-migrate: true -server: - tomcat: - max-http-post-size: 200MB - connection-timeout: 180000 -fastjson: - parser: - safeMode: true -mvc: - pathmatch: - matching-strategy: ANT_PATH_MATCHER -thymeleaf: - prefix: classpath:/templates/ - cache: false -dubbo: - application: - name: ${spring.application.name} - registry: - timeout: 20000 - address: nacos://${spring.cloud.nacos.config.server-addr}?namespace=${spring.cloud.nacos.config.namespace}-facade - check: false - filter: providerContextFilter - protocol: - port: -1 - name: dubbo - consumer: - timeout: 20000 - check: false - filter: consumerContextFilter -logging: - config: classpath:jjb-saas-logback-spring.xml - level: - com.alibaba.nacos.client.naming: OFF - com.alibaba.nacos.client.config.impl: OFF - com.alibaba.nacos.common.remote.client: OFF - -datapermssion: - tenantcondition: - defaultversion: NEWERSION - -easy-retry: - server: - host: http://jjb-saas-config - port: 1788 - - diff --git a/start/src/main/resources/nacos/jjb-saas-demo.yml b/start/src/main/resources/nacos/jjb-saas-demo.yml deleted file mode 100644 index 536d952..0000000 --- a/start/src/main/resources/nacos/jjb-saas-demo.yml +++ /dev/null @@ -1,18 +0,0 @@ -sdk: - client: - app-key: e6ab3c9abda747b39d7cc12b6dc0f5a0 - gateway: - url: ${common.gateway.network.http.intranet} -swagger: - enabled: ${common.swagger.enabled} - title: 例子 - description: 这是例子项目 - version: ${application.version} - group-name: 例子 -springfox: - documentation: - swagger-ui: - base-url: ${application.gateway} - swagger: - v2: - path: /${application.gateway}/v2/api-docs \ No newline at end of file diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/EmployeeMessageController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/EmployeeMessageController.java deleted file mode 100644 index 83a7a4c..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/EmployeeMessageController.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.zcloud.primeport.web; - -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.EmployeeMessageServiceI; -import com.zcloud.primeport.dto.EmployeeMessageAddCmd; -import com.zcloud.primeport.dto.EmployeeMessagePageQry; -import com.zcloud.primeport.dto.EmployeeMessageUpdateCmd; -import com.zcloud.primeport.dto.EmployeeMessageUpdateStatusCmd; -import com.zcloud.primeport.dto.clientobject.EmployeeMessageCO; -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 guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Api(tags = "用户的进入一级口门的信息") -@RequestMapping("/${application.gateway}/employeeMessage") -@RestController -@AllArgsConstructor -public class EmployeeMessageController { - private final EmployeeMessageServiceI employeeMessageService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody EmployeeMessageAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return employeeMessageService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody EmployeeMessagePageQry qry) { - return employeeMessageService.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(employeeMessageService.queryById(id)); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - employeeMessageService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - employeeMessageService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody EmployeeMessageUpdateCmd employeeMessageUpdateCmd) { - employeeMessageService.edit(employeeMessageUpdateCmd); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("更新状态") - @PutMapping("/updateStatus") - public SingleResponse updateStatus(@Validated @RequestBody EmployeeMessageUpdateStatusCmd cmd) { - employeeMessageService.updateStatus(cmd); - return SingleResponse.buildSuccess(); - } -} \ No newline at end of file diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/EnclosedAreaController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/EnclosedAreaController.java deleted file mode 100644 index 7affbcc..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/EnclosedAreaController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.zcloud.primeport.web; - - -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.EnclosedAreaServiceI; -import com.zcloud.primeport.dto.EnclosedAreaAddCmd; -import com.zcloud.primeport.dto.EnclosedAreaPageQry; -import com.zcloud.primeport.dto.EnclosedAreaUpdateCmd; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaCO; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaTreeCO; -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 fangjiakai - * @Date 2025-12-12 16:49:31 - */ -@Api(tags = "封闭区域") -@RequestMapping("/${application.gateway}/enclosedArea") -@RestController -@AllArgsConstructor -public class EnclosedAreaController { - private final EnclosedAreaServiceI enclosedAreaService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody EnclosedAreaAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - cmd.setCorpinfoId(ssoUser.getTenantId()); - cmd.setCorpinfoName(ssoUser.getTenantName()); - return enclosedAreaService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody EnclosedAreaPageQry qry) { - return enclosedAreaService.listPage(qry); - } - - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - - @ApiOperation("所有数据") - @GetMapping("/listAllTree") - public MultiResponse listAllTree() { - return MultiResponse.of(enclosedAreaService.listAllTree()); - } - - @ApiOperation("详情") - @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(enclosedAreaService.queryById(id)); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - enclosedAreaService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - enclosedAreaService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody EnclosedAreaUpdateCmd enclosedAreaUpdateCmd) { - enclosedAreaService.edit(enclosedAreaUpdateCmd); - return SingleResponse.buildSuccess(); - } -} - 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 deleted file mode 100644 index 0965576..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/GatePersonAuthLevelOneController.java +++ /dev/null @@ -1,72 +0,0 @@ -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/InspectionDeptController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java deleted file mode 100644 index 253055c..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.zcloud.primeport.web; - -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.InspectionDeptServiceI; -import com.zcloud.primeport.dto.InspectionDeptAddCmd; -import com.zcloud.primeport.dto.InspectionDeptPageQry; -import com.zcloud.primeport.dto.InspectionDeptUpdateCmd; -import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; -import com.zcloud.primeport.dto.clientobject.InspectionDeptInfoCO; -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 guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Api(tags = "检查部门表") -@RequestMapping("/${application.gateway}/inspectionDept") -@RestController -@AllArgsConstructor -public class InspectionDeptController { - private final InspectionDeptServiceI inspectionDeptService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody InspectionDeptAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return inspectionDeptService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody InspectionDeptPageQry qry) { - return inspectionDeptService.listPage(qry); - } - - - @ApiOperation("详情") - @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(inspectionDeptService.getInfoById( id)); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - inspectionDeptService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody InspectionDeptUpdateCmd inspectionDeptUpdateCmd) { - inspectionDeptService.edit(inspectionDeptUpdateCmd); - return SingleResponse.buildSuccess(); - } -} - diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionVehicleController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionVehicleController.java deleted file mode 100644 index 1f85598..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionVehicleController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.zcloud.primeport.web; - -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.InspectionVehicleServiceI; -import com.zcloud.primeport.dto.InspectionVehicleAddCmd; -import com.zcloud.primeport.dto.InspectionVehiclePageQry; -import com.zcloud.primeport.dto.InspectionVehicleUpdateCmd; -import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; -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 guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Api(tags = "检查部门对应车辆表") -@RequestMapping("/${application.gateway}/inspectionVehicle") -@RestController -@AllArgsConstructor -public class InspectionVehicleController { - private final InspectionVehicleServiceI inspectionVehicleService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody InspectionVehicleAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return inspectionVehicleService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody InspectionVehiclePageQry qry) { - return inspectionVehicleService.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 InspectionVehicleCO()); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - inspectionVehicleService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - inspectionVehicleService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody InspectionVehicleUpdateCmd inspectionVehicleUpdateCmd) { - inspectionVehicleService.edit(inspectionVehicleUpdateCmd); - 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 0442b47..4a67cf7 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 @@ -1,5 +1,6 @@ package com.zcloud.primeport.web; + import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; @@ -9,28 +10,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 -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-adapter + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ @Api(tags = "一级口门门禁审批人") @RequestMapping("/${application.gateway}/mkmjApprovalUser") @RestController @@ -41,27 +36,27 @@ public class MkmjApprovalUserController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody MkmjApprovalUserAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); return mkmjApprovalUserService.add(cmd); } - @ApiOperation("审批人列表-根据部门查询") - @GetMapping("/listDeptUser") - public MultiResponse listDeptUser(MkmjApprovalUserQry qry) { - return mkmjApprovalUserService.listDeptUser(qry); - } @ApiOperation("分页") - @GetMapping("/list") - public PageResponse page(MkmjApprovalUserPageQry qry) { + @PostMapping("/list") + public PageResponse page(@RequestBody MkmjApprovalUserPageQry qry) { return mkmjApprovalUserService.listPage(qry); } @ApiOperation("所有数据") @GetMapping("/listAll") - public MultiResponse listAll(MkmjApprovalUserPageQry qry) { - List mkmjApprovalUserCOS = mkmjApprovalUserService.listAll(qry); - return MultiResponse.of(mkmjApprovalUserCOS); + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); } + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new MkmjApprovalUserCO()); + } @ApiOperation("删除") @DeleteMapping("/{id}") @@ -69,11 +64,18 @@ public class MkmjApprovalUserController { mkmjApprovalUserService.remove(id); return SingleResponse.buildSuccess(); } - @Autowired - private ApplicationContext applicationContext; - @GetMapping("/getDataSource") - public Response getDataSource() { - Map dataSources = applicationContext.getBeansOfType(DataSource.class); + + @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) { + mkmjApprovalUserService.edit(mkmjApprovalUserUpdateCmd); return SingleResponse.buildSuccess(); } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjAreaController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjAreaController.java deleted file mode 100644 index 95fb062..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjAreaController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.zcloud.primeport.web; - - -import cn.hutool.core.util.ObjectUtil; -import com.zcloud.primeport.api.MkmjAreaServiceI; -import com.zcloud.primeport.domain.model.MkmjStatisticsE; -import com.zcloud.primeport.dto.MkmjAreaAddCmd; -import com.zcloud.primeport.dto.MkmjAreaPageQry; -import com.zcloud.primeport.dto.MkmjAreaUpdateCmd; -import com.zcloud.primeport.dto.StatisticsByAreaCmd; -import com.zcloud.primeport.dto.clientobject.MkmjAreaCO; -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.dto.clientobject.MkmjStatisticsCO; -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 fangjiakai - * @Date 2025-11-14 08:57:41 - */ -@Api(tags = "门口门禁区域表") -@RequestMapping("/${application.gateway}/mkmjArea") -@RestController -@AllArgsConstructor -public class MkmjAreaController { - private final MkmjAreaServiceI mkmjAreaService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody MkmjAreaAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - if(ObjectUtil.isEmpty(cmd.getCorpinfoId())){ - cmd.setCorpinfoId(ssoUser.getTenantId()); - cmd.setCorpinfoName(ssoUser.getTenantName()); - } - return mkmjAreaService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody MkmjAreaPageQry qry) { - return mkmjAreaService.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(mkmjAreaService.queryById(id)); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - mkmjAreaService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - mkmjAreaService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody MkmjAreaUpdateCmd mkmjAreaUpdateCmd) { - mkmjAreaService.edit(mkmjAreaUpdateCmd); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("统计") - @PostMapping("/statistics") - public MultiResponse statistics(@RequestBody StatisticsByAreaCmd qry) { - return MultiResponse.of(mkmjAreaService.statistics(qry.getIds())); - } -} - diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java new file mode 100644 index 0000000..820a454 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java @@ -0,0 +1,81 @@ +package com.zcloud.primeport.web; + + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.dto.SingleResponse; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.MkmjServiceI; +import com.zcloud.primeport.dto.MkmjAddCmd; +import com.zcloud.primeport.dto.MkmjPageQry; +import com.zcloud.primeport.dto.MkmjUpdateCmd; +import com.zcloud.primeport.dto.clientobject.MkmjCO; +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 makejava + * @Date 2026-03-05 11:33:15 + */ +@Api(tags = "门口信息管理表") +@RequestMapping("/${application.gateway}/mkmj") +@RestController +@AllArgsConstructor +public class MkmjController { + private final MkmjServiceI mkmjService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody MkmjAddCmd cmd) { + return mkmjService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody MkmjPageQry qry) { + return mkmjService.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(mkmjService.getInfoById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + mkmjService.remove(id); + return SingleResponse.buildSuccess(); + } + +// @ApiOperation("删除多个") +// @DeleteMapping("/ids") +// public Response removeBatch(@RequestParam String ids) { +// mkmjService.removeBatch(ids); +// return SingleResponse.buildSuccess(); +// } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody MkmjUpdateCmd mkmjUpdateCmd) { + mkmjService.edit(mkmjUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateVideoController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateController.java similarity index 50% rename from web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateVideoController.java rename to web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateController.java index 52a2dc0..d900085 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateVideoController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateController.java @@ -1,17 +1,17 @@ package com.zcloud.primeport.web; -import com.zcloud.primeport.api.MkmjGateVideoServiceI; -import com.zcloud.primeport.dto.MkmjGateVideoAddCmd; -import com.zcloud.primeport.dto.MkmjGateVideoPageQry; -import com.zcloud.primeport.dto.MkmjGateVideoUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjGateVideoCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.MkmjGateServiceI; +import com.zcloud.primeport.dto.MkmjGateAddCmd; +import com.zcloud.primeport.dto.MkmjGatePageQry; +import com.zcloud.primeport.dto.MkmjGateUpdateCmd; +import com.zcloud.primeport.dto.clientobject.MkmjGateCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -23,59 +23,59 @@ import java.util.ArrayList; /** * web-adapter * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ -@Api(tags = "门口门禁闸机摄像头表") -@RequestMapping("/${application.gateway}/mkmjGateVideo") +@Api(tags = "门口闸机表") +@RequestMapping("/${application.gateway}/mkmjGate") @RestController @AllArgsConstructor -public class MkmjGateVideoController { - private final MkmjGateVideoServiceI mkmjGateVideoService; +public class MkmjGateController { + private final MkmjGateServiceI mkmjGateService; @ApiOperation("新增") @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody MkmjGateVideoAddCmd cmd) { + public SingleResponse add(@Validated @RequestBody MkmjGateAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); - return mkmjGateVideoService.add(cmd); + return mkmjGateService.add(cmd); } @ApiOperation("分页") @PostMapping("/list") - public PageResponse page(@RequestBody MkmjGateVideoPageQry qry) { - return mkmjGateVideoService.listPage(qry); + public PageResponse page(@RequestBody MkmjGatePageQry qry) { + return mkmjGateService.listPage(qry); } @ApiOperation("所有数据") @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); } @ApiOperation("详情") @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(mkmjGateVideoService.queryById(id)); + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new MkmjGateCO()); } @ApiOperation("删除") @DeleteMapping("/{id}") public Response remove(@PathVariable("id") Long id) { - mkmjGateVideoService.remove(id); + mkmjGateService.remove(id); return SingleResponse.buildSuccess(); } @ApiOperation("删除多个") @DeleteMapping("/ids") public Response removeBatch(@RequestParam Long[] ids) { - mkmjGateVideoService.removeBatch(ids); + mkmjGateService.removeBatch(ids); return SingleResponse.buildSuccess(); } @ApiOperation("修改") @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody MkmjGateVideoUpdateCmd mkmjGateVideoUpdateCmd) { - mkmjGateVideoService.edit(mkmjGateVideoUpdateCmd); + public SingleResponse edit(@Validated @RequestBody MkmjGateUpdateCmd mkmjGateUpdateCmd) { + mkmjGateService.edit(mkmjGateUpdateCmd); return SingleResponse.buildSuccess(); } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjPassageController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjPassageController.java index a164eaf..364b101 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjPassageController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjPassageController.java @@ -1,19 +1,17 @@ package com.zcloud.primeport.web; -import com.zcloud.primeport.api.MkmjPassageServiceI; -import com.zcloud.primeport.dto.MkmjPassageAddCmd; -import com.zcloud.primeport.dto.MkmjPassagePageQry; -import com.zcloud.primeport.dto.MkmjPassageUpdateCmd; -import com.zcloud.primeport.dto.StatisticsByAreaCmd; -import com.zcloud.primeport.dto.clientobject.MkmjPassageCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.dto.clientobject.MkmjStatisticsCO; +import com.zcloud.primeport.api.MkmjPassageServiceI; +import com.zcloud.primeport.dto.MkmjPassageAddCmd; +import com.zcloud.primeport.dto.MkmjPassagePageQry; +import com.zcloud.primeport.dto.MkmjPassageUpdateCmd; +import com.zcloud.primeport.dto.clientobject.MkmjPassageCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -25,8 +23,8 @@ import java.util.ArrayList; /** * web-adapter * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Api(tags = "口门门禁通道表") @RequestMapping("/${application.gateway}/mkmjPassage") @@ -38,7 +36,6 @@ public class MkmjPassageController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody MkmjPassageAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return mkmjPassageService.add(cmd); } @@ -57,12 +54,7 @@ public class MkmjPassageController { @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(mkmjPassageService.queryById(id)); - } - @ApiOperation("是否重名") - @GetMapping("/hasName/{name}") - public SingleResponse hasName(@PathVariable("name") String name) { - return SingleResponse.of(mkmjPassageService.queryByName(name)); + return SingleResponse.of(new MkmjPassageCO()); } @ApiOperation("删除") @@ -85,11 +77,5 @@ public class MkmjPassageController { mkmjPassageService.edit(mkmjPassageUpdateCmd); return SingleResponse.buildSuccess(); } - - @ApiOperation("统计") - @PostMapping("/statistics") - public MultiResponse statistics(@RequestBody StatisticsByAreaCmd qry) { - return MultiResponse.of(mkmjPassageService.statistics(qry.getIds())); - } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjSwipeCardRecordController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjSwipeCardRecordController.java deleted file mode 100644 index ba7baa8..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjSwipeCardRecordController.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.zcloud.primeport.web; - - -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.MkmjSwipeCardRecordServiceI; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordAddCmd; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordPageQry; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjSwipeCardRecordCO; -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 fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Api(tags = "") -@RequestMapping("/${application.gateway}/mkmjSwipeCardRecord") -@RestController -@AllArgsConstructor -public class MkmjSwipeCardRecordController { - private final MkmjSwipeCardRecordServiceI mkmjSwipeCardRecordService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody MkmjSwipeCardRecordAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return mkmjSwipeCardRecordService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody MkmjSwipeCardRecordPageQry qry) { - return mkmjSwipeCardRecordService.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(mkmjSwipeCardRecordService.queryById(id)); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - mkmjSwipeCardRecordService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - mkmjSwipeCardRecordService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody MkmjSwipeCardRecordUpdateCmd mkmjSwipeCardRecordUpdateCmd) { - mkmjSwipeCardRecordService.edit(mkmjSwipeCardRecordUpdateCmd); - return SingleResponse.buildSuccess(); - } -} - diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java new file mode 100644 index 0000000..0f9b950 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java @@ -0,0 +1,82 @@ +package com.zcloud.primeport.web; + + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.dto.SingleResponse; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.PersonApplyServiceI; +import com.zcloud.primeport.dto.PersonApplyAddCmd; +import com.zcloud.primeport.dto.PersonApplyPageQry; +import com.zcloud.primeport.dto.PersonApplyUpdateCmd; +import com.zcloud.primeport.dto.clientobject.PersonApplyCO; +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 makejava + * @Date 2026-03-05 11:33:21 + */ +@Api(tags = "人员申请审批信息") +@RequestMapping("/${application.gateway}/personApply") +@RestController +@AllArgsConstructor +public class PersonApplyController { + private final PersonApplyServiceI personApplyService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody PersonApplyAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return personApplyService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody PersonApplyPageQry qry) { + return personApplyService.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 PersonApplyCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + personApplyService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + personApplyService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody PersonApplyUpdateCmd personApplyUpdateCmd) { + personApplyService.edit(personApplyUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjCarRecordController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/PersonMessageController.java similarity index 51% rename from web-adapter/src/main/java/com/zcloud/primeport/web/MkmjCarRecordController.java rename to web-adapter/src/main/java/com/zcloud/primeport/web/PersonMessageController.java index f62b306..2e15f25 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjCarRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/PersonMessageController.java @@ -7,11 +7,11 @@ import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.MkmjCarRecordServiceI; -import com.zcloud.primeport.dto.MkmjCarRecordAddCmd; -import com.zcloud.primeport.dto.MkmjCarRecordPageQry; -import com.zcloud.primeport.dto.MkmjCarRecordUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjCarRecordCO; +import com.zcloud.primeport.api.PersonMessageServiceI; +import com.zcloud.primeport.dto.PersonMessageAddCmd; +import com.zcloud.primeport.dto.PersonMessagePageQry; +import com.zcloud.primeport.dto.PersonMessageUpdateCmd; +import com.zcloud.primeport.dto.clientobject.PersonMessageCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -23,59 +23,59 @@ import java.util.ArrayList; /** * web-adapter * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 + * @Author makejava + * @Date 2026-03-05 11:33:20 */ -@Api(tags = "车辆进出港记录") -@RequestMapping("/${application.gateway}/mkmjCarRecord") +@Api(tags = "审批通过的人员信息用于与门禁系统对接") +@RequestMapping("/${application.gateway}/personMessage") @RestController @AllArgsConstructor -public class MkmjCarRecordController { - private final MkmjCarRecordServiceI mkmjCarRecordService; +public class PersonMessageController { + private final PersonMessageServiceI personMessageService; @ApiOperation("新增") @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody MkmjCarRecordAddCmd cmd) { + public SingleResponse add(@Validated @RequestBody PersonMessageAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); - return mkmjCarRecordService.add(cmd); + return personMessageService.add(cmd); } @ApiOperation("分页") @PostMapping("/list") - public PageResponse page(@RequestBody MkmjCarRecordPageQry qry) { - return mkmjCarRecordService.listPage(qry); + public PageResponse page(@RequestBody PersonMessagePageQry qry) { + return personMessageService.listPage(qry); } @ApiOperation("所有数据") @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); } @ApiOperation("详情") @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(mkmjCarRecordService.queryById(id)); + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new PersonMessageCO()); } @ApiOperation("删除") @DeleteMapping("/{id}") public Response remove(@PathVariable("id") Long id) { - mkmjCarRecordService.remove(id); + personMessageService.remove(id); return SingleResponse.buildSuccess(); } @ApiOperation("删除多个") @DeleteMapping("/ids") public Response removeBatch(@RequestParam Long[] ids) { - mkmjCarRecordService.removeBatch(ids); + personMessageService.removeBatch(ids); return SingleResponse.buildSuccess(); } @ApiOperation("修改") @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody MkmjCarRecordUpdateCmd mkmjCarRecordUpdateCmd) { - mkmjCarRecordService.edit(mkmjCarRecordUpdateCmd); + public SingleResponse edit(@Validated @RequestBody PersonMessageUpdateCmd personMessageUpdateCmd) { + personMessageService.edit(personMessageUpdateCmd); return SingleResponse.buildSuccess(); } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessEntourageController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessEntourageController.java deleted file mode 100644 index 1c160b4..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessEntourageController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.zcloud.primeport.web; - -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.TemporaryAccessEntourageServiceI; -import com.zcloud.primeport.dto.TemporaryAccessEntourageAddCmd; -import com.zcloud.primeport.dto.TemporaryAccessEntouragePageQry; -import com.zcloud.primeport.dto.TemporaryAccessEntourageUpdateCmd; -import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; -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 guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@Api(tags = "临时车辆的其他人员表.同行人员表") -@RequestMapping("/${application.gateway}/temporaryAccessEntourage") -@RestController -@AllArgsConstructor -public class TemporaryAccessEntourageController { - private final TemporaryAccessEntourageServiceI temporaryAccessEntourageService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody TemporaryAccessEntourageAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return temporaryAccessEntourageService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody TemporaryAccessEntouragePageQry qry) { - return temporaryAccessEntourageService.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(temporaryAccessEntourageService.queryById(id)); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - temporaryAccessEntourageService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - temporaryAccessEntourageService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody TemporaryAccessEntourageUpdateCmd temporaryAccessEntourageUpdateCmd) { - temporaryAccessEntourageService.edit(temporaryAccessEntourageUpdateCmd); - return SingleResponse.buildSuccess(); - } -} - diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjAreaGateController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java similarity index 52% rename from web-adapter/src/main/java/com/zcloud/primeport/web/MkmjAreaGateController.java rename to web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java index 9f0e0d5..c02d712 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjAreaGateController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java @@ -1,17 +1,17 @@ package com.zcloud.primeport.web; -import com.zcloud.primeport.api.MkmjAreaGateServiceI; -import com.zcloud.primeport.dto.MkmjAreaGateAddCmd; -import com.zcloud.primeport.dto.MkmjAreaGatePageQry; -import com.zcloud.primeport.dto.MkmjAreaGateUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjAreaGateCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.VehicleApplyServiceI; +import com.zcloud.primeport.dto.VehicleApplyAddCmd; +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.ApiOperation; import lombok.AllArgsConstructor; @@ -23,59 +23,59 @@ import java.util.ArrayList; /** * web-adapter * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 + * @Author makejava + * @Date 2026-03-05 11:33:23 */ -@Api(tags = "门口门禁区域闸机表") -@RequestMapping("/${application.gateway}/mkmjAreaGate") +@Api(tags = "车辆申请审批信息") +@RequestMapping("/${application.gateway}/vehicleApply") @RestController @AllArgsConstructor -public class MkmjAreaGateController { - private final MkmjAreaGateServiceI mkmjAreaGateService; +public class VehicleApplyController { + private final VehicleApplyServiceI vehicleApplyService; @ApiOperation("新增") @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody MkmjAreaGateAddCmd cmd) { + public SingleResponse add(@Validated @RequestBody VehicleApplyAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); - return mkmjAreaGateService.add(cmd); + return vehicleApplyService.add(cmd); } @ApiOperation("分页") @PostMapping("/list") - public PageResponse page(@RequestBody MkmjAreaGatePageQry qry) { - return mkmjAreaGateService.listPage(qry); + public PageResponse page(@RequestBody VehicleApplyPageQry qry) { + return vehicleApplyService.listPage(qry); } @ApiOperation("所有数据") @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); } @ApiOperation("详情") @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(mkmjAreaGateService.queryById(id)); + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new VehicleApplyCO()); } @ApiOperation("删除") @DeleteMapping("/{id}") public Response remove(@PathVariable("id") Long id) { - mkmjAreaGateService.remove(id); + vehicleApplyService.remove(id); return SingleResponse.buildSuccess(); } @ApiOperation("删除多个") @DeleteMapping("/ids") public Response removeBatch(@RequestParam Long[] ids) { - mkmjAreaGateService.removeBatch(ids); + vehicleApplyService.removeBatch(ids); return SingleResponse.buildSuccess(); } @ApiOperation("修改") @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody MkmjAreaGateUpdateCmd mkmjAreaGateUpdateCmd) { - mkmjAreaGateService.edit(mkmjAreaGateUpdateCmd); + public SingleResponse edit(@Validated @RequestBody VehicleApplyUpdateCmd vehicleApplyUpdateCmd) { + vehicleApplyService.edit(vehicleApplyUpdateCmd); return SingleResponse.buildSuccess(); } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java similarity index 50% rename from web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessController.java rename to web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java index 1ae0105..90587f4 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java @@ -1,16 +1,17 @@ package com.zcloud.primeport.web; + import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.TemporaryAccessServiceI; -import com.zcloud.primeport.dto.TemporaryAccessAddCmd; -import com.zcloud.primeport.dto.TemporaryAccessPageQry; -import com.zcloud.primeport.dto.TemporaryAccessUpdateCmd; -import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; +import com.zcloud.primeport.api.VehicleAuditServiceI; +import com.zcloud.primeport.dto.VehicleAuditAddCmd; +import com.zcloud.primeport.dto.VehicleAuditPageQry; +import com.zcloud.primeport.dto.VehicleAuditUpdateCmd; +import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -22,59 +23,59 @@ import java.util.ArrayList; /** * web-adapter * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 + * @Author makejava + * @Date 2026-03-05 11:33:24 */ -@Api(tags = "临时车辆表") -@RequestMapping("/${application.gateway}/temporaryAccess") +@Api(tags = "车辆审批") +@RequestMapping("/${application.gateway}/vehicleAudit") @RestController @AllArgsConstructor -public class TemporaryAccessController { - private final TemporaryAccessServiceI temporaryAccessService; +public class VehicleAuditController { + private final VehicleAuditServiceI vehicleAuditService; @ApiOperation("新增") @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody TemporaryAccessAddCmd cmd) { + public SingleResponse add(@Validated @RequestBody VehicleAuditAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); - return temporaryAccessService.add(cmd); + return vehicleAuditService.add(cmd); } @ApiOperation("分页") @PostMapping("/list") - public PageResponse page(@RequestBody TemporaryAccessPageQry qry) { - return temporaryAccessService.listPage(qry); + public PageResponse page(@RequestBody VehicleAuditPageQry qry) { + return vehicleAuditService.listPage(qry); } @ApiOperation("所有数据") @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); } @ApiOperation("详情") @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(temporaryAccessService.queryById(id)); + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new VehicleAuditCO()); } @ApiOperation("删除") @DeleteMapping("/{id}") public Response remove(@PathVariable("id") Long id) { - temporaryAccessService.remove(id); + vehicleAuditService.remove(id); return SingleResponse.buildSuccess(); } @ApiOperation("删除多个") @DeleteMapping("/ids") public Response removeBatch(@RequestParam Long[] ids) { - temporaryAccessService.removeBatch(ids); + vehicleAuditService.removeBatch(ids); return SingleResponse.buildSuccess(); } @ApiOperation("修改") @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody TemporaryAccessUpdateCmd temporaryAccessUpdateCmd) { - temporaryAccessService.edit(temporaryAccessUpdateCmd); + public SingleResponse edit(@Validated @RequestBody VehicleAuditUpdateCmd vehicleAuditUpdateCmd) { + vehicleAuditService.edit(vehicleAuditUpdateCmd); return SingleResponse.buildSuccess(); } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditLogController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditLogController.java deleted file mode 100644 index 0eb014b..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditLogController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.zcloud.primeport.web; - -import com.alibaba.cola.dto.MultiResponse; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.Response; -import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.primeport.api.VehicleAuditLogServiceI; -import com.zcloud.primeport.dto.VehicleAuditLogAddCmd; -import com.zcloud.primeport.dto.VehicleAuditLogApprovalCmd; -import com.zcloud.primeport.dto.VehicleAuditLogPageQry; -import com.zcloud.primeport.dto.VehicleAuditLogUpdateCmd; -import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; -import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; -import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; -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 guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Api(tags = "") -@RequestMapping("/${application.gateway}/vehicleAuditLog") -@RestController -@AllArgsConstructor -public class VehicleAuditLogController { - private final VehicleAuditLogServiceI vehicleAuditLogService; - -// @ApiOperation("新增") -// @PostMapping("/save") -// public SingleResponse add(@Validated @RequestBody VehicleAuditLogAddCmd cmd) { -// SSOUser ssoUser = AuthContext.getCurrentUser(); -// return vehicleAuditLogService.add(cmd); -// } - - -// @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 VehicleAuditLogCO()); -// } -// @ApiOperation("删除") -// @DeleteMapping("/{id}") -// public Response remove(@PathVariable("id") Long id) { -// vehicleAuditLogService.remove(id); -// return SingleResponse.buildSuccess(); -// } -// @ApiOperation("删除多个") -// @DeleteMapping("/ids") -// public Response removeBatch(@RequestParam Long[] ids) { -// vehicleAuditLogService.removeBatch(ids); -// return SingleResponse.buildSuccess(); -// } -// @ApiOperation("修改") -// @PutMapping("/edit") -// public SingleResponse edit(@Validated @RequestBody VehicleAuditLogUpdateCmd vehicleAuditLogUpdateCmd) { -// vehicleAuditLogService.edit(vehicleAuditLogUpdateCmd); -// return SingleResponse.buildSuccess(); -// } - - /** - * 审批通过/不通过 - * @param auditLogApprovalCmd - * @return - */ - @ApiOperation("通过/不通过") - @PutMapping("/approval") - public SingleResponse approval(@Validated @RequestBody VehicleAuditLogApprovalCmd auditLogApprovalCmd) { - vehicleAuditLogService.approval(auditLogApprovalCmd); - return SingleResponse.buildSuccess(); - } - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody VehicleAuditLogPageQry qry) { - return vehicleAuditLogService.listPage(qry); - } - @ApiOperation("获取登录人的审批车辆信息") - @PostMapping("/listFromUser") - public PageResponse pageAndCarInfo(@RequestBody VehicleAuditLogPageQry qry) { - return vehicleAuditLogService.listPageAndCarInfo(qry); - } - -} - diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleBlackController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleBlackController.java index dfaf1e4..acf786d 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleBlackController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleBlackController.java @@ -1,4 +1,6 @@ package com.zcloud.primeport.web; + + import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; @@ -21,10 +23,10 @@ import java.util.ArrayList; /** * web-adapter * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ -@Api(tags = "") +@Api(tags = "车辆黑名单管理") @RequestMapping("/${application.gateway}/vehicleBlack") @RestController @AllArgsConstructor @@ -37,11 +39,25 @@ public class VehicleBlackController { SSOUser ssoUser = AuthContext.getCurrentUser(); return vehicleBlackService.add(cmd); } + @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@RequestBody VehicleBlackPageQry qry) { return vehicleBlackService.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 VehicleBlackCO()); + } + @ApiOperation("删除") @DeleteMapping("/{id}") public Response remove(@PathVariable("id") Long id) { @@ -49,5 +65,18 @@ public class VehicleBlackController { return SingleResponse.buildSuccess(); } + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + vehicleBlackService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody VehicleBlackUpdateCmd vehicleBlackUpdateCmd) { + vehicleBlackService.edit(vehicleBlackUpdateCmd); + 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 07e908a..6af3d26 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 @@ -1,15 +1,16 @@ package com.zcloud.primeport.web; + import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; -import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.api.VehicleMessageServiceI; -import com.zcloud.primeport.dto.*; -import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; +import com.zcloud.primeport.dto.VehicleMessageAddCmd; +import com.zcloud.primeport.dto.VehicleMessagePageQry; +import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,74 +19,64 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; -/** -* web-adapter -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ /** - * 车辆管理,相关方车辆.分子公司车辆.监管端车辆.临时访客车辆信息. + * web-adapter + * + * @Author makejava + * @Date 2026-03-05 11:33:27 */ -@Api(tags = "车辆管理") +@Api(tags = "审批通过的固化车辆信息用于与门禁系统对接") @RequestMapping("/${application.gateway}/vehicleMessage") @RestController @AllArgsConstructor public class VehicleMessageController { private final VehicleMessageServiceI vehicleMessageService; - @ApiOperation("新增-监管端/分子公司人员车辆") - @PostMapping("/saveForCorp") - public SingleResponse addForCorp(@Validated @RequestBody VehicleMessageForCorpAddCmd cmd) { + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody VehicleMessageAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); - cmd.addLongiUserCorp(ssoUser.getTenantParentIds()); - return vehicleMessageService.addForCorp(cmd); + return vehicleMessageService.add(cmd); } - @ApiOperation("修改") - @PutMapping("/editForCorp") - public SingleResponse editForCorp(@Validated @RequestBody VehicleMessageUpdateCmd updateCmd) { - vehicleMessageService.editForCorp(updateCmd); - return SingleResponse.buildSuccess(); + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody VehicleMessagePageQry qry) { + return vehicleMessageService.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 VehicleMessageCO()); + } + @ApiOperation("删除") @DeleteMapping("/{id}") public Response remove(@PathVariable("id") Long id) { vehicleMessageService.remove(id); return SingleResponse.buildSuccess(); } - @ApiOperation("详情") - @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - VehicleMessageCO infoById = vehicleMessageService.getInfoById(id); - return SingleResponse.of(infoById); - } - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody VehicleMessagePageQry qry) { - SSOUser currentUser = AuthContext.getCurrentUser(); - qry.setCorpByCorpType(currentUser.getTenantParentIds()); - return vehicleMessageService.listPage(qry); - } - /** - * 开启/关闭 - * @param statusCmd - * @return - */ - @ApiOperation("修改状态") - @PutMapping("/editStatus") - public SingleResponse editStatus(@Validated @RequestBody VehicleMessageStatusCmd statusCmd) { - vehicleMessageService.updateStatus(statusCmd); + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + vehicleMessageService.removeBatch(ids); return SingleResponse.buildSuccess(); } - @ApiOperation("分页-根据企业ID获取企业车辆数量") - @PostMapping("/listFromCorp") - 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); + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { + vehicleMessageService.edit(vehicleMessageUpdateCmd); + return SingleResponse.buildSuccess(); } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleViolationsController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleViolationsController.java index 723225f..38fa27e 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleViolationsController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleViolationsController.java @@ -1,4 +1,6 @@ package com.zcloud.primeport.web; + + import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; @@ -10,7 +12,6 @@ import com.zcloud.primeport.dto.VehicleViolationsAddCmd; import com.zcloud.primeport.dto.VehicleViolationsPageQry; import com.zcloud.primeport.dto.VehicleViolationsUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; -import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -22,8 +23,8 @@ import java.util.ArrayList; /** * web-adapter * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Api(tags = "车辆违规记录") @RequestMapping("/${application.gateway}/vehicleViolations") @@ -44,10 +45,17 @@ public class VehicleViolationsController { public PageResponse page(@RequestBody VehicleViolationsPageQry qry) { return vehicleViolationsService.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(vehicleViolationsService.queryById(id)); + return SingleResponse.of(new VehicleViolationsCO()); } @ApiOperation("删除") @@ -57,17 +65,18 @@ public class VehicleViolationsController { return SingleResponse.buildSuccess(); } + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + vehicleViolationsService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + @ApiOperation("修改") @PutMapping("/edit") public SingleResponse edit(@Validated @RequestBody VehicleViolationsUpdateCmd vehicleViolationsUpdateCmd) { vehicleViolationsService.edit(vehicleViolationsUpdateCmd); return SingleResponse.buildSuccess(); } - - @ApiOperation("分页-和违规次数") - @PostMapping("/pageAncCount") - public PageResponse pageAncCount(@RequestBody VehicleViolationsPageQry qry) { - return vehicleViolationsService.listAndCountPage(qry); - } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VideoController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VideoController.java new file mode 100644 index 0000000..40498c2 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VideoController.java @@ -0,0 +1,82 @@ +package com.zcloud.primeport.web; + + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.dto.SingleResponse; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.VideoServiceI; +import com.zcloud.primeport.dto.VideoAddCmd; +import com.zcloud.primeport.dto.VideoPageQry; +import com.zcloud.primeport.dto.VideoUpdateCmd; +import com.zcloud.primeport.dto.clientobject.VideoCO; +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 makejava + * @Date 2026-03-05 11:33:30 + */ +@Api(tags = "摄像头表") +@RequestMapping("/${application.gateway}/video") +@RestController +@AllArgsConstructor +public class VideoController { + private final VideoServiceI videoService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody VideoAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return videoService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody VideoPageQry qry) { + return videoService.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 VideoCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + videoService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + videoService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody VideoUpdateCmd videoUpdateCmd) { + videoService.edit(videoUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/EmployeeMessageAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/EmployeeMessageAddExe.java deleted file mode 100644 index 5dacd52..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/EmployeeMessageAddExe.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.EmployeeMessageGateway; -import com.zcloud.primeport.domain.model.EmployeeMessageE; -import com.zcloud.primeport.dto.EmployeeMessageAddCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - - - -/** -* web-app -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Component -@AllArgsConstructor -public class EmployeeMessageAddExe { - private final EmployeeMessageGateway employeeMessageGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(EmployeeMessageAddCmd cmd) { - EmployeeMessageE employeeMessageE = new EmployeeMessageE(); - BeanUtils.copyProperties(cmd, employeeMessageE); - boolean res = false; - try { - res = employeeMessageGateway.add(employeeMessageE); - } 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/EmployeeMessageRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/EmployeeMessageRemoveExe.java deleted file mode 100644 index 0e39f2d..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/EmployeeMessageRemoveExe.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.command; -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.EmployeeMessageGateway; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - - - -/** -* web-app -* @Author guoyuepeng -* @Date 2025-12-18 14:32:15 -*/ -@Component -@AllArgsConstructor -public class EmployeeMessageRemoveExe { - private final EmployeeMessageGateway employeeMessageGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = employeeMessageGateway.deletedEmployeeMessageById(id); - if(!res){ - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = employeeMessageGateway.deletedEmployeeMessageByIds(ids); - if(!res){ - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/EmployeeMessageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/EmployeeMessageUpdateExe.java deleted file mode 100644 index 7693d1a..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/EmployeeMessageUpdateExe.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zcloud.primeport.command; -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.EmployeeMessageGateway; -import com.zcloud.primeport.domain.model.EmployeeMessageE; -import com.zcloud.primeport.dto.EmployeeMessageUpdateCmd; -import com.zcloud.primeport.dto.EmployeeMessageUpdateStatusCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - - - - -/** -* web-app -* @Author guoyuepeng -* @Date 2025-12-18 14:32:15 -*/ -@Component -@AllArgsConstructor -public class EmployeeMessageUpdateExe { - private final EmployeeMessageGateway employeeMessageGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(EmployeeMessageUpdateCmd employeeMessageUpdateCmd) { - EmployeeMessageE employeeMessageE = new EmployeeMessageE(); - BeanUtils.copyProperties(employeeMessageUpdateCmd, employeeMessageE); - boolean res = employeeMessageGateway.update(employeeMessageE); - if (!res) { - throw new BizException("修改失败"); - } - } - - @Transactional(rollbackFor = Exception.class) - public void execute(EmployeeMessageUpdateStatusCmd cmd) { - EmployeeMessageE employeeMessageE = new EmployeeMessageE(); - employeeMessageE.setId(cmd.getId()); - employeeMessageE.setStatus(cmd.getStatus()); - boolean res = employeeMessageGateway.updateStatus(employeeMessageE); - if (!res) { - throw new BizException("状态更新失败"); - } - } -} \ No newline at end of file diff --git a/web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaUpdateExe.java deleted file mode 100644 index a1c1fb3..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.EnclosedAreaGateway; -import com.zcloud.primeport.domain.model.EnclosedAreaE; -import com.zcloud.primeport.dto.EnclosedAreaUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:32 - */ -@Component -@AllArgsConstructor -public class EnclosedAreaUpdateExe { - private final EnclosedAreaGateway enclosedAreaGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(EnclosedAreaUpdateCmd enclosedAreaUpdateCmd) { - EnclosedAreaE enclosedAreaE = new EnclosedAreaE(); - BeanUtils.copyProperties(enclosedAreaUpdateCmd, enclosedAreaE); - boolean res = enclosedAreaGateway.update(enclosedAreaE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - 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 deleted file mode 100644 index 534b87a..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneAddExe.java +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 1a683af..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneRemoveExe.java +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index e464943..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/GatePersonAuthLevelOneUpdateExe.java +++ /dev/null @@ -1,35 +0,0 @@ -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/InspectionDeptAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java deleted file mode 100644 index 8fc9722..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; -import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; -import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; -import com.zcloud.primeport.domain.model.InspectionDeptE; -import com.zcloud.primeport.domain.model.InspectionVehicleE; -import com.zcloud.primeport.domain.model.VehicleMessageE; -import com.zcloud.primeport.dto.InspectionDeptAddCmd; -import com.zcloud.primeport.dto.VehicleInspectionAddCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Component -@AllArgsConstructor -public class InspectionDeptAddExe { - private final InspectionDeptGateway inspectionDeptGateway; - private final InspectionVehicleGateway inspectionVehicleGateway; - private final VehicleMessageGateway vehicleMessageGateway; - @Transactional(rollbackFor = Exception.class) - public boolean execute(InspectionDeptAddCmd cmd) { - InspectionDeptE examTypeE = new InspectionDeptE(); - BeanUtils.copyProperties(cmd, examTypeE); - boolean res = false; - try { - InspectionDeptE insDeptAdd = inspectionDeptGateway.add(examTypeE); - /** - * 1.增加车辆 - * 2.增加车辆和部门的关系 - */ - for (VehicleInspectionAddCmd vehicleInspectionAddCmd : cmd.getVehicleMessageAddCmd()) { - VehicleMessageE vehicleMessageE = new VehicleMessageE(); - BeanUtils.copyProperties(vehicleInspectionAddCmd, vehicleMessageE); - vehicleMessageE.VehicleMessageForInspection(vehicleMessageE); - VehicleMessageE vehicleAdd = vehicleMessageGateway.add(vehicleMessageE);// 添加车辆信息 - InspectionVehicleE inspectionVehicleE = new InspectionVehicleE(); - inspectionVehicleE.addDeptInspection(insDeptAdd.getId(),vehicleAdd.getId()); //车辆和部门之间的关系 - res = inspectionVehicleGateway.add(inspectionVehicleE); - } - } 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/InspectionDeptRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptRemoveExe.java deleted file mode 100644 index 3bdcab0..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptRemoveExe.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; -import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; -import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; -import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; -import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:08 - */ -@Component -@AllArgsConstructor -public class InspectionDeptRemoveExe { - private final InspectionDeptGateway inspectionDeptGateway; - private final InspectionVehicleRepository inspectionVehicleRepository; - private final InspectionVehicleGateway inspectionVehicleGateway; - private final VehicleMessageGateway vehicleMessageGateway; - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = inspectionDeptGateway.deletedInspectionDeptById(id); - List vehicleDOS = inspectionVehicleRepository.queryInspectionVehicleByDeptId(id); //获取这个部门下的车辆信息 - Map vehicleMap = vehicleDOS.stream().collect(java.util.stream.Collectors.toMap(InspectionVehicleDO::getId, InspectionVehicleDO -> InspectionVehicleDO)); //循环一下 - for (InspectionVehicleDO vehicleDO : vehicleMap.values()){ ///删除车辆 删除关系 - inspectionVehicleGateway.deletedInspectionVehicleById(vehicleDO.getId()); - vehicleMessageGateway.deletedVehicleMessageById(vehicleDO.getVehicleMessageId()); - } - if (!res) { - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = inspectionDeptGateway.deletedInspectionDeptByIds(ids); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptUpdateExe.java deleted file mode 100644 index 95428fe..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptUpdateExe.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; -import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; -import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; -import com.zcloud.primeport.domain.model.InspectionDeptE; -import com.zcloud.primeport.domain.model.InspectionVehicleE; -import com.zcloud.primeport.domain.model.VehicleMessageE; -import com.zcloud.primeport.dto.InspectionDeptUpdateCmd; -import com.zcloud.primeport.dto.VehicleInspectionUpdateCmd; -import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; -import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:08 - */ -@Component -@AllArgsConstructor -public class InspectionDeptUpdateExe { - private final InspectionDeptGateway inspectionDeptGateway; - private final InspectionVehicleGateway inspectionVehicleGateway; - private final VehicleMessageGateway vehicleMessageGateway; - - private final InspectionVehicleRepository inspectionVehicleRepository; - - @Transactional(rollbackFor = Exception.class) - public void execute(InspectionDeptUpdateCmd inspectionDeptUpdateCmd) { - InspectionDeptE inspectionDeptE = new InspectionDeptE(); - BeanUtils.copyProperties(inspectionDeptUpdateCmd, inspectionDeptE); - boolean res = inspectionDeptGateway.update(inspectionDeptE); - List vehicleDOS = inspectionVehicleRepository.queryInspectionVehicleByDeptId(inspectionDeptE.getId()); //获取这个部门下的车辆信息 - Map vehicleMap = vehicleDOS.stream().collect(java.util.stream.Collectors.toMap(InspectionVehicleDO::getId, InspectionVehicleDO -> InspectionVehicleDO)); //循环一下 - for (VehicleInspectionUpdateCmd vehicleInspectionAddCmd : inspectionDeptUpdateCmd.getVehicleMessageAddCmd()) { - if (vehicleInspectionAddCmd.getId() == null){ //新增 - VehicleMessageE vehicleMessageE = new VehicleMessageE(); - BeanUtils.copyProperties(vehicleInspectionAddCmd, vehicleMessageE); - vehicleMessageE.VehicleMessageForInspection(vehicleMessageE); - VehicleMessageE vehicleAdd = vehicleMessageGateway.add(vehicleMessageE);// 添加车辆信息 - InspectionVehicleE inspectionVehicleE = new InspectionVehicleE(); - inspectionVehicleE.addDeptInspection(inspectionDeptUpdateCmd.getId(),vehicleAdd.getId()); //车辆和部门之间的关系 - res = inspectionVehicleGateway.add(inspectionVehicleE); - }else{ - //修改 - VehicleMessageE vehicleMessageE = new VehicleMessageE(); - BeanUtils.copyProperties(vehicleInspectionAddCmd, vehicleMessageE); - vehicleMessageE.VehicleMessageForInspection(vehicleMessageE); - vehicleMessageGateway.update(vehicleMessageE);// 添加车辆信息 - } - if (vehicleMap.containsKey(vehicleInspectionAddCmd.getId())){ - vehicleMap.remove(vehicleInspectionAddCmd.getId()); - } - } - for (InspectionVehicleDO vehicleDO : vehicleMap.values()){ ///如果没返回回来,就删除车辆 删除关系 - inspectionVehicleGateway.deletedInspectionVehicleById(vehicleDO.getId()); - vehicleMessageGateway.deletedVehicleMessageById(vehicleDO.getVehicleMessageId()); - } - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleRemoveExe.java deleted file mode 100644 index 31039ce..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleRemoveExe.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Component -@AllArgsConstructor -public class InspectionVehicleRemoveExe { - private final InspectionVehicleGateway inspectionVehicleGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = inspectionVehicleGateway.deletedInspectionVehicleById(id); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = inspectionVehicleGateway.deletedInspectionVehicleByIds(ids); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleUpdateExe.java deleted file mode 100644 index ce7ad40..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; -import com.zcloud.primeport.domain.model.InspectionVehicleE; -import com.zcloud.primeport.dto.InspectionVehicleUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Component -@AllArgsConstructor -public class InspectionVehicleUpdateExe { - private final InspectionVehicleGateway inspectionVehicleGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(InspectionVehicleUpdateCmd inspectionVehicleUpdateCmd) { - InspectionVehicleE inspectionVehicleE = new InspectionVehicleE(); - BeanUtils.copyProperties(inspectionVehicleUpdateCmd, inspectionVehicleE); - boolean res = inspectionVehicleGateway.update(inspectionVehicleE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjAddExe.java similarity index 56% rename from web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleAddExe.java rename to web-app/src/main/java/com/zcloud/primeport/command/MkmjAddExe.java index b108276..e7962ff 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjAddExe.java @@ -1,8 +1,9 @@ package com.zcloud.primeport.command; + import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; -import com.zcloud.primeport.domain.model.InspectionVehicleE; -import com.zcloud.primeport.dto.InspectionVehicleAddCmd; +import com.zcloud.primeport.domain.gateway.MkmjGateway; +import com.zcloud.primeport.domain.model.MkmjE; +import com.zcloud.primeport.dto.MkmjAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -12,21 +13,21 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 + * @Author makejava + * @Date 2026-03-05 11:33:15 */ @Component @AllArgsConstructor -public class InspectionVehicleAddExe { - private final InspectionVehicleGateway inspectionVehicleGateway; +public class MkmjAddExe { + private final MkmjGateway mkmjGateway; @Transactional(rollbackFor = Exception.class) - public boolean execute(InspectionVehicleAddCmd cmd) { - InspectionVehicleE examTypeE = new InspectionVehicleE(); + public boolean execute(MkmjAddCmd cmd) { + MkmjE examTypeE = new MkmjE(); BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - res = inspectionVehicleGateway.add(examTypeE); + res = mkmjGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } 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 64c6d14..8553b14 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 @@ -10,13 +10,12 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; - - /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ @Component @AllArgsConstructor public class MkmjApprovalUserAddExe { @@ -24,8 +23,6 @@ public class MkmjApprovalUserAddExe { @Transactional(rollbackFor = Exception.class) public boolean execute(MkmjApprovalUserAddCmd cmd) { - // 查询下当前人是否已经存在，如存在无法新增 - MkmjApprovalUserE examTypeE = new MkmjApprovalUserE(); BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; @@ -39,6 +36,5 @@ public class MkmjApprovalUserAddExe { } return true; } - } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserRemoveExe.java index b89e48d..15422a4 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserRemoveExe.java @@ -7,13 +7,12 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; - - /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:17 + */ @Component @AllArgsConstructor public class MkmjApprovalUserRemoveExe { @@ -22,7 +21,7 @@ public class MkmjApprovalUserRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { boolean res = mkmjApprovalUserGateway.deletedMkmjApprovalUserById(id); - if(!res){ + if (!res) { throw new BizException("删除失败"); } return true; @@ -31,7 +30,7 @@ public class MkmjApprovalUserRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { boolean res = mkmjApprovalUserGateway.deletedMkmjApprovalUserByIds(ids); - if(!res){ + if (!res) { throw new BizException("删除失败"); } return true; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserUpdateExe.java index 8f02e15..425cf2e 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjApprovalUserUpdateExe.java @@ -10,13 +10,12 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; - - /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:17 + */ @Component @AllArgsConstructor public class MkmjApprovalUserUpdateExe { diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaGateAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaGateAddExe.java deleted file mode 100644 index e5d7af2..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaGateAddExe.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zcloud.primeport.command; - -import com.zcloud.primeport.domain.gateway.MkmjAreaGateGateway; -import com.zcloud.primeport.domain.model.MkmjAreaGateE; -import com.zcloud.primeport.dto.MkmjAreaGateAddCmd; -import com.alibaba.cola.exception.BizException; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -@Component -@AllArgsConstructor -public class MkmjAreaGateAddExe { - private final MkmjAreaGateGateway mkmjAreaGateGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(MkmjAreaGateAddCmd cmd) { - MkmjAreaGateE mkmjAreaGateE = new MkmjAreaGateE(); - BeanUtils.copyProperties(cmd, mkmjAreaGateE); - boolean res = false; - try { - res = mkmjAreaGateGateway.add(mkmjAreaGateE); - } 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/MkmjAreaGateUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaGateUpdateExe.java deleted file mode 100644 index f96adb2..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaGateUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjAreaGateGateway; -import com.zcloud.primeport.domain.model.MkmjAreaGateE; -import com.zcloud.primeport.dto.MkmjAreaGateUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Component -@AllArgsConstructor -public class MkmjAreaGateUpdateExe { - private final MkmjAreaGateGateway mkmjAreaGateGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(MkmjAreaGateUpdateCmd mkmjAreaGateUpdateCmd) { - MkmjAreaGateE mkmjAreaGateE = new MkmjAreaGateE(); - BeanUtils.copyProperties(mkmjAreaGateUpdateCmd, mkmjAreaGateE); - boolean res = mkmjAreaGateGateway.update(mkmjAreaGateE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaUpdateExe.java deleted file mode 100644 index 3d2e9cb..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjAreaGateway; -import com.zcloud.primeport.domain.model.MkmjAreaE; -import com.zcloud.primeport.dto.MkmjAreaUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -@Component -@AllArgsConstructor -public class MkmjAreaUpdateExe { - private final MkmjAreaGateway mkmjAreaGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(MkmjAreaUpdateCmd mkmjAreaUpdateCmd) { - MkmjAreaE mkmjAreaE = new MkmjAreaE(); - BeanUtils.copyProperties(mkmjAreaUpdateCmd, mkmjAreaE); - boolean res = mkmjAreaGateway.update(mkmjAreaE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjCarRecordAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjCarRecordAddExe.java deleted file mode 100644 index a60d3ce..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjCarRecordAddExe.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjCarRecordGateway; -import com.zcloud.primeport.domain.model.MkmjCarRecordE; -import com.zcloud.primeport.dto.MkmjCarRecordAddCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Component -@AllArgsConstructor -public class MkmjCarRecordAddExe { - private final MkmjCarRecordGateway mkmjCarRecordGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(MkmjCarRecordAddCmd cmd) { - MkmjCarRecordE mkmjCarRecordE = new MkmjCarRecordE(); - BeanUtils.copyProperties(cmd, mkmjCarRecordE); - boolean res = false; - try { - res = mkmjCarRecordGateway.add(mkmjCarRecordE); - } 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/MkmjCarRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjCarRecordUpdateExe.java deleted file mode 100644 index 9074bab..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjCarRecordUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjCarRecordGateway; -import com.zcloud.primeport.domain.model.MkmjCarRecordE; -import com.zcloud.primeport.dto.MkmjCarRecordUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Component -@AllArgsConstructor -public class MkmjCarRecordUpdateExe { - private final MkmjCarRecordGateway mkmjCarRecordGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(MkmjCarRecordUpdateCmd mkmjCarRecordUpdateCmd) { - MkmjCarRecordE mkmjCarRecordE = new MkmjCarRecordE(); - BeanUtils.copyProperties(mkmjCarRecordUpdateCmd, mkmjCarRecordE); - boolean res = mkmjCarRecordGateway.update(mkmjCarRecordE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateAddExe.java similarity index 56% rename from web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaAddExe.java rename to web-app/src/main/java/com/zcloud/primeport/command/MkmjGateAddExe.java index 98bdc56..832a964 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateAddExe.java @@ -1,9 +1,9 @@ package com.zcloud.primeport.command; -import com.zcloud.primeport.domain.gateway.MkmjAreaGateway; -import com.zcloud.primeport.domain.model.MkmjAreaE; -import com.zcloud.primeport.dto.MkmjAreaAddCmd; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.MkmjGateGateway; +import com.zcloud.primeport.domain.model.MkmjGateE; +import com.zcloud.primeport.dto.MkmjGateAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -13,21 +13,21 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:41 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ @Component @AllArgsConstructor -public class MkmjAreaAddExe { - private final MkmjAreaGateway mkmjAreaGateway; +public class MkmjGateAddExe { + private final MkmjGateGateway mkmjGateGateway; @Transactional(rollbackFor = Exception.class) - public boolean execute(MkmjAreaAddCmd cmd) { - MkmjAreaE mkmjAreaE = new MkmjAreaE(); - BeanUtils.copyProperties(cmd, mkmjAreaE); + public boolean execute(MkmjGateAddCmd cmd) { + MkmjGateE examTypeE = new MkmjGateE(); + BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - res = mkmjAreaGateway.add(mkmjAreaE); + res = mkmjGateGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateRemoveExe.java similarity index 68% rename from web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaRemoveExe.java rename to web-app/src/main/java/com/zcloud/primeport/command/MkmjGateRemoveExe.java index ebdfa21..50984bd 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateRemoveExe.java @@ -1,7 +1,7 @@ package com.zcloud.primeport.command; -import com.zcloud.primeport.domain.gateway.MkmjAreaGateway; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.MkmjGateGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -10,17 +10,17 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 + * @Author makejava + * @Date 2026-03-05 11:33:18 */ @Component @AllArgsConstructor -public class MkmjAreaRemoveExe { - private final MkmjAreaGateway mkmjAreaGateway; +public class MkmjGateRemoveExe { + private final MkmjGateGateway mkmjGateGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - boolean res = mkmjAreaGateway.deletedMkmjAreaById(id); + boolean res = mkmjGateGateway.deletedMkmjGateById(id); if (!res) { throw new BizException("删除失败"); } @@ -29,7 +29,7 @@ public class MkmjAreaRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { - boolean res = mkmjAreaGateway.deletedMkmjAreaByIds(ids); + boolean res = mkmjGateGateway.deletedMkmjGateByIds(ids); if (!res) { throw new BizException("删除失败"); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateUpdateExe.java new file mode 100644 index 0000000..5b6f25a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.MkmjGateGateway; +import com.zcloud.primeport.domain.model.MkmjGateE; +import com.zcloud.primeport.dto.MkmjGateUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +@Component +@AllArgsConstructor +public class MkmjGateUpdateExe { + private final MkmjGateGateway mkmjGateGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(MkmjGateUpdateCmd mkmjGateUpdateCmd) { + MkmjGateE mkmjGateE = new MkmjGateE(); + BeanUtils.copyProperties(mkmjGateUpdateCmd, mkmjGateE); + boolean res = mkmjGateGateway.update(mkmjGateE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateVideoAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateVideoAddExe.java deleted file mode 100644 index df07d4c..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateVideoAddExe.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zcloud.primeport.command; - -import com.zcloud.primeport.domain.gateway.MkmjGateVideoGateway; -import com.zcloud.primeport.domain.model.MkmjGateVideoE; -import com.zcloud.primeport.dto.MkmjGateVideoAddCmd; -import com.alibaba.cola.exception.BizException; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Component -@AllArgsConstructor -public class MkmjGateVideoAddExe { - private final MkmjGateVideoGateway mkmjGateVideoGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(MkmjGateVideoAddCmd cmd) { - MkmjGateVideoE mkmjGateVideoE = new MkmjGateVideoE(); - BeanUtils.copyProperties(cmd, mkmjGateVideoE); - boolean res = false; - try { - res = mkmjGateVideoGateway.add(mkmjGateVideoE); - } 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/MkmjGateVideoRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateVideoRemoveExe.java deleted file mode 100644 index 21ca98f..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateVideoRemoveExe.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.command; - -import com.zcloud.primeport.domain.gateway.MkmjGateVideoGateway; -import com.alibaba.cola.exception.BizException; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Component -@AllArgsConstructor -public class MkmjGateVideoRemoveExe { - private final MkmjGateVideoGateway mkmjGateVideoGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = mkmjGateVideoGateway.deletedMkmjGateVideoById(id); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = mkmjGateVideoGateway.deletedMkmjGateVideoByIds(ids); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateVideoUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateVideoUpdateExe.java deleted file mode 100644 index 16bad52..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateVideoUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjGateVideoGateway; -import com.zcloud.primeport.domain.model.MkmjGateVideoE; -import com.zcloud.primeport.dto.MkmjGateVideoUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Component -@AllArgsConstructor -public class MkmjGateVideoUpdateExe { - private final MkmjGateVideoGateway mkmjGateVideoGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(MkmjGateVideoUpdateCmd mkmjGateVideoUpdateCmd) { - MkmjGateVideoE mkmjGateVideoE = new MkmjGateVideoE(); - BeanUtils.copyProperties(mkmjGateVideoUpdateCmd, mkmjGateVideoE); - boolean res = mkmjGateVideoGateway.update(mkmjGateVideoE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageAddExe.java index e675a1e..5f47cfb 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageAddExe.java @@ -1,9 +1,9 @@ package com.zcloud.primeport.command; +import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.domain.gateway.MkmjPassageGateway; import com.zcloud.primeport.domain.model.MkmjPassageE; import com.zcloud.primeport.dto.MkmjPassageAddCmd; -import com.alibaba.cola.exception.BizException; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -13,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Component @AllArgsConstructor @@ -23,11 +23,11 @@ public class MkmjPassageAddExe { @Transactional(rollbackFor = Exception.class) public boolean execute(MkmjPassageAddCmd cmd) { - MkmjPassageE mkmjPassageE = new MkmjPassageE(); - BeanUtils.copyProperties(cmd, mkmjPassageE); + MkmjPassageE examTypeE = new MkmjPassageE(); + BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - res = mkmjPassageGateway.add(mkmjPassageE); + res = mkmjPassageGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageRemoveExe.java index ff26bf6..5cab04b 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageRemoveExe.java @@ -1,7 +1,7 @@ package com.zcloud.primeport.command; -import com.zcloud.primeport.domain.gateway.MkmjPassageGateway; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.MkmjPassageGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -10,8 +10,8 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Component @AllArgsConstructor diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageUpdateExe.java index 819725e..d1e9023 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjPassageUpdateExe.java @@ -13,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:20 */ @Component @AllArgsConstructor diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjRemoveExe.java new file mode 100644 index 0000000..09c3364 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.MkmjGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ +@Component +@AllArgsConstructor +public class MkmjRemoveExe { + private final MkmjGateway mkmjGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = mkmjGateway.deletedMkmjById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = mkmjGateway.deletedMkmjByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjSwipeCardRecordAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjSwipeCardRecordAddExe.java deleted file mode 100644 index 070eaa3..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjSwipeCardRecordAddExe.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjSwipeCardRecordGateway; -import com.zcloud.primeport.domain.model.MkmjSwipeCardRecordE; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordAddCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Component -@AllArgsConstructor -public class MkmjSwipeCardRecordAddExe { - private final MkmjSwipeCardRecordGateway mkmjSwipeCardRecordGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(MkmjSwipeCardRecordAddCmd cmd) { - MkmjSwipeCardRecordE mkmjSwipeCardRecordE = new MkmjSwipeCardRecordE(); - BeanUtils.copyProperties(cmd, mkmjSwipeCardRecordE); - boolean res = false; - try { - res = mkmjSwipeCardRecordGateway.add(mkmjSwipeCardRecordE); - } 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/MkmjSwipeCardRecordRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjSwipeCardRecordRemoveExe.java deleted file mode 100644 index f313e08..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjSwipeCardRecordRemoveExe.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjSwipeCardRecordGateway; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Component -@AllArgsConstructor -public class MkmjSwipeCardRecordRemoveExe { - private final MkmjSwipeCardRecordGateway mkmjSwipeCardRecordGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = mkmjSwipeCardRecordGateway.deletedMkmjSwipeCardRecordById(id); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = mkmjSwipeCardRecordGateway.deletedMkmjSwipeCardRecordByIds(ids); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjSwipeCardRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjSwipeCardRecordUpdateExe.java deleted file mode 100644 index 217dc1c..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjSwipeCardRecordUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjSwipeCardRecordGateway; -import com.zcloud.primeport.domain.model.MkmjSwipeCardRecordE; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Component -@AllArgsConstructor -public class MkmjSwipeCardRecordUpdateExe { - private final MkmjSwipeCardRecordGateway mkmjSwipeCardRecordGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(MkmjSwipeCardRecordUpdateCmd mkmjSwipeCardRecordUpdateCmd) { - MkmjSwipeCardRecordE mkmjSwipeCardRecordE = new MkmjSwipeCardRecordE(); - BeanUtils.copyProperties(mkmjSwipeCardRecordUpdateCmd, mkmjSwipeCardRecordE); - boolean res = mkmjSwipeCardRecordGateway.update(mkmjSwipeCardRecordE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjUpdateExe.java new file mode 100644 index 0000000..6a88461 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/MkmjUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.MkmjGateway; +import com.zcloud.primeport.domain.model.MkmjE; +import com.zcloud.primeport.dto.MkmjUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ +@Component +@AllArgsConstructor +public class MkmjUpdateExe { + private final MkmjGateway mkmjGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(MkmjUpdateCmd mkmjUpdateCmd) { + MkmjE mkmjE = new MkmjE(); + BeanUtils.copyProperties(mkmjUpdateCmd, mkmjE); + boolean res = mkmjGateway.update(mkmjE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java similarity index 53% rename from web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaAddExe.java rename to web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java index 969a3b4..bf8f6bf 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java @@ -1,9 +1,9 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.EnclosedAreaGateway; -import com.zcloud.primeport.domain.model.EnclosedAreaE; -import com.zcloud.primeport.dto.EnclosedAreaAddCmd; +import com.zcloud.primeport.domain.gateway.PersonApplyGateway; +import com.zcloud.primeport.domain.model.PersonApplyE; +import com.zcloud.primeport.dto.PersonApplyAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -13,21 +13,21 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-12-12 16:49:30 + * @Author makejava + * @Date 2026-03-05 11:33:21 */ @Component @AllArgsConstructor -public class EnclosedAreaAddExe { - private final EnclosedAreaGateway enclosedAreaGateway; +public class PersonApplyAddExe { + private final PersonApplyGateway personApplyGateway; @Transactional(rollbackFor = Exception.class) - public boolean execute(EnclosedAreaAddCmd cmd) { - EnclosedAreaE enclosedAreaE = new EnclosedAreaE(); - BeanUtils.copyProperties(cmd, enclosedAreaE); + public boolean execute(PersonApplyAddCmd cmd) { + PersonApplyE examTypeE = new PersonApplyE(); + BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - res = enclosedAreaGateway.add(enclosedAreaE); + res = personApplyGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyRemoveExe.java new file mode 100644 index 0000000..d580e73 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.PersonApplyGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@Component +@AllArgsConstructor +public class PersonApplyRemoveExe { + private final PersonApplyGateway personApplyGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = personApplyGateway.deletedPersonApplyById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = personApplyGateway.deletedPersonApplyByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java new file mode 100644 index 0000000..e54b462 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.PersonApplyGateway; +import com.zcloud.primeport.domain.model.PersonApplyE; +import com.zcloud.primeport.dto.PersonApplyUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:23 + */ +@Component +@AllArgsConstructor +public class PersonApplyUpdateExe { + private final PersonApplyGateway personApplyGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(PersonApplyUpdateCmd personApplyUpdateCmd) { + PersonApplyE personApplyE = new PersonApplyE(); + BeanUtils.copyProperties(personApplyUpdateCmd, personApplyE); + boolean res = personApplyGateway.update(personApplyE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditLogAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonMessageAddExe.java similarity index 57% rename from web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditLogAddExe.java rename to web-app/src/main/java/com/zcloud/primeport/command/PersonMessageAddExe.java index f149e0e..159c8c6 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditLogAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonMessageAddExe.java @@ -1,9 +1,9 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; -import com.zcloud.primeport.domain.model.VehicleAuditLogE; -import com.zcloud.primeport.dto.VehicleAuditLogAddCmd; +import com.zcloud.primeport.domain.gateway.PersonMessageGateway; +import com.zcloud.primeport.domain.model.PersonMessageE; +import com.zcloud.primeport.dto.PersonMessageAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -13,21 +13,21 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 + * @Author makejava + * @Date 2026-03-05 11:33:20 */ @Component @AllArgsConstructor -public class VehicleAuditLogAddExe { - private final VehicleAuditLogGateway vehicleAuditLogGateway; +public class PersonMessageAddExe { + private final PersonMessageGateway personMessageGateway; @Transactional(rollbackFor = Exception.class) - public boolean execute(VehicleAuditLogAddCmd cmd) { - VehicleAuditLogE examTypeE = new VehicleAuditLogE(); + public boolean execute(PersonMessageAddCmd cmd) { + PersonMessageE examTypeE = new PersonMessageE(); BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - res = vehicleAuditLogGateway.add(examTypeE); + res = personMessageGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjCarRecordRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonMessageRemoveExe.java similarity index 67% rename from web-app/src/main/java/com/zcloud/primeport/command/MkmjCarRecordRemoveExe.java rename to web-app/src/main/java/com/zcloud/primeport/command/PersonMessageRemoveExe.java index aaf3310..2cb2dfe 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjCarRecordRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonMessageRemoveExe.java @@ -1,7 +1,7 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjCarRecordGateway; +import com.zcloud.primeport.domain.gateway.PersonMessageGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -10,17 +10,17 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 + * @Author makejava + * @Date 2026-03-05 11:33:21 */ @Component @AllArgsConstructor -public class MkmjCarRecordRemoveExe { - private final MkmjCarRecordGateway mkmjCarRecordGateway; +public class PersonMessageRemoveExe { + private final PersonMessageGateway personMessageGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - boolean res = mkmjCarRecordGateway.deletedMkmjCarRecordById(id); + boolean res = personMessageGateway.deletedPersonMessageById(id); if (!res) { throw new BizException("删除失败"); } @@ -29,7 +29,7 @@ public class MkmjCarRecordRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { - boolean res = mkmjCarRecordGateway.deletedMkmjCarRecordByIds(ids); + boolean res = personMessageGateway.deletedPersonMessageByIds(ids); if (!res) { throw new BizException("删除失败"); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonMessageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonMessageUpdateExe.java new file mode 100644 index 0000000..3068d2e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonMessageUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.PersonMessageGateway; +import com.zcloud.primeport.domain.model.PersonMessageE; +import com.zcloud.primeport.dto.PersonMessageUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Component +@AllArgsConstructor +public class PersonMessageUpdateExe { + private final PersonMessageGateway personMessageGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(PersonMessageUpdateCmd personMessageUpdateCmd) { + PersonMessageE personMessageE = new PersonMessageE(); + BeanUtils.copyProperties(personMessageUpdateCmd, personMessageE); + boolean res = personMessageGateway.update(personMessageE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessAddExe.java deleted file mode 100644 index 24d59b9..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessAddExe.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.TemporaryAccessGateway; -import com.zcloud.primeport.domain.model.TemporaryAccessE; -import com.zcloud.primeport.dto.TemporaryAccessAddCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Component -@AllArgsConstructor -public class TemporaryAccessAddExe { - private final TemporaryAccessGateway temporaryAccessGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(TemporaryAccessAddCmd cmd) { - TemporaryAccessE temporaryAccessE = new TemporaryAccessE(); - BeanUtils.copyProperties(cmd, temporaryAccessE); - boolean res = false; - try { - res = temporaryAccessGateway.add(temporaryAccessE); - } 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/TemporaryAccessEntourageAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageAddExe.java deleted file mode 100644 index 14f8b60..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageAddExe.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.TemporaryAccessEntourageGateway; -import com.zcloud.primeport.domain.model.TemporaryAccessEntourageE; -import com.zcloud.primeport.dto.TemporaryAccessEntourageAddCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@Component -@AllArgsConstructor -public class TemporaryAccessEntourageAddExe { - private final TemporaryAccessEntourageGateway temporaryAccessEntourageGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(TemporaryAccessEntourageAddCmd cmd) { - TemporaryAccessEntourageE temporaryAccessEntourageE = new TemporaryAccessEntourageE(); - BeanUtils.copyProperties(cmd, temporaryAccessEntourageE); - boolean res = false; - try { - res = temporaryAccessEntourageGateway.add(temporaryAccessEntourageE); - } 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/TemporaryAccessEntourageRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageRemoveExe.java deleted file mode 100644 index 92b04b0..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageRemoveExe.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.TemporaryAccessEntourageGateway; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Component -@AllArgsConstructor -public class TemporaryAccessEntourageRemoveExe { - private final TemporaryAccessEntourageGateway temporaryAccessEntourageGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = temporaryAccessEntourageGateway.deletedTemporaryAccessEntourageById(id); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = temporaryAccessEntourageGateway.deletedTemporaryAccessEntourageByIds(ids); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageUpdateExe.java deleted file mode 100644 index de5bdbc..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.TemporaryAccessEntourageGateway; -import com.zcloud.primeport.domain.model.TemporaryAccessEntourageE; -import com.zcloud.primeport.dto.TemporaryAccessEntourageUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Component -@AllArgsConstructor -public class TemporaryAccessEntourageUpdateExe { - private final TemporaryAccessEntourageGateway temporaryAccessEntourageGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(TemporaryAccessEntourageUpdateCmd temporaryAccessEntourageUpdateCmd) { - TemporaryAccessEntourageE temporaryAccessEntourageE = new TemporaryAccessEntourageE(); - BeanUtils.copyProperties(temporaryAccessEntourageUpdateCmd, temporaryAccessEntourageE); - boolean res = temporaryAccessEntourageGateway.update(temporaryAccessEntourageE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessRemoveExe.java deleted file mode 100644 index b20e496..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessRemoveExe.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.TemporaryAccessGateway; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Component -@AllArgsConstructor -public class TemporaryAccessRemoveExe { - private final TemporaryAccessGateway temporaryAccessGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = temporaryAccessGateway.deletedTemporaryAccessById(id); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = temporaryAccessGateway.deletedTemporaryAccessByIds(ids); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessUpdateExe.java deleted file mode 100644 index 660d169..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.TemporaryAccessGateway; -import com.zcloud.primeport.domain.model.TemporaryAccessE; -import com.zcloud.primeport.dto.TemporaryAccessUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@Component -@AllArgsConstructor -public class TemporaryAccessUpdateExe { - private final TemporaryAccessGateway temporaryAccessGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(TemporaryAccessUpdateCmd temporaryAccessUpdateCmd) { - TemporaryAccessE temporaryAccessE = new TemporaryAccessE(); - BeanUtils.copyProperties(temporaryAccessUpdateCmd, temporaryAccessE); - boolean res = temporaryAccessGateway.update(temporaryAccessE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - 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 new file mode 100644 index 0000000..5aa2549 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; +import com.zcloud.primeport.domain.model.VehicleApplyE; +import com.zcloud.primeport.dto.VehicleApplyAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:23 + */ +@Component +@AllArgsConstructor +public class VehicleApplyAddExe { + private final VehicleApplyGateway vehicleApplyGateway; + + @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); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyRemoveExe.java similarity index 67% rename from web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaRemoveExe.java rename to web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyRemoveExe.java index 8372f7e..b133d7e 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/EnclosedAreaRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyRemoveExe.java @@ -1,7 +1,7 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.EnclosedAreaGateway; +import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -10,17 +10,17 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 + * @Author makejava + * @Date 2026-03-05 11:33:24 */ @Component @AllArgsConstructor -public class EnclosedAreaRemoveExe { - private final EnclosedAreaGateway enclosedAreaGateway; +public class VehicleApplyRemoveExe { + private final VehicleApplyGateway vehicleApplyGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - boolean res = enclosedAreaGateway.deletedEnclosedAreaById(id); + boolean res = vehicleApplyGateway.deletedVehicleApplyById(id); if (!res) { throw new BizException("删除失败"); } @@ -29,7 +29,7 @@ public class EnclosedAreaRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { - boolean res = enclosedAreaGateway.deletedEnclosedAreaByIds(ids); + boolean res = vehicleApplyGateway.deletedVehicleApplyByIds(ids); if (!res) { throw new BizException("删除失败"); } 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 new file mode 100644 index 0000000..c071eaa --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; +import com.zcloud.primeport.domain.model.VehicleApplyE; +import com.zcloud.primeport.dto.VehicleApplyUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:24 + */ +@Component +@AllArgsConstructor +public class VehicleApplyUpdateExe { + private final VehicleApplyGateway vehicleApplyGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(VehicleApplyUpdateCmd vehicleApplyUpdateCmd) { + VehicleApplyE vehicleApplyE = new VehicleApplyE(); + BeanUtils.copyProperties(vehicleApplyUpdateCmd, vehicleApplyE); + boolean res = vehicleApplyGateway.update(vehicleApplyE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditAddExe.java new file mode 100644 index 0000000..80d9d20 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; +import com.zcloud.primeport.domain.model.VehicleAuditE; +import com.zcloud.primeport.dto.VehicleAuditAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:24 + */ +@Component +@AllArgsConstructor +public class VehicleAuditAddExe { + private final VehicleAuditGateway vehicleAuditGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(VehicleAuditAddCmd cmd) { + VehicleAuditE examTypeE = new VehicleAuditE(); + BeanUtils.copyProperties(cmd, examTypeE); + boolean res = false; + try { + res = vehicleAuditGateway.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/VehicleAuditLogRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditLogRemoveExe.java deleted file mode 100644 index d189f8b..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditLogRemoveExe.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Component -@AllArgsConstructor -public class VehicleAuditLogRemoveExe { - private final VehicleAuditLogGateway vehicleAuditLogGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = vehicleAuditLogGateway.deletedVehicleAuditLogById(id); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = vehicleAuditLogGateway.deletedVehicleAuditLogByIds(ids); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditLogUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditLogUpdateExe.java deleted file mode 100644 index 7eb0920..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditLogUpdateExe.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; -import com.zcloud.primeport.domain.model.VehicleAuditLogE; -import com.zcloud.primeport.dto.VehicleAuditLogApprovalCmd; -import com.zcloud.primeport.dto.VehicleAuditLogUpdateCmd; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:47 - */ -@Component -@AllArgsConstructor -public class VehicleAuditLogUpdateExe { - private final VehicleAuditLogGateway vehicleAuditLogGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(VehicleAuditLogUpdateCmd vehicleAuditLogUpdateCmd) { - VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); - BeanUtils.copyProperties(vehicleAuditLogUpdateCmd, vehicleAuditLogE); - boolean res = vehicleAuditLogGateway.update(vehicleAuditLogE); - if (!res) { - throw new BizException("修改失败"); - } - } - - /** - * 审批功能 - * @param auditLogApprovalCmd - */ - @Transactional(rollbackFor = Exception.class) - public void execute(VehicleAuditLogApprovalCmd auditLogApprovalCmd) { - boolean res = false; - VehicleAuditLogE approval = new VehicleAuditLogE(); - VehicleAuditLogE vehicleAuditLogE = vehicleAuditLogGateway.queryVehicleAuditLogByVehicleMessageId(auditLogApprovalCmd.getVehicleMessageId()); //找到这个车辆未审批通过的记录 - if (vehicleAuditLogE == null){ - throw new BizException("未找到车辆审批记录!"); - } - if (vehicleAuditLogE.getStatus() == 2){ //2通过 - approval = approval.approvalTongguo(vehicleAuditLogE.getId()); - }else if (vehicleAuditLogE.getStatus() == 3){ //3不通过 - approval = approval.approvalNoTongguo(vehicleAuditLogE.getId(),auditLogApprovalCmd.getComments()); - }else if (vehicleAuditLogE.getStatus() == 1){ - throw new BizException("车辆已审批通过!"); - } - res = vehicleAuditLogGateway.update(approval); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaGateRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditRemoveExe.java similarity index 67% rename from web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaGateRemoveExe.java rename to web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditRemoveExe.java index 84dc7ac..260a128 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjAreaGateRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditRemoveExe.java @@ -1,7 +1,7 @@ package com.zcloud.primeport.command; -import com.zcloud.primeport.domain.gateway.MkmjAreaGateGateway; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -10,17 +10,17 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 + * @Author makejava + * @Date 2026-03-05 11:33:25 */ @Component @AllArgsConstructor -public class MkmjAreaGateRemoveExe { - private final MkmjAreaGateGateway mkmjAreaGateGateway; +public class VehicleAuditRemoveExe { + private final VehicleAuditGateway vehicleAuditGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - boolean res = mkmjAreaGateGateway.deletedMkmjAreaGateById(id); + boolean res = vehicleAuditGateway.deletedVehicleAuditById(id); if (!res) { throw new BizException("删除失败"); } @@ -29,7 +29,7 @@ public class MkmjAreaGateRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { - boolean res = mkmjAreaGateGateway.deletedMkmjAreaGateByIds(ids); + boolean res = vehicleAuditGateway.deletedVehicleAuditByIds(ids); 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 new file mode 100644 index 0000000..9c359ce --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; +import com.zcloud.primeport.domain.model.VehicleAuditE; +import com.zcloud.primeport.dto.VehicleAuditUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:26 + */ +@Component +@AllArgsConstructor +public class VehicleAuditUpdateExe { + private final VehicleAuditGateway vehicleAuditGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(VehicleAuditUpdateCmd vehicleAuditUpdateCmd) { + VehicleAuditE vehicleAuditE = new VehicleAuditE(); + BeanUtils.copyProperties(vehicleAuditUpdateCmd, vehicleAuditE); + boolean res = vehicleAuditGateway.update(vehicleAuditE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackAddExe.java index f6da967..a69f7e1 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackAddExe.java @@ -1,11 +1,9 @@ package com.zcloud.primeport.command; + import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; -import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; import com.zcloud.primeport.domain.model.VehicleBlackE; -import com.zcloud.primeport.domain.model.VehicleMessageE; import com.zcloud.primeport.dto.VehicleBlackAddCmd; -import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -15,34 +13,21 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @Component @AllArgsConstructor public class VehicleBlackAddExe { private final VehicleBlackGateway vehicleBlackGateway; - private final VehicleMessageGateway vehicleMessageGateway; + @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleBlackAddCmd cmd) { - + VehicleBlackE examTypeE = new VehicleBlackE(); + BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - /** - * 1.先把数据同步到车辆信息库中. - * 2.在写入数据库中. - */ - VehicleBlackE vehicleBlackE = new VehicleBlackE(); - VehicleMessageE infoByLicenceNo = vehicleMessageGateway.getInfoByLicenceNo(cmd.getLicenceNo()); - if (infoByLicenceNo == null) { //如果车辆不存在.则新增车辆.再存入黑名单中 - VehicleMessageE vehicleMessageE = new VehicleMessageE(); - BeanUtils.copyProperties(cmd, vehicleMessageE); - vehicleMessageE = vehicleMessageGateway.add(vehicleMessageE); - BeanUtils.copyProperties(vehicleBlackE, vehicleMessageE); - }else{ //如有车辆.则更新车辆信息.再存入黑名单中 - BeanUtils.copyProperties(vehicleBlackE, infoByLicenceNo); - } - res = vehicleBlackGateway.add(vehicleBlackE); + res = vehicleBlackGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackRemoveExe.java index c3c0044..b20f9e7 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackRemoveExe.java @@ -10,8 +10,8 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:09 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @Component @AllArgsConstructor diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackUpdateExe.java index 9e79468..ed5d581 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackUpdateExe.java @@ -1,4 +1,5 @@ package com.zcloud.primeport.command; + import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.model.VehicleBlackE; @@ -12,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:09 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @Component @AllArgsConstructor 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 451a906..790cec0 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 @@ -1,17 +1,10 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; -import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; -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.VehicleMessageAddCmd; -import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; import lombok.AllArgsConstructor; -import lombok.val; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -20,27 +13,21 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @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(); BeanUtils.copyProperties(cmd, examTypeE); - - // 检查是否可以添加车辆 - - boolean res = false; try { - VehicleMessageE add = vehicleMessageGateway.add(examTypeE); + res = vehicleMessageGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } @@ -49,41 +36,5 @@ public class VehicleMessageAddExe { } return true; } - - @Transactional(rollbackFor = Exception.class) - public boolean executeForCorp(VehicleMessageForCorpAddCmd cmd) { - VehicleMessageE examTypeE = new VehicleMessageE(); - BeanUtils.copyProperties(cmd, examTypeE); - examTypeE = examTypeE.VehicleMessageForCorpE(examTypeE); - boolean res = false; - try { - /** - * 1.判断是否重复 - * 2.判断是否在黑名单中 - */ -// VehicleMessageE infoByLicenceNo = vehicleMessageGateway.getInfoByLicenceNo(examTypeE.getLicenceNo()); -// if (infoByLicenceNo != null){ -// 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())) 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); - } - if (!res) { - throw new BizException("保存失败"); - } - return true; - } - } + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageRemoveExe.java index a553753..8c59477 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageRemoveExe.java @@ -7,13 +7,12 @@ 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 makejava + * @Date 2026-03-05 11:33:28 + */ @Component @AllArgsConstructor public class VehicleMessageRemoveExe { @@ -22,7 +21,7 @@ public class VehicleMessageRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { boolean res = vehicleMessageGateway.deletedVehicleMessageById(id); - if(!res){ + if (!res) { throw new BizException("删除失败"); } return true; @@ -31,7 +30,7 @@ public class VehicleMessageRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { boolean res = vehicleMessageGateway.deletedVehicleMessageByIds(ids); - if(!res){ + if (!res) { throw new BizException("删除失败"); } return true; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java index 59cdddb..08459f5 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java @@ -1,27 +1,26 @@ package com.zcloud.primeport.command; + import com.alibaba.cola.exception.BizException; -import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; 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.VehicleMessageStatusCmd; import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import lombok.AllArgsConstructor; -import lombok.val; import org.springframework.beans.BeanUtils; 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 makejava + * @Date 2026-03-05 11:33:28 + */ @Component @AllArgsConstructor public class VehicleMessageUpdateExe { private final VehicleMessageGateway vehicleMessageGateway; - private final VehicleAuditLogGateway vehicleAuditLogGateway; + @Transactional(rollbackFor = Exception.class) public void execute(VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { VehicleMessageE vehicleMessageE = new VehicleMessageE(); @@ -31,62 +30,5 @@ public class VehicleMessageUpdateExe { throw new BizException("修改失败"); } } - - /** - * 企业端和监管端修改车辆信息 - * @param vehicleMessageUpdateCmd - */ - @Transactional(rollbackFor = Exception.class) - public void executeFormCorp(VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { - VehicleMessageE vehicleMessageE = new VehicleMessageE(); - BeanUtils.copyProperties(vehicleMessageUpdateCmd, vehicleMessageE); - vehicleMessageE.updateFromCorp(vehicleMessageE); //修改车辆时候,初始化车辆信息 - -// VehicleMessageE infoById = vehicleMessageGateway.getInfoById(vehicleMessageUpdateCmd.getId()); -// if (infoById == null){ -// throw new BizException("车辆信息不存在"); -// } -// if (infoById.getIsAudit() != 2){ -// throw new BizException("车辆信息正在审核"); -// } - boolean res = vehicleMessageGateway.update(vehicleMessageE); //修改车辆信息 - if (!Tools.isEmpty(vehicleMessageUpdateCmd.getApprovalUserId())){ //新增一个审批记录 - VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); - BeanUtils.copyProperties(vehicleMessageUpdateCmd, vehicleAuditLogE); -// vehicleAuditLogE.addForVehicleLog(vehicleAuditLogE,vehicleMessageUpdateCmd.getId(),2); // 添加审批信息 - res = vehicleAuditLogGateway.add(vehicleAuditLogE); // 添加审批信息 - } - if (!res) { - throw new BizException("修改失败"); - } - } - - - @Transactional(rollbackFor = Exception.class) - public void updateStatus(VehicleMessageStatusCmd statusCmd) { - VehicleMessageE vehicleMessageE = new VehicleMessageE(); - BeanUtils.copyProperties(statusCmd, vehicleMessageE); - vehicleMessageE.updateFromCorp(vehicleMessageE); - boolean res = false; - if (statusCmd.getIsStatus() == 0){ // - val licenceNo = vehicleMessageGateway.countEnabledByLicenceNo(vehicleMessageE.getLicenceNo()); - if (licenceNo > 0){ - throw new BizException("车辆已存在"); - } - val countByUserId = vehicleMessageGateway.countByUserId(vehicleMessageE.getEmployeeVehicleUserId()); - if (countByUserId >= 2){ - throw new BizException("你已经添加两个车辆了.请先停用后在启用."); - } - res = vehicleMessageGateway.update(vehicleMessageE); - }else if (statusCmd.getIsStatus() == 1){ - res = vehicleMessageGateway.update(vehicleMessageE); //如果是车辆停工,就直接修改车辆状态 - }else { - throw new BizException("车辆状态错误"); - } - if (!res) { - throw new BizException("修改失败"); - } - } - } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java index c3f25f6..753c391 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java @@ -1,8 +1,7 @@ package com.zcloud.primeport.command; + import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.gateway.VehicleViolationsGateway; -import com.zcloud.primeport.domain.model.VehicleBlackE; import com.zcloud.primeport.domain.model.VehicleViolationsE; import com.zcloud.primeport.dto.VehicleViolationsAddCmd; import lombok.AllArgsConstructor; @@ -14,28 +13,21 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:28 + * @Author makejava + * @Date 2026-03-05 11:33:28 */ @Component @AllArgsConstructor public class VehicleViolationsAddExe { private final VehicleViolationsGateway vehicleViolationsGateway; - private final VehicleBlackGateway vehicleBlackGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleViolationsAddCmd cmd) { - VehicleViolationsE vehicleViolationsE = new VehicleViolationsE(); - BeanUtils.copyProperties(cmd, vehicleViolationsE); + VehicleViolationsE examTypeE = new VehicleViolationsE(); + BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - res = vehicleViolationsGateway.add(vehicleViolationsE); - Long count = vehicleViolationsGateway.getCountByVehicleId(vehicleViolationsE.getVehicleId()); - if (count >= 5){ //如果超过5次违规，则加入黑名单 - VehicleBlackE vehicleBlackE = new VehicleBlackE(); - vehicleBlackE.setVehicleId(vehicleViolationsE.getVehicleId()); - res = vehicleBlackGateway.add(vehicleBlackE); - } + res = vehicleViolationsGateway.add(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsRemoveExe.java index 232af8d..2ffbcb9 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsRemoveExe.java @@ -1,4 +1,5 @@ package com.zcloud.primeport.command; + import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.domain.gateway.VehicleViolationsGateway; import lombok.AllArgsConstructor; @@ -9,8 +10,8 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Component @AllArgsConstructor diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsUpdateExe.java index 9e43f64..86e3e2d 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsUpdateExe.java @@ -1,4 +1,5 @@ package com.zcloud.primeport.command; + import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.domain.gateway.VehicleViolationsGateway; import com.zcloud.primeport.domain.model.VehicleViolationsE; @@ -12,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:30 */ @Component @AllArgsConstructor diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VideoAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VideoAddExe.java new file mode 100644 index 0000000..7ea2ed2 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/VideoAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VideoGateway; +import com.zcloud.primeport.domain.model.VideoE; +import com.zcloud.primeport.dto.VideoAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:30 + */ +@Component +@AllArgsConstructor +public class VideoAddExe { + private final VideoGateway videoGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(VideoAddCmd cmd) { + VideoE examTypeE = new VideoE(); + BeanUtils.copyProperties(cmd, examTypeE); + boolean res = false; + try { + res = videoGateway.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/VideoRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VideoRemoveExe.java new file mode 100644 index 0000000..977868d --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/VideoRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VideoGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:31 + */ +@Component +@AllArgsConstructor +public class VideoRemoveExe { + private final VideoGateway videoGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = videoGateway.deletedVideoById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = videoGateway.deletedVideoByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VideoUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VideoUpdateExe.java new file mode 100644 index 0000000..43fbb79 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/VideoUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VideoGateway; +import com.zcloud.primeport.domain.model.VideoE; +import com.zcloud.primeport.dto.VideoUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:31 + */ +@Component +@AllArgsConstructor +public class VideoUpdateExe { + private final VideoGateway videoGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(VideoUpdateCmd videoUpdateCmd) { + VideoE videoE = new VideoE(); + BeanUtils.copyProperties(videoUpdateCmd, videoE); + boolean res = videoGateway.update(videoE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/EmployeeMessageCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/EmployeeMessageCoConvertor.java deleted file mode 100644 index bfe2daf..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/EmployeeMessageCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.EmployeeMessageCO; -import com.zcloud.primeport.persistence.dataobject.EmployeeMessageDO; -import org.mapstruct.Mapper; - -import java.util.List; - - - -/** -* web-app -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Mapper(componentModel = "spring") -public interface EmployeeMessageCoConvertor { - /** - * @param employeeMessageDOs - * @return - */ - List converDOsToCOs(List employeeMessageDOs); - - EmployeeMessageCO converDOToCO(EmployeeMessageDO employeeMessageDO); -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/EnclosedAreaCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/EnclosedAreaCoConvertor.java deleted file mode 100644 index ee9cf6b..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/EnclosedAreaCoConvertor.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.EnclosedAreaCO; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaTreeCO; -import com.zcloud.primeport.persistence.dataobject.EnclosedAreaDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -@Mapper(componentModel = "spring") -public interface EnclosedAreaCoConvertor { - /** - * @param enclosedAreaDOs - * @return - */ - List converDOsToCOs(List enclosedAreaDOs); - - EnclosedAreaCO converDOToCO(EnclosedAreaDO enclosedAreaDO); - - List converDOToTreeCOs(List enclosedAreaDOs); - - EnclosedAreaTreeCO converDOToTreeCO(EnclosedAreaDO enclosedAreaDO); -} - 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 deleted file mode 100644 index 7195dd7..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/GatePersonAuthLevelOneCoConvertor.java +++ /dev/null @@ -1,25 +0,0 @@ -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/convertor/InspectionDeptCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionDeptCoConvertor.java deleted file mode 100644 index 92279c3..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionDeptCoConvertor.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; -import com.zcloud.primeport.dto.clientobject.InspectionDeptInfoCO; -import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Mapper(componentModel = "spring") -public interface InspectionDeptCoConvertor { - /** - * @param inspectionDeptDOs - * @return - */ - List converDOsToCOs(List inspectionDeptDOs); - - - InspectionDeptInfoCO converDoToCo (InspectionDeptDO inspectionDeptDO); - - -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionVehicleCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionVehicleCoConvertor.java deleted file mode 100644 index 175867e..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionVehicleCoConvertor.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.domain.model.InspectionVehicleE; -import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; -import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Mapper(componentModel = "spring") -public interface InspectionVehicleCoConvertor { - /** - * @param inspectionVehicleDOs - * @return - */ - List converDOsToCOs(List inspectionVehicleDOs); - - - /** - * @param inspectionVehicleDO - * @return - */ - InspectionVehicleE converDOToE( InspectionVehicleDO inspectionVehicleDO); -} - 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 d4870d7..42ad25c 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 @@ -7,18 +7,18 @@ import org.mapstruct.Mapper; import java.util.List; - /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ @Mapper(componentModel = "spring") public interface MkmjApprovalUserCoConvertor { /** - * @param mkmjApprovalUserDOs - * @return - */ + * @param mkmjApprovalUserDOs + * @return + */ List converDOsToCOs(List mkmjApprovalUserDOs); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjAreaCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjAreaCoConvertor.java deleted file mode 100644 index 06d2b3b..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjAreaCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.MkmjAreaCO; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:41 - */ -@Mapper(componentModel = "spring") -public interface MkmjAreaCoConvertor { - /** - * @param mkmjAreaDOs - * @return - */ - List converDOsToCOs(List mkmjAreaDOs); - - MkmjAreaCO converDOToCO(MkmjAreaDO mkmjAreaDO); -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjAreaGateCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjAreaGateCoConvertor.java deleted file mode 100644 index 1d28fca..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjAreaGateCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.MkmjAreaGateCO; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaGateDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Mapper(componentModel = "spring") -public interface MkmjAreaGateCoConvertor { - /** - * @param mkmjAreaGateDOs - * @return - */ - List converDOsToCOs(List mkmjAreaGateDOs); - - MkmjAreaGateCO converDOToCO(MkmjAreaGateDO mkmjAreaGateDO); -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjCarRecordCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjCarRecordCoConvertor.java deleted file mode 100644 index 1d73e22..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjCarRecordCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.MkmjCarRecordCO; -import com.zcloud.primeport.persistence.dataobject.MkmjCarRecordDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Mapper(componentModel = "spring") -public interface MkmjCarRecordCoConvertor { - /** - * @param mkmjCarRecordDOs - * @return - */ - List converDOsToCOs(List mkmjCarRecordDOs); - - MkmjCarRecordCO converDOToCO(MkmjCarRecordDO mkmjCarRecordDO); -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjCoConvertor.java new file mode 100644 index 0000000..61937f9 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjCoConvertor.java @@ -0,0 +1,25 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.MkmjCO; +import com.zcloud.primeport.persistence.dataobject.MkmjDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:15 + */ +@Mapper(componentModel = "spring") +public interface MkmjCoConvertor { + /** + * @param mkmjDOs + * @return + */ + List converDOsToCOs(List mkmjDOs); + MkmjCO converDOToCO(MkmjDO mkmjDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateCoConvertor.java new file mode 100644 index 0000000..8e6c815 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.MkmjGateCO; +import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:17 + */ +@Mapper(componentModel = "spring") +public interface MkmjGateCoConvertor { + /** + * @param mkmjGateDOs + * @return + */ + List converDOsToCOs(List mkmjGateDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateVideoCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateVideoCoConvertor.java deleted file mode 100644 index ad758f0..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateVideoCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.MkmjGateVideoCO; -import com.zcloud.primeport.persistence.dataobject.MkmjGateVideoDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Mapper(componentModel = "spring") -public interface MkmjGateVideoCoConvertor { - /** - * @param mkmjGateVideoDOs - * @return - */ - List converDOsToCOs(List mkmjGateVideoDOs); - - MkmjGateVideoCO converDOToCO(MkmjGateVideoDO mkmjGateVideoDO); -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjPassageCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjPassageCoConvertor.java index 326a6ec..2bfeb67 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjPassageCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjPassageCoConvertor.java @@ -10,8 +10,8 @@ import java.util.List; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Mapper(componentModel = "spring") public interface MkmjPassageCoConvertor { @@ -20,7 +20,5 @@ public interface MkmjPassageCoConvertor { * @return */ List converDOsToCOs(List mkmjPassageDOs); - - MkmjPassageCO converDOToCO(MkmjPassageDO mkmjPassageDO); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjSwipeCardRecordCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjSwipeCardRecordCoConvertor.java deleted file mode 100644 index 15ce13d..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjSwipeCardRecordCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.MkmjSwipeCardRecordCO; -import com.zcloud.primeport.persistence.dataobject.MkmjSwipeCardRecordDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Mapper(componentModel = "spring") -public interface MkmjSwipeCardRecordCoConvertor { - /** - * @param mkmjSwipeCardRecordDOs - * @return - */ - List converDOsToCOs(List mkmjSwipeCardRecordDOs); - - MkmjSwipeCardRecordCO converDOToCO(MkmjSwipeCardRecordDO mkmjSwipeCardRecordDO); -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonApplyCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonApplyCoConvertor.java new file mode 100644 index 0000000..de1528a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonApplyCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.PersonApplyCO; +import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Mapper(componentModel = "spring") +public interface PersonApplyCoConvertor { + /** + * @param personApplyDOs + * @return + */ + List converDOsToCOs(List personApplyDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonMessageCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonMessageCoConvertor.java new file mode 100644 index 0000000..d311ddc --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonMessageCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.PersonMessageCO; +import com.zcloud.primeport.persistence.dataobject.PersonMessageDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:20 + */ +@Mapper(componentModel = "spring") +public interface PersonMessageCoConvertor { + /** + * @param personMessageDOs + * @return + */ + List converDOsToCOs(List personMessageDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessCoConvertor.java deleted file mode 100644 index 7a31661..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Mapper(componentModel = "spring") -public interface TemporaryAccessCoConvertor { - /** - * @param temporaryAccessDOs - * @return - */ - List converDOsToCOs(List temporaryAccessDOs); - - TemporaryAccessCO converDOToCO(TemporaryAccessDO temporaryAccessDO); -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessEntourageCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessEntourageCoConvertor.java deleted file mode 100644 index cce313d..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessEntourageCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@Mapper(componentModel = "spring") -public interface TemporaryAccessEntourageCoConvertor { - /** - * @param temporaryAccessEntourageDOs - * @return - */ - List converDOsToCOs(List temporaryAccessEntourageDOs); - - TemporaryAccessEntourageCO converDOToCO(TemporaryAccessEntourageDO temporaryAccessEntourageDO); -} - 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 new file mode 100644 index 0000000..4de9e4d --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:23 + */ +@Mapper(componentModel = "spring") +public interface VehicleApplyCoConvertor { + /** + * @param vehicleApplyDOs + * @return + */ + List converDOsToCOs(List vehicleApplyDOs); +} + 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 new file mode 100644 index 0000000..b53f930 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; +import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:24 + */ +@Mapper(componentModel = "spring") +public interface VehicleAuditCoConvertor { + /** + * @param vehicleAuditDOs + * @return + */ + List converDOsToCOs(List vehicleAuditDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditLogCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditLogCoConvertor.java deleted file mode 100644 index 8bdd984..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditLogCoConvertor.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; -import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; -import com.zcloud.primeport.persistence.dataobject.VehicleAuditLogDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Mapper(componentModel = "spring") -public interface VehicleAuditLogCoConvertor { - /** - * @param vehicleAuditLogDOs - * @return - */ - List converDOsToCOs(List vehicleAuditLogDOs); - - List converCarDOsToCOs2(List vehicleAuditLogDOs); -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleBlackCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleBlackCoConvertor.java index f7c1676..f550081 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleBlackCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleBlackCoConvertor.java @@ -1,4 +1,5 @@ package com.zcloud.primeport.command.convertor; + import com.zcloud.primeport.dto.clientobject.VehicleBlackCO; import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO; import org.mapstruct.Mapper; @@ -9,8 +10,8 @@ import java.util.List; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @Mapper(componentModel = "spring") public interface VehicleBlackCoConvertor { @@ -19,7 +20,5 @@ public interface VehicleBlackCoConvertor { * @return */ List converDOsToCOs(List vehicleBlackDOs); - - VehicleBlackCO converDOToCO(VehicleBlackDO vehicleBlackDO); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java index fe9543a..aa55298 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java @@ -1,36 +1,24 @@ package com.zcloud.primeport.command.convertor; -import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; -import com.zcloud.primeport.dto.clientobject.VehicleDeptInfoCO; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; -import com.zcloud.primeport.persistence.dataobject.VehicleCountByCorpDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import org.mapstruct.Mapper; + import java.util.List; - /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:27 + */ @Mapper(componentModel = "spring") public interface VehicleMessageCoConvertor { - /** - * @param vehicleMessageDOs - * @return - */ - List converDOsToCOs(List vehicleMessageDOs); - VehicleMessageCO converDOsToCOs(VehicleMessageDO vehicleMessageDOs); - /** * @param vehicleMessageDOs * @return */ - List converCountDOsToCOs(List vehicleMessageDOs); - - - List converDOsToDeptInfoCOs(List vehicleMessageDOs); + List converDOsToCOs(List vehicleMessageDOs); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleViolationsCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleViolationsCoConvertor.java index 3b124b3..ce1d58c 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleViolationsCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleViolationsCoConvertor.java @@ -1,8 +1,6 @@ package com.zcloud.primeport.command.convertor; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; -import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; -import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO; import org.mapstruct.Mapper; @@ -12,8 +10,8 @@ import java.util.List; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Mapper(componentModel = "spring") public interface VehicleViolationsCoConvertor { @@ -22,11 +20,5 @@ public interface VehicleViolationsCoConvertor { * @return */ List converDOsToCOs(List vehicleViolationsDOs); - - VehicleViolationsCO converDOToCO(VehicleViolationsDO vehicleViolationsDO); - - - List converFromViolationsDOsToCOs(List vehicleViolationsDOs); - } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VideoCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VideoCoConvertor.java new file mode 100644 index 0000000..2044a1b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VideoCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.VideoCO; +import com.zcloud.primeport.persistence.dataobject.VideoDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:30 + */ +@Mapper(componentModel = "spring") +public interface VideoCoConvertor { + /** + * @param videoDOs + * @return + */ + List converDOsToCOs(List videoDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/EmployeeMessageQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/EmployeeMessageQueryExe.java deleted file mode 100644 index a0e0d9e..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/EmployeeMessageQueryExe.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.primeport.command.convertor.EmployeeMessageCoConvertor; -import com.zcloud.primeport.dto.EmployeeMessagePageQry; -import com.zcloud.primeport.dto.clientobject.EmployeeMessageCO; -import com.zcloud.primeport.persistence.dataobject.EmployeeMessageDO; -import com.zcloud.primeport.persistence.repository.EmployeeMessageRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - - - -/** -* web-app -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Component -@AllArgsConstructor -public class EmployeeMessageQueryExe { - private final EmployeeMessageRepository employeeMessageRepository; - private final EmployeeMessageCoConvertor employeeMessageCoConvertor; - - /** - * 根据id查询 - * @param id - * @return - */ - public EmployeeMessageCO queryById(Long id) { - return employeeMessageCoConvertor.converDOToCO(employeeMessageRepository.getById(id)); - } - /** - * 分页 - * - * @param employeeMessagePageQry - * @return - */ - public PageResponse execute(EmployeeMessagePageQry employeeMessagePageQry) { - Map params = PageQueryHelper.toHashMap(employeeMessagePageQry); - PageResponse pageResponse = employeeMessageRepository.listPage(params); - List examCenterCOS = employeeMessageCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/EnclosedAreaQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/EnclosedAreaQueryExe.java deleted file mode 100644 index d083c19..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/EnclosedAreaQueryExe.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.zcloud.primeport.command.query; - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.cola.dto.PageResponse; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -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.EnclosedAreaCoConvertor; -import com.zcloud.primeport.dto.EnclosedAreaPageQry; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaCO; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaTreeCO; -import com.zcloud.primeport.persistence.dataobject.EnclosedAreaDO; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaDO; -import com.zcloud.primeport.persistence.repository.EnclosedAreaRepository; -import com.zcloud.primeport.persistence.repository.MkmjAreaRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -@Component -@AllArgsConstructor -public class EnclosedAreaQueryExe { - private final EnclosedAreaRepository enclosedAreaRepository; - private final EnclosedAreaCoConvertor enclosedAreaCoConvertor; - private final MkmjAreaRepository mkmjAreaRepository; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public EnclosedAreaCO queryById(Long id) { - return enclosedAreaCoConvertor.converDOToCO(enclosedAreaRepository.getById(id)); - } - - /** - * 分页 - * - * @param enclosedAreaPageQry - * @return - */ - public PageResponse execute(EnclosedAreaPageQry enclosedAreaPageQry) { - Map params = PageQueryHelper.toHashMap(enclosedAreaPageQry); - PageResponse pageResponse = enclosedAreaRepository.listPage(params); - List enclosedAreaCOS = enclosedAreaCoConvertor.converDOsToCOs(pageResponse.getData()); - if(ObjectUtil.isNotEmpty(enclosedAreaCOS)){ - List ids = enclosedAreaCOS.stream().map(EnclosedAreaCO::getId).collect(Collectors.toList()); - List mkmjAreaDOs = mkmjAreaRepository.list(new LambdaQueryWrapper() - .eq(MkmjAreaDO::getDeleteEnum,"FALSE") - .or(w -> w.in(MkmjAreaDO::getInDirectionArea, ids) - .in(MkmjAreaDO::getOutDirectionArea, ids))); - List children = enclosedAreaRepository.list(new QueryWrapper().lambda() - .eq(EnclosedAreaDO::getDeleteEnum, "FALSE") - .in(EnclosedAreaDO::getParentId, ids)); - - enclosedAreaCOS.forEach(enclosedAreaCO -> { - enclosedAreaCO.setUseCount(mkmjAreaDOs.stream().filter(mkmjAreaDO -> mkmjAreaDO.getInDirectionArea().equals(enclosedAreaCO.getId()) || mkmjAreaDO.getOutDirectionArea().equals(enclosedAreaCO.getId())).count()); - enclosedAreaCO.setChildCount(children.stream().filter(child -> child.getParentId().equals(enclosedAreaCO.getId())).count()); - }); - } - return PageResponse.of(enclosedAreaCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } - - public List listAllTree() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(EnclosedAreaDO::getDeleteEnum, "FALSE"); - List enclosedAreaDOs = enclosedAreaRepository.list(queryWrapper); - List enclosedAreaTreeCOS = enclosedAreaCoConvertor.converDOToTreeCOs(enclosedAreaDOs); - return Tools.buildEntityTree(enclosedAreaTreeCOS, "id", "parentId", "children"); - } -} - 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 deleted file mode 100644 index c796cfa..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/GatePersonAuthLevelOneQueryExe.java +++ /dev/null @@ -1,47 +0,0 @@ -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/InspectionDeptQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionDeptQueryExe.java deleted file mode 100644 index 7e93390..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionDeptQueryExe.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.primeport.command.convertor.InspectionDeptCoConvertor; -import com.zcloud.primeport.command.convertor.VehicleMessageCoConvertor; -import com.zcloud.primeport.dto.InspectionDeptPageQry; -import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; -import com.zcloud.primeport.dto.clientobject.InspectionDeptInfoCO; -import com.zcloud.primeport.dto.clientobject.VehicleDeptInfoCO; -import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; -import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; -import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; -import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; -import com.zcloud.primeport.persistence.repository.InspectionDeptRepository; -import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; -import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Component -@AllArgsConstructor -public class InspectionDeptQueryExe { - private final InspectionDeptRepository inspectionDeptRepository; - private final InspectionDeptCoConvertor inspectionDeptCoConvertor; - - private final InspectionVehicleRepository inspectionVehicleRepository; - private final VehicleMessageRepository vehicleMessageRepository; - - private final VehicleMessageCoConvertor vehicleMessageCoConvertor; - /** - * 分页 - * - * @param inspectionDeptPageQry - * @return - */ - public PageResponse execute(InspectionDeptPageQry inspectionDeptPageQry) { - Map parmas = PageQueryHelper.toHashMap(inspectionDeptPageQry); - PageResponse pageResponse = inspectionDeptRepository.listPage(parmas); - List examCenterCOS = inspectionDeptCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } - - /** - * 根据id获取详情 - * @param id - * @return - */ - public InspectionDeptInfoCO executeById(Long id) { - InspectionDeptDO inspectionDeptDO = inspectionDeptRepository.getById(id); - InspectionDeptInfoCO deptInfoCO = inspectionDeptCoConvertor.converDoToCo(inspectionDeptDO); // 获取部门信息 - List inspectionVehicleDOS = inspectionVehicleRepository.queryInspectionVehicleByDeptId(id); // 获取部门下的车辆信息 - Long[] ids = new Long[inspectionVehicleDOS.size()]; - for (int i = 0; i < inspectionVehicleDOS.size(); i++) { - ids[i] = inspectionVehicleDOS.get(i).getVehicleMessageId(); - } - List vehicleMessageDOS = vehicleMessageRepository.listAll(ids); // 获取车辆信息 - List vehicleMessageCOS = vehicleMessageCoConvertor.converDOsToDeptInfoCOs(vehicleMessageDOS); // 获取车辆信息 - deptInfoCO.setVehicleDeptInfoCOS(vehicleMessageCOS); - return deptInfoCO; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionVehicleQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionVehicleQueryExe.java deleted file mode 100644 index 7b2fce7..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionVehicleQueryExe.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.primeport.command.convertor.InspectionVehicleCoConvertor; -import com.zcloud.primeport.dto.InspectionVehiclePageQry; -import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; -import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; -import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Component -@AllArgsConstructor -public class InspectionVehicleQueryExe { - private final InspectionVehicleRepository inspectionVehicleRepository; - private final InspectionVehicleCoConvertor inspectionVehicleCoConvertor; - - /** - * 分页 - * - * @param inspectionVehiclePageQry - * @return - */ - public PageResponse execute(InspectionVehiclePageQry inspectionVehiclePageQry) { - Map parmas = PageQueryHelper.toHashMap(inspectionVehiclePageQry); - PageResponse pageResponse = inspectionVehicleRepository.listPage(parmas); - List examCenterCOS = inspectionVehicleCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - 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 ef1a728..81da1d2 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,19 +1,15 @@ 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; @@ -21,8 +17,8 @@ import java.util.Map; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ @Component @AllArgsConstructor @@ -42,21 +38,5 @@ public class MkmjApprovalUserQueryExe { 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); - 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/command/query/MkmjAreaGateQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjAreaGateQueryExe.java deleted file mode 100644 index 7b748bb..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjAreaGateQueryExe.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.zcloud.primeport.command.convertor.MkmjAreaGateCoConvertor; -import com.zcloud.primeport.domain.model.VideoCountE; -import com.zcloud.primeport.dto.MkmjAreaGatePageQry; -import com.zcloud.primeport.dto.clientobject.MkmjAreaCO; -import com.zcloud.primeport.dto.clientobject.MkmjAreaGateCO; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaGateDO; -import com.zcloud.primeport.persistence.repository.MkmjAreaGateRepository; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.primeport.persistence.repository.MkmjGateVideoRepository; -import com.zcloud.primeport.persistence.repository.MkmjPassageRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Component -@AllArgsConstructor -public class MkmjAreaGateQueryExe { - private final MkmjAreaGateRepository mkmjAreaGateRepository; - private final MkmjAreaGateCoConvertor mkmjAreaGateCoConvertor; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public MkmjAreaGateCO queryById(Long id) { - return mkmjAreaGateCoConvertor.converDOToCO(mkmjAreaGateRepository.getById(id)); - } - - /** - * 分页 - * - * @param mkmjAreaGatePageQry - * @return - */ - public PageResponse execute(MkmjAreaGatePageQry mkmjAreaGatePageQry) { - Map params = PageQueryHelper.toHashMap(mkmjAreaGatePageQry); - PageResponse pageResponse = mkmjAreaGateRepository.listPage(params); - List examCenterCOS = mkmjAreaGateCoConvertor.converDOsToCOs(pageResponse.getData()); - List ids = examCenterCOS.stream().map(MkmjAreaGateCO::getPassageId).collect(Collectors.toList()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjAreaQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjAreaQueryExe.java deleted file mode 100644 index a4a5391..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjAreaQueryExe.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.primeport.command.convertor.MkmjAreaCoConvertor; -import com.zcloud.primeport.domain.model.MkmjStatisticsE; -import com.zcloud.primeport.domain.model.PassageCountE; -import com.zcloud.primeport.domain.model.VideoCountE; -import com.zcloud.primeport.dto.MkmjAreaPageQry; -import com.zcloud.primeport.dto.clientobject.MkmjAreaCO; -import com.zcloud.primeport.dto.clientobject.MkmjStatisticsCO; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaDO; -import com.zcloud.primeport.persistence.repository.*; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -@Component -@AllArgsConstructor -public class MkmjAreaQueryExe { - private final MkmjAreaRepository mkmjAreaRepository; - private final MkmjAreaCoConvertor mkmjAreaCoConvertor; - private final MkmjGateVideoRepository mkmjGateVideoRepository; - private final MkmjCarRecordRepository mkmjCarRecordRepository; - private final MkmjSwipeCardRecordRepository mkmjSwipeCardRecordRepository; - private final MkmjPassageRepository mkmjPassageRepository; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public MkmjAreaCO queryById(Long id) { - return mkmjAreaCoConvertor.converDOToCO(mkmjAreaRepository.getById(id)); - } - - /** - * 分页 - * - * @param mkmjAreaPageQry - * @return - */ - public PageResponse execute(MkmjAreaPageQry mkmjAreaPageQry) { - Map params = PageQueryHelper.toHashMap(mkmjAreaPageQry); - PageResponse pageResponse = mkmjAreaRepository.listPage(params); - List examCenterCOS = mkmjAreaCoConvertor.converDOsToCOs(pageResponse.getData()); - if(examCenterCOS.size() > 0) { - List ids = examCenterCOS.stream().map(MkmjAreaCO::getAreaId).collect(Collectors.toList()); - List videoCounts = mkmjGateVideoRepository.listVideoCountByAreaId(ids); - List passageCounts = mkmjPassageRepository.listPassageCountByAreaId(ids); - examCenterCOS.forEach(examCenterCO -> { - videoCounts.forEach(videoCount -> { - if (examCenterCO.getAreaId().equals(videoCount.getAreaGateId())) { - examCenterCO.setVideoNum(videoCount.getCount()); - } - }); - passageCounts.forEach(passageCount -> { - if (examCenterCO.getAreaId().equals(passageCount.getAreaId())) { - examCenterCO.setPassageNum(passageCount.getCount()); - } - }); - }); - } - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } - - public List statistics(List ids) { - // 获取车辆和人员统计数据 - List carCounts = mkmjCarRecordRepository.statisticsByArea(ids); - List personCounts = mkmjSwipeCardRecordRepository.statisticsByArea(ids); - - // 创建一个 map 来存储 areaId 对应的统计数据 - Map statisticsMap = new HashMap<>(); - - // 处理车辆统计数据 - for (MkmjStatisticsE carCount : carCounts) { - MkmjStatisticsCO co = new MkmjStatisticsCO(); - co.setId(carCount.getId()); - co.setCarInCount(carCount.getCarInCount()); - co.setCarOutCount(carCount.getCarOutCount()); - statisticsMap.put(carCount.getId(), co); - } - - // 处理人员统计数据 - for (MkmjStatisticsE personCount : personCounts) { - MkmjStatisticsCO co = statisticsMap.getOrDefault(personCount.getId(), new MkmjStatisticsCO()); - co.setId(personCount.getId()); - co.setPersonInCount(personCount.getPersonInCount()); - co.setPersonOutCount(personCount.getPersonOutCount()); - statisticsMap.put(personCount.getId(), co); - } - - // 返回合并后的列表 - return new ArrayList<>(statisticsMap.values()); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjCarRecordQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjCarRecordQueryExe.java deleted file mode 100644 index 0248b0c..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjCarRecordQueryExe.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.primeport.command.convertor.MkmjCarRecordCoConvertor; -import com.zcloud.primeport.dto.MkmjCarRecordPageQry; -import com.zcloud.primeport.dto.clientobject.MkmjCarRecordCO; -import com.zcloud.primeport.persistence.dataobject.MkmjCarRecordDO; -import com.zcloud.primeport.persistence.repository.MkmjCarRecordRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Component -@AllArgsConstructor -public class MkmjCarRecordQueryExe { - private final MkmjCarRecordRepository mkmjCarRecordRepository; - private final MkmjCarRecordCoConvertor mkmjCarRecordCoConvertor; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public MkmjCarRecordCO queryById(Long id) { - return mkmjCarRecordCoConvertor.converDOToCO(mkmjCarRecordRepository.getById(id)); - } - - /** - * 分页 - * - * @param mkmjCarRecordPageQry - * @return - */ - public PageResponse execute(MkmjCarRecordPageQry mkmjCarRecordPageQry) { - Map params = PageQueryHelper.toHashMap(mkmjCarRecordPageQry); - PageResponse pageResponse = mkmjCarRecordRepository.listPage(params); - List examCenterCOS = mkmjCarRecordCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateQueryExe.java new file mode 100644 index 0000000..921b76d --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.MkmjGateCoConvertor; +import com.zcloud.primeport.dto.MkmjGatePageQry; +import com.zcloud.primeport.dto.clientobject.MkmjGateCO; +import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; +import com.zcloud.primeport.persistence.repository.MkmjGateRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +@Component +@AllArgsConstructor +public class MkmjGateQueryExe { + private final MkmjGateRepository mkmjGateRepository; + private final MkmjGateCoConvertor mkmjGateCoConvertor; + + /** + * 分页 + * + * @param mkmjGatePageQry + * @return + */ + public PageResponse execute(MkmjGatePageQry mkmjGatePageQry) { + Map parmas = PageQueryHelper.toHashMap(mkmjGatePageQry); + PageResponse pageResponse = mkmjGateRepository.listPage(parmas); + List examCenterCOS = mkmjGateCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateVideoQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateVideoQueryExe.java deleted file mode 100644 index 7031754..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateVideoQueryExe.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.zcloud.primeport.command.convertor.MkmjGateVideoCoConvertor; -import com.zcloud.primeport.dto.MkmjGateVideoPageQry; -import com.zcloud.primeport.dto.clientobject.MkmjGateVideoCO; -import com.zcloud.primeport.persistence.dataobject.MkmjGateVideoDO; -import com.zcloud.primeport.persistence.repository.MkmjGateVideoRepository; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.alibaba.cola.dto.PageResponse; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Component -@AllArgsConstructor -public class MkmjGateVideoQueryExe { - private final MkmjGateVideoRepository mkmjGateVideoRepository; - private final MkmjGateVideoCoConvertor mkmjGateVideoCoConvertor; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public MkmjGateVideoCO queryById(Long id) { - return mkmjGateVideoCoConvertor.converDOToCO(mkmjGateVideoRepository.getById(id)); - } - - /** - * 分页 - * - * @param mkmjGateVideoPageQry - * @return - */ - public PageResponse execute(MkmjGateVideoPageQry mkmjGateVideoPageQry) { - Map params = PageQueryHelper.toHashMap(mkmjGateVideoPageQry); - PageResponse pageResponse = mkmjGateVideoRepository.listPage(params); - List examCenterCOS = mkmjGateVideoCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjPassageQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjPassageQueryExe.java index ce8cc47..2c35ed5 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjPassageQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjPassageQueryExe.java @@ -1,58 +1,30 @@ package com.zcloud.primeport.command.query; import com.alibaba.cola.dto.PageResponse; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.MkmjPassageCoConvertor; -import com.zcloud.primeport.domain.model.GateCountE; -import com.zcloud.primeport.domain.model.MkmjStatisticsE; import com.zcloud.primeport.dto.MkmjPassagePageQry; import com.zcloud.primeport.dto.clientobject.MkmjPassageCO; -import com.zcloud.primeport.dto.clientobject.MkmjStatisticsCO; import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; -import com.zcloud.primeport.persistence.repository.MkmjAreaGateRepository; -import com.zcloud.primeport.persistence.repository.MkmjCarRecordRepository; import com.zcloud.primeport.persistence.repository.MkmjPassageRepository; -import com.zcloud.primeport.persistence.repository.MkmjSwipeCardRecordRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Component @AllArgsConstructor public class MkmjPassageQueryExe { private final MkmjPassageRepository mkmjPassageRepository; private final MkmjPassageCoConvertor mkmjPassageCoConvertor; - private final MkmjAreaGateRepository mkmjAreaGateRepository; - private final MkmjCarRecordRepository mkmjCarRecordRepository; - private final MkmjSwipeCardRecordRepository mkmjSwipeCardRecordRepository; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public MkmjPassageCO queryById(Long id) { - return mkmjPassageCoConvertor.converDOToCO(mkmjPassageRepository.getById(id)); - } - - public MkmjPassageCO queryByName(String name) { - return mkmjPassageCoConvertor.converDOToCO(mkmjPassageRepository.getOne( - new LambdaQueryWrapper().eq(MkmjPassageDO::getPassageName, name))); - } /** * 分页 @@ -61,50 +33,10 @@ public class MkmjPassageQueryExe { * @return */ public PageResponse execute(MkmjPassagePageQry mkmjPassagePageQry) { - Map params = PageQueryHelper.toHashMap(mkmjPassagePageQry); - PageResponse pageResponse = mkmjPassageRepository.listPage(params); - List passageCOS = mkmjPassageCoConvertor.converDOsToCOs(pageResponse.getData()); - List ids = passageCOS.stream().map(MkmjPassageCO::getPassageId).collect(Collectors.toList()); - List gateCounts = mkmjAreaGateRepository.listGateCountByPassageId(ids); - passageCOS.forEach(mkmjPassageCO -> { - gateCounts.forEach(gateCountE -> { - if (mkmjPassageCO.getAreaId().equals(gateCountE.getPassageId())) { - mkmjPassageCO.setGateNum(gateCountE.getCount()); - } - }); - }); - return PageResponse.of(passageCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + Map parmas = PageQueryHelper.toHashMap(mkmjPassagePageQry); + PageResponse pageResponse = mkmjPassageRepository.listPage(parmas); + List examCenterCOS = mkmjPassageCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - - public List statistics(List ids) { - List carCounts = mkmjCarRecordRepository.statisticsByPassage(ids); - List personCounts = mkmjSwipeCardRecordRepository.statisticsByPassage(ids); - - // 创建一个 map 来存储 areaId 对应的统计数据 - Map statisticsMap = new HashMap<>(); - - // 处理车辆统计数据 - for (MkmjStatisticsE carCount : carCounts) { - MkmjStatisticsCO co = new MkmjStatisticsCO(); - co.setId(carCount.getId()); - co.setCarInCount(carCount.getCarInCount()); - co.setCarOutCount(carCount.getCarOutCount()); - statisticsMap.put(carCount.getId(), co); - } - - // 处理人员统计数据 - for (MkmjStatisticsE personCount : personCounts) { - MkmjStatisticsCO co = statisticsMap.getOrDefault(personCount.getId(), new MkmjStatisticsCO()); - co.setId(personCount.getId()); - co.setPersonInCount(personCount.getPersonInCount()); - co.setPersonOutCount(personCount.getPersonOutCount()); - statisticsMap.put(personCount.getId(), co); - } - - // 返回合并后的列表 - return new ArrayList<>(statisticsMap.values()); - } - - } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java new file mode 100644 index 0000000..f7fd7fa --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java @@ -0,0 +1,46 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.MkmjCoConvertor; +import com.zcloud.primeport.dto.MkmjPageQry; +import com.zcloud.primeport.dto.clientobject.MkmjCO; +import com.zcloud.primeport.persistence.dataobject.MkmjDO; +import com.zcloud.primeport.persistence.repository.MkmjRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:15 + */ +@Component +@AllArgsConstructor +public class MkmjQueryExe { + private final MkmjRepository mkmjRepository; + private final MkmjCoConvertor mkmjCoConvertor; + + /** + * 分页 + * + * @param mkmjPageQry + * @return + */ + public PageResponse execute(MkmjPageQry mkmjPageQry) { + Map parmas = PageQueryHelper.toHashMap(mkmjPageQry); + PageResponse pageResponse = mkmjRepository.listPage(parmas); + List examCenterCOS = mkmjCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public MkmjCO getInfoById(Long id) { + return mkmjCoConvertor.converDOToCO(mkmjRepository.getById(id)); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjSwipeCardRecordQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjSwipeCardRecordQueryExe.java deleted file mode 100644 index dc11e66..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjSwipeCardRecordQueryExe.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.primeport.command.convertor.MkmjSwipeCardRecordCoConvertor; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordPageQry; -import com.zcloud.primeport.dto.clientobject.MkmjSwipeCardRecordCO; -import com.zcloud.primeport.persistence.dataobject.MkmjSwipeCardRecordDO; -import com.zcloud.primeport.persistence.repository.MkmjSwipeCardRecordRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Component -@AllArgsConstructor -public class MkmjSwipeCardRecordQueryExe { - private final MkmjSwipeCardRecordRepository mkmjSwipeCardRecordRepository; - private final MkmjSwipeCardRecordCoConvertor mkmjSwipeCardRecordCoConvertor; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public MkmjSwipeCardRecordCO queryById(Long id) { - return mkmjSwipeCardRecordCoConvertor.converDOToCO(mkmjSwipeCardRecordRepository.getById(id)); - } - - /** - * 分页 - * - * @param mkmjSwipeCardRecordPageQry - * @return - */ - public PageResponse execute(MkmjSwipeCardRecordPageQry mkmjSwipeCardRecordPageQry) { - Map params = PageQueryHelper.toHashMap(mkmjSwipeCardRecordPageQry); - PageResponse pageResponse = mkmjSwipeCardRecordRepository.listPage(params); - List examCenterCOS = mkmjSwipeCardRecordCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java new file mode 100644 index 0000000..9922aac --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.PersonApplyCoConvertor; +import com.zcloud.primeport.dto.PersonApplyPageQry; +import com.zcloud.primeport.dto.clientobject.PersonApplyCO; +import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import com.zcloud.primeport.persistence.repository.PersonApplyRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@Component +@AllArgsConstructor +public class PersonApplyQueryExe { + private final PersonApplyRepository personApplyRepository; + private final PersonApplyCoConvertor personApplyCoConvertor; + + /** + * 分页 + * + * @param personApplyPageQry + * @return + */ + public PageResponse execute(PersonApplyPageQry personApplyPageQry) { + Map parmas = PageQueryHelper.toHashMap(personApplyPageQry); + PageResponse pageResponse = personApplyRepository.listPage(parmas); + List examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonMessageQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonMessageQueryExe.java new file mode 100644 index 0000000..8ddeeb2 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonMessageQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.PersonMessageCoConvertor; +import com.zcloud.primeport.dto.PersonMessagePageQry; +import com.zcloud.primeport.dto.clientobject.PersonMessageCO; +import com.zcloud.primeport.persistence.dataobject.PersonMessageDO; +import com.zcloud.primeport.persistence.repository.PersonMessageRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Component +@AllArgsConstructor +public class PersonMessageQueryExe { + private final PersonMessageRepository personMessageRepository; + private final PersonMessageCoConvertor personMessageCoConvertor; + + /** + * 分页 + * + * @param personMessagePageQry + * @return + */ + public PageResponse execute(PersonMessagePageQry personMessagePageQry) { + Map parmas = PageQueryHelper.toHashMap(personMessagePageQry); + PageResponse pageResponse = personMessageRepository.listPage(parmas); + List examCenterCOS = personMessageCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessEntourageQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessEntourageQueryExe.java deleted file mode 100644 index 77a6ab9..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessEntourageQueryExe.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.primeport.command.convertor.TemporaryAccessEntourageCoConvertor; -import com.zcloud.primeport.dto.TemporaryAccessEntouragePageQry; -import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; -import com.zcloud.primeport.persistence.repository.TemporaryAccessEntourageRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Component -@AllArgsConstructor -public class TemporaryAccessEntourageQueryExe { - private final TemporaryAccessEntourageRepository temporaryAccessEntourageRepository; - private final TemporaryAccessEntourageCoConvertor temporaryAccessEntourageCoConvertor; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public TemporaryAccessEntourageCO queryById(Long id) { - return temporaryAccessEntourageCoConvertor.converDOToCO(temporaryAccessEntourageRepository.getById(id)); - } - - /** - * 分页 - * - * @param temporaryAccessEntouragePageQry - * @return - */ - public PageResponse execute(TemporaryAccessEntouragePageQry temporaryAccessEntouragePageQry) { - Map params = PageQueryHelper.toHashMap(temporaryAccessEntouragePageQry); - PageResponse pageResponse = temporaryAccessEntourageRepository.listPage(params); - List examCenterCOS = temporaryAccessEntourageCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessQueryExe.java deleted file mode 100644 index 6c389cb..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessQueryExe.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.primeport.command.convertor.TemporaryAccessCoConvertor; -import com.zcloud.primeport.dto.TemporaryAccessPageQry; -import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; -import com.zcloud.primeport.persistence.repository.TemporaryAccessRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Component -@AllArgsConstructor -public class TemporaryAccessQueryExe { - private final TemporaryAccessRepository temporaryAccessRepository; - private final TemporaryAccessCoConvertor temporaryAccessCoConvertor; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public TemporaryAccessCO queryById(Long id) { - return temporaryAccessCoConvertor.converDOToCO(temporaryAccessRepository.getById(id)); - } - - /** - * 分页 - * - * @param temporaryAccessPageQry - * @return - */ - public PageResponse execute(TemporaryAccessPageQry temporaryAccessPageQry) { - Map params = PageQueryHelper.toHashMap(temporaryAccessPageQry); - PageResponse pageResponse = temporaryAccessRepository.listPage(params); - List examCenterCOS = temporaryAccessCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - 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 new file mode 100644 index 0000000..a0729e1 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.VehicleApplyCoConvertor; +import com.zcloud.primeport.dto.VehicleApplyPageQry; +import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:24 + */ +@Component +@AllArgsConstructor +public class VehicleApplyQueryExe { + private final VehicleApplyRepository vehicleApplyRepository; + private final VehicleApplyCoConvertor vehicleApplyCoConvertor; + + /** + * 分页 + * + * @param vehicleApplyPageQry + * @return + */ + public PageResponse execute(VehicleApplyPageQry vehicleApplyPageQry) { + Map parmas = PageQueryHelper.toHashMap(vehicleApplyPageQry); + PageResponse pageResponse = vehicleApplyRepository.listPage(parmas); + List examCenterCOS = vehicleApplyCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditLogQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditLogQueryExe.java deleted file mode 100644 index f874a38..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditLogQueryExe.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.primeport.command.convertor.VehicleAuditLogCoConvertor; -import com.zcloud.primeport.dto.VehicleAuditLogPageQry; -import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; -import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; -import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; -import com.zcloud.primeport.persistence.dataobject.VehicleAuditLogDO; -import com.zcloud.primeport.persistence.repository.VehicleAuditLogRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Component -@AllArgsConstructor -public class VehicleAuditLogQueryExe { - private final VehicleAuditLogRepository vehicleAuditLogRepository; - private final VehicleAuditLogCoConvertor vehicleAuditLogCoConvertor; - private final VehicleMessageQueryExe vehicleMessageQueryExe; - /** - * 分页 - * - * @param vehicleAuditLogPageQry - * @return - */ - public PageResponse execute(VehicleAuditLogPageQry vehicleAuditLogPageQry) { - Map parmas = PageQueryHelper.toHashMap(vehicleAuditLogPageQry); - PageResponse pageResponse = vehicleAuditLogRepository.listPage(parmas); - List examCenterCOS = vehicleAuditLogCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } - - public PageResponse executeAndCarInfo(VehicleAuditLogPageQry vehicleAuditLogPageQry) { - Map parmas = PageQueryHelper.toHashMap(vehicleAuditLogPageQry); - PageResponse pageResponse = vehicleAuditLogRepository.listPage(parmas); - List examCenterCOS = vehicleAuditLogCoConvertor.converCarDOsToCOs2(pageResponse.getData()); - - Long [] vehicleMessageIds = new Long[examCenterCOS.size()]; - for (int i = 0; i < examCenterCOS.size(); i++) { - vehicleMessageIds[i] = examCenterCOS.get(i).getVehicleMessageId(); - } - Map longVehicleMessageCOMap = vehicleMessageQueryExe.listMapAllByIds(vehicleMessageIds); // 根据id 获取信息 - for (VehicleLogAndCarCO vehicleAuditLogCO : examCenterCOS){ - if (longVehicleMessageCOMap.containsKey(vehicleAuditLogCO.getVehicleMessageId())){ - vehicleAuditLogCO.setVehicleMessageCO(longVehicleMessageCOMap.get(vehicleAuditLogCO.getVehicleMessageId())); - } - } - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } -} - 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 new file mode 100644 index 0000000..ed7c5c5 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.VehicleAuditCoConvertor; +import com.zcloud.primeport.dto.VehicleAuditPageQry; +import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; +import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; +import com.zcloud.primeport.persistence.repository.VehicleAuditRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +@Component +@AllArgsConstructor +public class VehicleAuditQueryExe { + private final VehicleAuditRepository vehicleAuditRepository; + private final VehicleAuditCoConvertor vehicleAuditCoConvertor; + + /** + * 分页 + * + * @param vehicleAuditPageQry + * @return + */ + public PageResponse execute(VehicleAuditPageQry vehicleAuditPageQry) { + Map parmas = PageQueryHelper.toHashMap(vehicleAuditPageQry); + PageResponse pageResponse = vehicleAuditRepository.listPage(parmas); + List examCenterCOS = vehicleAuditCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleBlackQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleBlackQueryExe.java index 4e7c33a..3c7d4d0 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleBlackQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleBlackQueryExe.java @@ -1,17 +1,15 @@ package com.zcloud.primeport.command.query; -import com.zcloud.gbscommon.utils.PageQueryHelper; + import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.VehicleBlackCoConvertor; import com.zcloud.primeport.dto.VehicleBlackPageQry; import com.zcloud.primeport.dto.clientobject.VehicleBlackCO; import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO; -import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import com.zcloud.primeport.persistence.repository.VehicleBlackRepository; -import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -19,24 +17,14 @@ import java.util.Map; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:09 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @Component @AllArgsConstructor public class VehicleBlackQueryExe { private final VehicleBlackRepository vehicleBlackRepository; private final VehicleBlackCoConvertor vehicleBlackCoConvertor; - private final VehicleMessageRepository vehicleMessageRepository; - /** - * 根据id查询 - * - * @param id - * @return - */ - public VehicleBlackCO queryById(Long id) { - return vehicleBlackCoConvertor.converDOToCO(vehicleBlackRepository.getById(id)); - } /** * 分页 @@ -45,20 +33,9 @@ public class VehicleBlackQueryExe { * @return */ public PageResponse execute(VehicleBlackPageQry vehicleBlackPageQry) { - Map params = PageQueryHelper.toHashMap(vehicleBlackPageQry); - PageResponse pageResponse = vehicleBlackRepository.listPage(params); - List examCenterCOS = vehicleBlackCoConvertor.converDOsToCOs(pageResponse.getData()); //分页获取信息 - Long[] vehicleIds = examCenterCOS.stream().map(VehicleBlackCO::getVehicleId).toArray(Long[]::new); - List vehicleMessageDOS = vehicleMessageRepository.listAll(vehicleIds); // 根据id获取信息 - Map vehicleMessageDOMap = new HashMap<>(); - for (VehicleMessageDO vehicleMessageDO : vehicleMessageDOS) { - vehicleMessageDOMap.put(vehicleMessageDO.getId(), vehicleMessageDO); - } - for (VehicleBlackCO vehicleBlackCO : examCenterCOS) { - if (vehicleMessageDOMap.containsKey(vehicleBlackCO.getVehicleId())){ - vehicleBlackCO.setVehicleId(vehicleMessageDOMap.get(vehicleBlackCO.getVehicleId()).getId()); - } - } + Map parmas = PageQueryHelper.toHashMap(vehicleBlackPageQry); + PageResponse pageResponse = vehicleBlackRepository.listPage(parmas); + List examCenterCOS = vehicleBlackCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java index 9e0223f..dc29bb8 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java @@ -1,29 +1,25 @@ package com.zcloud.primeport.command.query; -import cn.hutool.core.bean.BeanUtil; import com.alibaba.cola.dto.PageResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.VehicleMessageCoConvertor; import com.zcloud.primeport.dto.VehicleMessagePageQry; -import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; -import com.zcloud.primeport.persistence.dataobject.VehicleCountByCorpDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; 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-15 11:41:21 -*/ + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:28 + */ @Component @AllArgsConstructor public class VehicleMessageQueryExe { @@ -31,84 +27,16 @@ public class VehicleMessageQueryExe { private final VehicleMessageCoConvertor vehicleMessageCoConvertor; /** - * 分页 - * - * @param vehicleMessagePageQry - * @return - */ - public PageResponse execute(VehicleMessagePageQry vehicleMessagePageQry) { - Map parmas = PageQueryHelper.toHashMap(vehicleMessagePageQry); - PageResponse pageResponse = vehicleMessageRepository.listPage(parmas); - List examCenterCOS = vehicleMessageCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } - public VehicleMessageCO queryById(Long id) { - VehicleMessageDO byId = vehicleMessageRepository.getById(id); - VehicleMessageCO vehicleMessageCO = vehicleMessageCoConvertor.converDOsToCOs(byId); - return vehicleMessageCO; - } - - public PageResponse listFromCorp(VehicleMessagePageQry vehicleMessagePageQry) { - Map parmas = BeanUtil.beanToMap(vehicleMessagePageQry); - PageResponse pageResponse = vehicleMessageRepository.listCountFromCorp(parmas); - List examCenterCOS = vehicleMessageCoConvertor.converCountDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } - - - public Map listMapAllByIds(Long[] ids) { - if (ids == null || ids.length == 0){ - return new HashMap<>(); - } - List vehicleMessageDOs = vehicleMessageRepository.listAll(ids); - List vehicleMessageCOS = vehicleMessageCoConvertor.converDOsToCOs(vehicleMessageDOs); - Map vehicleMessageCOMap = new HashMap<>(); - for (VehicleMessageCO vehicleMessageCO : vehicleMessageCOS) { - vehicleMessageCOMap.put(vehicleMessageCO.getId(), vehicleMessageCO); - } - return vehicleMessageCOMap; - } - - public VehicleMessageCO infoByLicenceNo(String licenceNo) { - - VehicleMessageDO info = vehicleMessageRepository.getByLicenceNo(licenceNo); - VehicleMessageCO vehicleMessageCO = vehicleMessageCoConvertor.converDOsToCOs(info); - return vehicleMessageCO; - } - - /** - * 根据车牌号查询启用状态的数据数量 - * @param licenceNo 车牌号 - * @return 启用状态的数据数量，如果没有则返回0 - */ - public int countEnabledByLicenceNo(String licenceNo) { - return vehicleMessageRepository.countEnabledByLicenceNo(licenceNo); - } - - /** - * 根据用户ID获取该用户的车辆数量 - * @param userId 用户ID - * @return 车辆数量，如果没有则返回0 - */ - public int countByUserId(Long userId) { - return vehicleMessageRepository.countByUserId(userId); - } - - /** - * 是否可以添加数量 - * @param licenceNo - * @param userId + * 分页 + * + * @param vehicleMessagePageQry * @return */ - public Boolean isJudgmentAdd(String licenceNo, Long userId){ - boolean res = false; - if (countEnabledByLicenceNo(licenceNo) > 0) { - throw new RuntimeException("车牌号已存在"); - } - if (countByUserId(userId) >= 2) { - throw new RuntimeException("你已经启用两台处理,请先禁用一个"); - } - res = true; - return res; + public PageResponse execute(VehicleMessagePageQry vehicleMessagePageQry) { + Map parmas = PageQueryHelper.toHashMap(vehicleMessagePageQry); + PageResponse pageResponse = vehicleMessageRepository.listPage(parmas); + List examCenterCOS = vehicleMessageCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } } + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleViolationsQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleViolationsQueryExe.java index 996da14..af98afd 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleViolationsQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleViolationsQueryExe.java @@ -1,14 +1,11 @@ package com.zcloud.primeport.command.query; -import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.VehicleViolationsCoConvertor; import com.zcloud.primeport.dto.VehicleViolationsPageQry; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; -import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; -import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO; -import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; import com.zcloud.primeport.persistence.repository.VehicleViolationsRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -20,24 +17,14 @@ import java.util.Map; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Component @AllArgsConstructor public class VehicleViolationsQueryExe { private final VehicleViolationsRepository vehicleViolationsRepository; private final VehicleViolationsCoConvertor vehicleViolationsCoConvertor; - private final VehicleMessageRepository vehicleMessageRepository; - /** - * 根据id查询 - * - * @param id - * @return - */ - public VehicleViolationsCO queryById(Long id) { - return vehicleViolationsCoConvertor.converDOToCO(vehicleViolationsRepository.getById(id)); - } /** * 分页 @@ -46,18 +33,10 @@ public class VehicleViolationsQueryExe { * @return */ public PageResponse execute(VehicleViolationsPageQry vehicleViolationsPageQry) { - Map params = PageQueryHelper.toHashMap(vehicleViolationsPageQry); - PageResponse pageResponse = vehicleViolationsRepository.listPage(params); + Map parmas = PageQueryHelper.toHashMap(vehicleViolationsPageQry); + PageResponse pageResponse = vehicleViolationsRepository.listPage(parmas); List examCenterCOS = vehicleViolationsCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - - - public PageResponse executeFromViolations(VehicleViolationsPageQry vehicleViolationsPageQry) { - Map params = PageQueryHelper.toHashMap(vehicleViolationsPageQry); - PageResponse pageResponse = vehicleMessageRepository.listPageFromViolations(params); - List examCenterCOS = vehicleViolationsCoConvertor.converFromViolationsDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); - } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VideoQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VideoQueryExe.java new file mode 100644 index 0000000..f984291 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VideoQueryExe.java @@ -0,0 +1,42 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.VideoCoConvertor; +import com.zcloud.primeport.dto.VideoPageQry; +import com.zcloud.primeport.dto.clientobject.VideoCO; +import com.zcloud.primeport.persistence.dataobject.VideoDO; +import com.zcloud.primeport.persistence.repository.VideoRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:31 + */ +@Component +@AllArgsConstructor +public class VideoQueryExe { + private final VideoRepository videoRepository; + private final VideoCoConvertor videoCoConvertor; + + /** + * 分页 + * + * @param videoPageQry + * @return + */ + public PageResponse execute(VideoPageQry videoPageQry) { + Map parmas = PageQueryHelper.toHashMap(videoPageQry); + PageResponse pageResponse = videoRepository.listPage(parmas); + List examCenterCOS = videoCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/EmployeeMessageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/EmployeeMessageServiceImpl.java deleted file mode 100644 index bccf982..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/EmployeeMessageServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.zcloud.primeport.service; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.EmployeeMessageServiceI; -import com.zcloud.primeport.command.EmployeeMessageAddExe; -import com.zcloud.primeport.command.EmployeeMessageRemoveExe; -import com.zcloud.primeport.command.EmployeeMessageUpdateExe; -import com.zcloud.primeport.command.query.EmployeeMessageQueryExe; -import com.zcloud.primeport.dto.EmployeeMessageAddCmd; -import com.zcloud.primeport.dto.EmployeeMessagePageQry; -import com.zcloud.primeport.dto.EmployeeMessageUpdateCmd; -import com.zcloud.primeport.dto.EmployeeMessageUpdateStatusCmd; -import com.zcloud.primeport.dto.clientobject.EmployeeMessageCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** -* web-app -* @Author guoyuepeng -* @Date 2025-12-18 14:32:15 -*/ -@Service -@AllArgsConstructor -public class EmployeeMessageServiceImpl implements EmployeeMessageServiceI { - private final EmployeeMessageAddExe employeeMessageAddExe; - private final EmployeeMessageUpdateExe employeeMessageUpdateExe; - private final EmployeeMessageRemoveExe employeeMessageRemoveExe; - private final EmployeeMessageQueryExe employeeMessageQueryExe; - - @Override - public EmployeeMessageCO queryById(Long id){ - return employeeMessageQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(EmployeeMessagePageQry qry){ - - return employeeMessageQueryExe.execute(qry); - } - - @Override - public SingleResponse add(EmployeeMessageAddCmd cmd) { - - employeeMessageAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(EmployeeMessageUpdateCmd employeeMessageUpdateCmd) { - employeeMessageUpdateExe.execute(employeeMessageUpdateCmd); - } - - @Override - public void updateStatus(EmployeeMessageUpdateStatusCmd cmd) { - employeeMessageUpdateExe.execute(cmd); - } - - @Override - public void remove(Long id) { - employeeMessageRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - employeeMessageRemoveExe.execute(ids); - } -} \ No newline at end of file diff --git a/web-app/src/main/java/com/zcloud/primeport/service/EnclosedAreaServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/EnclosedAreaServiceImpl.java deleted file mode 100644 index ae54155..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/EnclosedAreaServiceImpl.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.zcloud.primeport.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.EnclosedAreaServiceI; -import com.zcloud.primeport.command.EnclosedAreaAddExe; -import com.zcloud.primeport.command.EnclosedAreaRemoveExe; -import com.zcloud.primeport.command.EnclosedAreaUpdateExe; -import com.zcloud.primeport.command.query.EnclosedAreaQueryExe; -import com.zcloud.primeport.dto.EnclosedAreaAddCmd; -import com.zcloud.primeport.dto.EnclosedAreaPageQry; -import com.zcloud.primeport.dto.EnclosedAreaUpdateCmd; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaCO; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaTreeCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:32 - */ -@Service -@AllArgsConstructor -public class EnclosedAreaServiceImpl implements EnclosedAreaServiceI { - private final EnclosedAreaAddExe enclosedAreaAddExe; - private final EnclosedAreaUpdateExe enclosedAreaUpdateExe; - private final EnclosedAreaRemoveExe enclosedAreaRemoveExe; - private final EnclosedAreaQueryExe enclosedAreaQueryExe; - - @Override - public EnclosedAreaCO queryById(Long id) { - return enclosedAreaQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(EnclosedAreaPageQry qry) { - - return enclosedAreaQueryExe.execute(qry); - } - - @Override - public SingleResponse add(EnclosedAreaAddCmd cmd) { - - enclosedAreaAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(EnclosedAreaUpdateCmd enclosedAreaUpdateCmd) { - enclosedAreaUpdateExe.execute(enclosedAreaUpdateCmd); - } - - @Override - public void remove(Long id) { - enclosedAreaRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - enclosedAreaRemoveExe.execute(ids); - } - - @Override - public List listAllTree(){ - return enclosedAreaQueryExe.listAllTree(); - } -} - 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 deleted file mode 100644 index d0fb23e..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/GatePersonAuthLevelOneServiceImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -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/InspectionDeptServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/InspectionDeptServiceImpl.java deleted file mode 100644 index 0de964a..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/InspectionDeptServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zcloud.primeport.service; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.InspectionDeptServiceI; -import com.zcloud.primeport.command.InspectionDeptAddExe; -import com.zcloud.primeport.command.InspectionDeptRemoveExe; -import com.zcloud.primeport.command.InspectionDeptUpdateExe; -import com.zcloud.primeport.command.query.InspectionDeptQueryExe; -import com.zcloud.primeport.dto.InspectionDeptAddCmd; -import com.zcloud.primeport.dto.InspectionDeptPageQry; -import com.zcloud.primeport.dto.InspectionDeptUpdateCmd; -import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; -import com.zcloud.primeport.dto.clientobject.InspectionDeptInfoCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:08 - */ -@Service -@AllArgsConstructor -public class InspectionDeptServiceImpl implements InspectionDeptServiceI { - private final InspectionDeptAddExe inspectionDeptAddExe; - private final InspectionDeptUpdateExe inspectionDeptUpdateExe; - private final InspectionDeptRemoveExe inspectionDeptRemoveExe; - private final InspectionDeptQueryExe inspectionDeptQueryExe; - - @Override - public PageResponse listPage(InspectionDeptPageQry qry) { - - return inspectionDeptQueryExe.execute(qry); - } - - @Override - public SingleResponse add(InspectionDeptAddCmd cmd) { - - inspectionDeptAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(InspectionDeptUpdateCmd inspectionDeptUpdateCmd) { - inspectionDeptUpdateExe.execute(inspectionDeptUpdateCmd); - } - - @Override - public void remove(Long id) { - inspectionDeptRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - inspectionDeptRemoveExe.execute(ids); - } - - @Override - public InspectionDeptInfoCO getInfoById(Long id) { - return inspectionDeptQueryExe.executeById( id); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/service/InspectionVehicleServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/InspectionVehicleServiceImpl.java deleted file mode 100644 index 7978bcb..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/InspectionVehicleServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zcloud.primeport.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.InspectionVehicleServiceI; -import com.zcloud.primeport.command.InspectionVehicleAddExe; -import com.zcloud.primeport.command.InspectionVehicleRemoveExe; -import com.zcloud.primeport.command.InspectionVehicleUpdateExe; -import com.zcloud.primeport.command.query.InspectionVehicleQueryExe; -import com.zcloud.primeport.dto.InspectionVehicleAddCmd; -import com.zcloud.primeport.dto.InspectionVehiclePageQry; -import com.zcloud.primeport.dto.InspectionVehicleUpdateCmd; -import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Service -@AllArgsConstructor -public class InspectionVehicleServiceImpl implements InspectionVehicleServiceI { - private final InspectionVehicleAddExe inspectionVehicleAddExe; - private final InspectionVehicleUpdateExe inspectionVehicleUpdateExe; - private final InspectionVehicleRemoveExe inspectionVehicleRemoveExe; - private final InspectionVehicleQueryExe inspectionVehicleQueryExe; - - @Override - public PageResponse listPage(InspectionVehiclePageQry qry) { - - return inspectionVehicleQueryExe.execute(qry); - } - - @Override - public SingleResponse add(InspectionVehicleAddCmd cmd) { - - inspectionVehicleAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(InspectionVehicleUpdateCmd inspectionVehicleUpdateCmd) { - inspectionVehicleUpdateExe.execute(inspectionVehicleUpdateCmd); - } - - @Override - public void remove(Long id) { - inspectionVehicleRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - inspectionVehicleRemoveExe.execute(ids); - } -} - 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 3b29d86..39f08dc 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,6 +1,5 @@ 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; @@ -10,19 +9,16 @@ 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; import org.springframework.stereotype.Service; -import java.util.List; - /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ @Service @AllArgsConstructor @@ -40,6 +36,7 @@ public class MkmjApprovalUserServiceImpl implements MkmjApprovalUserServiceI { @Override public SingleResponse add(MkmjApprovalUserAddCmd cmd) { + mkmjApprovalUserAddExe.execute(cmd); return SingleResponse.buildSuccess(); } @@ -58,17 +55,5 @@ public class MkmjApprovalUserServiceImpl implements MkmjApprovalUserServiceI { public void removeBatch(Long[] ids) { mkmjApprovalUserRemoveExe.execute(ids); } - - @Override - public List listAll(MkmjApprovalUserPageQry qry) { - return mkmjApprovalUserQueryExe.executeList(qry); - } - - @Override - public MultiResponse listDeptUser(MkmjApprovalUserQry qry) { - List mkmjApprovalUserCOS = mkmjApprovalUserQueryExe.listDeptUser(qry); - return MultiResponse.of(mkmjApprovalUserCOS); - } - } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjAreaGateServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjAreaGateServiceImpl.java deleted file mode 100644 index 6a7ed18..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjAreaGateServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.zcloud.primeport.service; - -import com.zcloud.primeport.api.MkmjAreaGateServiceI; -import com.zcloud.primeport.command.MkmjAreaGateAddExe; -import com.zcloud.primeport.command.MkmjAreaGateRemoveExe; -import com.zcloud.primeport.command.MkmjAreaGateUpdateExe; -import com.zcloud.primeport.command.query.MkmjAreaGateQueryExe; -import com.zcloud.primeport.dto.MkmjAreaGateAddCmd; -import com.zcloud.primeport.dto.MkmjAreaGatePageQry; -import com.zcloud.primeport.dto.MkmjAreaGateUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjAreaGateCO; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Service -@AllArgsConstructor -public class MkmjAreaGateServiceImpl implements MkmjAreaGateServiceI { - private final MkmjAreaGateAddExe mkmjAreaGateAddExe; - private final MkmjAreaGateUpdateExe mkmjAreaGateUpdateExe; - private final MkmjAreaGateRemoveExe mkmjAreaGateRemoveExe; - private final MkmjAreaGateQueryExe mkmjAreaGateQueryExe; - - @Override - public MkmjAreaGateCO queryById(Long id) { - return mkmjAreaGateQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(MkmjAreaGatePageQry qry) { - - return mkmjAreaGateQueryExe.execute(qry); - } - - @Override - public SingleResponse add(MkmjAreaGateAddCmd cmd) { - - mkmjAreaGateAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(MkmjAreaGateUpdateCmd mkmjAreaGateUpdateCmd) { - mkmjAreaGateUpdateExe.execute(mkmjAreaGateUpdateCmd); - } - - @Override - public void remove(Long id) { - mkmjAreaGateRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - mkmjAreaGateRemoveExe.execute(ids); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjAreaServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjAreaServiceImpl.java deleted file mode 100644 index b53f169..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjAreaServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.zcloud.primeport.service; - -import com.zcloud.primeport.api.MkmjAreaServiceI; -import com.zcloud.primeport.command.MkmjAreaAddExe; -import com.zcloud.primeport.command.MkmjAreaRemoveExe; -import com.zcloud.primeport.command.MkmjAreaUpdateExe; -import com.zcloud.primeport.command.query.MkmjAreaQueryExe; -import com.zcloud.primeport.dto.MkmjAreaAddCmd; -import com.zcloud.primeport.dto.MkmjAreaPageQry; -import com.zcloud.primeport.dto.MkmjAreaUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjAreaCO; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.clientobject.MkmjStatisticsCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -@Service -@AllArgsConstructor -public class MkmjAreaServiceImpl implements MkmjAreaServiceI { - private final MkmjAreaAddExe mkmjAreaAddExe; - private final MkmjAreaUpdateExe mkmjAreaUpdateExe; - private final MkmjAreaRemoveExe mkmjAreaRemoveExe; - private final MkmjAreaQueryExe mkmjAreaQueryExe; - - @Override - public MkmjAreaCO queryById(Long id) { - return mkmjAreaQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(MkmjAreaPageQry qry) { - - return mkmjAreaQueryExe.execute(qry); - } - - @Override - public SingleResponse add(MkmjAreaAddCmd cmd) { - - mkmjAreaAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(MkmjAreaUpdateCmd mkmjAreaUpdateCmd) { - mkmjAreaUpdateExe.execute(mkmjAreaUpdateCmd); - } - - @Override - public void remove(Long id) { - mkmjAreaRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - mkmjAreaRemoveExe.execute(ids); - } - - @Override - public List statistics(List ids) { - return mkmjAreaQueryExe.statistics(ids); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjCarRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjCarRecordServiceImpl.java deleted file mode 100644 index 3007711..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjCarRecordServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zcloud.primeport.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.MkmjCarRecordServiceI; -import com.zcloud.primeport.command.MkmjCarRecordAddExe; -import com.zcloud.primeport.command.MkmjCarRecordRemoveExe; -import com.zcloud.primeport.command.MkmjCarRecordUpdateExe; -import com.zcloud.primeport.command.query.MkmjCarRecordQueryExe; -import com.zcloud.primeport.dto.MkmjCarRecordAddCmd; -import com.zcloud.primeport.dto.MkmjCarRecordPageQry; -import com.zcloud.primeport.dto.MkmjCarRecordUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjCarRecordCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Service -@AllArgsConstructor -public class MkmjCarRecordServiceImpl implements MkmjCarRecordServiceI { - private final MkmjCarRecordAddExe mkmjCarRecordAddExe; - private final MkmjCarRecordUpdateExe mkmjCarRecordUpdateExe; - private final MkmjCarRecordRemoveExe mkmjCarRecordRemoveExe; - private final MkmjCarRecordQueryExe mkmjCarRecordQueryExe; - - @Override - public MkmjCarRecordCO queryById(Long id) { - return mkmjCarRecordQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(MkmjCarRecordPageQry qry) { - - return mkmjCarRecordQueryExe.execute(qry); - } - - @Override - public SingleResponse add(MkmjCarRecordAddCmd cmd) { - - mkmjCarRecordAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(MkmjCarRecordUpdateCmd mkmjCarRecordUpdateCmd) { - mkmjCarRecordUpdateExe.execute(mkmjCarRecordUpdateCmd); - } - - @Override - public void remove(Long id) { - mkmjCarRecordRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - mkmjCarRecordRemoveExe.execute(ids); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateServiceImpl.java new file mode 100644 index 0000000..ca7dcc3 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.MkmjGateServiceI; +import com.zcloud.primeport.command.MkmjGateAddExe; +import com.zcloud.primeport.command.MkmjGateRemoveExe; +import com.zcloud.primeport.command.MkmjGateUpdateExe; +import com.zcloud.primeport.command.query.MkmjGateQueryExe; +import com.zcloud.primeport.dto.MkmjGateAddCmd; +import com.zcloud.primeport.dto.MkmjGatePageQry; +import com.zcloud.primeport.dto.MkmjGateUpdateCmd; +import com.zcloud.primeport.dto.clientobject.MkmjGateCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +@Service +@AllArgsConstructor +public class MkmjGateServiceImpl implements MkmjGateServiceI { + private final MkmjGateAddExe mkmjGateAddExe; + private final MkmjGateUpdateExe mkmjGateUpdateExe; + private final MkmjGateRemoveExe mkmjGateRemoveExe; + private final MkmjGateQueryExe mkmjGateQueryExe; + + @Override + public PageResponse listPage(MkmjGatePageQry qry) { + + return mkmjGateQueryExe.execute(qry); + } + + @Override + public SingleResponse add(MkmjGateAddCmd cmd) { + + mkmjGateAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(MkmjGateUpdateCmd mkmjGateUpdateCmd) { + mkmjGateUpdateExe.execute(mkmjGateUpdateCmd); + } + + @Override + public void remove(Long id) { + mkmjGateRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + mkmjGateRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateVideoServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateVideoServiceImpl.java deleted file mode 100644 index ee717fa..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateVideoServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.zcloud.primeport.service; - -import com.zcloud.primeport.api.MkmjGateVideoServiceI; -import com.zcloud.primeport.command.MkmjGateVideoAddExe; -import com.zcloud.primeport.command.MkmjGateVideoRemoveExe; -import com.zcloud.primeport.command.MkmjGateVideoUpdateExe; -import com.zcloud.primeport.command.query.MkmjGateVideoQueryExe; -import com.zcloud.primeport.dto.MkmjGateVideoAddCmd; -import com.zcloud.primeport.dto.MkmjGateVideoPageQry; -import com.zcloud.primeport.dto.MkmjGateVideoUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjGateVideoCO; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Service -@AllArgsConstructor -public class MkmjGateVideoServiceImpl implements MkmjGateVideoServiceI { - private final MkmjGateVideoAddExe mkmjGateVideoAddExe; - private final MkmjGateVideoUpdateExe mkmjGateVideoUpdateExe; - private final MkmjGateVideoRemoveExe mkmjGateVideoRemoveExe; - private final MkmjGateVideoQueryExe mkmjGateVideoQueryExe; - - @Override - public MkmjGateVideoCO queryById(Long id) { - return mkmjGateVideoQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(MkmjGateVideoPageQry qry) { - - return mkmjGateVideoQueryExe.execute(qry); - } - - @Override - public SingleResponse add(MkmjGateVideoAddCmd cmd) { - - mkmjGateVideoAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(MkmjGateVideoUpdateCmd mkmjGateVideoUpdateCmd) { - mkmjGateVideoUpdateExe.execute(mkmjGateVideoUpdateCmd); - } - - @Override - public void remove(Long id) { - mkmjGateVideoRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - mkmjGateVideoRemoveExe.execute(ids); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjPassageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjPassageServiceImpl.java index d17dc4d..88e4a55 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjPassageServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/MkmjPassageServiceImpl.java @@ -1,5 +1,7 @@ package com.zcloud.primeport.service; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.api.MkmjPassageServiceI; import com.zcloud.primeport.command.MkmjPassageAddExe; import com.zcloud.primeport.command.MkmjPassageRemoveExe; @@ -9,20 +11,14 @@ import com.zcloud.primeport.dto.MkmjPassageAddCmd; import com.zcloud.primeport.dto.MkmjPassagePageQry; import com.zcloud.primeport.dto.MkmjPassageUpdateCmd; import com.zcloud.primeport.dto.clientobject.MkmjPassageCO; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.clientobject.MkmjStatisticsCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import java.util.List; - /** * web-app * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:20 */ @Service @AllArgsConstructor @@ -32,14 +28,6 @@ public class MkmjPassageServiceImpl implements MkmjPassageServiceI { private final MkmjPassageRemoveExe mkmjPassageRemoveExe; private final MkmjPassageQueryExe mkmjPassageQueryExe; - @Override - public MkmjPassageCO queryById(Long id) { - return mkmjPassageQueryExe.queryById(id); - } - @Override - public MkmjPassageCO queryByName(String name){ - return mkmjPassageQueryExe.queryByName(name); - } @Override public PageResponse listPage(MkmjPassagePageQry qry) { @@ -67,10 +55,5 @@ public class MkmjPassageServiceImpl implements MkmjPassageServiceI { public void removeBatch(Long[] ids) { mkmjPassageRemoveExe.execute(ids); } - - @Override - public List statistics(List ids){ - return mkmjPassageQueryExe.statistics(ids); - } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjServiceImpl.java new file mode 100644 index 0000000..23b3e96 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/MkmjServiceImpl.java @@ -0,0 +1,64 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.MkmjServiceI; +import com.zcloud.primeport.command.MkmjAddExe; +import com.zcloud.primeport.command.MkmjRemoveExe; +import com.zcloud.primeport.command.MkmjUpdateExe; +import com.zcloud.primeport.command.query.MkmjQueryExe; +import com.zcloud.primeport.dto.MkmjAddCmd; +import com.zcloud.primeport.dto.MkmjPageQry; +import com.zcloud.primeport.dto.MkmjUpdateCmd; +import com.zcloud.primeport.dto.clientobject.MkmjCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ +@Service +@AllArgsConstructor +public class MkmjServiceImpl implements MkmjServiceI { + private final MkmjAddExe mkmjAddExe; + private final MkmjUpdateExe mkmjUpdateExe; + private final MkmjRemoveExe mkmjRemoveExe; + private final MkmjQueryExe mkmjQueryExe; + + @Override + public PageResponse listPage(MkmjPageQry qry) { + + return mkmjQueryExe.execute(qry); + } + + @Override + public SingleResponse add(MkmjAddCmd cmd) { + + mkmjAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(MkmjUpdateCmd mkmjUpdateCmd) { + mkmjUpdateExe.execute(mkmjUpdateCmd); + } + + @Override + public void remove(Long id) { + mkmjRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + mkmjRemoveExe.execute(ids); + } + + @Override + public MkmjCO getInfoById(Long id) { + return mkmjQueryExe.getInfoById(id); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjSwipeCardRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjSwipeCardRecordServiceImpl.java deleted file mode 100644 index 0626596..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjSwipeCardRecordServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zcloud.primeport.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.MkmjSwipeCardRecordServiceI; -import com.zcloud.primeport.command.MkmjSwipeCardRecordAddExe; -import com.zcloud.primeport.command.MkmjSwipeCardRecordRemoveExe; -import com.zcloud.primeport.command.MkmjSwipeCardRecordUpdateExe; -import com.zcloud.primeport.command.query.MkmjSwipeCardRecordQueryExe; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordAddCmd; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordPageQry; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjSwipeCardRecordCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Service -@AllArgsConstructor -public class MkmjSwipeCardRecordServiceImpl implements MkmjSwipeCardRecordServiceI { - private final MkmjSwipeCardRecordAddExe mkmjSwipeCardRecordAddExe; - private final MkmjSwipeCardRecordUpdateExe mkmjSwipeCardRecordUpdateExe; - private final MkmjSwipeCardRecordRemoveExe mkmjSwipeCardRecordRemoveExe; - private final MkmjSwipeCardRecordQueryExe mkmjSwipeCardRecordQueryExe; - - @Override - public MkmjSwipeCardRecordCO queryById(Long id) { - return mkmjSwipeCardRecordQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(MkmjSwipeCardRecordPageQry qry) { - - return mkmjSwipeCardRecordQueryExe.execute(qry); - } - - @Override - public SingleResponse add(MkmjSwipeCardRecordAddCmd cmd) { - - mkmjSwipeCardRecordAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(MkmjSwipeCardRecordUpdateCmd mkmjSwipeCardRecordUpdateCmd) { - mkmjSwipeCardRecordUpdateExe.execute(mkmjSwipeCardRecordUpdateCmd); - } - - @Override - public void remove(Long id) { - mkmjSwipeCardRecordRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - mkmjSwipeCardRecordRemoveExe.execute(ids); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java new file mode 100644 index 0000000..c6b741e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.PersonApplyServiceI; +import com.zcloud.primeport.command.PersonApplyAddExe; +import com.zcloud.primeport.command.PersonApplyRemoveExe; +import com.zcloud.primeport.command.PersonApplyUpdateExe; +import com.zcloud.primeport.command.query.PersonApplyQueryExe; +import com.zcloud.primeport.dto.PersonApplyAddCmd; +import com.zcloud.primeport.dto.PersonApplyPageQry; +import com.zcloud.primeport.dto.PersonApplyUpdateCmd; +import com.zcloud.primeport.dto.clientobject.PersonApplyCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@Service +@AllArgsConstructor +public class PersonApplyServiceImpl implements PersonApplyServiceI { + private final PersonApplyAddExe personApplyAddExe; + private final PersonApplyUpdateExe personApplyUpdateExe; + private final PersonApplyRemoveExe personApplyRemoveExe; + private final PersonApplyQueryExe personApplyQueryExe; + + @Override + public PageResponse listPage(PersonApplyPageQry qry) { + + return personApplyQueryExe.execute(qry); + } + + @Override + public SingleResponse add(PersonApplyAddCmd cmd) { + + personApplyAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(PersonApplyUpdateCmd personApplyUpdateCmd) { + personApplyUpdateExe.execute(personApplyUpdateCmd); + } + + @Override + public void remove(Long id) { + personApplyRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + personApplyRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/PersonMessageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/PersonMessageServiceImpl.java new file mode 100644 index 0000000..fb19eab --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/PersonMessageServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.PersonMessageServiceI; +import com.zcloud.primeport.command.PersonMessageAddExe; +import com.zcloud.primeport.command.PersonMessageRemoveExe; +import com.zcloud.primeport.command.PersonMessageUpdateExe; +import com.zcloud.primeport.command.query.PersonMessageQueryExe; +import com.zcloud.primeport.dto.PersonMessageAddCmd; +import com.zcloud.primeport.dto.PersonMessagePageQry; +import com.zcloud.primeport.dto.PersonMessageUpdateCmd; +import com.zcloud.primeport.dto.clientobject.PersonMessageCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Service +@AllArgsConstructor +public class PersonMessageServiceImpl implements PersonMessageServiceI { + private final PersonMessageAddExe personMessageAddExe; + private final PersonMessageUpdateExe personMessageUpdateExe; + private final PersonMessageRemoveExe personMessageRemoveExe; + private final PersonMessageQueryExe personMessageQueryExe; + + @Override + public PageResponse listPage(PersonMessagePageQry qry) { + + return personMessageQueryExe.execute(qry); + } + + @Override + public SingleResponse add(PersonMessageAddCmd cmd) { + + personMessageAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(PersonMessageUpdateCmd personMessageUpdateCmd) { + personMessageUpdateExe.execute(personMessageUpdateCmd); + } + + @Override + public void remove(Long id) { + personMessageRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + personMessageRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessEntourageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessEntourageServiceImpl.java deleted file mode 100644 index c4705a2..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessEntourageServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zcloud.primeport.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.TemporaryAccessEntourageServiceI; -import com.zcloud.primeport.command.TemporaryAccessEntourageAddExe; -import com.zcloud.primeport.command.TemporaryAccessEntourageRemoveExe; -import com.zcloud.primeport.command.TemporaryAccessEntourageUpdateExe; -import com.zcloud.primeport.command.query.TemporaryAccessEntourageQueryExe; -import com.zcloud.primeport.dto.TemporaryAccessEntourageAddCmd; -import com.zcloud.primeport.dto.TemporaryAccessEntouragePageQry; -import com.zcloud.primeport.dto.TemporaryAccessEntourageUpdateCmd; -import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Service -@AllArgsConstructor -public class TemporaryAccessEntourageServiceImpl implements TemporaryAccessEntourageServiceI { - private final TemporaryAccessEntourageAddExe temporaryAccessEntourageAddExe; - private final TemporaryAccessEntourageUpdateExe temporaryAccessEntourageUpdateExe; - private final TemporaryAccessEntourageRemoveExe temporaryAccessEntourageRemoveExe; - private final TemporaryAccessEntourageQueryExe temporaryAccessEntourageQueryExe; - - @Override - public TemporaryAccessEntourageCO queryById(Long id) { - return temporaryAccessEntourageQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(TemporaryAccessEntouragePageQry qry) { - - return temporaryAccessEntourageQueryExe.execute(qry); - } - - @Override - public SingleResponse add(TemporaryAccessEntourageAddCmd cmd) { - - temporaryAccessEntourageAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(TemporaryAccessEntourageUpdateCmd temporaryAccessEntourageUpdateCmd) { - temporaryAccessEntourageUpdateExe.execute(temporaryAccessEntourageUpdateCmd); - } - - @Override - public void remove(Long id) { - temporaryAccessEntourageRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - temporaryAccessEntourageRemoveExe.execute(ids); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessServiceImpl.java deleted file mode 100644 index f9ac53b..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zcloud.primeport.service; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.TemporaryAccessServiceI; -import com.zcloud.primeport.command.TemporaryAccessAddExe; -import com.zcloud.primeport.command.TemporaryAccessRemoveExe; -import com.zcloud.primeport.command.TemporaryAccessUpdateExe; -import com.zcloud.primeport.command.query.TemporaryAccessQueryExe; -import com.zcloud.primeport.dto.TemporaryAccessAddCmd; -import com.zcloud.primeport.dto.TemporaryAccessPageQry; -import com.zcloud.primeport.dto.TemporaryAccessUpdateCmd; -import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@Service -@AllArgsConstructor -public class TemporaryAccessServiceImpl implements TemporaryAccessServiceI { - private final TemporaryAccessAddExe temporaryAccessAddExe; - private final TemporaryAccessUpdateExe temporaryAccessUpdateExe; - private final TemporaryAccessRemoveExe temporaryAccessRemoveExe; - private final TemporaryAccessQueryExe temporaryAccessQueryExe; - - @Override - public TemporaryAccessCO queryById(Long id) { - return temporaryAccessQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(TemporaryAccessPageQry qry) { - - return temporaryAccessQueryExe.execute(qry); - } - - @Override - public SingleResponse add(TemporaryAccessAddCmd cmd) { - - temporaryAccessAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(TemporaryAccessUpdateCmd temporaryAccessUpdateCmd) { - temporaryAccessUpdateExe.execute(temporaryAccessUpdateCmd); - } - - @Override - public void remove(Long id) { - temporaryAccessRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - temporaryAccessRemoveExe.execute(ids); - } -} - 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 new file mode 100644 index 0000000..2862534 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.VehicleApplyServiceI; +import com.zcloud.primeport.command.VehicleApplyAddExe; +import com.zcloud.primeport.command.VehicleApplyRemoveExe; +import com.zcloud.primeport.command.VehicleApplyUpdateExe; +import com.zcloud.primeport.command.query.VehicleApplyQueryExe; +import com.zcloud.primeport.dto.VehicleApplyAddCmd; +import com.zcloud.primeport.dto.VehicleApplyPageQry; +import com.zcloud.primeport.dto.VehicleApplyUpdateCmd; +import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:24 + */ +@Service +@AllArgsConstructor +public class VehicleApplyServiceImpl implements VehicleApplyServiceI { + private final VehicleApplyAddExe vehicleApplyAddExe; + private final VehicleApplyUpdateExe vehicleApplyUpdateExe; + private final VehicleApplyRemoveExe vehicleApplyRemoveExe; + private final VehicleApplyQueryExe vehicleApplyQueryExe; + + @Override + public PageResponse listPage(VehicleApplyPageQry qry) { + + return vehicleApplyQueryExe.execute(qry); + } + + @Override + public SingleResponse add(VehicleApplyAddCmd cmd) { + + vehicleApplyAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(VehicleApplyUpdateCmd vehicleApplyUpdateCmd) { + vehicleApplyUpdateExe.execute(vehicleApplyUpdateCmd); + } + + @Override + public void remove(Long id) { + vehicleApplyRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + vehicleApplyRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditLogServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditLogServiceImpl.java deleted file mode 100644 index 5b7d7b2..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditLogServiceImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.zcloud.primeport.service; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.api.VehicleAuditLogServiceI; -import com.zcloud.primeport.command.VehicleAuditLogAddExe; -import com.zcloud.primeport.command.VehicleAuditLogRemoveExe; -import com.zcloud.primeport.command.VehicleAuditLogUpdateExe; -import com.zcloud.primeport.command.query.VehicleAuditLogQueryExe; -import com.zcloud.primeport.dto.VehicleAuditLogAddCmd; -import com.zcloud.primeport.dto.VehicleAuditLogApprovalCmd; -import com.zcloud.primeport.dto.VehicleAuditLogPageQry; -import com.zcloud.primeport.dto.VehicleAuditLogUpdateCmd; -import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; -import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; -import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * web-app - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:47 - */ -@Service -@AllArgsConstructor -public class VehicleAuditLogServiceImpl implements VehicleAuditLogServiceI { - private final VehicleAuditLogAddExe vehicleAuditLogAddExe; - private final VehicleAuditLogUpdateExe vehicleAuditLogUpdateExe; - private final VehicleAuditLogRemoveExe vehicleAuditLogRemoveExe; - private final VehicleAuditLogQueryExe vehicleAuditLogQueryExe; - - @Override - public PageResponse listPage(VehicleAuditLogPageQry qry) { - - return vehicleAuditLogQueryExe.execute(qry); - } - - @Override - public SingleResponse add(VehicleAuditLogAddCmd cmd) { - - vehicleAuditLogAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(VehicleAuditLogUpdateCmd vehicleAuditLogUpdateCmd) { - vehicleAuditLogUpdateExe.execute(vehicleAuditLogUpdateCmd); - } - - @Override - public void remove(Long id) { - vehicleAuditLogRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - vehicleAuditLogRemoveExe.execute(ids); - } - - /** - * 审批车辆信息,通过/不通过 - * @param auditLogApprovalCmd - */ - @Override - public void approval(VehicleAuditLogApprovalCmd auditLogApprovalCmd) { - vehicleAuditLogUpdateExe.execute(auditLogApprovalCmd); - } - - @Override - public PageResponse listPageAndCarInfo(VehicleAuditLogPageQry qry) { - return vehicleAuditLogQueryExe.executeAndCarInfo(qry); - } - - -} - 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 new file mode 100644 index 0000000..7962016 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.VehicleAuditServiceI; +import com.zcloud.primeport.command.VehicleAuditAddExe; +import com.zcloud.primeport.command.VehicleAuditRemoveExe; +import com.zcloud.primeport.command.VehicleAuditUpdateExe; +import com.zcloud.primeport.command.query.VehicleAuditQueryExe; +import com.zcloud.primeport.dto.VehicleAuditAddCmd; +import com.zcloud.primeport.dto.VehicleAuditPageQry; +import com.zcloud.primeport.dto.VehicleAuditUpdateCmd; +import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +@Service +@AllArgsConstructor +public class VehicleAuditServiceImpl implements VehicleAuditServiceI { + private final VehicleAuditAddExe vehicleAuditAddExe; + private final VehicleAuditUpdateExe vehicleAuditUpdateExe; + private final VehicleAuditRemoveExe vehicleAuditRemoveExe; + private final VehicleAuditQueryExe vehicleAuditQueryExe; + + @Override + public PageResponse listPage(VehicleAuditPageQry qry) { + + return vehicleAuditQueryExe.execute(qry); + } + + @Override + public SingleResponse add(VehicleAuditAddCmd cmd) { + + vehicleAuditAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(VehicleAuditUpdateCmd vehicleAuditUpdateCmd) { + vehicleAuditUpdateExe.execute(vehicleAuditUpdateCmd); + } + + @Override + public void remove(Long id) { + vehicleAuditRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + vehicleAuditRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleBlackServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleBlackServiceImpl.java index a044e1b..da8f9d9 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleBlackServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleBlackServiceImpl.java @@ -1,4 +1,5 @@ package com.zcloud.primeport.service; + import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.api.VehicleBlackServiceI; @@ -16,8 +17,8 @@ import org.springframework.stereotype.Service; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:09 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @Service @AllArgsConstructor @@ -27,11 +28,6 @@ public class VehicleBlackServiceImpl implements VehicleBlackServiceI { private final VehicleBlackRemoveExe vehicleBlackRemoveExe; private final VehicleBlackQueryExe vehicleBlackQueryExe; - @Override - public VehicleBlackCO queryById(Long id) { - return vehicleBlackQueryExe.queryById(id); - } - @Override public PageResponse listPage(VehicleBlackPageQry qry) { diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java index b210a85..9c7f224 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java @@ -1,4 +1,5 @@ package com.zcloud.primeport.service; + import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.api.VehicleMessageServiceI; @@ -6,17 +7,19 @@ import com.zcloud.primeport.command.VehicleMessageAddExe; import com.zcloud.primeport.command.VehicleMessageRemoveExe; import com.zcloud.primeport.command.VehicleMessageUpdateExe; import com.zcloud.primeport.command.query.VehicleMessageQueryExe; -import com.zcloud.primeport.dto.*; -import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; +import com.zcloud.primeport.dto.VehicleMessageAddCmd; +import com.zcloud.primeport.dto.VehicleMessagePageQry; +import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; /** -* web-app -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:28 + */ @Service @AllArgsConstructor public class VehicleMessageServiceImpl implements VehicleMessageServiceI { @@ -26,7 +29,7 @@ public class VehicleMessageServiceImpl implements VehicleMessageServiceI { private final VehicleMessageQueryExe vehicleMessageQueryExe; @Override - public PageResponse listPage(VehicleMessagePageQry qry){ + public PageResponse listPage(VehicleMessagePageQry qry) { return vehicleMessageQueryExe.execute(qry); } @@ -52,48 +55,5 @@ public class VehicleMessageServiceImpl implements VehicleMessageServiceI { public void removeBatch(Long[] ids) { vehicleMessageRemoveExe.execute(ids); } - - @Override - public SingleResponse addForCorp(VehicleMessageForCorpAddCmd cmdCorp) { - vehicleMessageAddExe.executeForCorp(cmdCorp); - return SingleResponse.buildSuccess(); - } - - @Override - public void editForCorp(VehicleMessageUpdateCmd vehicleMessageUpdateCmd) { - vehicleMessageUpdateExe.executeFormCorp(vehicleMessageUpdateCmd); - } - - @Override - public VehicleMessageCO getInfoById(Long id) { - VehicleMessageCO vehicleMessageCO = vehicleMessageQueryExe.queryById(id); - return vehicleMessageCO; - } - - @Override - public void updateStatus(VehicleMessageStatusCmd statusCmd) { - vehicleMessageUpdateExe.updateStatus(statusCmd); - } - - @Override - public PageResponse listFromCorp(VehicleMessagePageQry qry) { - return vehicleMessageQueryExe.listFromCorp(qry); - } - - @Override - public VehicleMessageCO infoByLicenceNo(String licenceNo) { - VehicleMessageCO vehicleMessageCO = vehicleMessageQueryExe.infoByLicenceNo(licenceNo); - return vehicleMessageCO; - } - - @Override - public int countEnabledByLicenceNo(String licenceNo) { - return vehicleMessageQueryExe.countEnabledByLicenceNo(licenceNo); - } - - @Override - public int countByUserId(Long userId) { - return vehicleMessageQueryExe.countByUserId(userId); - } - } + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleViolationsServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleViolationsServiceImpl.java index 5fe2ff0..27c8b9e 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleViolationsServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleViolationsServiceImpl.java @@ -11,15 +11,14 @@ import com.zcloud.primeport.dto.VehicleViolationsAddCmd; import com.zcloud.primeport.dto.VehicleViolationsPageQry; import com.zcloud.primeport.dto.VehicleViolationsUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; -import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; /** * web-app * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:30 */ @Service @AllArgsConstructor @@ -29,11 +28,6 @@ public class VehicleViolationsServiceImpl implements VehicleViolationsServiceI { private final VehicleViolationsRemoveExe vehicleViolationsRemoveExe; private final VehicleViolationsQueryExe vehicleViolationsQueryExe; - @Override - public VehicleViolationsCO queryById(Long id) { - return vehicleViolationsQueryExe.queryById(id); - } - @Override public PageResponse listPage(VehicleViolationsPageQry qry) { @@ -61,10 +55,5 @@ public class VehicleViolationsServiceImpl implements VehicleViolationsServiceI { public void removeBatch(Long[] ids) { vehicleViolationsRemoveExe.execute(ids); } - - @Override - public PageResponse listAndCountPage(VehicleViolationsPageQry qry) { - return vehicleViolationsQueryExe.executeFromViolations(qry); - } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VideoServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VideoServiceImpl.java new file mode 100644 index 0000000..2a7a78e --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/VideoServiceImpl.java @@ -0,0 +1,59 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.VideoServiceI; +import com.zcloud.primeport.command.VideoAddExe; +import com.zcloud.primeport.command.VideoRemoveExe; +import com.zcloud.primeport.command.VideoUpdateExe; +import com.zcloud.primeport.command.query.VideoQueryExe; +import com.zcloud.primeport.dto.VideoAddCmd; +import com.zcloud.primeport.dto.VideoPageQry; +import com.zcloud.primeport.dto.VideoUpdateCmd; +import com.zcloud.primeport.dto.clientobject.VideoCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:31 + */ +@Service +@AllArgsConstructor +public class VideoServiceImpl implements VideoServiceI { + private final VideoAddExe videoAddExe; + private final VideoUpdateExe videoUpdateExe; + private final VideoRemoveExe videoRemoveExe; + private final VideoQueryExe videoQueryExe; + + @Override + public PageResponse listPage(VideoPageQry qry) { + + return videoQueryExe.execute(qry); + } + + @Override + public SingleResponse add(VideoAddCmd cmd) { + + videoAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(VideoUpdateCmd videoUpdateCmd) { + videoUpdateExe.execute(videoUpdateCmd); + } + + @Override + public void remove(Long id) { + videoRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + videoRemoveExe.execute(ids); + } +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/EmployeeMessageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/EmployeeMessageServiceI.java deleted file mode 100644 index 4fcfc83..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/EmployeeMessageServiceI.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zcloud.primeport.api; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.EmployeeMessageAddCmd; -import com.zcloud.primeport.dto.EmployeeMessagePageQry; -import com.zcloud.primeport.dto.EmployeeMessageUpdateCmd; -import com.zcloud.primeport.dto.EmployeeMessageUpdateStatusCmd; -import com.zcloud.primeport.dto.clientobject.EmployeeMessageCO; - -/** -* web-client -* @Author guoyuepeng -* @Date 2025-12-18 14:32:15 -*/ -public interface EmployeeMessageServiceI { - EmployeeMessageCO queryById(Long id); - - PageResponse listPage(EmployeeMessagePageQry qry); - - SingleResponse add(EmployeeMessageAddCmd cmd); - - void edit(EmployeeMessageUpdateCmd cmd); - - void updateStatus(EmployeeMessageUpdateStatusCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} \ No newline at end of file diff --git a/web-client/src/main/java/com/zcloud/primeport/api/EnclosedAreaServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/EnclosedAreaServiceI.java deleted file mode 100644 index 5c630e9..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/EnclosedAreaServiceI.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.EnclosedAreaAddCmd; -import com.zcloud.primeport.dto.EnclosedAreaPageQry; -import com.zcloud.primeport.dto.EnclosedAreaUpdateCmd; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaCO; -import com.zcloud.primeport.dto.clientobject.EnclosedAreaTreeCO; - -import java.util.List; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -public interface EnclosedAreaServiceI { - EnclosedAreaCO queryById(Long id); - - PageResponse listPage(EnclosedAreaPageQry qry); - - SingleResponse add(EnclosedAreaAddCmd cmd); - - void edit(EnclosedAreaUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); - - List listAllTree(); -} - 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 deleted file mode 100644 index 41ad3e3..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/GatePersonAuthLevelOneServiceI.java +++ /dev/null @@ -1,28 +0,0 @@ -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/InspectionDeptServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/InspectionDeptServiceI.java deleted file mode 100644 index 49f20e7..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/InspectionDeptServiceI.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.InspectionDeptAddCmd; -import com.zcloud.primeport.dto.InspectionDeptPageQry; -import com.zcloud.primeport.dto.InspectionDeptUpdateCmd; -import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; -import com.zcloud.primeport.dto.clientobject.InspectionDeptInfoCO; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:08 - */ -public interface InspectionDeptServiceI { - PageResponse listPage(InspectionDeptPageQry qry); - - SingleResponse add(InspectionDeptAddCmd cmd); - - void edit(InspectionDeptUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); - - InspectionDeptInfoCO getInfoById(Long id); -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/api/InspectionVehicleServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/InspectionVehicleServiceI.java deleted file mode 100644 index 6a8abd6..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/InspectionVehicleServiceI.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zcloud.primeport.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.InspectionVehicleAddCmd; -import com.zcloud.primeport.dto.InspectionVehiclePageQry; -import com.zcloud.primeport.dto.InspectionVehicleUpdateCmd; -import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -public interface InspectionVehicleServiceI { - PageResponse listPage(InspectionVehiclePageQry qry); - - SingleResponse add(InspectionVehicleAddCmd cmd); - - void edit(InspectionVehicleUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} - 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 0e9c105..83469a1 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,20 +1,18 @@ 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; -import java.util.List; - /** -* web-client -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:17 + */ public interface MkmjApprovalUserServiceI { PageResponse listPage(MkmjApprovalUserPageQry qry); @@ -25,9 +23,5 @@ public interface MkmjApprovalUserServiceI { void remove(Long id); void removeBatch(Long[] ids); - - List listAll(MkmjApprovalUserPageQry qry); - - MultiResponse listDeptUser(MkmjApprovalUserQry qry); } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjAreaGateServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjAreaGateServiceI.java deleted file mode 100644 index c6e42fc..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjAreaGateServiceI.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.api; - -import com.zcloud.primeport.dto.MkmjAreaGateAddCmd; -import com.zcloud.primeport.dto.MkmjAreaGatePageQry; -import com.zcloud.primeport.dto.MkmjAreaGateUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjAreaGateCO; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -public interface MkmjAreaGateServiceI { - MkmjAreaGateCO queryById(Long id); - - PageResponse listPage(MkmjAreaGatePageQry qry); - - SingleResponse add(MkmjAreaGateAddCmd cmd); - - void edit(MkmjAreaGateUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjAreaServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjAreaServiceI.java deleted file mode 100644 index 23d8574..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjAreaServiceI.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.primeport.api; - -import com.zcloud.primeport.dto.MkmjAreaAddCmd; -import com.zcloud.primeport.dto.MkmjAreaPageQry; -import com.zcloud.primeport.dto.MkmjAreaUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjAreaCO; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.clientobject.MkmjStatisticsCO; - -import java.util.List; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -public interface MkmjAreaServiceI { - MkmjAreaCO queryById(Long id); - - PageResponse listPage(MkmjAreaPageQry qry); - - SingleResponse add(MkmjAreaAddCmd cmd); - - void edit(MkmjAreaUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); - - List statistics(List ids); -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjCarRecordServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjCarRecordServiceI.java deleted file mode 100644 index 4605475..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjCarRecordServiceI.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zcloud.primeport.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.MkmjCarRecordAddCmd; -import com.zcloud.primeport.dto.MkmjCarRecordPageQry; -import com.zcloud.primeport.dto.MkmjCarRecordUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjCarRecordCO; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -public interface MkmjCarRecordServiceI { - MkmjCarRecordCO queryById(Long id); - - PageResponse listPage(MkmjCarRecordPageQry qry); - - SingleResponse add(MkmjCarRecordAddCmd cmd); - - void edit(MkmjCarRecordUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateServiceI.java new file mode 100644 index 0000000..bf65cff --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.MkmjGateAddCmd; +import com.zcloud.primeport.dto.MkmjGatePageQry; +import com.zcloud.primeport.dto.MkmjGateUpdateCmd; +import com.zcloud.primeport.dto.clientobject.MkmjGateCO; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +public interface MkmjGateServiceI { + PageResponse listPage(MkmjGatePageQry qry); + + SingleResponse add(MkmjGateAddCmd cmd); + + void edit(MkmjGateUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateVideoServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateVideoServiceI.java deleted file mode 100644 index f75b574..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateVideoServiceI.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.api; - -import com.zcloud.primeport.dto.MkmjGateVideoAddCmd; -import com.zcloud.primeport.dto.MkmjGateVideoPageQry; -import com.zcloud.primeport.dto.MkmjGateVideoUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjGateVideoCO; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -public interface MkmjGateVideoServiceI { - MkmjGateVideoCO queryById(Long id); - - PageResponse listPage(MkmjGateVideoPageQry qry); - - SingleResponse add(MkmjGateVideoAddCmd cmd); - - void edit(MkmjGateVideoUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjPassageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjPassageServiceI.java index e12d697..d1cc101 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjPassageServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/MkmjPassageServiceI.java @@ -1,26 +1,19 @@ package com.zcloud.primeport.api; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.dto.MkmjPassageAddCmd; import com.zcloud.primeport.dto.MkmjPassagePageQry; import com.zcloud.primeport.dto.MkmjPassageUpdateCmd; import com.zcloud.primeport.dto.clientobject.MkmjPassageCO; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.clientobject.MkmjStatisticsCO; - -import java.util.List; - /** * web-client * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:20 */ public interface MkmjPassageServiceI { - MkmjPassageCO queryById(Long id); - MkmjPassageCO queryByName(String name); - PageResponse listPage(MkmjPassagePageQry qry); SingleResponse add(MkmjPassageAddCmd cmd); @@ -30,9 +23,5 @@ public interface MkmjPassageServiceI { void remove(Long id); void removeBatch(Long[] ids); - - List statistics(List ids); - - } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjServiceI.java new file mode 100644 index 0000000..330fe30 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/MkmjServiceI.java @@ -0,0 +1,29 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.MkmjAddCmd; +import com.zcloud.primeport.dto.MkmjPageQry; +import com.zcloud.primeport.dto.MkmjUpdateCmd; +import com.zcloud.primeport.dto.clientobject.MkmjCO; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ +public interface MkmjServiceI { + PageResponse listPage(MkmjPageQry qry); + + SingleResponse add(MkmjAddCmd cmd); + + void edit(MkmjUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + MkmjCO getInfoById(Long id); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjSwipeCardRecordServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjSwipeCardRecordServiceI.java deleted file mode 100644 index 0aa2395..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjSwipeCardRecordServiceI.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zcloud.primeport.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordAddCmd; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordPageQry; -import com.zcloud.primeport.dto.MkmjSwipeCardRecordUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjSwipeCardRecordCO; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -public interface MkmjSwipeCardRecordServiceI { - MkmjSwipeCardRecordCO queryById(Long id); - - PageResponse listPage(MkmjSwipeCardRecordPageQry qry); - - SingleResponse add(MkmjSwipeCardRecordAddCmd cmd); - - void edit(MkmjSwipeCardRecordUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java new file mode 100644 index 0000000..4274390 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.PersonApplyAddCmd; +import com.zcloud.primeport.dto.PersonApplyPageQry; +import com.zcloud.primeport.dto.PersonApplyUpdateCmd; +import com.zcloud.primeport.dto.clientobject.PersonApplyCO; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +public interface PersonApplyServiceI { + PageResponse listPage(PersonApplyPageQry qry); + + SingleResponse add(PersonApplyAddCmd cmd); + + void edit(PersonApplyUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/PersonMessageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/PersonMessageServiceI.java new file mode 100644 index 0000000..fcb7b79 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/PersonMessageServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.PersonMessageAddCmd; +import com.zcloud.primeport.dto.PersonMessagePageQry; +import com.zcloud.primeport.dto.PersonMessageUpdateCmd; +import com.zcloud.primeport.dto.clientobject.PersonMessageCO; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +public interface PersonMessageServiceI { + PageResponse listPage(PersonMessagePageQry qry); + + SingleResponse add(PersonMessageAddCmd cmd); + + void edit(PersonMessageUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessEntourageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessEntourageServiceI.java deleted file mode 100644 index 12aeed6..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessEntourageServiceI.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zcloud.primeport.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.TemporaryAccessEntourageAddCmd; -import com.zcloud.primeport.dto.TemporaryAccessEntouragePageQry; -import com.zcloud.primeport.dto.TemporaryAccessEntourageUpdateCmd; -import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -public interface TemporaryAccessEntourageServiceI { - TemporaryAccessEntourageCO queryById(Long id); - - PageResponse listPage(TemporaryAccessEntouragePageQry qry); - - SingleResponse add(TemporaryAccessEntourageAddCmd cmd); - - void edit(TemporaryAccessEntourageUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessServiceI.java deleted file mode 100644 index 5c102fc..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessServiceI.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zcloud.primeport.api; - -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.TemporaryAccessAddCmd; -import com.zcloud.primeport.dto.TemporaryAccessPageQry; -import com.zcloud.primeport.dto.TemporaryAccessUpdateCmd; -import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -public interface TemporaryAccessServiceI { - TemporaryAccessCO queryById(Long id); - - PageResponse listPage(TemporaryAccessPageQry qry); - - SingleResponse add(TemporaryAccessAddCmd cmd); - - void edit(TemporaryAccessUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} - 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 new file mode 100644 index 0000000..5b8b5d5 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.VehicleApplyAddCmd; +import com.zcloud.primeport.dto.VehicleApplyPageQry; +import com.zcloud.primeport.dto.VehicleApplyUpdateCmd; +import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:24 + */ +public interface VehicleApplyServiceI { + PageResponse listPage(VehicleApplyPageQry qry); + + SingleResponse add(VehicleApplyAddCmd cmd); + + void edit(VehicleApplyUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditLogServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditLogServiceI.java deleted file mode 100644 index 64d047f..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditLogServiceI.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zcloud.primeport.api; -import com.alibaba.cola.dto.PageResponse; -import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.VehicleAuditLogAddCmd; -import com.zcloud.primeport.dto.VehicleAuditLogApprovalCmd; -import com.zcloud.primeport.dto.VehicleAuditLogPageQry; -import com.zcloud.primeport.dto.VehicleAuditLogUpdateCmd; -import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; -import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; -import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -public interface VehicleAuditLogServiceI { - PageResponse listPage(VehicleAuditLogPageQry qry); - - SingleResponse add(VehicleAuditLogAddCmd cmd); - - void edit(VehicleAuditLogUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); - - void approval(VehicleAuditLogApprovalCmd auditLogApprovalCmd); - - - PageResponse listPageAndCarInfo(VehicleAuditLogPageQry qry); - - -} - 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 new file mode 100644 index 0000000..4420472 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.VehicleAuditAddCmd; +import com.zcloud.primeport.dto.VehicleAuditPageQry; +import com.zcloud.primeport.dto.VehicleAuditUpdateCmd; +import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +public interface VehicleAuditServiceI { + PageResponse listPage(VehicleAuditPageQry qry); + + SingleResponse add(VehicleAuditAddCmd cmd); + + void edit(VehicleAuditUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleBlackServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleBlackServiceI.java index 30cb83a..8096396 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleBlackServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleBlackServiceI.java @@ -1,4 +1,5 @@ package com.zcloud.primeport.api; + import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.dto.VehicleBlackAddCmd; @@ -9,12 +10,10 @@ import com.zcloud.primeport.dto.clientobject.VehicleBlackCO; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:09 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ public interface VehicleBlackServiceI { - VehicleBlackCO queryById(Long id); - PageResponse listPage(VehicleBlackPageQry qry); SingleResponse add(VehicleBlackAddCmd cmd); diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java index 4bf536d..41500f2 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java @@ -1,17 +1,18 @@ package com.zcloud.primeport.api; - import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.*; -import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; +import com.zcloud.primeport.dto.VehicleMessageAddCmd; +import com.zcloud.primeport.dto.VehicleMessagePageQry; +import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; /** -* web-client -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:28 + */ public interface VehicleMessageServiceI { PageResponse listPage(VehicleMessagePageQry qry); @@ -22,32 +23,5 @@ public interface VehicleMessageServiceI { void remove(Long id); void removeBatch(Long[] ids); - - SingleResponse addForCorp (VehicleMessageForCorpAddCmd cmdCorp); - void editForCorp (VehicleMessageUpdateCmd cmd); - - - VehicleMessageCO getInfoById(Long id); - void updateStatus(VehicleMessageStatusCmd statusCmd); - - - PageResponse listFromCorp(VehicleMessagePageQry qry); - - - VehicleMessageCO infoByLicenceNo(String licenceNo ); - - /** - * 根据车牌号查询启用状态的数据数量 - * @param licenceNo 车牌号 - * @return 启用状态的数据数量，如果没有则返回0 - */ - int countEnabledByLicenceNo(String licenceNo); - - /** - * 根据用户ID获取该用户的车辆数量 - * @param userId 用户ID - * @return 车辆数量，如果没有则返回0 - */ - int countByUserId(Long userId); - } + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleViolationsServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleViolationsServiceI.java index 893bad4..5f1da66 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleViolationsServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleViolationsServiceI.java @@ -6,17 +6,14 @@ import com.zcloud.primeport.dto.VehicleViolationsAddCmd; import com.zcloud.primeport.dto.VehicleViolationsPageQry; import com.zcloud.primeport.dto.VehicleViolationsUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; -import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ public interface VehicleViolationsServiceI { - VehicleViolationsCO queryById(Long id); - PageResponse listPage(VehicleViolationsPageQry qry); SingleResponse add(VehicleViolationsAddCmd cmd); @@ -26,9 +23,5 @@ public interface VehicleViolationsServiceI { void remove(Long id); void removeBatch(Long[] ids); - - - PageResponse listAndCountPage(VehicleViolationsPageQry qry); - } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VideoServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VideoServiceI.java new file mode 100644 index 0000000..940ed45 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/VideoServiceI.java @@ -0,0 +1,27 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.VideoAddCmd; +import com.zcloud.primeport.dto.VideoPageQry; +import com.zcloud.primeport.dto.VideoUpdateCmd; +import com.zcloud.primeport.dto.clientobject.VideoCO; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:31 + */ +public interface VideoServiceI { + PageResponse listPage(VideoPageQry qry); + + SingleResponse add(VideoAddCmd cmd); + + void edit(VideoUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageAddCmd.java deleted file mode 100644 index 1ab5f96..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageAddCmd.java +++ /dev/null @@ -1,38 +0,0 @@ -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.*; - -/** -* web-client -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class EmployeeMessageAddCmd extends Command { - @ApiModelProperty(value = "用户ID", name = "userId", required = true) - @NotNull(message = "用户ID不能为空") - private Long userId; - - @ApiModelProperty(value = "是否有进入一级口门的权限(0-无权限;1有权限)", name = "isPermission", required = true) - @NotNull(message = "是否有进入一级口门的权限(0-无权限;1有权限)不能为空") - private Integer isPermission; - - @ApiModelProperty(value = "是否有人脸权限", name = "isUserFace", required = true) - @NotNull(message = "是否有人脸权限不能为空") - private Integer isUserFace; - - @ApiModelProperty(value = "可以进入的口门信息", name = "mkmjScope", required = true) - @NotEmpty(message = "可以进入的口门信息不能为空") - private String mkmjScope; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessagePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessagePageQry.java deleted file mode 100644 index 801a755..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessagePageQry.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.primeport.dto; - - -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - - -/** -* web-client -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Data -public class EmployeeMessagePageQry extends PageQuery { - -/** -* 查询条件操作前缀,支持以下几种数据库查询操作： -* - `like`: 模糊匹配查询，对应SQL的LIKE操作符 -* - `eq`: 等值查询，对应SQL的=操作符 -* - `gt`: 大于比较查询 -* - `lt`: 小于比较查询 -* - `ge`: 大于等于比较查询 -* - `le`: 小于等于比较查询 -* - `ne`: 不等比较查询，对应SQL的!=操作符 -*/ - private Long likeUserId; - - private Long eqDepartmentId; - - private String likeName; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateCmd.java deleted file mode 100644 index 85ccaf0..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateCmd.java +++ /dev/null @@ -1,38 +0,0 @@ -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.*; - -/** -* web-client -* @Author guoyuepeng -* @Date 2025-12-18 14:32:15 -*/ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class EmployeeMessageUpdateCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotNull(message = "id不能为空") - private Long id; - @ApiModelProperty(value = "用户ID", name = "userId", required = true) - @NotNull(message = "用户ID不能为空") - private Long userId; - @ApiModelProperty(value = "是否有进入一级口门的权限(0-无权限;1有权限)", name = "isPermission", required = true) - @NotNull(message = "是否有进入一级口门的权限(0-无权限;1有权限)不能为空") - private Integer isPermission; - @ApiModelProperty(value = "是否有人脸权限", name = "isUserFace", required = true) - @NotNull(message = "是否有人脸权限不能为空") - private Integer isUserFace; - @ApiModelProperty(value = "可以进入的口门信息", name = "mkmjScope", required = true) - @NotEmpty(message = "可以进入的口门信息不能为空") - private String mkmjScope; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateStatusCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateStatusCmd.java deleted file mode 100644 index 05dee2b..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateStatusCmd.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.Command; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * web-client - * 更新员工消息状态命令 - * @Author guoyuepeng - * @Date 2025-12-18 14:32:14 - */ -@Data -public class EmployeeMessageUpdateStatusCmd extends Command { - - @ApiModelProperty(value = "员工消息ID", name = "id", required = true) - @NotNull(message = "员工消息ID不能为空") - private Long id; - - @ApiModelProperty(value = "状态：0-停用 1-启用", name = "status", required = true) - @NotNull(message = "状态不能为空") - private Integer status; -} \ No newline at end of file diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaAddCmd.java deleted file mode 100644 index 56a5b29..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaAddCmd.java +++ /dev/null @@ -1,61 +0,0 @@ -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 fangjiakai - * @Date 2025-12-12 16:49:30 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class EnclosedAreaAddCmd extends Command { - @ApiModelProperty(value = "父级id", name = "parentId", required = true) - @NotNull(message = "父级id不能为空") - private Long parentId; - - @ApiModelProperty(value = "父级名称", name = "parentName", required = true) - @NotEmpty(message = "父级名称不能为空") - private String parentName; - - @ApiModelProperty(value = "封闭区域名称", name = "name", required = true) - @NotEmpty(message = "封闭区域名称不能为空") - private String name; - - @ApiModelProperty(value = "封闭区域类型", name = "type", required = true) - @NotEmpty(message = "封闭区域类型不能为空") - private String type; - - @ApiModelProperty(value = "封闭区域类型", name = "typeName", required = true) - @NotEmpty(message = "封闭区域类型不能为空") - private String typeName; - - @ApiModelProperty(value = "管辖单位", name = "corpinfoId", required = true) - @NotNull(message = "管辖单位不能为空") - private Long corpinfoId; - - @ApiModelProperty(value = "管辖单位", name = "corpinfoName", required = true) - @NotEmpty(message = "管辖单位不能为空") - private String corpinfoName; - - @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") - private String longitude; - - @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") - private String latitude; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaPageQry.java deleted file mode 100644 index d1a0ff7..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaPageQry.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.PageQuery; -import lombok.Data; - - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -@Data -public class EnclosedAreaPageQry extends PageQuery { - - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - private Long eqParentId; - private String likeName; - private String eqType; - private Long eqCorpinfoId; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaUpdateCmd.java deleted file mode 100644 index d4c83ca..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/EnclosedAreaUpdateCmd.java +++ /dev/null @@ -1,55 +0,0 @@ -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 fangjiakai - * @Date 2025-12-12 16:49:32 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class EnclosedAreaUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotNull(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "父级id", name = "parentId", required = true) - @NotNull(message = "父级id不能为空") - private Long parentId; - @ApiModelProperty(value = "父级名称", name = "parentName", required = true) - @NotEmpty(message = "父级名称不能为空") - private String parentName; - @ApiModelProperty(value = "封闭区域名称", name = "name", required = true) - @NotEmpty(message = "封闭区域名称不能为空") - private String name; - @ApiModelProperty(value = "封闭区域类型", name = "type", required = true) - @NotEmpty(message = "封闭区域类型不能为空") - private String type; - @ApiModelProperty(value = "封闭区域类型", name = "typeName", required = true) - @NotEmpty(message = "封闭区域类型不能为空") - private String typeName; - @ApiModelProperty(value = "管辖单位", name = "corpinfoId", required = true) - @NotNull(message = "管辖单位不能为空") - private Long corpinfoId; - @ApiModelProperty(value = "管辖单位", name = "corpinfoName", required = true) - @NotEmpty(message = "管辖单位不能为空") - private String corpinfoName; - @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") - private String longitude; - @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") - private String latitude; -} - 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 deleted file mode 100644 index 772bc4e..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneAddCmd.java +++ /dev/null @@ -1,42 +0,0 @@ -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/GatePersonAuthLevelOneUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneUpdateCmd.java deleted file mode 100644 index 67ae696..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOneUpdateCmd.java +++ /dev/null @@ -1,42 +0,0 @@ -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/InspectionDeptAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java deleted file mode 100644 index c769e7f..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java +++ /dev/null @@ -1,34 +0,0 @@ -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 java.util.List; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class InspectionDeptAddCmd extends Command { - - - @ApiModelProperty(value = "名称", name = "name", required = true) - @NotEmpty(message = "名称不能为空") - private String name; - @ApiModelProperty(value = "单位车辆信息部门为空", name = "VehicleMessageAddCmd", required = true) - @NotEmpty(message = "单位车辆信息部门为空") - List VehicleMessageAddCmd; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptPageQry.java deleted file mode 100644 index 5f9a215..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptPageQry.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Data -public class InspectionDeptPageQry extends PageQuery { - - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - private String likeName; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptUpdateCmd.java deleted file mode 100644 index c69a4f8..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptUpdateCmd.java +++ /dev/null @@ -1,37 +0,0 @@ -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 java.util.List; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:08 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class InspectionDeptUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "名称", name = "name", required = true) - @NotEmpty(message = "名称不能为空") - private String name; - - @ApiModelProperty(value = "单位车辆信息部门为空", name = "VehicleMessageAddCmd", required = true) - @NotEmpty(message = "单位车辆信息部门为空") - List VehicleMessageAddCmd; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleAddCmd.java deleted file mode 100644 index 8de9232..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleAddCmd.java +++ /dev/null @@ -1,34 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-20 15:25:19 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class InspectionVehicleAddCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "检查部门ID", name = "inspectionDeptId", required = true) - @NotEmpty(message = "检查部门ID不能为空") - private Long inspectionDeptId; - @ApiModelProperty(value = "车辆id", name = "vehicleMessageId", required = true) - @NotEmpty(message = "车辆id不能为空") - private Long vehicleMessageId; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleUpdateCmd.java deleted file mode 100644 index 510d2cd..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleUpdateCmd.java +++ /dev/null @@ -1,33 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class InspectionVehicleUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "检查部门ID", name = "inspectionDeptId", required = true) - @NotEmpty(message = "检查部门ID不能为空") - private Long inspectionDeptId; - @ApiModelProperty(value = "车辆id", name = "vehicleMessageId", required = true) - @NotEmpty(message = "车辆id不能为空") - private Long vehicleMessageId; -} - 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 new file mode 100644 index 0000000..e1d27b6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java @@ -0,0 +1,58 @@ +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 makejava + * @Date 2026-03-05 11:33:14 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MkmjAddCmd extends Command { + @ApiModelProperty(value = "口门名称", name = "mkmjName", required = true) + @NotEmpty(message = "口门名称不能为空") + private String mkmjName; + @ApiModelProperty(value = "口门级别 1-一级 2-二级", name = "mkmjLevel", required = true) + @NotNull(message = "口门级别 1-一级 2-二级不能为空") + private Integer mkmjLevel; + @ApiModelProperty(value = "口门类型", name = "mkmjType", required = true) + @NotEmpty(message = "口门类型") + private String mkmjType; + @ApiModelProperty(value = "所属港区", name = "hgAuthArea", required = true) + @NotEmpty(message = "所属港区不能为空") + private String hgAuthArea; + @ApiModelProperty(value = "所属港区名称", name = "hgAuthAreaName", required = true) + @NotEmpty(message = "所属港区名称不能为空") + private String hgAuthAreaName; + @ApiModelProperty(value = "口门类型名称1-人行 2-车行 3-综合", name = "mkmjTypeName", required = true) + @NotEmpty(message = "口门类型名称1-人行 2-车行 3-综合不能为空") + private String mkmjTypeName; + @ApiModelProperty(value = "口门状态 1-停用 2-正常", name = "mkmjStatus", required = true) + @NotNull(message = "口门状态 1-停用 2-正常不能为空") + private Integer mkmjStatus; + @ApiModelProperty(value = "入方向区域- 二级有用", name = "inDirectionArea", required = true) + private Long inDirectionArea; + @ApiModelProperty(value = "入方向区域名称- 二级有用", name = "inDirectionAreaName", required = true) + private Long inDirectionAreaName; + @ApiModelProperty(value = "出方向区域- 二级有用", name = "outDirectionArea", required = true) + private Long outDirectionArea; + @ApiModelProperty(value = "出方向区域名称- 二级有用", name = "outDirectionAreaName", required = true) + private Long outDirectionAreaName; + @ApiModelProperty(value = "经度", name = "longitude", required = true) + private String longitude; + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + private String latitude; +} + 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 6b37f7d..d36c076 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 @@ -8,31 +8,83 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.Date; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:16 */ @EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor public class MkmjApprovalUserAddCmd extends Command { - @ApiModelProperty(value = "审批人", name = "userId", required = true) - @NotNull(message = "审批人不能为空") + @ApiModelProperty(value = "主键ID", name = "id", required = true) + @NotEmpty(message = "主键ID不能为空") + private Long id; + @ApiModelProperty(value = "审批人企业id", name = "corpId", required = true) + @NotEmpty(message = "审批人企业id不能为空") + private Long corpId; + @ApiModelProperty(value = "审批人企业名称", name = "corpName", required = true) + @NotEmpty(message = "审批人企业名称不能为空") + private String corpName; + @ApiModelProperty(value = "审批人部门id", name = "deptId", required = true) + @NotEmpty(message = "审批人部门id不能为空") + private Long deptId; + @ApiModelProperty(value = "审批人部门名称", name = "deptName", required = true) + @NotEmpty(message = "审批人部门名称不能为空") + private String deptName; + @ApiModelProperty(value = "审批人id", name = "userId", required = true) + @NotEmpty(message = "审批人id不能为空") private Long userId; - @ApiModelProperty( name = "isPersonnelPermission") - @NotNull(message = "人员审核权限") - private Integer isPersonnelPermission; - @ApiModelProperty( name = "isVehiclePermission") - @NotNull(message = "车辆审核权限") - private Integer isVehiclePermission; - @ApiModelProperty( name = "isTemporaryPermission") - @NotNull(message = "临时审核权限") - private Integer isTemporaryPermission; + @ApiModelProperty(value = "审批人名称", name = "userName", required = true) + @NotEmpty(message = "审批人名称不能为空") + private String userName; + @ApiModelProperty(value = "人员审核权限(1-无权限,2-有权限)", name = "personnelPermissionFlag", required = true) + @NotEmpty(message = "人员审核权限(1-无权限,2-有权限)不能为空") + private Integer personnelPermissionFlag; + @ApiModelProperty(value = "车辆审核权限(1-无权限,2-有权限)", name = "vehiclePermissionFlag", required = true) + @NotEmpty(message = "车辆审核权限(1-无权限,2-有权限)不能为空") + private Integer vehiclePermissionFlag; + @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)", name = "temporaryPermissionFlag", required = true) + @NotEmpty(message = "临时审核权限(1-无权限,2-有权限)不能为空") + private Integer temporaryPermissionFlag; + @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识true false不能为空") + private String deleteEnum; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户id", name = "tenantId", required = true) + @NotEmpty(message = "租户id不能为空") + private Long tenantId; + @ApiModelProperty(value = "单位id", name = "orgId", required = true) + @NotEmpty(message = "单位id不能为空") + private Long orgId; + @ApiModelProperty(value = "版本", name = "version", required = true) + @NotEmpty(message = "版本不能为空") + private Integer version; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) + @NotEmpty(message = "修改时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人id", name = "createId", required = true) + @NotEmpty(message = "创建人id不能为空") + private Long createId; + @ApiModelProperty(value = "修改人id", name = "updateId", required = true) + @NotEmpty(message = "修改人id不能为空") + private Long updateId; + @ApiModelProperty(value = "${column.comment}", name = "env", required = true) + @NotEmpty(message = "${column.comment}不能为空") + private String env; } 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 51fc478..9ef8722 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,32 +1,28 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ @Data public class MkmjApprovalUserPageQry extends PageQuery { - private String likeDeptName; - - public String likeUserName; + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private Long likeCorpId; +} - public String likeName; - - 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 deleted file mode 100644 index d55f0c5..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserQry.java +++ /dev/null @@ -1,19 +0,0 @@ -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/MkmjApprovalUserUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserUpdateCmd.java index e80f594..ccc736f 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserUpdateCmd.java @@ -1,20 +1,20 @@ 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 java.util.Date; /** -* web-client -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:17 + */ @EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @@ -23,38 +23,68 @@ public class MkmjApprovalUserUpdateCmd extends Command { @ApiModelProperty(value = "主键ID", name = "id", required = true) @NotEmpty(message = "主键ID不能为空") private Long id; - @ApiModelProperty(value = "审批人部门ID", name = "deptName", required = true) - @NotEmpty(message = "审批人部门ID不能为空") - private String deptName; - @ApiModelProperty(value = "审批人部门", name = "deptId", required = true) - @NotEmpty(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) - @NotEmpty(message = "审批人名字不能为空") - private Long userId; - @ApiModelProperty(value = "岗位名称", name = "postName", required = true) - @NotEmpty(message = "岗位名称不能为空") - private String postName; - @ApiModelProperty(value = "岗位id", name = "postId", required = true) - @NotEmpty(message = "岗位id不能为空") - private Long postId; - @ApiModelProperty(value = "企业id", name = "corpId", required = true) - @NotEmpty(message = "企业id不能为空") + @ApiModelProperty(value = "审批人企业id", name = "corpId", required = true) + @NotEmpty(message = "审批人企业id不能为空") private Long corpId; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") + @ApiModelProperty(value = "审批人企业名称", name = "corpName", required = true) + @NotEmpty(message = "审批人企业名称不能为空") + private String corpName; + @ApiModelProperty(value = "审批人部门id", name = "deptId", required = true) + @NotEmpty(message = "审批人部门id不能为空") + private Long deptId; + @ApiModelProperty(value = "审批人部门名称", name = "deptName", required = true) + @NotEmpty(message = "审批人部门名称不能为空") + private String deptName; + @ApiModelProperty(value = "审批人id", name = "userId", required = true) + @NotEmpty(message = "审批人id不能为空") + private Long userId; + @ApiModelProperty(value = "审批人名称", name = "userName", required = true) + @NotEmpty(message = "审批人名称不能为空") + private String userName; + @ApiModelProperty(value = "人员审核权限(1-无权限,2-有权限)", name = "personnelPermissionFlag", required = true) + @NotEmpty(message = "人员审核权限(1-无权限,2-有权限)不能为空") + private Integer personnelPermissionFlag; + @ApiModelProperty(value = "车辆审核权限(1-无权限,2-有权限)", name = "vehiclePermissionFlag", required = true) + @NotEmpty(message = "车辆审核权限(1-无权限,2-有权限)不能为空") + private Integer vehiclePermissionFlag; + @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)", name = "temporaryPermissionFlag", required = true) + @NotEmpty(message = "临时审核权限(1-无权限,2-有权限)不能为空") + private Integer temporaryPermissionFlag; + @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识true false不能为空") private String deleteEnum; - @ApiModelProperty(name = "isPersonnelPermission") - private Integer isPersonnelPermission; - @ApiModelProperty(name = "isVehiclePermission") - private Integer isVehiclePermission; - @ApiModelProperty(name = "isTemporaryPermission") - private Integer isTemporaryPermission; - + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户id", name = "tenantId", required = true) + @NotEmpty(message = "租户id不能为空") + private Long tenantId; + @ApiModelProperty(value = "单位id", name = "orgId", required = true) + @NotEmpty(message = "单位id不能为空") + private Long orgId; + @ApiModelProperty(value = "版本", name = "version", required = true) + @NotEmpty(message = "版本不能为空") + private Integer version; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) + @NotEmpty(message = "修改时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人id", name = "createId", required = true) + @NotEmpty(message = "创建人id不能为空") + private Long createId; + @ApiModelProperty(value = "修改人id", name = "updateId", required = true) + @NotEmpty(message = "修改人id不能为空") + private Long updateId; + @ApiModelProperty(value = "${column.comment}", name = "env", required = true) + @NotEmpty(message = "${column.comment}不能为空") + private String env; } + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaAddCmd.java deleted file mode 100644 index 64672b6..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaAddCmd.java +++ /dev/null @@ -1,67 +0,0 @@ -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 fangjiakai - * @Date 2025-11-14 09:51:09 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjAreaAddCmd extends Command { - @ApiModelProperty(value = "区域名称", name = "areaName", required = true) - @NotEmpty(message = "区域名称不能为空") - private String areaName; - - @ApiModelProperty(value = "区域范围", name = "areaRange", required = true) - @NotEmpty(message = "区域范围不能为空") - private String areaRange; - - @ApiModelProperty(value = "区域级别 1-一级 2-二级 3-三级", name = "areaLevel", required = true) - @NotNull(message = "区域级别 1-一级 2-二级 3-三级不能为空") - private Integer areaLevel; - - @ApiModelProperty(value = "上级区域id(当area_level=1时，此字段为字典bianma)", name = "areaParentId", required = true) - @NotEmpty(message = "上级区域id(当area_level=1时，此字段为字典bianma)不能为空") - private String areaParentId; - - @ApiModelProperty(value = "上级区域", name = "areaParentName", required = true) - @NotEmpty(message = "上级区域不能为空") - private String areaParentName; - - @ApiModelProperty(value = "口门类型 1-人行 2-车行 3-综合", name = "areaType", required = true) - @NotNull(message = "口门类型 1-人行 2-车行 3-综合不能为空") - private Integer areaType; - - @ApiModelProperty(value = "区域状态 0-停用 1-正常 2-暂时关闭", name = "areaStatus", required = true) - @NotNull(message = "区域状态 0-停用 1-正常 2-暂时关闭不能为空") - private Integer areaStatus; - - @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") - private String longitude; - - @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") - private String latitude; - - @ApiModelProperty(value = "企业id", name = "corpinfoId") - private Long corpinfoId; - @ApiModelProperty(value = "企业名称", name = "corpinfoName") - private String corpinfoName; - - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateAddCmd.java deleted file mode 100644 index 8b86686..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateAddCmd.java +++ /dev/null @@ -1,77 +0,0 @@ -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 fangjiakai - * @Date 2025-11-14 16:01:00 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjAreaGateAddCmd extends Command { - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - private String corpinfoId; - - @ApiModelProperty(value = "口门区域id", name = "areaId", required = true) - @NotEmpty(message = "口门区域id不能为空") - private String areaId; - - @ApiModelProperty(value = "通道id", name = "passageId", required = true) - @NotEmpty(message = "通道id不能为空") - private String passageId; - - @ApiModelProperty(value = "闸机标识", name = "gateNumber", required = true) - private String gateNumber; - - @ApiModelProperty(value = "闸机名称", name = "gateName", required = true) - @NotEmpty(message = "闸机名称不能为空") - private String gateName; - - @ApiModelProperty(value = "闸机类型 1-入 2出", name = "gateType", required = true) - @NotNull(message = "闸机类型 1-入 2出不能为空") - private Integer gateType; - - @ApiModelProperty(value = "闸机状态 0- 停用 1-正常 2-暂时关闭", name = "gateStatus", required = true) - @NotNull(message = "闸机状态 0- 停用 1-正常 2-暂时关闭不能为空") - private Integer gateStatus; - - @ApiModelProperty(value = "闸机类别 0-人行口门 1-车行口门 2-综合口门", name = "gateCategory", required = true) - @NotNull(message = "闸机类别 0-人行口门 1-车行口门 2-综合口门不能为空") - private Integer gateCategory; - - @ApiModelProperty(value = "闸机型号", name = "gateModel", required = true) - @NotEmpty(message = "闸机型号不能为空") - private String gateModel; - - @ApiModelProperty(value = "闸机位置", name = "gatePosition", required = true) - @NotEmpty(message = "闸机位置不能为空") - private String gatePosition; - - @ApiModelProperty(value = "是否相邻区域 0否 1是", name = "isAdjacent", required = true) - private Integer isAdjacent; - - @ApiModelProperty(value = "相邻区域id", name = "adjacentAreaId", required = true) - private String adjacentAreaId; - - @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") - private String longitude; - - @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") - private String latitude; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGatePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGatePageQry.java deleted file mode 100644 index 3242576..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGatePageQry.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Data -public class MkmjAreaGatePageQry extends PageQuery { - - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - private String eqAreaId; - private String eqPassageId; - private String likeGateName; - private Integer eqGateStatus; - private Integer eqGateType; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateUpdateCmd.java deleted file mode 100644 index 8296933..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateUpdateCmd.java +++ /dev/null @@ -1,69 +0,0 @@ -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 fangjiakai - * @Date 2025-11-14 16:01:00 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjAreaGateUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotNull(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "业务主键id", name = "areaGateId", required = true) - @NotEmpty(message = "业务主键id不能为空") - private String areaGateId; - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - private String corpinfoId; - @ApiModelProperty(value = "口门区域id", name = "areaId", required = true) - @NotEmpty(message = "口门区域id不能为空") - private String areaId; - @ApiModelProperty(value = "通道id", name = "passageId", required = true) - @NotEmpty(message = "通道id不能为空") - private String passageId; - @ApiModelProperty(value = "闸机标识", name = "gateNumber", required = true) - private String gateNumber; - @ApiModelProperty(value = "闸机名称", name = "gateName", required = true) - @NotEmpty(message = "闸机名称不能为空") - private String gateName; - @ApiModelProperty(value = "闸机类型 1-入 2出", name = "gateType", required = true) - @NotNull(message = "闸机类型 1-入 2出不能为空") - private Integer gateType; - @ApiModelProperty(value = "闸机状态 0- 停用 1-正常 2-暂时关闭", name = "gateStatus", required = true) - @NotNull(message = "闸机状态 0- 停用 1-正常 2-暂时关闭不能为空") - private Integer gateStatus; - @ApiModelProperty(value = "闸机类别 0-人行口门 1-车行口门 2-综合口门", name = "gateCategory", required = true) - @NotNull(message = "闸机类别 0-人行口门 1-车行口门 2-综合口门不能为空") - private Integer gateCategory; - @ApiModelProperty(value = "闸机型号", name = "gateModel", required = true) - @NotEmpty(message = "闸机型号不能为空") - private String gateModel; - @ApiModelProperty(value = "闸机位置", name = "gatePosition", required = true) - @NotEmpty(message = "闸机位置不能为空") - private String gatePosition; - @ApiModelProperty(value = "是否相邻区域 0否 1是", name = "isAdjacent", required = true) - private Integer isAdjacent; - @ApiModelProperty(value = "相邻区域id", name = "adjacentAreaId", required = true) - private String adjacentAreaId; - @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") - private String longitude; - @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") - private String latitude; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaPageQry.java deleted file mode 100644 index 47fc612..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaPageQry.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -@Data -public class MkmjAreaPageQry extends PageQuery { - - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - private String likeAreaName; - private Integer eqAreaStatus; - private Integer eqAreaType; - private String eqAreaParentId; - private Integer eqAreaLevel; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaUpdateCmd.java deleted file mode 100644 index 9d240c1..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaUpdateCmd.java +++ /dev/null @@ -1,63 +0,0 @@ -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 fangjiakai - * @Date 2025-11-14 09:51:10 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjAreaUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotNull(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "业务主键id", name = "areaId", required = true) - @NotEmpty(message = "业务主键id不能为空") - private String areaId; - @ApiModelProperty(value = "区域名称", name = "areaName", required = true) - @NotEmpty(message = "区域名称不能为空") - private String areaName; - @ApiModelProperty(value = "区域范围", name = "areaRange", required = true) - @NotEmpty(message = "区域范围不能为空") - private String areaRange; - @ApiModelProperty(value = "区域级别 1-一级 2-二级 3-三级", name = "areaLevel", required = true) - @NotNull(message = "区域级别 1-一级 2-二级 3-三级不能为空") - private Integer areaLevel; - @ApiModelProperty(value = "上级区域id(当area_level=1时，此字段为字典bianma)", name = "areaParentId", required = true) - @NotEmpty(message = "上级区域id(当area_level=1时，此字段为字典bianma)不能为空") - private String areaParentId; - @ApiModelProperty(value = "上级区域", name = "areaParentName", required = true) - @NotEmpty(message = "上级区域不能为空") - private String areaParentName; - @ApiModelProperty(value = "口门类型 1-人行 2-车行 3-综合", name = "areaType", required = true) - @NotNull(message = "口门类型 1-人行 2-车行 3-综合不能为空") - private Integer areaType; - @ApiModelProperty(value = "区域状态 0-停用 1-正常 2-暂时关闭", name = "areaStatus", required = true) - @NotNull(message = "区域状态 0-停用 1-正常 2-暂时关闭不能为空") - private Integer areaStatus; - @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") - private String longitude; - @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") - private String latitude; - - @ApiModelProperty(value = "企业id", name = "corpinfoId") - private Long corpinfoId; - @ApiModelProperty(value = "企业名称", name = "corpinfoName") - private String corpinfoName; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordAddCmd.java deleted file mode 100644 index 5ddddaa..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordAddCmd.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.Command; -import com.fasterxml.jackson.annotation.JsonFormat; -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; -import java.sql.Date; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:08 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjCarRecordAddCmd extends Command { - @ApiModelProperty(value = "车辆id", name = "vehicleRecordId", required = true) - @NotEmpty(message = "车辆id不能为空") - private String vehicleRecordId; - - @ApiModelProperty(value = "车辆牌照号码", name = "vehiclePlateNumber", required = true) - @NotEmpty(message = "车辆牌照号码不能为空") - private String vehiclePlateNumber; - - @ApiModelProperty(value = "车辆行驶证号码", name = "vehicleRegistrationNumber", required = true) - @NotEmpty(message = "车辆行驶证号码不能为空") - private String vehicleRegistrationNumber; - - @ApiModelProperty(value = "车辆类型名称", name = "vehicleCategoryName", required = true) - @NotEmpty(message = "车辆类型名称不能为空") - private String vehicleCategoryName; - - @ApiModelProperty(value = "车辆联系人姓名", name = "vehicleContactName", required = true) - @NotEmpty(message = "车辆联系人姓名不能为空") - private String vehicleContactName; - - @ApiModelProperty(value = "车辆联系人电话", name = "vehicleContactPhoneNumber", required = true) - @NotEmpty(message = "车辆联系人电话不能为空") - private String vehicleContactPhoneNumber; - - @ApiModelProperty(value = "车辆备案信息录入单位", name = "vehicleFilingInfoRecordingOrg", required = true) - @NotEmpty(message = "车辆备案信息录入单位不能为空") - private String vehicleFilingInfoRecordingOrg; - - @ApiModelProperty(value = "车辆牌照颜色名称", name = "vehiclePlateColor", required = true) - @NotEmpty(message = "车辆牌照颜色名称不能为空") - private String vehiclePlateColor; - - @ApiModelProperty(value = "车辆入港闸口", name = "vehicleArrivalBarrier", required = true) - @NotEmpty(message = "车辆入港闸口不能为空") - private String vehicleArrivalBarrier; - - @ApiModelProperty(value = "${column.comment}", name = "regexArrivalBarrier", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String regexArrivalBarrier; - - @ApiModelProperty(value = "车辆入港时间", name = "vehicleArrivalTime", required = true) - @NotEmpty(message = "车辆入港时间不能为空") - private String vehicleArrivalTime; - - @ApiModelProperty(value = "车辆离港闸口", name = "vehicleDepartureBarrier", required = true) - @NotEmpty(message = "车辆离港闸口不能为空") - private String vehicleDepartureBarrier; - - @ApiModelProperty(value = "${column.comment}", name = "regexDepartureBarrier", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String regexDepartureBarrier; - - @ApiModelProperty(value = "车辆离港时间", name = "vehicleDepartureTime", required = true) - @NotEmpty(message = "车辆离港时间不能为空") - private String vehicleDepartureTime; - - @ApiModelProperty(value = "车辆备案方式", name = "vehicleFilingMethod", required = true) - @NotEmpty(message = "车辆备案方式不能为空") - private String vehicleFilingMethod; - - @ApiModelProperty(value = "车辆在港状态", name = "vehicleArrivalStatus", required = true) - @NotEmpty(message = "车辆在港状态不能为空") - private String vehicleArrivalStatus; - - @ApiModelProperty(value = "数据来源", name = "edwDataSource", required = true) - @NotEmpty(message = "数据来源不能为空") - private String edwDataSource; - - @ApiModelProperty(value = "数据创建日期", name = "edwCreateDate", required = true) - @NotEmpty(message = "数据创建日期不能为空") - private String edwCreateDate; - - @ApiModelProperty(value = "数据更新日期", name = "edwLastUpdate", required = true) - @NotEmpty(message = "数据更新日期不能为空") - private String edwLastUpdate; - - @ApiModelProperty(value = "数据有效标识", name = "edwValidFlag", required = true) - @NotEmpty(message = "数据有效标识不能为空") - private String edwValidFlag; - - @ApiModelProperty(value = "分区列", name = "dataVersion", required = true) - @NotNull(message = "分区列不能为空") - private Long dataVersion; - - @ApiModelProperty(value = "同步时间", name = "accLastUpdateDate", required = true) - @NotNull(message = "同步时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date accLastUpdateDate; - - @ApiModelProperty(value = "自增长id主键", name = "idSequence", required = true) - @NotNull(message = "自增长id主键不能为空") - private Long idSequence; - - @ApiModelProperty(value = "同步时间", name = "synctime", required = true) - @NotEmpty(message = "同步时间不能为空") - private String synctime; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordUpdateCmd.java deleted file mode 100644 index bb6bd3f..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordUpdateCmd.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.Command; -import com.fasterxml.jackson.annotation.JsonFormat; -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; -import java.sql.Date; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjCarRecordUpdateCmd extends Command { - @ApiModelProperty(value = "主键id", name = "id", required = true) - @NotNull(message = "主键id不能为空") - private Long id; - @ApiModelProperty(value = "车辆id", name = "vehicleRecordId", required = true) - @NotEmpty(message = "车辆id不能为空") - private String vehicleRecordId; - @ApiModelProperty(value = "车辆牌照号码", name = "vehiclePlateNumber", required = true) - @NotEmpty(message = "车辆牌照号码不能为空") - private String vehiclePlateNumber; - @ApiModelProperty(value = "车辆行驶证号码", name = "vehicleRegistrationNumber", required = true) - @NotEmpty(message = "车辆行驶证号码不能为空") - private String vehicleRegistrationNumber; - @ApiModelProperty(value = "车辆类型名称", name = "vehicleCategoryName", required = true) - @NotEmpty(message = "车辆类型名称不能为空") - private String vehicleCategoryName; - @ApiModelProperty(value = "车辆联系人姓名", name = "vehicleContactName", required = true) - @NotEmpty(message = "车辆联系人姓名不能为空") - private String vehicleContactName; - @ApiModelProperty(value = "车辆联系人电话", name = "vehicleContactPhoneNumber", required = true) - @NotEmpty(message = "车辆联系人电话不能为空") - private String vehicleContactPhoneNumber; - @ApiModelProperty(value = "车辆备案信息录入单位", name = "vehicleFilingInfoRecordingOrg", required = true) - @NotEmpty(message = "车辆备案信息录入单位不能为空") - private String vehicleFilingInfoRecordingOrg; - @ApiModelProperty(value = "车辆牌照颜色名称", name = "vehiclePlateColor", required = true) - @NotEmpty(message = "车辆牌照颜色名称不能为空") - private String vehiclePlateColor; - @ApiModelProperty(value = "车辆入港闸口", name = "vehicleArrivalBarrier", required = true) - @NotEmpty(message = "车辆入港闸口不能为空") - private String vehicleArrivalBarrier; - @ApiModelProperty(value = "${column.comment}", name = "regexArrivalBarrier", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String regexArrivalBarrier; - @ApiModelProperty(value = "车辆入港时间", name = "vehicleArrivalTime", required = true) - @NotEmpty(message = "车辆入港时间不能为空") - private String vehicleArrivalTime; - @ApiModelProperty(value = "车辆离港闸口", name = "vehicleDepartureBarrier", required = true) - @NotEmpty(message = "车辆离港闸口不能为空") - private String vehicleDepartureBarrier; - @ApiModelProperty(value = "${column.comment}", name = "regexDepartureBarrier", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String regexDepartureBarrier; - @ApiModelProperty(value = "车辆离港时间", name = "vehicleDepartureTime", required = true) - @NotEmpty(message = "车辆离港时间不能为空") - private String vehicleDepartureTime; - @ApiModelProperty(value = "车辆备案方式", name = "vehicleFilingMethod", required = true) - @NotEmpty(message = "车辆备案方式不能为空") - private String vehicleFilingMethod; - @ApiModelProperty(value = "车辆在港状态", name = "vehicleArrivalStatus", required = true) - @NotEmpty(message = "车辆在港状态不能为空") - private String vehicleArrivalStatus; - @ApiModelProperty(value = "数据来源", name = "edwDataSource", required = true) - @NotEmpty(message = "数据来源不能为空") - private String edwDataSource; - @ApiModelProperty(value = "数据创建日期", name = "edwCreateDate", required = true) - @NotEmpty(message = "数据创建日期不能为空") - private String edwCreateDate; - @ApiModelProperty(value = "数据更新日期", name = "edwLastUpdate", required = true) - @NotEmpty(message = "数据更新日期不能为空") - private String edwLastUpdate; - @ApiModelProperty(value = "数据有效标识", name = "edwValidFlag", required = true) - @NotEmpty(message = "数据有效标识不能为空") - private String edwValidFlag; - @ApiModelProperty(value = "分区列", name = "dataVersion", required = true) - @NotNull(message = "分区列不能为空") - private Long dataVersion; - @ApiModelProperty(value = "同步时间", name = "accLastUpdateDate", required = true) - @NotNull(message = "同步时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date accLastUpdateDate; - @ApiModelProperty(value = "自增长id主键", name = "idSequence", required = true) - @NotNull(message = "自增长id主键不能为空") - private Long idSequence; - @ApiModelProperty(value = "同步时间", name = "synctime", required = true) - @NotEmpty(message = "同步时间不能为空") - private String synctime; -} - 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 new file mode 100644 index 0000000..f2c29e2 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java @@ -0,0 +1,102 @@ +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 makejava + * @Date 2026-03-05 11:33:17 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MkmjGateAddCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotEmpty(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "口门区域id", name = "mkmjId", required = true) + @NotEmpty(message = "口门区域id不能为空") + private String mkmjId; + @ApiModelProperty(value = "通道id", name = "passageId", required = true) + @NotEmpty(message = "通道id不能为空") + private String passageId; + @ApiModelProperty(value = "闸机标识", name = "gateNumber", required = true) + @NotEmpty(message = "闸机标识不能为空") + private String gateNumber; + @ApiModelProperty(value = "闸机名称", name = "gateName", required = true) + @NotEmpty(message = "闸机名称不能为空") + private String gateName; + @ApiModelProperty(value = "闸机类型", name = "gateType", required = true) + @NotEmpty(message = "闸机类型不能为空") + private String gateType; + @ApiModelProperty(value = "闸机类型名称", name = "gateTypeName", required = true) + @NotEmpty(message = "闸机类型名称不能为空") + private String gateTypeName; + @ApiModelProperty(value = "闸机状态 1- 停用 2-正常", name = "gateStatus", required = true) + @NotEmpty(message = "闸机状态 1- 停用 2-正常不能为空") + private Integer gateStatus; + @ApiModelProperty(value = "闸机类别", name = "gateCategory", required = true) + @NotEmpty(message = "闸机类别不能为空") + private String gateCategory; + @ApiModelProperty(value = "闸机类别名称", name = "gateCategoryName", required = true) + @NotEmpty(message = "闸机类别名称不能为空") + private String gateCategoryName; + @ApiModelProperty(value = "闸机型号", name = "gateModel", required = true) + @NotEmpty(message = "闸机型号不能为空") + private String gateModel; + @ApiModelProperty(value = "闸机位置", name = "gatePosition", required = true) + @NotEmpty(message = "闸机位置不能为空") + private String gatePosition; + @ApiModelProperty(value = "经度", name = "longitude", required = true) + @NotEmpty(message = "经度不能为空") + private String longitude; + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + @NotEmpty(message = "纬度不能为空") + private String latitude; + @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识true false不能为空") + private String deleteEnum; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户id", name = "tenantId", required = true) + @NotEmpty(message = "租户id不能为空") + private Long tenantId; + @ApiModelProperty(value = "单位id", name = "orgId", required = true) + @NotEmpty(message = "单位id不能为空") + private Long orgId; + @ApiModelProperty(value = "版本", name = "version", required = true) + @NotEmpty(message = "版本不能为空") + private String version; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private String createTime; + @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) + @NotEmpty(message = "修改时间不能为空") + private String updateTime; + @ApiModelProperty(value = "创建人id", name = "createId", required = true) + @NotEmpty(message = "创建人id不能为空") + private Long createId; + @ApiModelProperty(value = "修改人id", name = "updateId", required = true) + @NotEmpty(message = "修改人id不能为空") + private Long updateId; + @ApiModelProperty(value = "${column.comment}", name = "env", required = true) + @NotEmpty(message = "${column.comment}不能为空") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGatePageQry.java similarity index 80% rename from web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessPageQry.java rename to web-client/src/main/java/com/zcloud/primeport/dto/MkmjGatePageQry.java index a475313..7548c0f 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGatePageQry.java @@ -7,11 +7,11 @@ import lombok.Data; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 + * @Author makejava + * @Date 2026-03-05 11:33:18 */ @Data -public class TemporaryAccessPageQry extends PageQuery { +public class MkmjGatePageQry extends PageQuery { /** * 查询条件操作前缀,支持以下几种数据库查询操作： @@ -23,6 +23,6 @@ public class TemporaryAccessPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private Long likeUserId; + private String likeMkmjId; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateUpdateCmd.java new file mode 100644 index 0000000..6b340aa --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateUpdateCmd.java @@ -0,0 +1,102 @@ +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 makejava + * @Date 2026-03-05 11:33:18 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MkmjGateUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotEmpty(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "口门区域id", name = "mkmjId", required = true) + @NotEmpty(message = "口门区域id不能为空") + private String mkmjId; + @ApiModelProperty(value = "通道id", name = "passageId", required = true) + @NotEmpty(message = "通道id不能为空") + private String passageId; + @ApiModelProperty(value = "闸机标识", name = "gateNumber", required = true) + @NotEmpty(message = "闸机标识不能为空") + private String gateNumber; + @ApiModelProperty(value = "闸机名称", name = "gateName", required = true) + @NotEmpty(message = "闸机名称不能为空") + private String gateName; + @ApiModelProperty(value = "闸机类型", name = "gateType", required = true) + @NotEmpty(message = "闸机类型不能为空") + private String gateType; + @ApiModelProperty(value = "闸机类型名称", name = "gateTypeName", required = true) + @NotEmpty(message = "闸机类型名称不能为空") + private String gateTypeName; + @ApiModelProperty(value = "闸机状态 1- 停用 2-正常", name = "gateStatus", required = true) + @NotEmpty(message = "闸机状态 1- 停用 2-正常不能为空") + private Integer gateStatus; + @ApiModelProperty(value = "闸机类别", name = "gateCategory", required = true) + @NotEmpty(message = "闸机类别不能为空") + private String gateCategory; + @ApiModelProperty(value = "闸机类别名称", name = "gateCategoryName", required = true) + @NotEmpty(message = "闸机类别名称不能为空") + private String gateCategoryName; + @ApiModelProperty(value = "闸机型号", name = "gateModel", required = true) + @NotEmpty(message = "闸机型号不能为空") + private String gateModel; + @ApiModelProperty(value = "闸机位置", name = "gatePosition", required = true) + @NotEmpty(message = "闸机位置不能为空") + private String gatePosition; + @ApiModelProperty(value = "经度", name = "longitude", required = true) + @NotEmpty(message = "经度不能为空") + private String longitude; + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + @NotEmpty(message = "纬度不能为空") + private String latitude; + @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识true false不能为空") + private String deleteEnum; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户id", name = "tenantId", required = true) + @NotEmpty(message = "租户id不能为空") + private Long tenantId; + @ApiModelProperty(value = "单位id", name = "orgId", required = true) + @NotEmpty(message = "单位id不能为空") + private Long orgId; + @ApiModelProperty(value = "版本", name = "version", required = true) + @NotEmpty(message = "版本不能为空") + private String version; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private String createTime; + @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) + @NotEmpty(message = "修改时间不能为空") + private String updateTime; + @ApiModelProperty(value = "创建人id", name = "createId", required = true) + @NotEmpty(message = "创建人id不能为空") + private Long createId; + @ApiModelProperty(value = "修改人id", name = "updateId", required = true) + @NotEmpty(message = "修改人id不能为空") + private Long updateId; + @ApiModelProperty(value = "${column.comment}", name = "env", required = true) + @NotEmpty(message = "${column.comment}不能为空") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoAddCmd.java deleted file mode 100644 index a558023..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoAddCmd.java +++ /dev/null @@ -1,61 +0,0 @@ -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 fangjiakai - * @Date 2025-11-14 17:16:03 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjGateVideoAddCmd extends Command { - @ApiModelProperty(value = "闸机摄像头id", name = "gateVideoId", required = true) - @NotEmpty(message = "闸机摄像头id不能为空") - private String gateVideoId; - - @ApiModelProperty(value = "口门/闸机id", name = "areaGateId", required = true) - @NotEmpty(message = "口门/闸机id不能为空") - private String areaGateId; - - @ApiModelProperty(value = "设备类型（1-口门 2-闸机）", name = "deviceType", required = true) - @NotNull(message = "设备类型（1-口门 2-闸机）不能为空") - private Integer deviceType; - - @ApiModelProperty(value = "摄像头id", name = "videoResourceId", required = true) - @NotEmpty(message = "摄像头id不能为空") - private String videoResourceId; - - @ApiModelProperty(value = "摄像头名称", name = "videoResourceName", required = true) - @NotEmpty(message = "摄像头名称不能为空") - private String videoResourceName; - - @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）", name = "videoType", required = true) - @NotNull(message = "摄像头类型（1-移动 2-平台）不能为空") - private Integer videoType; - - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") - private String corpinfoId; - - @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") - private String longitude; - - @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") - private String latitude; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoPageQry.java deleted file mode 100644 index 0fdd04b..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoPageQry.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Data -public class MkmjGateVideoPageQry extends PageQuery { - - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - private String eqAreaGateId; - private String likeVideoResourceName; - private Integer eqVideoType; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoUpdateCmd.java deleted file mode 100644 index efe3cc4..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoUpdateCmd.java +++ /dev/null @@ -1,55 +0,0 @@ -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 fangjiakai - * @Date 2025-11-14 17:16:03 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjGateVideoUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotNull(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "闸机摄像头id", name = "gateVideoId", required = true) - @NotEmpty(message = "闸机摄像头id不能为空") - private String gateVideoId; - @ApiModelProperty(value = "口门/闸机id", name = "areaGateId", required = true) - @NotEmpty(message = "口门/闸机id不能为空") - private String areaGateId; - @ApiModelProperty(value = "设备类型（1-口门 2-闸机）", name = "deviceType", required = true) - @NotNull(message = "设备类型（1-口门 2-闸机）不能为空") - private Integer deviceType; - @ApiModelProperty(value = "摄像头id", name = "videoResourceId", required = true) - @NotEmpty(message = "摄像头id不能为空") - private String videoResourceId; - @ApiModelProperty(value = "摄像头名称", name = "videoResourceName", required = true) - @NotEmpty(message = "摄像头名称不能为空") - private String videoResourceName; - @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）", name = "videoType", required = true) - @NotNull(message = "摄像头类型（1-移动 2-平台）不能为空") - private Integer videoType; - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") - private String corpinfoId; - @ApiModelProperty(value = "经度", name = "longitude", required = true) - @NotEmpty(message = "经度不能为空") - private String longitude; - @ApiModelProperty(value = "纬度", name = "latitude", required = true) - @NotEmpty(message = "纬度不能为空") - private String latitude; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehiclePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPageQry.java similarity index 74% rename from web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehiclePageQry.java rename to web-client/src/main/java/com/zcloud/primeport/dto/MkmjPageQry.java index 8e7079e..07dd8f3 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehiclePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPageQry.java @@ -8,11 +8,11 @@ import lombok.Data; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 + * @Author makejava + * @Date 2026-03-05 11:33:15 */ @Data -public class InspectionVehiclePageQry extends PageQuery { +public class MkmjPageQry extends PageQuery { /** * 查询条件操作前缀,支持以下几种数据库查询操作： @@ -24,6 +24,8 @@ public class InspectionVehiclePageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private Long likeInspectionDeptId; + private String likeMkmjName; + @ApiModelProperty(value = "前端标识") + private String menuPath; } 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 410f3c3..5dbe654 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 @@ -7,13 +7,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; /** * web-client * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @EqualsAndHashCode(callSuper = true) @Data @@ -23,26 +23,20 @@ public class MkmjPassageAddCmd extends Command { @ApiModelProperty(value = "通道名称", name = "passageName", required = true) @NotEmpty(message = "通道名称不能为空") private String passageName; - @ApiModelProperty(value = "通道类型 1-人行 2-车行 3-综合", name = "passageType", required = true) - @NotNull(message = "通道类型 1-人行 2-车行 3-综合不能为空") + @NotEmpty(message = "通道类型 1-人行 2-车行 3-综合不能为空") private Integer passageType; - - @ApiModelProperty(value = "通道状态 0-停用 1-正常 2-暂时关闭", name = "passageStatus", required = true) - @NotNull(message = "通道状态 0-停用 1-正常 2-暂时关闭不能为空") + @ApiModelProperty(value = "通道状态 1-停用 2-正常", name = "passageStatus", required = true) + @NotEmpty(message = "通道状态 1-停用 2-正常不能为空") private Integer passageStatus; - - @ApiModelProperty(value = "口门区域id", name = "areaId", required = true) + @ApiModelProperty(value = "口门区域id", name = "mkmjId", required = true) @NotEmpty(message = "口门区域id不能为空") - private String areaId; - + private String mkmjId; @ApiModelProperty(value = "经度", name = "longitude", required = true) @NotEmpty(message = "经度不能为空") private String longitude; - @ApiModelProperty(value = "纬度", name = "latitude", required = true) @NotEmpty(message = "纬度不能为空") private String latitude; - } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassagePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassagePageQry.java index c4beee0..f40f71e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassagePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassagePageQry.java @@ -1,15 +1,14 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * web-client * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Data public class MkmjPassagePageQry extends PageQuery { @@ -25,8 +24,5 @@ public class MkmjPassagePageQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ private String likePassageName; - private Integer eqPassageStatus; - private Integer eqPassageType; - private String eqAreaId; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java index e773e80..55ad778 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java @@ -7,13 +7,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; /** * web-client * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:20 */ @EqualsAndHashCode(callSuper = true) @Data @@ -21,28 +21,61 @@ import javax.validation.constraints.*; @AllArgsConstructor public class MkmjPassageUpdateCmd extends Command { @ApiModelProperty(value = "主键", name = "id", required = true) - @NotNull(message = "主键不能为空") + @NotEmpty(message = "主键不能为空") private Long id; - @ApiModelProperty(value = "业务主键id", name = "passageId", required = true) - @NotEmpty(message = "业务主键id不能为空") - private String passageId; @ApiModelProperty(value = "通道名称", name = "passageName", required = true) @NotEmpty(message = "通道名称不能为空") private String passageName; @ApiModelProperty(value = "通道类型 1-人行 2-车行 3-综合", name = "passageType", required = true) - @NotNull(message = "通道类型 1-人行 2-车行 3-综合不能为空") + @NotEmpty(message = "通道类型 1-人行 2-车行 3-综合不能为空") private Integer passageType; - @ApiModelProperty(value = "通道状态 0-停用 1-正常 2-暂时关闭", name = "passageStatus", required = true) - @NotNull(message = "通道状态 0-停用 1-正常 2-暂时关闭不能为空") + @ApiModelProperty(value = "通道状态 1-停用 2-正常", name = "passageStatus", required = true) + @NotEmpty(message = "通道状态 1-停用 2-正常不能为空") private Integer passageStatus; - @ApiModelProperty(value = "口门区域id", name = "areaId", required = true) + @ApiModelProperty(value = "口门区域id", name = "mkmjId", required = true) @NotEmpty(message = "口门区域id不能为空") - private String areaId; + private String mkmjId; @ApiModelProperty(value = "经度", name = "longitude", required = true) @NotEmpty(message = "经度不能为空") private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) @NotEmpty(message = "纬度不能为空") private String latitude; + @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识true false不能为空") + private String deleteEnum; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户id", name = "tenantId", required = true) + @NotEmpty(message = "租户id不能为空") + private Long tenantId; + @ApiModelProperty(value = "单位id", name = "orgId", required = true) + @NotEmpty(message = "单位id不能为空") + private Long orgId; + @ApiModelProperty(value = "版本", name = "version", required = true) + @NotEmpty(message = "版本不能为空") + private String version; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private String createTime; + @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) + @NotEmpty(message = "修改时间不能为空") + private String updateTime; + @ApiModelProperty(value = "创建人id", name = "createId", required = true) + @NotEmpty(message = "创建人id不能为空") + private Long createId; + @ApiModelProperty(value = "修改人id", name = "updateId", required = true) + @NotEmpty(message = "修改人id不能为空") + private Long updateId; + @ApiModelProperty(value = "${column.comment}", name = "env", required = true) + @NotEmpty(message = "${column.comment}不能为空") + private String env; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordAddCmd.java deleted file mode 100644 index a15b79c..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordAddCmd.java +++ /dev/null @@ -1,205 +0,0 @@ -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 fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjSwipeCardRecordAddCmd extends Command { - @ApiModelProperty(value = "节点编码", name = "nodecode", required = true) - @NotEmpty(message = "节点编码不能为空") - private String nodecode; - - @ApiModelProperty(value = "报警编号", name = "alarmcode", required = true) - @NotEmpty(message = "报警编号不能为空") - private String alarmcode; - - @ApiModelProperty(value = "报警图片路径", name = "alarmpicture", required = true) - @NotEmpty(message = "报警图片路径不能为空") - private String alarmpicture; - - @ApiModelProperty(value = "节点类型", name = "nodetype", required = true) - @NotEmpty(message = "节点类型不能为空") - private String nodetype; - - @ApiModelProperty(value = "报警时间，10位时间戳", name = "alarmdate", required = true) - @NotNull(message = "报警时间，10位时间戳不能为空") - private Integer alarmdate; - - @ApiModelProperty(value = "报警等级 1：严重，2：一般，3：轻微", name = "alarmgrade", required = true) - @NotNull(message = "报警等级 1：严重，2：一般，3：轻微不能为空") - private Integer alarmgrade; - - @ApiModelProperty(value = "单元类型", name = "unittype", required = true) - @NotNull(message = "单元类型不能为空") - private Integer unittype; - - @ApiModelProperty(value = "报警类型", name = "alarmtype", required = true) - @NotNull(message = "报警类型不能为空") - private Integer alarmtype; - - @ApiModelProperty(value = "通道序号", name = "channelseq", required = true) - @NotNull(message = "通道序号不能为空") - private Integer channelseq; - - @ApiModelProperty(value = "通道名称", name = "channelname", required = true) - @NotEmpty(message = "通道名称不能为空") - private String channelname; - - @ApiModelProperty(value = "报警状态 1：报警产生，2：报警消失", name = "alarmstat", required = true) - @NotNull(message = "报警状态 1：报警产生，2：报警消失不能为空") - private Integer alarmstat; - - @ApiModelProperty(value = "部门名称", name = "deptname", required = true) - @NotEmpty(message = "部门名称不能为空") - private String deptname; - - @ApiModelProperty(value = "通道编号", name = "acschannelcode", required = true) - @NotEmpty(message = "通道编号不能为空") - private String acschannelcode; - - @ApiModelProperty(value = "口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知", name = "maskstate", required = true) - @NotNull(message = "口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知不能为空") - private Integer maskstate; - - @ApiModelProperty(value = "进出门类型: 详见 读卡器业务类型字典", name = "enterorexit", required = true) - @NotEmpty(message = "进出门类型: 详见 读卡器业务类型字典不能为空") - private String enterorexit; - - @ApiModelProperty(value = "开门类型字符串", name = "opentypestr", required = true) - @NotEmpty(message = "开门类型字符串不能为空") - private String opentypestr; - - @ApiModelProperty(value = "刷卡时间，格式：yyyy-MM:dd HH:mm:ss", name = "swingtime", required = true) - @NotEmpty(message = "刷卡时间，格式：yyyy-MM:dd HH:mm:ss不能为空") - private String swingtime; - - @ApiModelProperty(value = "设备名称", name = "devicename", required = true) - @NotEmpty(message = "设备名称不能为空") - private String devicename; - - @ApiModelProperty(value = "人员编号", name = "personcode", required = true) - @NotEmpty(message = "人员编号不能为空") - private String personcode; - - @ApiModelProperty(value = "开门类型, 详见开门类型 字典", name = "opentype", required = true) - @NotEmpty(message = "开门类型, 详见开门类型 字典不能为空") - private String opentype; - - @ApiModelProperty(value = "组织编码", name = "orgcode", required = true) - @NotEmpty(message = "组织编码不能为空") - private String orgcode; - - @ApiModelProperty(value = "证件类型", name = "papertype", required = true) - @NotEmpty(message = "证件类型不能为空") - private String papertype; - - @ApiModelProperty(value = "证件号", name = "papernumber", required = true) - @NotEmpty(message = "证件号不能为空") - private String papernumber; - - @ApiModelProperty(value = "错误详情", name = "errordetail", required = true) - @NotEmpty(message = "错误详情不能为空") - private String errordetail; - - @ApiModelProperty(value = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码", name = "openfailedcod", required = true) - @NotEmpty(message = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码不能为空") - private String openfailedcod; - - @ApiModelProperty(value = "固定值：evo-accesscontrol", name = "from", required = true) - @NotEmpty(message = "固定值：evo-accesscontrol不能为空") - private String from; - - @ApiModelProperty(value = "extendId标识", name = "extendid", required = true) - @NotNull(message = "extendId标识不能为空") - private Long extendid; - - @ApiModelProperty(value = "开始时间, 13位时间戳", name = "begintime", required = true) - @NotNull(message = "开始时间, 13位时间戳不能为空") - private Long begintime; - - @ApiModelProperty(value = "通道名称", name = "acschannelname", required = true) - @NotEmpty(message = "通道名称不能为空") - private String acschannelname; - - @ApiModelProperty(value = "预留字段，暂未使用，默认值为0", name = "cardstatus", required = true) - @NotNull(message = "预留字段，暂未使用，默认值为0不能为空") - private Integer cardstatus; - - @ApiModelProperty(value = "组织名称", name = "orgname", required = true) - @NotEmpty(message = "组织名称不能为空") - private String orgname; - - @ApiModelProperty(value = "性别 1 男，2 女， 0 未知", name = "sex", required = true) - @NotNull(message = "性别 1 男，2 女， 0 未知不能为空") - private Integer sex; - - @ApiModelProperty(value = "人员部门id", name = "deptid", required = true) - @NotNull(message = "人员部门id不能为空") - private Integer deptid; - - @ApiModelProperty(value = "卡类型", name = "cardtype", required = true) - @NotNull(message = "卡类型不能为空") - private Integer cardtype; - - @ApiModelProperty(value = "设备编号", name = "devicecode", required = true) - @NotEmpty(message = "设备编号不能为空") - private String devicecode; - - @ApiModelProperty(value = "人员姓名", name = "personname", required = true) - @NotEmpty(message = "人员姓名不能为空") - private String personname; - - @ApiModelProperty(value = "刷卡人在平台上的图片，相对路径", name = "personimg", required = true) - @NotEmpty(message = "刷卡人在平台上的图片，相对路径不能为空") - private String personimg; - - @ApiModelProperty(value = "开门结果 0 失败 1 成功", name = "openresult", required = true) - @NotNull(message = "开门结果 0 失败 1 成功不能为空") - private Integer openresult; - - @ApiModelProperty(value = "人员id", name = "personid", required = true) - @NotNull(message = "人员id不能为空") - private Integer personid; - - @ApiModelProperty(value = "抓拍图，相对路径", name = "recordimage1", required = true) - @NotEmpty(message = "抓拍图，相对路径不能为空") - private String recordimage1; - - @ApiModelProperty(value = "卡介质 0 IC 1 有源RFID 2 CPU", name = "category", required = true) - @NotEmpty(message = "卡介质 0 IC 1 有源RFID 2 CPU不能为空") - private String category; - - @ApiModelProperty(value = "卡号", name = "cardnumber", required = true) - @NotEmpty(message = "卡号不能为空") - private String cardnumber; - - @ApiModelProperty(value = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物", name = "rfidtype", required = true) - @NotNull(message = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物不能为空") - private Integer rfidtype; - - @ApiModelProperty(value = "年龄", name = "age", required = true) - @NotNull(message = "年龄不能为空") - private Integer age; - - @ApiModelProperty(value = "0-非访客，1-访客", name = "vrecordflag", required = true) - @NotNull(message = "0-非访客，1-访客不能为空") - private Integer vrecordflag; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordUpdateCmd.java deleted file mode 100644 index 269df1e..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordUpdateCmd.java +++ /dev/null @@ -1,163 +0,0 @@ -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 fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjSwipeCardRecordUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotNull(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "节点编码", name = "nodecode", required = true) - @NotEmpty(message = "节点编码不能为空") - private String nodecode; - @ApiModelProperty(value = "报警编号", name = "alarmcode", required = true) - @NotEmpty(message = "报警编号不能为空") - private String alarmcode; - @ApiModelProperty(value = "报警图片路径", name = "alarmpicture", required = true) - @NotEmpty(message = "报警图片路径不能为空") - private String alarmpicture; - @ApiModelProperty(value = "节点类型", name = "nodetype", required = true) - @NotEmpty(message = "节点类型不能为空") - private String nodetype; - @ApiModelProperty(value = "报警时间，10位时间戳", name = "alarmdate", required = true) - @NotNull(message = "报警时间，10位时间戳不能为空") - private Integer alarmdate; - @ApiModelProperty(value = "报警等级 1：严重，2：一般，3：轻微", name = "alarmgrade", required = true) - @NotNull(message = "报警等级 1：严重，2：一般，3：轻微不能为空") - private Integer alarmgrade; - @ApiModelProperty(value = "单元类型", name = "unittype", required = true) - @NotNull(message = "单元类型不能为空") - private Integer unittype; - @ApiModelProperty(value = "报警类型", name = "alarmtype", required = true) - @NotNull(message = "报警类型不能为空") - private Integer alarmtype; - @ApiModelProperty(value = "通道序号", name = "channelseq", required = true) - @NotNull(message = "通道序号不能为空") - private Integer channelseq; - @ApiModelProperty(value = "通道名称", name = "channelname", required = true) - @NotEmpty(message = "通道名称不能为空") - private String channelname; - @ApiModelProperty(value = "报警状态 1：报警产生，2：报警消失", name = "alarmstat", required = true) - @NotNull(message = "报警状态 1：报警产生，2：报警消失不能为空") - private Integer alarmstat; - @ApiModelProperty(value = "部门名称", name = "deptname", required = true) - @NotEmpty(message = "部门名称不能为空") - private String deptname; - @ApiModelProperty(value = "通道编号", name = "acschannelcode", required = true) - @NotEmpty(message = "通道编号不能为空") - private String acschannelcode; - @ApiModelProperty(value = "口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知", name = "maskstate", required = true) - @NotNull(message = "口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知不能为空") - private Integer maskstate; - @ApiModelProperty(value = "进出门类型: 详见 读卡器业务类型字典", name = "enterorexit", required = true) - @NotEmpty(message = "进出门类型: 详见 读卡器业务类型字典不能为空") - private String enterorexit; - @ApiModelProperty(value = "开门类型字符串", name = "opentypestr", required = true) - @NotEmpty(message = "开门类型字符串不能为空") - private String opentypestr; - @ApiModelProperty(value = "刷卡时间，格式：yyyy-MM:dd HH:mm:ss", name = "swingtime", required = true) - @NotEmpty(message = "刷卡时间，格式：yyyy-MM:dd HH:mm:ss不能为空") - private String swingtime; - @ApiModelProperty(value = "设备名称", name = "devicename", required = true) - @NotEmpty(message = "设备名称不能为空") - private String devicename; - @ApiModelProperty(value = "人员编号", name = "personcode", required = true) - @NotEmpty(message = "人员编号不能为空") - private String personcode; - @ApiModelProperty(value = "开门类型, 详见开门类型 字典", name = "opentype", required = true) - @NotEmpty(message = "开门类型, 详见开门类型 字典不能为空") - private String opentype; - @ApiModelProperty(value = "组织编码", name = "orgcode", required = true) - @NotEmpty(message = "组织编码不能为空") - private String orgcode; - @ApiModelProperty(value = "证件类型", name = "papertype", required = true) - @NotEmpty(message = "证件类型不能为空") - private String papertype; - @ApiModelProperty(value = "证件号", name = "papernumber", required = true) - @NotEmpty(message = "证件号不能为空") - private String papernumber; - @ApiModelProperty(value = "错误详情", name = "errordetail", required = true) - @NotEmpty(message = "错误详情不能为空") - private String errordetail; - @ApiModelProperty(value = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码", name = "openfailedcod", required = true) - @NotEmpty(message = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码不能为空") - private String openfailedcod; - @ApiModelProperty(value = "固定值：evo-accesscontrol", name = "from", required = true) - @NotEmpty(message = "固定值：evo-accesscontrol不能为空") - private String from; - @ApiModelProperty(value = "extendId标识", name = "extendid", required = true) - @NotNull(message = "extendId标识不能为空") - private Long extendid; - @ApiModelProperty(value = "开始时间, 13位时间戳", name = "begintime", required = true) - @NotNull(message = "开始时间, 13位时间戳不能为空") - private Long begintime; - @ApiModelProperty(value = "通道名称", name = "acschannelname", required = true) - @NotEmpty(message = "通道名称不能为空") - private String acschannelname; - @ApiModelProperty(value = "预留字段，暂未使用，默认值为0", name = "cardstatus", required = true) - @NotNull(message = "预留字段，暂未使用，默认值为0不能为空") - private Integer cardstatus; - @ApiModelProperty(value = "组织名称", name = "orgname", required = true) - @NotEmpty(message = "组织名称不能为空") - private String orgname; - @ApiModelProperty(value = "性别 1 男，2 女， 0 未知", name = "sex", required = true) - @NotNull(message = "性别 1 男，2 女， 0 未知不能为空") - private Integer sex; - @ApiModelProperty(value = "人员部门id", name = "deptid", required = true) - @NotNull(message = "人员部门id不能为空") - private Integer deptid; - @ApiModelProperty(value = "卡类型", name = "cardtype", required = true) - @NotNull(message = "卡类型不能为空") - private Integer cardtype; - @ApiModelProperty(value = "设备编号", name = "devicecode", required = true) - @NotEmpty(message = "设备编号不能为空") - private String devicecode; - @ApiModelProperty(value = "人员姓名", name = "personname", required = true) - @NotEmpty(message = "人员姓名不能为空") - private String personname; - @ApiModelProperty(value = "刷卡人在平台上的图片，相对路径", name = "personimg", required = true) - @NotEmpty(message = "刷卡人在平台上的图片，相对路径不能为空") - private String personimg; - @ApiModelProperty(value = "开门结果 0 失败 1 成功", name = "openresult", required = true) - @NotNull(message = "开门结果 0 失败 1 成功不能为空") - private Integer openresult; - @ApiModelProperty(value = "人员id", name = "personid", required = true) - @NotNull(message = "人员id不能为空") - private Integer personid; - @ApiModelProperty(value = "抓拍图，相对路径", name = "recordimage1", required = true) - @NotEmpty(message = "抓拍图，相对路径不能为空") - private String recordimage1; - @ApiModelProperty(value = "卡介质 0 IC 1 有源RFID 2 CPU", name = "category", required = true) - @NotEmpty(message = "卡介质 0 IC 1 有源RFID 2 CPU不能为空") - private String category; - @ApiModelProperty(value = "卡号", name = "cardnumber", required = true) - @NotEmpty(message = "卡号不能为空") - private String cardnumber; - @ApiModelProperty(value = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物", name = "rfidtype", required = true) - @NotNull(message = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物不能为空") - private Integer rfidtype; - @ApiModelProperty(value = "年龄", name = "age", required = true) - @NotNull(message = "年龄不能为空") - private Integer age; - @ApiModelProperty(value = "0-非访客，1-访客", name = "vrecordflag", required = true) - @NotNull(message = "0-非访客，1-访客不能为空") - private Integer vrecordflag; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateCmd.java new file mode 100644 index 0000000..151a9c5 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateCmd.java @@ -0,0 +1,62 @@ +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 makejava + * @Date 2026-03-05 11:33:16 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MkmjUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "口门名称", name = "mkmjName", required = true) + @NotEmpty(message = "口门名称不能为空") + private String mkmjName; + @ApiModelProperty(value = "口门级别 1-一级 2-二级", name = "mkmjLevel", required = true) + @NotNull(message = "口门级别 1-一级 2-二级不能为空") + private Integer mkmjLevel; + @ApiModelProperty(value = "口门类型", name = "mkmjType", required = true) + @NotEmpty(message = "口门类型") + private String mkmjType; + @ApiModelProperty(value = "所属港区", name = "hgAuthArea", required = true) + @NotEmpty(message = "所属港区不能为空") + private String hgAuthArea; + @ApiModelProperty(value = "所属港区名称", name = "hgAuthAreaName", required = true) + @NotEmpty(message = "所属港区名称不能为空") + private String hgAuthAreaName; + @ApiModelProperty(value = "口门类型名称1-人行 2-车行 3-综合", name = "mkmjTypeName", required = true) + @NotEmpty(message = "口门类型名称1-人行 2-车行 3-综合不能为空") + private String mkmjTypeName; + @ApiModelProperty(value = "口门状态 1-停用 2-正常", name = "mkmjStatus", required = true) + @NotNull(message = "口门状态 1-停用 2-正常不能为空") + private Integer mkmjStatus; + @ApiModelProperty(value = "入方向区域- 二级有用", name = "inDirectionArea", required = true) + private Long inDirectionArea; + @ApiModelProperty(value = "入方向区域名称- 二级有用", name = "inDirectionAreaName", required = true) + private Long inDirectionAreaName; + @ApiModelProperty(value = "出方向区域- 二级有用", name = "outDirectionArea", required = true) + private Long outDirectionArea; + @ApiModelProperty(value = "出方向区域名称- 二级有用", name = "outDirectionAreaName", required = true) + private Long outDirectionAreaName; + @ApiModelProperty(value = "经度", name = "longitude", required = true) + private String longitude; + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + private String latitude; + +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java new file mode 100644 index 0000000..80ceb54 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java @@ -0,0 +1,117 @@ +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 makejava + * @Date 2026-03-05 11:33:21 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PersonApplyAddCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) + @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空") + private Object personBelongType; + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @NotEmpty(message = "授权范围港区与区域不能为空") + private Object gateLevelAuthArea; + @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)", name = "auditFlag", required = true) + @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)不能为空") + private Integer auditFlag; + @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) + @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") + private Integer mkmjPermission; + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private Date visitEndTime; + @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId", required = true) + @NotEmpty(message = "待审批人员所属企业ID不能为空") + private Long personCorpId; + @ApiModelProperty(value = "待审批人员所属企业名称", name = "personCorpName", required = true) + @NotEmpty(message = "待审批人员所属企业名称不能为空") + private String personCorpName; + @ApiModelProperty(value = "待审批人员所属部门id", name = "personDepartmentId", required = true) + @NotEmpty(message = "待审批人员所属部门id不能为空") + private Long personDepartmentId; + @ApiModelProperty(value = "待审批人员部门名称", name = "personDepartmentName", required = true) + @NotEmpty(message = "待审批人员部门名称不能为空") + private String personDepartmentName; + @ApiModelProperty(value = "待审批人员id", name = "employeePersonUserId", required = true) + @NotEmpty(message = "待审批人员id不能为空") + private Long employeePersonUserId; + @ApiModelProperty(value = "待审批人员姓名", name = "employeePersonUserName", required = true) + @NotEmpty(message = "待审批人员姓名不能为空") + private String employeePersonUserName; + @ApiModelProperty(value = "头像", name = "userFaceUrl", required = true) + @NotEmpty(message = "头像不能为空") + private String userFaceUrl; + @ApiModelProperty(value = "手机号", name = "userPhone", required = true) + @NotEmpty(message = "手机号不能为空") + private String userPhone; + @ApiModelProperty(value = "身份证号码", name = "userCard", required = true) + @NotEmpty(message = "身份证号码不能为空") + private String userCard; + @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) + @NotEmpty(message = "告知签字不能为空") + private Long informSignId; + @ApiModelProperty(value = "项目id", name = "projectId", required = true) + @NotEmpty(message = "项目id不能为空") + private Long projectId; + @ApiModelProperty(value = "项目名称", name = "projectName", required = true) + @NotEmpty(message = "项目名称不能为空") + private String projectName; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "来访事由", name = "remarks", required = true) + @NotEmpty(message = "来访事由不能为空") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOnePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyPageQry.java similarity index 79% rename from web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOnePageQry.java rename to web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyPageQry.java index dac2b49..29b8726 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/GatePersonAuthLevelOnePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyPageQry.java @@ -7,11 +7,11 @@ import lombok.Data; /** * web-client * - * @Author dearLin - * @Date 2025-12-31 10:51:44 + * @Author makejava + * @Date 2026-03-05 11:33:22 */ @Data -public class GatePersonAuthLevelOnePageQry extends PageQuery { +public class PersonApplyPageQry extends PageQuery { /** * 查询条件操作前缀,支持以下几种数据库查询操作： @@ -23,6 +23,6 @@ public class GatePersonAuthLevelOnePageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeUserCard; + private Object likePersonBelongType; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java new file mode 100644 index 0000000..7ab33bb --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java @@ -0,0 +1,117 @@ +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 makejava + * @Date 2026-03-05 11:33:22 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PersonApplyUpdateCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) + @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空") + private Object personBelongType; + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @NotEmpty(message = "授权范围港区与区域不能为空") + private Object gateLevelAuthArea; + @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)", name = "auditFlag", required = true) + @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)不能为空") + private Integer auditFlag; + @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) + @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") + private Integer mkmjPermission; + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private Date visitEndTime; + @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId", required = true) + @NotEmpty(message = "待审批人员所属企业ID不能为空") + private Long personCorpId; + @ApiModelProperty(value = "待审批人员所属企业名称", name = "personCorpName", required = true) + @NotEmpty(message = "待审批人员所属企业名称不能为空") + private String personCorpName; + @ApiModelProperty(value = "待审批人员所属部门id", name = "personDepartmentId", required = true) + @NotEmpty(message = "待审批人员所属部门id不能为空") + private Long personDepartmentId; + @ApiModelProperty(value = "待审批人员部门名称", name = "personDepartmentName", required = true) + @NotEmpty(message = "待审批人员部门名称不能为空") + private String personDepartmentName; + @ApiModelProperty(value = "待审批人员id", name = "employeePersonUserId", required = true) + @NotEmpty(message = "待审批人员id不能为空") + private Long employeePersonUserId; + @ApiModelProperty(value = "待审批人员姓名", name = "employeePersonUserName", required = true) + @NotEmpty(message = "待审批人员姓名不能为空") + private String employeePersonUserName; + @ApiModelProperty(value = "头像", name = "userFaceUrl", required = true) + @NotEmpty(message = "头像不能为空") + private String userFaceUrl; + @ApiModelProperty(value = "手机号", name = "userPhone", required = true) + @NotEmpty(message = "手机号不能为空") + private String userPhone; + @ApiModelProperty(value = "身份证号码", name = "userCard", required = true) + @NotEmpty(message = "身份证号码不能为空") + private String userCard; + @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) + @NotEmpty(message = "告知签字不能为空") + private Long informSignId; + @ApiModelProperty(value = "项目id", name = "projectId", required = true) + @NotEmpty(message = "项目id不能为空") + private Long projectId; + @ApiModelProperty(value = "项目名称", name = "projectName", required = true) + @NotEmpty(message = "项目名称不能为空") + private String projectName; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "来访事由", name = "remarks", required = true) + @NotEmpty(message = "来访事由不能为空") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java new file mode 100644 index 0000000..3de141a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java @@ -0,0 +1,90 @@ +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 makejava + * @Date 2026-03-05 11:33:20 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PersonMessageAddCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Object id; + @ApiModelProperty(value = "人员申请id", name = "personApplyId", required = true) + @NotEmpty(message = "人员申请id不能为空") + private Long personApplyId; + @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) + @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空") + private Object personBelongType; + @ApiModelProperty(value = "头像", name = "userFaceUrl", required = true) + @NotEmpty(message = "头像不能为空") + private String userFaceUrl; + @ApiModelProperty(value = "身份证号码", name = "userCard", required = true) + @NotEmpty(message = "身份证号码不能为空") + private String userCard; + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @NotEmpty(message = "授权范围港区与区域不能为空") + private Object gateLevelAuthArea; + @ApiModelProperty(value = "授权访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "授权访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "授权访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "授权访问结束时间不能为空") + private Date visitEndTime; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true) + @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空") + private Integer syncStatus; + @ApiModelProperty(value = "对接说明", name = "syncRemarks", required = true) + @NotEmpty(message = "对接说明不能为空") + private String syncRemarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessagePageQry.java similarity index 79% rename from web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordPageQry.java rename to web-client/src/main/java/com/zcloud/primeport/dto/PersonMessagePageQry.java index a37b83f..57ce9ea 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessagePageQry.java @@ -7,11 +7,11 @@ import lombok.Data; /** * web-client * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 + * @Author makejava + * @Date 2026-03-05 11:33:21 */ @Data -public class MkmjSwipeCardRecordPageQry extends PageQuery { +public class PersonMessagePageQry extends PageQuery { /** * 查询条件操作前缀,支持以下几种数据库查询操作： @@ -23,6 +23,6 @@ public class MkmjSwipeCardRecordPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeNodecode; + private Long likePersonApplyId; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java new file mode 100644 index 0000000..28f75fe --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java @@ -0,0 +1,90 @@ +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 makejava + * @Date 2026-03-05 11:33:21 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PersonMessageUpdateCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Object id; + @ApiModelProperty(value = "人员申请id", name = "personApplyId", required = true) + @NotEmpty(message = "人员申请id不能为空") + private Long personApplyId; + @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) + @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空") + private Object personBelongType; + @ApiModelProperty(value = "头像", name = "userFaceUrl", required = true) + @NotEmpty(message = "头像不能为空") + private String userFaceUrl; + @ApiModelProperty(value = "身份证号码", name = "userCard", required = true) + @NotEmpty(message = "身份证号码不能为空") + private String userCard; + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @NotEmpty(message = "授权范围港区与区域不能为空") + private Object gateLevelAuthArea; + @ApiModelProperty(value = "授权访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "授权访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "授权访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "授权访问结束时间不能为空") + private Date visitEndTime; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true) + @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空") + private Integer syncStatus; + @ApiModelProperty(value = "对接说明", name = "syncRemarks", required = true) + @NotEmpty(message = "对接说明不能为空") + private String syncRemarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/StatisticsByAreaCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/StatisticsByAreaCmd.java deleted file mode 100644 index 31ac197..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/StatisticsByAreaCmd.java +++ /dev/null @@ -1,22 +0,0 @@ -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 java.util.List; - -/** - * @author fangjiakai - * @date 2025/11/17 9:41 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class StatisticsByAreaCmd extends Command { - List ids; -} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessAddCmd.java deleted file mode 100644 index 484ed40..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessAddCmd.java +++ /dev/null @@ -1,112 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class TemporaryAccessAddCmd extends Command { - @ApiModelProperty(value = "审批人ID", name = "userId", required = true) - @NotNull(message = "审批人ID不能为空") - private Long userId; - - @ApiModelProperty(value = "审批人姓名", name = "userName", required = true) - @NotEmpty(message = "审批人姓名不能为空") - private String userName; - - @ApiModelProperty(value = "手机号", name = "phone", required = true) - @NotEmpty(message = "手机号不能为空") - private String phone; - - @ApiModelProperty(value = "身份证号", name = "idCard", required = true) - @NotEmpty(message = "身份证号不能为空") - private String idCard; - - @ApiModelProperty(value = "企业ID", name = "corpId", required = true) - @NotEmpty(message = "企业ID不能为空") - private String corpId; - - @ApiModelProperty(value = "企业名称", name = "corpName", required = true) - @NotEmpty(message = "企业名称不能为空") - private String corpName; - - @ApiModelProperty(value = "部门id", name = "deptId", required = true) - @NotEmpty(message = "部门id不能为空") - private String deptId; - - @ApiModelProperty(value = "部门名称", name = "deptName", required = true) - @NotEmpty(message = "部门名称不能为空") - private String deptName; - - @ApiModelProperty(value = "车牌号", name = "carNo", required = true) - @NotEmpty(message = "车牌号不能为空") - private String carNo; - - @ApiModelProperty(value = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)", name = "carPlantType", required = true) - @NotEmpty(message = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)不能为空") - private String carPlantType; - - @ApiModelProperty(value = "车辆类型(0：货车，1：轿车，2：大巴客车)", name = "carType", required = true) - @NotEmpty(message = "车辆类型(0：货车，1：轿车，2：大巴客车)不能为空") - private String carType; - - @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 = "doorId", required = true) - @NotEmpty(message = "口门ID不能为空") - private String doorId; - - @ApiModelProperty(value = "口门名称", name = "doorName", required = true) - @NotEmpty(message = "口门名称不能为空") - private String doorName; - - @ApiModelProperty(value = "驾驶证照片", name = "drivingLicensePath", required = true) - @NotEmpty(message = "驾驶证照片不能为空") - private String drivingLicensePath; - - @ApiModelProperty(value = "身份证正面", name = "idCardFrontPath", required = true) - @NotEmpty(message = "身份证正面不能为空") - private String idCardFrontPath; - - @ApiModelProperty(value = "身份证反面", name = "idCardFlipsidePath", required = true) - @NotEmpty(message = "身份证反面不能为空") - private String idCardFlipsidePath; - - @ApiModelProperty(value = "访问类型(1：人员，2：车辆)", name = "temporaryType", required = true) - @NotEmpty(message = "访问类型(1：人员，2：车辆)不能为空") - private String temporaryType; - - @ApiModelProperty(value = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)", name = "temporaryFrom", required = true) - @NotEmpty(message = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)不能为空") - private String temporaryFrom; - - @ApiModelProperty(value = "来访事由", name = "visitReason", required = true) - @NotEmpty(message = "来访事由不能为空") - private String visitReason; - - @ApiModelProperty(value = "排放标准:", name = " emissionStandards", required = true) - @NotEmpty(message = "排放标准:") - private String emissionStandards; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageAddCmd.java deleted file mode 100644 index 5446f25..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageAddCmd.java +++ /dev/null @@ -1,45 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class TemporaryAccessEntourageAddCmd extends Command { - @ApiModelProperty(value = "${column.comment}", name = "entourageId", required = true) - @NotNull(message = "${column.comment}不能为空") - private Long entourageId; - - @ApiModelProperty(value = "临时访问表id", name = "temporaryId", required = true) - @NotNull(message = "临时访问表id不能为空") - private Long temporaryId; - - @ApiModelProperty(value = "姓名", name = "name", required = true) - @NotEmpty(message = "姓名不能为空") - private String name; - - @ApiModelProperty(value = "手机号", name = "phone", required = true) - @NotEmpty(message = "手机号不能为空") - private String phone; - - @ApiModelProperty(value = "工作单位", name = "jobName", required = true) - @NotEmpty(message = "工作单位不能为空") - private String jobName; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntouragePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntouragePageQry.java deleted file mode 100644 index 43438bf..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntouragePageQry.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.zcloud.primeport.dto; - -import com.alibaba.cola.dto.PageQuery; -import lombok.Data; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Data -public class TemporaryAccessEntouragePageQry extends PageQuery { - - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - private Long likeTemporaryId; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageUpdateCmd.java deleted file mode 100644 index 4d157b6..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageUpdateCmd.java +++ /dev/null @@ -1,40 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class TemporaryAccessEntourageUpdateCmd extends Command { - @ApiModelProperty(value = "${column.comment}", name = "entourageId", required = true) - @NotNull(message = "${column.comment}不能为空") - private Long entourageId; - @ApiModelProperty(value = "临时访问表id", name = "temporaryId", required = true) - @NotNull(message = "临时访问表id不能为空") - private Long temporaryId; - @ApiModelProperty(value = "姓名", name = "name", required = true) - @NotEmpty(message = "姓名不能为空") - private String name; - @ApiModelProperty(value = "手机号", name = "phone", required = true) - @NotEmpty(message = "手机号不能为空") - private String phone; - @ApiModelProperty(value = "工作单位", name = "jobName", required = true) - @NotEmpty(message = "工作单位不能为空") - private String jobName; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessUpdateCmd.java deleted file mode 100644 index 83ae1a7..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessUpdateCmd.java +++ /dev/null @@ -1,94 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class TemporaryAccessUpdateCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotNull(message = "id不能为空") - private Long id; - @ApiModelProperty(value = "审批人ID", name = "userId", required = true) - @NotNull(message = "审批人ID不能为空") - private Long userId; - @ApiModelProperty(value = "审批人姓名", name = "userName", required = true) - @NotEmpty(message = "审批人姓名不能为空") - private String userName; - @ApiModelProperty(value = "手机号", name = "phone", required = true) - @NotEmpty(message = "手机号不能为空") - private String phone; - @ApiModelProperty(value = "身份证号", name = "idCard", required = true) - @NotEmpty(message = "身份证号不能为空") - private String idCard; - @ApiModelProperty(value = "企业ID", name = "corpId", required = true) - @NotEmpty(message = "企业ID不能为空") - private String corpId; - @ApiModelProperty(value = "企业名称", name = "corpName", required = true) - @NotEmpty(message = "企业名称不能为空") - private String corpName; - @ApiModelProperty(value = "部门id", name = "deptId", required = true) - @NotEmpty(message = "部门id不能为空") - private String deptId; - @ApiModelProperty(value = "部门名称", name = "deptName", required = true) - @NotEmpty(message = "部门名称不能为空") - private String deptName; - @ApiModelProperty(value = "车牌号", name = "carNo", required = true) - @NotEmpty(message = "车牌号不能为空") - private String carNo; - @ApiModelProperty(value = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)", name = "carPlantType", required = true) - @NotEmpty(message = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)不能为空") - private String carPlantType; - @ApiModelProperty(value = "车辆类型(0：货车，1：轿车，2：大巴客车)", name = "carType", required = true) - @NotEmpty(message = "车辆类型(0：货车，1：轿车，2：大巴客车)不能为空") - private String carType; - @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 = "doorId", required = true) - @NotEmpty(message = "口门ID不能为空") - private String doorId; - @ApiModelProperty(value = "口门名称", name = "doorName", required = true) - @NotEmpty(message = "口门名称不能为空") - private String doorName; - @ApiModelProperty(value = "驾驶证照片", name = "drivingLicensePath", required = true) - @NotEmpty(message = "驾驶证照片不能为空") - private String drivingLicensePath; - @ApiModelProperty(value = "身份证正面", name = "idCardFrontPath", required = true) - @NotEmpty(message = "身份证正面不能为空") - private String idCardFrontPath; - @ApiModelProperty(value = "身份证反面", name = "idCardFlipsidePath", required = true) - @NotEmpty(message = "身份证反面不能为空") - private String idCardFlipsidePath; - @ApiModelProperty(value = "访问类型(1：人员，2：车辆)", name = "temporaryType", required = true) - @NotEmpty(message = "访问类型(1：人员，2：车辆)不能为空") - private String temporaryType; - @ApiModelProperty(value = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)", name = "temporaryFrom", required = true) - @NotEmpty(message = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)不能为空") - private String temporaryFrom; - @ApiModelProperty(value = "来访事由", name = "visitReason", required = true) - @NotEmpty(message = "来访事由不能为空") - private String visitReason; - @ApiModelProperty(value = "排放标准:", name = " emissionStandards", required = true) - @NotEmpty(message = "排放标准:") - private String emissionStandards; -} - 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 new file mode 100644 index 0000000..86aa725 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java @@ -0,0 +1,153 @@ +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 makejava + * @Date 2026-03-05 11:33:23 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VehicleApplyAddCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true) + @NotEmpty(message = "车辆状态(1未启用,2启用)不能为空") + private Integer statusFlag; + @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) + @NotEmpty(message = "车牌类型数据字典不能为空") + private String licenceType; + @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) + @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空") + private Integer auditFlag; + @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) + @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") + private Integer mkmjPermission; + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private Date visitEndTime; + @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId", required = true) + @NotEmpty(message = "车辆所属企业ID不能为空") + private Long vehicleCorpId; + @ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName", required = true) + @NotEmpty(message = "车辆所属企业名称不能为空") + private String vehicleCorpName; + @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) + @NotEmpty(message = "车辆所属部门id不能为空") + private Long vehicleDepartmentId; + @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true) + @NotEmpty(message = "车辆所属部门名称不能为空") + private String vehicleDepartmentName; + @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId", required = true) + @NotEmpty(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 = "排放标准: + level1 ->国一 + level2 ->国二 + level3 ->国三 + level4 ->国四 + level5 ->国五 + level6 ->国六", name = "emissionStandardsName", required = true) + @NotEmpty(message = "排放标准: + level1 ->国一 + level2 ->国二 + level3 ->国三 + level4 ->国四 + level5 ->国五 + level6 ->国六不能为空") + private String emissionStandardsName; + @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) + @NotEmpty(message = "行驶证照片不能为空") + private Long drivingLicenseId; + @ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true) + @NotEmpty(message = "车辆照片不能为空") + private Long attachmentId; + @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) + @NotEmpty(message = "告知签字不能为空") + private Long informSignId; + @ApiModelProperty(value = "项目id", name = "projectId", required = true) + @NotEmpty(message = "项目id不能为空") + private Long projectId; + @ApiModelProperty(value = "项目名称", name = "projectName", required = true) + @NotEmpty(message = "项目名称不能为空") + private String projectName; + @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true) + @NotEmpty(message = "1被拉黑2未拉黑不能为空") + private Integer blockedFlag; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java similarity index 79% rename from web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordPageQry.java rename to web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java index 5385fd1..cdd1f55 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjCarRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java @@ -7,11 +7,11 @@ import lombok.Data; /** * web-client * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 + * @Author makejava + * @Date 2026-03-05 11:33:24 */ @Data -public class MkmjCarRecordPageQry extends PageQuery { +public class VehicleApplyPageQry extends PageQuery { /** * 查询条件操作前缀,支持以下几种数据库查询操作： @@ -23,6 +23,6 @@ public class MkmjCarRecordPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeVehicleRecordId; + private Integer likeStatusFlag; } 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 new file mode 100644 index 0000000..1ee845f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java @@ -0,0 +1,153 @@ +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 makejava + * @Date 2026-03-05 11:33:24 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VehicleApplyUpdateCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true) + @NotEmpty(message = "车辆状态(1未启用,2启用)不能为空") + private Integer statusFlag; + @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) + @NotEmpty(message = "车牌类型数据字典不能为空") + private String licenceType; + @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) + @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空") + private Integer auditFlag; + @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) + @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") + private Integer mkmjPermission; + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private Date visitEndTime; + @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId", required = true) + @NotEmpty(message = "车辆所属企业ID不能为空") + private Long vehicleCorpId; + @ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName", required = true) + @NotEmpty(message = "车辆所属企业名称不能为空") + private String vehicleCorpName; + @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) + @NotEmpty(message = "车辆所属部门id不能为空") + private Long vehicleDepartmentId; + @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true) + @NotEmpty(message = "车辆所属部门名称不能为空") + private String vehicleDepartmentName; + @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId", required = true) + @NotEmpty(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 = "排放标准: + level1 ->国一 + level2 ->国二 + level3 ->国三 + level4 ->国四 + level5 ->国五 + level6 ->国六", name = "emissionStandardsName", required = true) + @NotEmpty(message = "排放标准: + level1 ->国一 + level2 ->国二 + level3 ->国三 + level4 ->国四 + level5 ->国五 + level6 ->国六不能为空") + private String emissionStandardsName; + @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) + @NotEmpty(message = "行驶证照片不能为空") + private Long drivingLicenseId; + @ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true) + @NotEmpty(message = "车辆照片不能为空") + private Long attachmentId; + @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) + @NotEmpty(message = "告知签字不能为空") + private Long informSignId; + @ApiModelProperty(value = "项目id", name = "projectId", required = true) + @NotEmpty(message = "项目id不能为空") + private Long projectId; + @ApiModelProperty(value = "项目名称", name = "projectName", required = true) + @NotEmpty(message = "项目名称不能为空") + private String projectName; + @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true) + @NotEmpty(message = "1被拉黑2未拉黑不能为空") + private Integer blockedFlag; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditAddCmd.java new file mode 100644 index 0000000..9a58f98 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditAddCmd.java @@ -0,0 +1,99 @@ +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 makejava + * @Date 2026-03-05 11:33:24 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VehicleAuditAddCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true) + @NotEmpty(message = "车辆申请id不能为空") + private String vehicleApplyId; + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true) + @NotEmpty(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空") + private Integer batchType; + @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState", required = true) + @NotEmpty(message = "审批状态(1,申请;2.更新)不能为空") + private Integer batchState; + @ApiModelProperty(value = "审批人id", name = "auditUserId", required = true) + @NotEmpty(message = "审批人id不能为空") + private Long auditUserId; + @ApiModelProperty(value = "审批人姓名", name = "auditUserName", required = true) + @NotEmpty(message = "审批人姓名不能为空") + private String auditUserName; + @ApiModelProperty(value = "审批部门id", name = "auditDeptId", required = true) + @NotEmpty(message = "审批部门id不能为空") + private Long auditDeptId; + @ApiModelProperty(value = "审批部门名称", name = "auditDeptName", required = true) + @NotEmpty(message = "审批部门名称不能为空") + private String auditDeptName; + @ApiModelProperty(value = "审批人企业id", name = "auditCorpId", required = true) + @NotEmpty(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) + @NotEmpty(message = "审批状态(1,未开始,2通过,3不通过)不能为空") + private Integer auditStatus; + @ApiModelProperty(value = "待审核信息", name = "changeAfter", required = true) + @NotEmpty(message = "待审核信息不能为空") + private Object changeAfter; + @ApiModelProperty(value = "变更前信息", name = "changeBefore", required = true) + @NotEmpty(message = "变更前信息不能为空") + private Object changeBefore; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Object version; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogAddCmd.java deleted file mode 100644 index 164c93c..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogAddCmd.java +++ /dev/null @@ -1,62 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class VehicleAuditLogAddCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") - private Long id; - @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true) - @NotEmpty(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空") - private Integer batchType; - @ApiModelProperty(value = "审批状态(0,申请;2.更新)", name = "batchState", required = true) - @NotEmpty(message = "审批状态(0,申请;2.更新)不能为空") - private Integer batchState; - @ApiModelProperty(value = "审批批次(审批全流程,一次申请一次id)", name = "batchId", required = true) - @NotEmpty(message = "审批批次(审批全流程,一次申请一次id)不能为空") - private String batchId; - @ApiModelProperty(value = "车辆id", name = "vehicleMessageId", required = true) - @NotEmpty(message = "车辆id不能为空") - private Long vehicleMessageId; - @ApiModelProperty(value = "审批人id", name = "userId", required = true) - @NotEmpty(message = "审批人id不能为空") - private Long userId; - @ApiModelProperty(value = "审批人姓名", name = "userName", required = true) - @NotEmpty(message = "审批人姓名不能为空") - private String userName; - @ApiModelProperty(value = "审批部门id", name = "deptId", required = true) - @NotEmpty(message = "审批部门id不能为空") - private Long deptId; - @ApiModelProperty(value = "审批部门名称", name = "deptName", required = true) - @NotEmpty(message = "审批部门名称不能为空") - private String deptName; - @ApiModelProperty(value = "审批步骤排序", name = "stepSort", required = true) - @NotEmpty(message = "审批步骤排序不能为空") - private Integer stepSort; - @ApiModelProperty(value = "审批状态(1未开始.2通过.3不通过)", name = "status", required = true) - @NotEmpty(message = "审批状态(1未开始.2通过.3不通过)不能为空") - private Integer status; - @ApiModelProperty(value = "审批状态(0正常,1.废除)", name = "stepType", required = true) - @NotEmpty(message = "审批状态(0正常,1.废除)不能为空") - private Integer stepType; - @ApiModelProperty(value = "驳回备注", name = "comments", required = true) - @NotEmpty(message = "驳回备注不能为空") - private String comments; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogApprovalCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogApprovalCmd.java deleted file mode 100644 index 00081c7..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogApprovalCmd.java +++ /dev/null @@ -1,40 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-18 14:07:47 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class VehicleAuditLogApprovalCmd extends Command { - - @ApiModelProperty(value = "车辆id", name = "vehicleMessageId", required = true) - @NotEmpty(message = "车辆id不能为空") - private Long vehicleMessageId; - - @ApiModelProperty(value = "审批人id", name = "userId", required = true) - @NotEmpty(message = "审批人id不能为空") - private Long userId; - - @ApiModelProperty(value = "审批状态(1未开始.2通过.3不通过)", name = "status", required = true) - @NotEmpty(message = "审批状态(1未开始.2通过.3不通过)不能为空") - private Integer status; - - @ApiModelProperty(value = "驳回备注", name = "comments", required = true) - private String comments; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogPageQry.java deleted file mode 100644 index e6b267d..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogPageQry.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.zcloud.primeport.dto; -import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Data -public class VehicleAuditLogPageQry extends PageQuery { - - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - - @ApiModelProperty("车辆ID") - private String eqVehicleMessageId; - - @ApiModelProperty("审批状态(0,申请;2.更新)") - private String eqBatchState; - - - @ApiModelProperty("审批人员") - private String eqUserId; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogUpdateCmd.java deleted file mode 100644 index aa1d911..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogUpdateCmd.java +++ /dev/null @@ -1,65 +0,0 @@ -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 java.util.Date; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:47 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class VehicleAuditLogUpdateCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") - private Long id; - @ApiModelProperty(value = "业务id", name = "vehicleAuditLogId", required = true) - @NotEmpty(message = "业务id不能为空") - private String vehicleAuditLogId; - @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true) - @NotEmpty(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空") - private Integer batchType; - @ApiModelProperty(value = "审批状态(0,申请;2.更新)", name = "batchState", required = true) - @NotEmpty(message = "审批状态(0,申请;2.更新)不能为空") - private Integer batchState; - @ApiModelProperty(value = "车辆id", name = "vehicleMessageId", required = true) - @NotEmpty(message = "车辆id不能为空") - private Long vehicleMessageId; - @ApiModelProperty(value = "审批人id", name = "userId", required = true) - @NotEmpty(message = "审批人id不能为空") - private Long userId; - @ApiModelProperty(value = "审批人姓名", name = "userName", required = true) - @NotEmpty(message = "审批人姓名不能为空") - private String userName; - @ApiModelProperty(value = "审批部门id", name = "deptId", required = true) - @NotEmpty(message = "审批部门id不能为空") - private Long deptId; - @ApiModelProperty(value = "审批部门名称", name = "deptName", required = true) - @NotEmpty(message = "审批部门名称不能为空") - private String deptName; - @ApiModelProperty(value = "审批步骤排序", name = "stepSort", required = true) - @NotEmpty(message = "审批步骤排序不能为空") - private Integer stepSort; - @ApiModelProperty(value = "审批状态(1未开始.2通过.3不通过)", name = "status", required = true) - @NotEmpty(message = "审批状态(1未开始.2通过.3不通过)不能为空") - private Integer status; - @ApiModelProperty(value = "审批状态(0正常,1.废除)", name = "stepType", required = true) - @NotEmpty(message = "审批状态(0正常,1.废除)不能为空") - private Integer stepType; - @ApiModelProperty(value = "驳回备注", name = "comments", required = true) - @NotEmpty(message = "驳回备注不能为空") - private String comments; -} - 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 new file mode 100644 index 0000000..57e617a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +@Data +public class VehicleAuditPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeVehicleApplyId; +} + 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 new file mode 100644 index 0000000..8acad75 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java @@ -0,0 +1,99 @@ +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 makejava + * @Date 2026-03-05 11:33:25 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VehicleAuditUpdateCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true) + @NotEmpty(message = "车辆申请id不能为空") + private String vehicleApplyId; + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true) + @NotEmpty(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空") + private Integer batchType; + @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState", required = true) + @NotEmpty(message = "审批状态(1,申请;2.更新)不能为空") + private Integer batchState; + @ApiModelProperty(value = "审批人id", name = "auditUserId", required = true) + @NotEmpty(message = "审批人id不能为空") + private Long auditUserId; + @ApiModelProperty(value = "审批人姓名", name = "auditUserName", required = true) + @NotEmpty(message = "审批人姓名不能为空") + private String auditUserName; + @ApiModelProperty(value = "审批部门id", name = "auditDeptId", required = true) + @NotEmpty(message = "审批部门id不能为空") + private Long auditDeptId; + @ApiModelProperty(value = "审批部门名称", name = "auditDeptName", required = true) + @NotEmpty(message = "审批部门名称不能为空") + private String auditDeptName; + @ApiModelProperty(value = "审批人企业id", name = "auditCorpId", required = true) + @NotEmpty(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) + @NotEmpty(message = "审批状态(1,未开始,2通过,3不通过)不能为空") + private Integer auditStatus; + @ApiModelProperty(value = "待审核信息", name = "changeAfter", required = true) + @NotEmpty(message = "待审核信息不能为空") + private Object changeAfter; + @ApiModelProperty(value = "变更前信息", name = "changeBefore", required = true) + @NotEmpty(message = "变更前信息不能为空") + private Object changeBefore; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Object version; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java index b91ce7d..f1fbf5b 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java @@ -1,4 +1,5 @@ package com.zcloud.primeport.dto; + import com.alibaba.cola.dto.Command; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -6,29 +7,66 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor public class VehicleBlackAddCmd extends Command { - @ApiModelProperty(value = "车辆信息表（t_vehicle_message）的主键id", name = "vehicleId", required = true) - @NotNull(message = "车辆信息表（t_vehicle_message）的主键id不能为空") + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true) + @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空") private Long vehicleId; - + @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName", required = true) + @NotEmpty(message = "车辆所属人姓名（临时车）不能为空") + private String employeeVehicleUserName; @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) @NotEmpty(message = "车牌号不能为空") private String licenceNo; - - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) - @NotNull(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") - private Integer licenceType; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java index 4f766f7..0831f9b 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java @@ -1,14 +1,14 @@ package com.zcloud.primeport.dto; + import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @Data public class VehicleBlackPageQry extends PageQuery { diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java index 48c14a5..9ec9c24 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java @@ -7,13 +7,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:09 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @EqualsAndHashCode(callSuper = true) @Data @@ -21,10 +21,52 @@ import javax.validation.constraints.*; @AllArgsConstructor public class VehicleBlackUpdateCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) - @NotNull(message = "id不能为空") + @NotEmpty(message = "id不能为空") private Long id; - @ApiModelProperty(value = "车辆信息表（t_vehicle_message）的主键id", name = "vehicleId", required = true) - @NotNull(message = "车辆信息表（t_vehicle_message）的主键id不能为空") + @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true) + @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空") private Long vehicleId; + @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName", required = true) + @NotEmpty(message = "车辆所属人姓名（临时车）不能为空") + private String employeeVehicleUserName; + @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) + @NotEmpty(message = "车牌号不能为空") + private String licenceNo; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java deleted file mode 100644 index 7cc0e1a..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java +++ /dev/null @@ -1,45 +0,0 @@ -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 java.util.Date; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class VehicleInspectionAddCmd extends Command { - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) - @NotEmpty(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 = "访问起始时间", name = "visitStartTime", required = true) - @NotEmpty(message = "访问起始时间不能为空") - private Date visitStartTime; - @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) - @NotEmpty(message = "访问结束时间不能为空") - private Date visitEndTime; -} - - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionUpdateCmd.java deleted file mode 100644 index 8c55078..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionUpdateCmd.java +++ /dev/null @@ -1,48 +0,0 @@ -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; -import java.util.Date; - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class VehicleInspectionUpdateCmd extends Command { - @ApiModelProperty(value = "车辆id", name = "id") - private Integer id; - @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 = "访问起始时间", name = "visitStartTime", required = true) - @NotEmpty(message = "访问起始时间不能为空") - private Date visitStartTime; - @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) - @NotEmpty(message = "访问结束时间不能为空") - private Date visitEndTime; -} - - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java index 23412e6..adf5898 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java @@ -1,6 +1,5 @@ package com.zcloud.primeport.dto; - import com.alibaba.cola.dto.Command; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,13 +8,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; -import java.util.Date; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @EqualsAndHashCode(callSuper = true) @Data @@ -25,12 +23,12 @@ public class VehicleMessageAddCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) @NotEmpty(message = "id不能为空") private Long id; - @ApiModelProperty(value = "业务id", name = "vehicleMessageId", required = true) - @NotEmpty(message = "业务id不能为空") - private String vehicleMessageId; - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) - @NotEmpty(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") - private Integer licenceType; + @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) + @NotEmpty(message = "车牌类型数据字典不能为空") + private String licenceType; + @ApiModelProperty(value = "车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true) + @NotEmpty(message = "车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") + private String licenceTypeName; @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) @NotEmpty(message = "车牌号不能为空") private String licenceNo; @@ -38,62 +36,64 @@ public class VehicleMessageAddCmd extends Command { @NotEmpty(message = "车辆类型不能为空") private String vehicleType; @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) - @NotEmpty(message = "车辆类型不能为空-名字") + @NotEmpty(message = "车辆类型-名字不能为空") private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆", name = "vehicleBelongType", required = true) - @NotEmpty(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆不能为空") - private Integer vehicleBelongType; - @ApiModelProperty(value = "所属车队ID", name = "motorcadeId", required = true) - @NotEmpty(message = "所属车队ID不能为空") - private Long motorcadeId; - @ApiModelProperty(value = "是否危化车辆(0：否，1：是)", name = "isDangerous", required = true) - @NotEmpty(message = "是否危化车辆(0：否，1：是)不能为空") - private Integer isDangerous; - @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)", name = "portId", required = true) - @NotEmpty(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") - private Integer portId; - @ApiModelProperty(value = "是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回)", name = "isAudit", required = true) - @NotEmpty(message = "是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回)不能为空") - private Integer isAudit; - @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) - @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") - private Integer mkmjPermission; - @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) - @NotEmpty(message = "访问起始时间不能为空") + @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 = "授权访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "授权访问起始时间不能为空") private Date visitStartTime; - @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) - @NotEmpty(message = "访问结束时间不能为空") + @ApiModelProperty(value = "授权访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "授权访问结束时间不能为空") private Date visitEndTime; - @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) - @NotEmpty(message = "车辆所属部门id不能为空") - private Long vehicleDepartmentId; - @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true) - @NotEmpty(message = "车辆所属部门名称不能为空") - private String vehicleDepartmentName; - @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 = "企业ID", name = "corpId", required = true) - @NotEmpty(message = "企业ID不能为空") - private Long corpId; - @ApiModelProperty(value = "排放标准:", name = " emissionStandards", required = true) - @NotEmpty(message = "排放标准:") - private String emissionStandards; - @ApiModelProperty(value = "附件地址", name = "attachmentUrl", required = true) - @NotEmpty(message = "附件地址不能为空") - private String attachmentUrl; - - public void addLongiUserCorp( String tenantParentIds){ - if (tenantParentIds != null){ - String [] corpIds = tenantParentIds.split(","); - if (corpIds.length > 0){ - this.corpId = Long.parseLong(corpIds[corpIds.length-1]); - } - } - } + @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true) + @NotEmpty(message = "车辆申请id不能为空") + private Long vehicleApplyId; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true) + @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空") + private Integer syncStatus; + @ApiModelProperty(value = "对接说明", name = "syncRemarks", required = true) + @NotEmpty(message = "对接说明不能为空") + private String syncRemarks; } - 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 deleted file mode 100644 index 63c5d57..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java +++ /dev/null @@ -1,86 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-15 11:41:21 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@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) - private Long employeeVehicleUserId; - @ApiModelProperty(value = "车辆所属人姓名(员工车辆)", name = "employeeVehicleUserName", required = true) - 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) - private Long corpId; - @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(","); - if (corpIds.length > 0){ - this.corpId = Long.parseLong(corpIds[corpIds.length-1]); - } - } - } -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java index bc80975..78e8265 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java @@ -1,77 +1,28 @@ package com.zcloud.primeport.dto; - import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotEmpty; - /** -* web-client -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:28 + */ @Data public class VehicleMessagePageQry extends PageQuery { -/** -* 查询条件操作前缀,支持以下几种数据库查询操作： -* - `like`: 模糊匹配查询，对应SQL的LIKE操作符 -* - `eq`: 等值查询，对应SQL的=操作符 -* - `gt`: 大于比较查询 -* - `lt`: 小于比较查询 -* - `ge`: 大于等于比较查询 -* - `le`: 小于等于比较查询 -* - `ne`: 不等比较查询，对应SQL的!=操作符 -*/ - @ApiModelProperty(value = "车牌号") - private String likeLicenceNo; - - @ApiModelProperty(value = "车辆所属人id") - private String eqEmployeeVehicleUserId; - - @ApiModelProperty(value = "车辆所属人姓名") - private String likeEmployeeVehicleUserName; - - @ApiModelProperty(value = "车辆所属部门id") - private String eqVehicleDepartmentId; - - @ApiModelProperty(value = "车辆所属部门名称") - private String likeVehicleDepartmentName; - - - @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)") - private Integer eqPortId; /** - * 车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆 + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - @ApiModelProperty(value = "车辆所属类型") - private String eqVehicleBelongType; - - @ApiModelProperty(value = "企业ID") - private String eqCorpId; - - @ApiModelProperty(value = "删除状态") - private String eqDeleteEnum = "FALSE" ; - // 是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回) - @ApiModelProperty(value = "是否审核") - private String eqIsAudit; - - /** - * 获取监管端id - * @param tenantParentIds - */ - public void setCorpByCorpType(String tenantParentIds){ - if (tenantParentIds != null){ - String [] corpIds = tenantParentIds.split(","); - if (corpIds.length > 0){ - this.eqCorpId = corpIds[corpIds.length-1]; - } - } - - } - + private String likeLicenceType; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java deleted file mode 100644 index 0d705aa..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java +++ /dev/null @@ -1,35 +0,0 @@ -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.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -/** -* web-client -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class VehicleMessageStatusCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotNull(message = "id不能为空") - private Long id; - @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "isStatus", required = true) - @NotNull(message = "车辆状态(0未启用,1启用)") - @Min(value = 0, message = "车辆状态错误") - @Max(value = 2, message = "车辆状态错误") - private Integer isStatus; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java index 14b23ef..16d6383 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java @@ -1,128 +1,99 @@ 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 guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:28 + */ @EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor public class VehicleMessageUpdateCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) - @NotNull(message = "id不能为空") + @NotEmpty(message = "id不能为空") private Long id; - - @ApiModelProperty(value = "业务id", name = "vehicleMessageId", required = true) - @NotEmpty(message = "业务id不能为空") - private String vehicleMessageId; - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) - @NotNull(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") - private Integer licenceType; + @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) + @NotEmpty(message = "车牌类型数据字典不能为空") + private String licenceType; + @ApiModelProperty(value = "车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true) + @NotEmpty(message = "车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") + private String licenceTypeName; @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) @NotEmpty(message = "车牌号不能为空") private String licenceNo; - @ApiModelProperty(value = "车辆类型 0-货车 1- 轿车 2-大巴客车", name = "vehicleType", required = true) - @NotEmpty(message = "车辆类型 0-货车 1- 轿车 2-大巴客车不能为空") + @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) + @NotEmpty(message = "车辆类型不能为空") private String vehicleType; @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) - @NotEmpty(message = "车辆类型不能为空-名字") + @NotEmpty(message = "车辆类型-名字不能为空") private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) - @NotNull(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") - private Integer vehicleBelongType; - @ApiModelProperty(value = "车辆来源(0,1,2 平台新建,3.对接车辆)", name = "carFrom", required = true) - @NotNull(message = "车辆来源(0,1,2 平台新建,3.对接车辆)不能为空") - private Integer carFrom; - @ApiModelProperty(value = "驾驶证x", name = "drivingLicense", required = true) - @NotEmpty(message = "驾驶证x不能为空") - private String drivingLicense; - @ApiModelProperty(value = "绿本x", name = "greenBook", required = true) - @NotEmpty(message = "绿本x不能为空") - private String greenBook; - @ApiModelProperty(value = "环保随车清单x", name = "ecoFriendlyChecklist", required = true) - @NotEmpty(message = "环保随车清单x不能为空") - private String ecoFriendlyChecklist; - @ApiModelProperty(value = "出厂合格证x", name = "factoryCertificate", required = true) - @NotEmpty(message = "出厂合格证x不能为空") - private String factoryCertificate; - @ApiModelProperty(value = "环保信息截图x", name = "environmentalScreenshots", required = true) - @NotEmpty(message = "环保信息截图x不能为空") - private String environmentalScreenshots; - @ApiModelProperty(value = "所属车队ID", name = "motorcadeId", required = true) - @NotNull(message = "所属车队ID不能为空") - private Long motorcadeId; - @ApiModelProperty(value = "是否危化车辆(0：否，1：是)", name = "isDangerousCar", required = true) - @NotNull(message = "是否危化车辆(0：否，1：是)不能为空") - private Integer isDangerousCar; - @ApiModelProperty(value = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)", name = "isAudit", required = true) - @NotNull(message = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)不能为空") - private Integer isAudit; - @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)", name = "portId", required = true) - @NotNull(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") - private Integer portId; - @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) - @NotNull(message = "进出港权限(1:有 2：无)不能为空") - private String mkmjPermission; - @ApiModelProperty(value = "车辆责任人id", name = "userId", required = true) - @NotNull(message = "车辆责任人id不能为空") - private Long userId; - @ApiModelProperty(value = "车辆责任人姓名", name = "userName", required = true) - @NotEmpty(message = "车辆责任人姓名不能为空") - private String userName; - @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(员工车辆)", name = "employeeVehicleUserId", required = true) - @NotNull(message = "车辆所属人id(员工车辆)不能为空") - private Long employeeVehicleUserId; - @ApiModelProperty(value = "车辆所属人姓名(员工车辆)", name = "employeeVehicleUserName", required = true) - @NotEmpty(message = "车辆所属人姓名(员工车辆)不能为空") - private String employeeVehicleUserName; - @ApiModelProperty(value = "企业ID(~~~~~~)", name = "corpId", required = true) - @NotNull(message = "企业ID(~~~~~~)不能为空") - private Long corpId; - @ApiModelProperty(value = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六", name = "emissionStandards", required = true) - @NotEmpty(message = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六不能为空") - private String emissionStandards; - @ApiModelProperty(value = "联系人姓名", name = "contact", required = true) - @NotEmpty(message = "联系人姓名不能为空") - private String contact; - @ApiModelProperty(value = "联系人电话", name = "phone", required = true) - @NotEmpty(message = "联系人电话不能为空") - private String phone; - @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 = "approvalUserId") - 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; + @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 = "授权访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "授权访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "授权访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "授权访问结束时间不能为空") + private Date visitEndTime; + @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true) + @NotEmpty(message = "车辆申请id不能为空") + private Long vehicleApplyId; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true) + @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空") + private Integer syncStatus; + @ApiModelProperty(value = "对接说明", name = "syncRemarks", required = true) + @NotEmpty(message = "对接说明不能为空") + private String syncRemarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java index 10a268d..d6c0ce0 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java @@ -1,52 +1,93 @@ package com.zcloud.primeport.dto; - import com.alibaba.cola.dto.Command; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; -import java.util.Date; +import javax.validation.constraints.NotEmpty; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:28 + * @Author makejava + * @Date 2026-03-05 11:33:28 */ @EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor public class VehicleViolationsAddCmd extends Command { - @ApiModelProperty(value = "车辆信息表（t_vehicle_message）的主键id", name = "vehicleId", required = true) - @NotNull(message = "车辆信息主键") + @ApiModelProperty(value = "车辆违规记录id", name = "id", required = true) + @NotEmpty(message = "车辆违规记录id不能为空") + private Long id; + @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true) + @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空") private Long vehicleId; - - @ApiModelProperty(value = "违规类型（0-未按规定车道行驶，1-违规停车）", name = "violationType", required = true) - @NotNull(message = "违规类型（0-未按规定车道行驶，1-违规停车）不能为空") - private Integer violationType; - + @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName", required = true) + @NotEmpty(message = "车辆所属人姓名（临时车）不能为空") + private String employeeVehicleUserName; + @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) + @NotEmpty(message = "车牌号不能为空") + private String licenceNo; + @ApiModelProperty(value = "违规类型", name = "violationType", required = true) + @NotEmpty(message = "违规类型不能为空") + private String violationType; + @ApiModelProperty(value = "违规类型名称", name = "violationTypeName", required = true) + @NotEmpty(message = "违规类型名称不能为空") + private String violationTypeName; @ApiModelProperty(value = "违规区域（位置）", name = "location", required = true) @NotEmpty(message = "违规区域（位置）不能为空") private String location; - - @ApiModelProperty(value = "违规图片的存储路径", name = "filepath", required = true) + @ApiModelProperty(value = "违规图片的存储路径", name = "illegalImagesId", required = true) @NotEmpty(message = "违规图片的存储路径不能为空") - private String filepath; - + private String illegalImagesId; @ApiModelProperty(value = "违规说明", name = "describeMessage", required = true) @NotEmpty(message = "违规说明不能为空") private String describeMessage; - @ApiModelProperty(value = "违规时间", name = "violationtime", required = true) - @NotNull(message = "违规时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") + @NotEmpty(message = "违规时间不能为空") private Date violationtime; - + @ApiModelProperty(value = "违规处理状态，1已处理2未处理", name = "violationProcessingStatus", required = true) + @NotEmpty(message = "违规处理状态，1已处理2未处理不能为空") + private Integer violationProcessingStatus; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsPageQry.java index 6adfb6c..afc99b8 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsPageQry.java @@ -1,15 +1,14 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.PageQuery; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Data public class VehicleViolationsPageQry extends PageQuery { diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java index 85a0685..98d667b 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java @@ -1,48 +1,93 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.Command; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; -import java.util.Date; +import javax.validation.constraints.NotEmpty; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:30 */ @EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor public class VehicleViolationsUpdateCmd extends Command { - @ApiModelProperty(value = "车辆违规记录表的id", name = "id", required = true) - @NotNull(message = "车辆违规记录表的id不能为空") + @ApiModelProperty(value = "车辆违规记录id", name = "id", required = true) + @NotEmpty(message = "车辆违规记录id不能为空") private Long id; - @ApiModelProperty(value = "车辆信息表（t_vehicle_message）的主键id", name = "vehicleId", required = true) - @NotNull(message = "车辆信息表（t_vehicle_message）的主键id不能为空") + @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true) + @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空") private Long vehicleId; - @ApiModelProperty(value = "违规类型（0-未按规定车道行驶，1-违规停车）", name = "violationType", required = true) - @NotNull(message = "违规类型（0-未按规定车道行驶，1-违规停车）不能为空") - private Integer violationType; + @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName", required = true) + @NotEmpty(message = "车辆所属人姓名（临时车）不能为空") + private String employeeVehicleUserName; + @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) + @NotEmpty(message = "车牌号不能为空") + private String licenceNo; + @ApiModelProperty(value = "违规类型", name = "violationType", required = true) + @NotEmpty(message = "违规类型不能为空") + private String violationType; + @ApiModelProperty(value = "违规类型名称", name = "violationTypeName", required = true) + @NotEmpty(message = "违规类型名称不能为空") + private String violationTypeName; @ApiModelProperty(value = "违规区域（位置）", name = "location", required = true) @NotEmpty(message = "违规区域（位置）不能为空") private String location; - @ApiModelProperty(value = "违规图片的存储路径", name = "filepath", required = true) + @ApiModelProperty(value = "违规图片的存储路径", name = "illegalImagesId", required = true) @NotEmpty(message = "违规图片的存储路径不能为空") - private String filepath; + private String illegalImagesId; @ApiModelProperty(value = "违规说明", name = "describeMessage", required = true) @NotEmpty(message = "违规说明不能为空") private String describeMessage; @ApiModelProperty(value = "违规时间", name = "violationtime", required = true) - @NotNull(message = "违规时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") + @NotEmpty(message = "违规时间不能为空") private Date violationtime; + @ApiModelProperty(value = "违规处理状态，1已处理2未处理", name = "violationProcessingStatus", required = true) + @NotEmpty(message = "违规处理状态，1已处理2未处理不能为空") + private Integer violationProcessingStatus; + @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识不能为空") + private String deleteEnum; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private Date createTime; + @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) + @NotEmpty(message = "更新时间不能为空") + private Date updateTime; + @ApiModelProperty(value = "创建人ID", name = "createId", required = true) + @NotEmpty(message = "创建人ID不能为空") + private Long createId; + @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) + @NotEmpty(message = "更新人ID不能为空") + private Long updateId; + @ApiModelProperty(value = "环境标识", name = "env", required = true) + @NotEmpty(message = "环境标识不能为空") + private String env; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) + @NotEmpty(message = "租户ID不能为空") + private Long tenantId; + @ApiModelProperty(value = "组织ID", name = "orgId", required = true) + @NotEmpty(message = "组织ID不能为空") + private Long orgId; + @ApiModelProperty(value = "版本号", name = "version", required = true) + @NotEmpty(message = "版本号不能为空") + private Integer version; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + 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 new file mode 100644 index 0000000..c9c8f87 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java @@ -0,0 +1,84 @@ +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 makejava + * @Date 2026-03-05 11:33:30 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VideoAddCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotEmpty(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "口门/闸机id 外键id ", name = "foreignId", required = true) + @NotEmpty(message = "口门/闸机id 外键id 不能为空") + private Long foreignId; + @ApiModelProperty(value = "设备类型（1-口门 2-闸机）", name = "deviceType", required = true) + @NotEmpty(message = "设备类型（1-口门 2-闸机）不能为空") + private Integer deviceType; + @ApiModelProperty(value = "摄像头id", name = "videoResourceId", required = true) + @NotEmpty(message = "摄像头id不能为空") + private String videoResourceId; + @ApiModelProperty(value = "摄像头名称", name = "videoResourceName", required = true) + @NotEmpty(message = "摄像头名称不能为空") + private String videoResourceName; + @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）", name = "videoType", required = true) + @NotEmpty(message = "摄像头类型（1-移动 2-平台）不能为空") + private Integer videoType; + @ApiModelProperty(value = "经度", name = "longitude", required = true) + @NotEmpty(message = "经度不能为空") + private String longitude; + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + @NotEmpty(message = "纬度不能为空") + private String latitude; + @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识true false不能为空") + private String deleteEnum; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户id", name = "tenantId", required = true) + @NotEmpty(message = "租户id不能为空") + private Long tenantId; + @ApiModelProperty(value = "单位id", name = "orgId", required = true) + @NotEmpty(message = "单位id不能为空") + private Long orgId; + @ApiModelProperty(value = "版本", name = "version", required = true) + @NotEmpty(message = "版本不能为空") + private String version; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private String createTime; + @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) + @NotEmpty(message = "修改时间不能为空") + private String updateTime; + @ApiModelProperty(value = "创建人id", name = "createId", required = true) + @NotEmpty(message = "创建人id不能为空") + private Long createId; + @ApiModelProperty(value = "修改人id", name = "updateId", required = true) + @NotEmpty(message = "修改人id不能为空") + private Long updateId; + @ApiModelProperty(value = "${column.comment}", name = "env", required = true) + @NotEmpty(message = "${column.comment}不能为空") + private String env; +} + 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 new file mode 100644 index 0000000..1e31243 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VideoPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:30 + */ +@Data +public class VideoPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private Long likeForeignId; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java new file mode 100644 index 0000000..602416d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java @@ -0,0 +1,84 @@ +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 makejava + * @Date 2026-03-05 11:33:31 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VideoUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotEmpty(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "口门/闸机id 外键id ", name = "foreignId", required = true) + @NotEmpty(message = "口门/闸机id 外键id 不能为空") + private Long foreignId; + @ApiModelProperty(value = "设备类型（1-口门 2-闸机）", name = "deviceType", required = true) + @NotEmpty(message = "设备类型（1-口门 2-闸机）不能为空") + private Integer deviceType; + @ApiModelProperty(value = "摄像头id", name = "videoResourceId", required = true) + @NotEmpty(message = "摄像头id不能为空") + private String videoResourceId; + @ApiModelProperty(value = "摄像头名称", name = "videoResourceName", required = true) + @NotEmpty(message = "摄像头名称不能为空") + private String videoResourceName; + @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）", name = "videoType", required = true) + @NotEmpty(message = "摄像头类型（1-移动 2-平台）不能为空") + private Integer videoType; + @ApiModelProperty(value = "经度", name = "longitude", required = true) + @NotEmpty(message = "经度不能为空") + private String longitude; + @ApiModelProperty(value = "纬度", name = "latitude", required = true) + @NotEmpty(message = "纬度不能为空") + private String latitude; + @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) + @NotEmpty(message = "删除标识true false不能为空") + private String deleteEnum; + @ApiModelProperty(value = "备注", name = "remarks", required = true) + @NotEmpty(message = "备注不能为空") + private String remarks; + @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) + @NotEmpty(message = "更新人姓名不能为空") + private String updateName; + @ApiModelProperty(value = "租户id", name = "tenantId", required = true) + @NotEmpty(message = "租户id不能为空") + private Long tenantId; + @ApiModelProperty(value = "单位id", name = "orgId", required = true) + @NotEmpty(message = "单位id不能为空") + private Long orgId; + @ApiModelProperty(value = "版本", name = "version", required = true) + @NotEmpty(message = "版本不能为空") + private String version; + @ApiModelProperty(value = "创建时间", name = "createTime", required = true) + @NotEmpty(message = "创建时间不能为空") + private String createTime; + @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) + @NotEmpty(message = "修改时间不能为空") + private String updateTime; + @ApiModelProperty(value = "创建人id", name = "createId", required = true) + @NotEmpty(message = "创建人id不能为空") + private Long createId; + @ApiModelProperty(value = "修改人id", name = "updateId", required = true) + @NotEmpty(message = "修改人id不能为空") + private Long updateId; + @ApiModelProperty(value = "${column.comment}", name = "env", required = true) + @NotEmpty(message = "${column.comment}不能为空") + private String env; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EmployeeMessageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EmployeeMessageCO.java deleted file mode 100644 index 90800b9..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EmployeeMessageCO.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import java.sql.Date; - - - -/** -* web-client -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Data -public class EmployeeMessageCO extends ClientObject { - //id - @ApiModelProperty(value = "id") - private Long id; - //用户ID - @ApiModelProperty(value = "用户ID") - private Long userId; - //是否有进入一级口门的权限(0-无权限;1有权限) - @ApiModelProperty(value = "是否有进入一级口门的权限(0-无权限;1有权限)") - private Integer isPermission; - //是否有人脸权限 - @ApiModelProperty(value = "是否有人脸权限") - private Integer isUserFace; - //可以进入的口门信息 - @ApiModelProperty(value = "可以进入的口门信息") - private String mkmjScope; - //状态：0-停用 1-启用 - @ApiModelProperty(value = "状态：0-停用 1-启用") - private Integer status; - //删除标识 - @ApiModelProperty(value = "删除标识") - private String deleteEnum; - - /** - * 部门 - * 姓名 - * 岗位 - * 手机号 - * 车辆数 其他接口的获取车辆数接口 - * 门禁权限 (就是是否有进入一级口门的权限(0-无权限;1有权限)) - * 是否录入人脸 (是否有人脸权限) - */ - - // 部门 - @ApiModelProperty(value = "部门") - private String department; - - // 姓名 - @ApiModelProperty(value = "姓名") - private String name; - - // 岗位 - @ApiModelProperty(value = "岗位") - private String post; - - // 手机号 - @ApiModelProperty(value = "手机号") - private String phoneNumber; - - // 车辆数 - @ApiModelProperty(value = "车辆数") - private Integer vehicleCount; -} \ No newline at end of file diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EnclosedAreaTreeCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EnclosedAreaTreeCO.java deleted file mode 100644 index 286e591..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EnclosedAreaTreeCO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -@Data -public class EnclosedAreaTreeCO extends ClientObject { - //主键 - @ApiModelProperty(value = "主键") - private Long id; - //封闭区域名称 - @ApiModelProperty(value = "封闭区域名称") - private String name; - @ApiModelProperty(value = "子节点") - private List children; -} - 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 deleted file mode 100644 index 2c4300a..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/GatePersonAuthLevelOneCO.java +++ /dev/null @@ -1,61 +0,0 @@ -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/InspectionDeptCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptCO.java deleted file mode 100644 index 2475ef5..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptCO.java +++ /dev/null @@ -1,33 +0,0 @@ -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 guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Data -public class InspectionDeptCO extends ClientObject { - //主键 - @ApiModelProperty(value = "主键") - private Long id; - //名称 - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "检查部门下的车辆数量") - @TableField(exist = false) - private Integer vehicleCount; - - - - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptInfoCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptInfoCO.java deleted file mode 100644 index 5871580..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptInfoCO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - - -import com.alibaba.cola.dto.ClientObject; -import com.baomidou.mybatisplus.annotation.TableField; -import com.zcloud.primeport.dto.VehicleInspectionUpdateCmd; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import java.util.List; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Data -public class InspectionDeptInfoCO extends ClientObject { - //主键 - @ApiModelProperty(value = "主键") - private Long id; - //名称 - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "单位车辆信息部门为空", name = "VehicleMessageAddCmd", required = true) - @NotEmpty(message = "单位车辆信息部门为空") - List vehicleDeptInfoCOS; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionVehicleCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionVehicleCO.java deleted file mode 100644 index 4b52ab2..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionVehicleCO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Data -public class InspectionVehicleCO extends ClientObject { - //主键 - @ApiModelProperty(value = "主键") - private Long id; - //检查部门ID - @ApiModelProperty(value = "检查部门ID") - private Long inspectionDeptId; - //车辆id - @ApiModelProperty(value = "车辆id") - private Long vehicleMessageId; - -} - 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 3951295..b4739ff 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 @@ -1,6 +1,5 @@ package com.zcloud.primeport.dto.clientobject; - import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,50 +8,74 @@ import lombok.Data; /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:16 */ @Data public class MkmjApprovalUserCO extends ClientObject { //主键ID @ApiModelProperty(value = "主键ID") private Long id; - //审批人部门ID - @ApiModelProperty(value = "审批人部门ID") - private String departmentName; - //审批人部门 - @ApiModelProperty(value = "审批人部门") - private Long departmentId; - //审批人姓名 - @ApiModelProperty(value = "审批人姓名") - private String name; - //审批人 - @ApiModelProperty(value = "审批人") - private String userName; - //审批人名字 - @ApiModelProperty(value = "审批人名字") + //审批人企业id + @ApiModelProperty(value = "审批人企业id") + private Long corpId; + //审批人企业名称 + @ApiModelProperty(value = "审批人企业名称") + private String corpName; + //审批人部门id + @ApiModelProperty(value = "审批人部门id") + private Long deptId; + //审批人部门名称 + @ApiModelProperty(value = "审批人部门名称") + private String deptName; + //审批人id + @ApiModelProperty(value = "审批人id") private Long userId; - //岗位名称 - @ApiModelProperty(value = "岗位名称") - private String postName; - //岗位id - @ApiModelProperty(value = "岗位id") - private Long postId; - //企业id - @ApiModelProperty(value = "企业id") - private Long corpinfoId; - //删除标识 - @ApiModelProperty(value = "删除标识") + //审批人名称 + @ApiModelProperty(value = "审批人名称") + private String userName; + //人员审核权限(1-无权限,2-有权限) + @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; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") private String deleteEnum; - //人员审核权限(0-无权限,1-有权限) - @ApiModelProperty(value = "人员审核权限(0-无权限,1-有权限)") - private Integer isPersonnelPermission; - //车辆审核权限(0-无权限,1-有权限) - @ApiModelProperty(value = "车辆审核权限(0-无权限,1-有权限)") - private Integer isVehiclePermission; - //临时审核权限(0-无权限,1-有权限) - @ApiModelProperty(value = "临时审核权限(0-无权限,1-有权限)") - private Integer isTemporaryPermission; - @ApiModelProperty(value = "待审批数量") - private Integer pendingApprovalQuantity; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private Integer version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private Date updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; } + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjAreaCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjAreaCO.java deleted file mode 100644 index 694e31a..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjAreaCO.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-14 09:51:09 - */ -@Data -public class MkmjAreaCO extends ClientObject { - //主键 - @ApiModelProperty(value = "主键") - private Long id; - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String areaId; - //区域名称 - @ApiModelProperty(value = "区域名称") - private String areaName; - //区域范围 - @ApiModelProperty(value = "区域范围") - private String areaRange; - //区域级别 1-一级 2-二级 3-三级 - @ApiModelProperty(value = "区域级别 1-一级 2-二级 3-三级") - private Integer areaLevel; - //上级区域id(当area_level=1时，此字段为字典bianma) - @ApiModelProperty(value = "上级区域id(当area_level=1时，此字段为字典bianma)") - private String areaParentId; - //上级区域 - @ApiModelProperty(value = "上级区域") - private String areaParentName; - //口门类型 1-人行 2-车行 3-综合 - @ApiModelProperty(value = "口门类型 1-人行 2-车行 3-综合") - private Integer areaType; - //区域状态 0-停用 1-正常 2-暂时关闭 - @ApiModelProperty(value = "区域状态 0-停用 1-正常 2-暂时关闭") - private Integer areaStatus; - //入方向区域 - @ApiModelProperty(value = "入方向区域") - private Long inDirectionArea; - //出方向区域 - @ApiModelProperty(value = "出方向区域") - private Long outDirectionArea; - //企业id - @ApiModelProperty(value = "企业id") - private Long corpinfoId; - @ApiModelProperty(value = "企业名称") - private String corpinfoName; - //经度 - @ApiModelProperty(value = "经度") - private String longitude; - //纬度 - @ApiModelProperty(value = "纬度") - private String latitude; - // 视频个数 - @ApiModelProperty(value = "视频个数") - private Long videoNum; - // 通道个数 - @ApiModelProperty(value = "通道个数") - private Long passageNum; -} - 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 new file mode 100644 index 0000000..abf0b1c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java @@ -0,0 +1,57 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:15 + */ +@Data +public class MkmjCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //口门名称 + @ApiModelProperty(value = "口门名称") + private String mkmjName; + //口门级别 1-一级 2-二级 + @ApiModelProperty(value = "口门级别 1-一级 2-二级") + private Integer mkmjLevel; + //口门类型 1-人行 2-车行 3-综合 + @ApiModelProperty(value = "口门类型 1-人行 2-车行 3-综合") + private String mkmjType; + //口门类型名称1-人行 2-车行 3-综合 + @ApiModelProperty(value = "口门类型名称1-人行 2-车行 3-综合") + private String mkmjTypeName; + //口门状态 1-停用 2-正常 + @ApiModelProperty(value = "口门状态 1-停用 2-正常") + private Integer mkmjStatus; + //入方向区域- 二级有用 + @ApiModelProperty(value = "入方向区域- 二级有用") + private Long inDirectionArea; + //入方向区域名称- 二级有用 + @ApiModelProperty(value = "入方向区域名称- 二级有用") + private Long inDirectionAreaName; + //出方向区域- 二级有用 + @ApiModelProperty(value = "出方向区域- 二级有用") + private Long outDirectionArea; + //出方向区域名称- 二级有用 + @ApiModelProperty(value = "出方向区域名称- 二级有用") + private Long outDirectionAreaName; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + @ApiModelProperty(value = "摄像头数量") + private Integer videoCount; + @ApiModelProperty(value = "数量") + private Integer passageCount; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCarRecordCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCarRecordCO.java deleted file mode 100644 index ae6e226..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCarRecordCO.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.sql.Date; - - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Data -public class MkmjCarRecordCO extends ClientObject { - //主键id - @ApiModelProperty(value = "主键id") - private Long id; - //车辆id - @ApiModelProperty(value = "车辆id") - private String vehicleRecordId; - //车辆牌照号码 - @ApiModelProperty(value = "车辆牌照号码") - private String vehiclePlateNumber; - //车辆行驶证号码 - @ApiModelProperty(value = "车辆行驶证号码") - private String vehicleRegistrationNumber; - //车辆类型名称 - @ApiModelProperty(value = "车辆类型名称") - private String vehicleCategoryName; - //车辆联系人姓名 - @ApiModelProperty(value = "车辆联系人姓名") - private String vehicleContactName; - //车辆联系人电话 - @ApiModelProperty(value = "车辆联系人电话") - private String vehicleContactPhoneNumber; - //车辆备案信息录入单位 - @ApiModelProperty(value = "车辆备案信息录入单位") - private String vehicleFilingInfoRecordingOrg; - //车辆牌照颜色名称 - @ApiModelProperty(value = "车辆牌照颜色名称") - private String vehiclePlateColor; - //车辆入港闸口 - @ApiModelProperty(value = "车辆入港闸口") - private String vehicleArrivalBarrier; - private String regexArrivalBarrier; - //车辆入港时间 - @ApiModelProperty(value = "车辆入港时间") - private String vehicleArrivalTime; - //车辆离港闸口 - @ApiModelProperty(value = "车辆离港闸口") - private String vehicleDepartureBarrier; - private String regexDepartureBarrier; - //车辆离港时间 - @ApiModelProperty(value = "车辆离港时间") - private String vehicleDepartureTime; - //车辆备案方式 - @ApiModelProperty(value = "车辆备案方式") - private String vehicleFilingMethod; - //车辆在港状态 - @ApiModelProperty(value = "车辆在港状态") - private String vehicleArrivalStatus; - //数据来源 - @ApiModelProperty(value = "数据来源") - private String edwDataSource; - //数据创建日期 - @ApiModelProperty(value = "数据创建日期") - private String edwCreateDate; - //数据更新日期 - @ApiModelProperty(value = "数据更新日期") - private String edwLastUpdate; - //数据有效标识 - @ApiModelProperty(value = "数据有效标识") - private String edwValidFlag; - //分区列 - @ApiModelProperty(value = "分区列") - private Long dataVersion; - //同步时间 - @ApiModelProperty(value = "同步时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date accLastUpdateDate; - //自增长id主键 - @ApiModelProperty(value = "自增长id主键") - private Long idSequence; - //同步时间 - @ApiModelProperty(value = "同步时间") - private String synctime; - //删除标识true false - @ApiModelProperty(value = "删除标识true false") - private String deleteEnum; - //备注 - @ApiModelProperty(value = "备注") - private String remarks; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") - private String createName; - //更新人姓名 - @ApiModelProperty(value = "更新人姓名") - private String updateName; - //租户id - @ApiModelProperty(value = "租户id") - private Long tenantId; - //单位id - @ApiModelProperty(value = "单位id") - private Long orgId; - //版本 - @ApiModelProperty(value = "版本") - private String version; - //创建时间 - @ApiModelProperty(value = "创建时间") - private String createTime; - //修改时间 - @ApiModelProperty(value = "修改时间") - private String updateTime; - //创建人id - @ApiModelProperty(value = "创建人id") - private Long createId; - //修改人id - @ApiModelProperty(value = "修改人id") - private Long updateId; - private String env; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjAreaGateCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateCO.java similarity index 67% rename from web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjAreaGateCO.java rename to web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateCO.java index 48f687f..659858b 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjAreaGateCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateCO.java @@ -8,23 +8,17 @@ import lombok.Data; /** * web-client * - * @Author fangjiakai - * @Date 2025-11-14 16:01:00 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ @Data -public class MkmjAreaGateCO extends ClientObject { +public class MkmjGateCO extends ClientObject { //主键 @ApiModelProperty(value = "主键") private Long id; - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String areaGateId; - //企业id - @ApiModelProperty(value = "企业id") - private String corpinfoId; //口门区域id @ApiModelProperty(value = "口门区域id") - private String areaId; + private String mkmjId; //通道id @ApiModelProperty(value = "通道id") private String passageId; @@ -34,27 +28,27 @@ public class MkmjAreaGateCO extends ClientObject { //闸机名称 @ApiModelProperty(value = "闸机名称") private String gateName; - //闸机类型 1-入 2出 - @ApiModelProperty(value = "闸机类型 1-入 2出") - private Integer gateType; - //闸机状态 0- 停用 1-正常 2-暂时关闭 - @ApiModelProperty(value = "闸机状态 0- 停用 1-正常 2-暂时关闭") + //闸机类型 + @ApiModelProperty(value = "闸机类型") + private String gateType; + //闸机类型名称 + @ApiModelProperty(value = "闸机类型名称") + private String gateTypeName; + //闸机状态 1- 停用 2-正常 + @ApiModelProperty(value = "闸机状态 1- 停用 2-正常") private Integer gateStatus; - //闸机类别 0-人行口门 1-车行口门 2-综合口门 - @ApiModelProperty(value = "闸机类别 0-人行口门 1-车行口门 2-综合口门") - private Integer gateCategory; + //闸机类别 + @ApiModelProperty(value = "闸机类别") + private String gateCategory; + //闸机类别名称 + @ApiModelProperty(value = "闸机类别名称") + private String gateCategoryName; //闸机型号 @ApiModelProperty(value = "闸机型号") private String gateModel; //闸机位置 @ApiModelProperty(value = "闸机位置") private String gatePosition; - //是否相邻区域 0否 1是 - @ApiModelProperty(value = "是否相邻区域 0否 1是") - private Integer isAdjacent; - //相邻区域id - @ApiModelProperty(value = "相邻区域id") - private String adjacentAreaId; //经度 @ApiModelProperty(value = "经度") private String longitude; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjPassageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjPassageCO.java index 17339b0..d84566b 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjPassageCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjPassageCO.java @@ -8,40 +8,65 @@ import lombok.Data; /** * web-client * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Data public class MkmjPassageCO extends ClientObject { //主键 @ApiModelProperty(value = "主键") private Long id; - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String passageId; //通道名称 @ApiModelProperty(value = "通道名称") private String passageName; //通道类型 1-人行 2-车行 3-综合 @ApiModelProperty(value = "通道类型 1-人行 2-车行 3-综合") private Integer passageType; - //通道状态 0-停用 1-正常 2-暂时关闭 - @ApiModelProperty(value = "通道状态 0-停用 1-正常 2-暂时关闭") + //通道状态 1-停用 2-正常 + @ApiModelProperty(value = "通道状态 1-停用 2-正常") private Integer passageStatus; //口门区域id @ApiModelProperty(value = "口门区域id") - private String areaId; - //企业id - @ApiModelProperty(value = "企业id") - private String corpinfoId; + private String mkmjId; //经度 @ApiModelProperty(value = "经度") private String longitude; //纬度 @ApiModelProperty(value = "纬度") private String latitude; - // 设备数量 - @ApiModelProperty(value = "设备数量") - private Long gateNum; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjStatisticsCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjStatisticsCO.java deleted file mode 100644 index c0e7765..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjStatisticsCO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import lombok.Data; - -/** - * @author fangjiakai - * @date 2025/11/17 9:44 - */ - -@Data -public class MkmjStatisticsCO extends ClientObject { - private String id; - private Long carInCount; - private Long carOutCount; - private Long personInCount; - private Long personOutCount; -} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjSwipeCardRecordCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjSwipeCardRecordCO.java deleted file mode 100644 index c77144c..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjSwipeCardRecordCO.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Data -public class MkmjSwipeCardRecordCO extends ClientObject { - //主键 - @ApiModelProperty(value = "主键") - private Long id; - //节点编码 - @ApiModelProperty(value = "节点编码") - private String nodecode; - //报警编号 - @ApiModelProperty(value = "报警编号") - private String alarmcode; - //报警图片路径 - @ApiModelProperty(value = "报警图片路径") - private String alarmpicture; - //节点类型 - @ApiModelProperty(value = "节点类型") - private String nodetype; - //报警时间，10位时间戳 - @ApiModelProperty(value = "报警时间，10位时间戳") - private Integer alarmdate; - //报警等级 1：严重，2：一般，3：轻微 - @ApiModelProperty(value = "报警等级 1：严重，2：一般，3：轻微") - private Integer alarmgrade; - //单元类型 - @ApiModelProperty(value = "单元类型") - private Integer unittype; - //报警类型 - @ApiModelProperty(value = "报警类型") - private Integer alarmtype; - //通道序号 - @ApiModelProperty(value = "通道序号") - private Integer channelseq; - //通道名称 - @ApiModelProperty(value = "通道名称") - private String channelname; - //报警状态 1：报警产生，2：报警消失 - @ApiModelProperty(value = "报警状态 1：报警产生，2：报警消失") - private Integer alarmstat; - //部门名称 - @ApiModelProperty(value = "部门名称") - private String deptname; - //通道编号 - @ApiModelProperty(value = "通道编号") - private String acschannelcode; - //口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知 - @ApiModelProperty(value = "口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知") - private Integer maskstate; - //进出门类型: 详见 读卡器业务类型字典 - @ApiModelProperty(value = "进出门类型: 详见 读卡器业务类型字典") - private String enterorexit; - //开门类型字符串 - @ApiModelProperty(value = "开门类型字符串") - private String opentypestr; - //刷卡时间，格式：yyyy-MM:dd HH:mm:ss - @ApiModelProperty(value = "刷卡时间，格式：yyyy-MM:dd HH:mm:ss") - private String swingtime; - //设备名称 - @ApiModelProperty(value = "设备名称") - private String devicename; - //人员编号 - @ApiModelProperty(value = "人员编号") - private String personcode; - //开门类型, 详见开门类型 字典 - @ApiModelProperty(value = "开门类型, 详见开门类型 字典") - private String opentype; - //组织编码 - @ApiModelProperty(value = "组织编码") - private String orgcode; - //证件类型 - @ApiModelProperty(value = "证件类型") - private String papertype; - //证件号 - @ApiModelProperty(value = "证件号") - private String papernumber; - //错误详情 - @ApiModelProperty(value = "错误详情") - private String errordetail; - //开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码 - @ApiModelProperty(value = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码") - private String openfailedcod; - //固定值：evo-accesscontrol - @ApiModelProperty(value = "固定值：evo-accesscontrol") - private String from; - //extendId标识 - @ApiModelProperty(value = "extendId标识") - private Long extendid; - //开始时间, 13位时间戳 - @ApiModelProperty(value = "开始时间, 13位时间戳") - private Long begintime; - //通道名称 - @ApiModelProperty(value = "通道名称") - private String acschannelname; - //预留字段，暂未使用，默认值为0 - @ApiModelProperty(value = "预留字段，暂未使用，默认值为0") - private Integer cardstatus; - //组织名称 - @ApiModelProperty(value = "组织名称") - private String orgname; - //性别 1 男，2 女， 0 未知 - @ApiModelProperty(value = "性别 1 男，2 女， 0 未知") - private Integer sex; - //人员部门id - @ApiModelProperty(value = "人员部门id") - private Integer deptid; - //卡类型 - @ApiModelProperty(value = "卡类型") - private Integer cardtype; - //设备编号 - @ApiModelProperty(value = "设备编号") - private String devicecode; - //人员姓名 - @ApiModelProperty(value = "人员姓名") - private String personname; - //刷卡人在平台上的图片，相对路径 - @ApiModelProperty(value = "刷卡人在平台上的图片，相对路径") - private String personimg; - //开门结果 0 失败 1 成功 - @ApiModelProperty(value = "开门结果 0 失败 1 成功") - private Integer openresult; - //人员id - @ApiModelProperty(value = "人员id") - private Integer personid; - //抓拍图，相对路径 - @ApiModelProperty(value = "抓拍图，相对路径") - private String recordimage1; - //卡介质 0 IC 1 有源RFID 2 CPU - @ApiModelProperty(value = "卡介质 0 IC 1 有源RFID 2 CPU") - private String category; - //卡号 - @ApiModelProperty(value = "卡号") - private String cardnumber; - //rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物 - @ApiModelProperty(value = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物") - private Integer rfidtype; - //年龄 - @ApiModelProperty(value = "年龄") - private Integer age; - //0-非访客，1-访客 - @ApiModelProperty(value = "0-非访客，1-访客") - private Integer vrecordflag; - //删除标识true false - @ApiModelProperty(value = "删除标识true false") - private String deleteEnum; - //备注 - @ApiModelProperty(value = "备注") - private String remarks; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") - private String createName; - //更新人姓名 - @ApiModelProperty(value = "更新人姓名") - private String updateName; - //租户id - @ApiModelProperty(value = "租户id") - private Long tenantId; - //单位id - @ApiModelProperty(value = "单位id") - private Long orgId; - //版本 - @ApiModelProperty(value = "版本") - private String version; - //创建时间 - @ApiModelProperty(value = "创建时间") - private String createTime; - //修改时间 - @ApiModelProperty(value = "修改时间") - private String updateTime; - //创建人id - @ApiModelProperty(value = "创建人id") - private Long createId; - //修改人id - @ApiModelProperty(value = "修改人id") - private Long updateId; - private String env; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java new file mode 100644 index 0000000..1b99173 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java @@ -0,0 +1,110 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Data +public class PersonApplyCO extends ClientObject { + //id + @ApiModelProperty(value = "id") + private Long id; + //1股份2分公司3相关方4临时人员 + @ApiModelProperty(value = "1股份2分公司3相关方4临时人员") + private Object personBelongType; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private Object gateLevelAuthArea; + //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）) + @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)") + private Integer auditFlag; + //进出港权限(1:有 2：无) + @ApiModelProperty(value = "进出港权限(1:有 2：无)") + private Integer mkmjPermission; + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + private Date visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + private Date visitEndTime; + //待审批人员所属企业ID + @ApiModelProperty(value = "待审批人员所属企业ID") + private Long personCorpId; + //待审批人员所属企业名称 + @ApiModelProperty(value = "待审批人员所属企业名称") + private String personCorpName; + //待审批人员所属部门id + @ApiModelProperty(value = "待审批人员所属部门id") + private Long personDepartmentId; + //待审批人员部门名称 + @ApiModelProperty(value = "待审批人员部门名称") + private String personDepartmentName; + //待审批人员id + @ApiModelProperty(value = "待审批人员id") + private Long employeePersonUserId; + //待审批人员姓名 + @ApiModelProperty(value = "待审批人员姓名") + private String employeePersonUserName; + //头像 + @ApiModelProperty(value = "头像") + private String userFaceUrl; + //手机号 + @ApiModelProperty(value = "手机号") + private String userPhone; + //身份证号码 + @ApiModelProperty(value = "身份证号码") + private String userCard; + //告知签字 + @ApiModelProperty(value = "告知签字") + private Long informSignId; + //项目id + @ApiModelProperty(value = "项目id") + private Long projectId; + //项目名称 + @ApiModelProperty(value = "项目名称") + private String projectName; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //来访事由 + @ApiModelProperty(value = "来访事由") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonMessageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonMessageCO.java new file mode 100644 index 0000000..a9b8415 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonMessageCO.java @@ -0,0 +1,83 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:20 + */ +@Data +public class PersonMessageCO extends ClientObject { + //id + @ApiModelProperty(value = "id") + private Object id; + //人员申请id + @ApiModelProperty(value = "人员申请id") + private Long personApplyId; + //1股份2分公司3相关方4临时人员 + @ApiModelProperty(value = "1股份2分公司3相关方4临时人员") + private Object personBelongType; + //头像 + @ApiModelProperty(value = "头像") + private String userFaceUrl; + //身份证号码 + @ApiModelProperty(value = "身份证号码") + private String userCard; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private Object gateLevelAuthArea; + //授权访问起始时间 + @ApiModelProperty(value = "授权访问起始时间") + private Date visitStartTime; + //授权访问结束时间 + @ApiModelProperty(value = "授权访问结束时间") + private Date visitEndTime; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //对接状态，1对接完成，2未对接 + @ApiModelProperty(value = "对接状态，1对接完成，2未对接") + private Integer syncStatus; + //对接说明 + @ApiModelProperty(value = "对接说明") + private String syncRemarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessCO.java deleted file mode 100644 index b8ca2fa..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessCO.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Data -public class TemporaryAccessCO extends ClientObject { - //id - @ApiModelProperty(value = "id") - private Long id; - //审批人ID - @ApiModelProperty(value = "审批人ID") - private Long userId; - //审批人姓名 - @ApiModelProperty(value = "审批人姓名") - private String userName; - //手机号 - @ApiModelProperty(value = "手机号") - private String phone; - //身份证号 - @ApiModelProperty(value = "身份证号") - private String idCard; - //企业ID - @ApiModelProperty(value = "企业ID") - private String corpId; - //企业名称 - @ApiModelProperty(value = "企业名称") - private String corpName; - //部门id - @ApiModelProperty(value = "部门id") - private String deptId; - //部门名称 - @ApiModelProperty(value = "部门名称") - private String deptName; - //车牌号 - @ApiModelProperty(value = "车牌号") - private String carNo; - //车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌) - @ApiModelProperty(value = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)") - private String carPlantType; - //车辆类型(0：货车，1：轿车，2：大巴客车) - @ApiModelProperty(value = "车辆类型(0：货车，1：轿车，2：大巴客车)") - private String carType; - //访问起始时间 - @ApiModelProperty(value = "访问起始时间") - private String visitStartTime; - //访问结束时间 - @ApiModelProperty(value = "访问结束时间") - private String visitEndTime; - //口门ID - @ApiModelProperty(value = "口门ID") - private String doorId; - //口门名称 - @ApiModelProperty(value = "口门名称") - private String doorName; - //驾驶证照片 - @ApiModelProperty(value = "驾驶证照片") - private String drivingLicensePath; - //身份证正面 - @ApiModelProperty(value = "身份证正面") - private String idCardFrontPath; - //身份证反面 - @ApiModelProperty(value = "身份证反面") - private String idCardFlipsidePath; - //访问类型(1：人员，2：车辆) - @ApiModelProperty(value = "访问类型(1：人员，2：车辆)") - private String temporaryType; - //访问来源(0：监管，1：企业，2：相关方，3：驻港单位) - @ApiModelProperty(value = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)") - private String temporaryFrom; - //来访事由 - @ApiModelProperty(value = "来访事由") - private String visitReason; - //排放标准: - @ApiModelProperty(value = "排放标准:") - private String emissionStandards; - //删除标识 - @ApiModelProperty(value = "删除标识") - private String deleteEnum; - //创建时间 - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTime; - //更新时间 - @ApiModelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date updateTime; - //创建人ID - @ApiModelProperty(value = "创建人ID") - private Long createId; - //更新人ID - @ApiModelProperty(value = "更新人ID") - private Long updateId; - //环境标识 - @ApiModelProperty(value = "环境标识") - private String env; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") - private String createName; - //更新人姓名 - @ApiModelProperty(value = "更新人姓名") - private String updateName; - //租户ID - @ApiModelProperty(value = "租户ID") - private Long tenantId; - //组织ID - @ApiModelProperty(value = "组织ID") - private Long orgId; - //版本号 - @ApiModelProperty(value = "版本号") - private Integer version; - //备注 - @ApiModelProperty(value = "备注") - private String remarks; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessEntourageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessEntourageCO.java deleted file mode 100644 index 18bdbf5..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessEntourageCO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.sql.Date; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@Data -public class TemporaryAccessEntourageCO extends ClientObject { - private Long entourageId; - //临时访问表id - @ApiModelProperty(value = "临时访问表id") - private Long temporaryId; - //姓名 - @ApiModelProperty(value = "姓名") - private String name; - //手机号 - @ApiModelProperty(value = "手机号") - private String phone; - //工作单位 - @ApiModelProperty(value = "工作单位") - private String jobName; -} - 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 new file mode 100644 index 0000000..f33c73f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java @@ -0,0 +1,146 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:23 + */ +@Data +public class VehicleApplyCO extends ClientObject { + //id + @ApiModelProperty(value = "id") + private Long id; + //车辆状态(1未启用,2启用) + @ApiModelProperty(value = "车辆状态(1未启用,2启用)") + private Integer statusFlag; + //车牌类型数据字典 + @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 Object gateLevelAuthArea; + //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）) + @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)") + private Integer auditFlag; + //进出港权限(1:有 2：无) + @ApiModelProperty(value = "进出港权限(1:有 2：无)") + private Integer mkmjPermission; + //访问起始时间 + @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 emissionStandards; + //排放标准: + level1 ->国一 + level2 ->国二 + level3 ->国三 + level4 ->国四 + level5 ->国五 + level6 ->国六 + @ApiModelProperty(value = "排放标准: + level1 ->国一 + level2 ->国二 + level3 ->国三 + level4 ->国四 + level5 ->国五 + level6 ->国六") + private String emissionStandardsName; + //行驶证照片 + @ApiModelProperty(value = "行驶证照片") + private Long drivingLicenseId; + //车辆照片 + @ApiModelProperty(value = "车辆照片") + private Long attachmentId; + //告知签字 + @ApiModelProperty(value = "告知签字") + private Long informSignId; + //项目id + @ApiModelProperty(value = "项目id") + private Long projectId; + //项目名称 + @ApiModelProperty(value = "项目名称") + private String projectName; + //1被拉黑2未拉黑 + @ApiModelProperty(value = "1被拉黑2未拉黑") + private Integer blockedFlag; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; +} + 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 new file mode 100644 index 0000000..5d9acd6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java @@ -0,0 +1,92 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:24 + */ +@Data +public class VehicleAuditCO extends ClientObject { + //id + @ApiModelProperty(value = "id") + private Long id; + //车辆申请id + @ApiModelProperty(value = "车辆申请id") + private String vehicleApplyId; + //审批批次(1.普通车辆.2危险化学品车辆) + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") + private Integer batchType; + //审批状态(1,申请;2.更新) + @ApiModelProperty(value = "审批状态(1,申请;2.更新)") + private Integer batchState; + //审批人id + @ApiModelProperty(value = "审批人id") + private Long auditUserId; + //审批人姓名 + @ApiModelProperty(value = "审批人姓名") + private String auditUserName; + //审批部门id + @ApiModelProperty(value = "审批部门id") + private Long auditDeptId; + //审批部门名称 + @ApiModelProperty(value = "审批部门名称") + private String auditDeptName; + //审批人企业id + @ApiModelProperty(value = "审批人企业id") + private Long auditCorpId; + //审批人企业名称 + @ApiModelProperty(value = "审批人企业名称") + private String auditCorpName; + //审批状态(1,未开始,2通过,3不通过) + @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)") + private Integer auditStatus; + //待审核信息 + @ApiModelProperty(value = "待审核信息") + private Object changeAfter; + //变更前信息 + @ApiModelProperty(value = "变更前信息") + private Object changeBefore; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Object version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java deleted file mode 100644 index 250aefb..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Data -public class VehicleAuditLogCO extends ClientObject { - //id - @ApiModelProperty(value = "id") - private Long id; - //业务id - @ApiModelProperty(value = "业务id") - private String vehicleAuditLogId; - //审批批次(1.普通车辆.2危险化学品车辆) - @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") - private Integer batchType; - //审批状态(0,申请;2.更新) - @ApiModelProperty(value = "审批状态(0,申请;2.更新)") - private Integer batchState; - //车辆id - @ApiModelProperty(value = "车辆id") - private Long vehicleMessageId; - //审批人id - @ApiModelProperty(value = "审批人id") - private Long userId; - //审批人姓名 - @ApiModelProperty(value = "审批人姓名") - private String userName; - //审批部门id - @ApiModelProperty(value = "审批部门id") - private Long deptId; - //审批部门名称 - @ApiModelProperty(value = "审批部门名称") - private String deptName; - //审批步骤排序 - @ApiModelProperty(value = "审批步骤排序") - private Integer stepSort; - //审批状态(1未开始.2通过.3不通过) - @ApiModelProperty(value = "审批状态(1未开始.2通过.3不通过)") - private Integer status; - //审批状态(0正常,1.废除) - @ApiModelProperty(value = "审批状态(0正常,1.废除)") - private Integer stepType; - //驳回备注 - @ApiModelProperty(value = "驳回备注") - private String comments; -} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java index f0765fd..f84bd80 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java @@ -1,30 +1,65 @@ package com.zcloud.primeport.dto.clientobject; import com.alibaba.cola.dto.ClientObject; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Date; - /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @Data public class VehicleBlackCO extends ClientObject { //id @ApiModelProperty(value = "id") private Long id; - //车辆信息表（t_vehicle_message）的主键id - @ApiModelProperty(value = "车辆信息表（t_vehicle_message）的主键id") + //车辆信息表（vehicle_apply）的主键id + @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id") private Long vehicleId; - - @ApiModelProperty(value = "车辆信息") - private VehicleMessageCO vehicleMessage; - + //车辆所属人姓名（临时车） + @ApiModelProperty(value = "车辆所属人姓名（临时车）") + private String employeeVehicleUserName; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountByCorpCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountByCorpCO.java deleted file mode 100644 index 674037a..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountByCorpCO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import lombok.Data; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 - */ -@Data -public class VehicleCountByCorpCO extends ClientObject { - - private String corpId; - private String corpName; - private String corpVehicleCount; - -} - - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountFromViolationsCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountFromViolationsCO.java deleted file mode 100644 index 4ecd937..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountFromViolationsCO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 - */ -@Data -public class VehicleCountFromViolationsCO extends BaseDO { - - @ApiModelProperty(value = "id") - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //业务id - @ApiModelProperty(value = "业务id") - private String vehicleMessageId; - //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") - private Integer licenceType; - //车牌号 - @ApiModelProperty(value = "车牌号") - private String licenceNo; - //车辆类型 - @ApiModelProperty(value = "车辆类型") - private String vehicleType; - @ApiModelProperty(value = "车辆类型-名字") - private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") - private Integer vehicleBelongType; - @ApiModelProperty(value = "违规数量") - private String violationsCount; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDeptInfoCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDeptInfoCO.java deleted file mode 100644 index ac4fb0f..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDeptInfoCO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.Date; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 - */ -@Data -public class VehicleDeptInfoCO extends ClientObject { - - @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 = "访问起始时间", name = "visitStartTime", required = true) - @NotEmpty(message = "访问起始时间不能为空") - private Date visitStartTime; - @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) - @NotEmpty(message = "访问结束时间不能为空") - private Date visitEndTime; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleLogAndCarCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleLogAndCarCO.java deleted file mode 100644 index e329631..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleLogAndCarCO.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Data -public class VehicleLogAndCarCO extends ClientObject { - //id - @ApiModelProperty(value = "id") - private Long id; - //业务id - @ApiModelProperty(value = "业务id") - private String vehicleAuditLogId; - //审批批次(1.普通车辆.2危险化学品车辆) - @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") - private Integer batchType; - //审批状态(0,申请;2.更新) - @ApiModelProperty(value = "审批状态(0,申请;2.更新)") - private Integer batchState; - //车辆id - @ApiModelProperty(value = "车辆id") - private Long vehicleMessageId; - //审批人id - @ApiModelProperty(value = "审批人id") - private Long userId; - //审批人姓名 - @ApiModelProperty(value = "审批人姓名") - private String userName; - //审批部门id - @ApiModelProperty(value = "审批部门id") - private Long deptId; - //审批部门名称 - @ApiModelProperty(value = "审批部门名称") - private String deptName; - //审批步骤排序 - @ApiModelProperty(value = "审批步骤排序") - private Integer stepSort; - //审批状态(1未开始.2通过.3不通过) - @ApiModelProperty(value = "审批状态(1未开始.2通过.3不通过)") - private Integer status; - //审批状态(0正常,1.废除) - @ApiModelProperty(value = "审批状态(0正常,1.废除)") - private Integer stepType; - //驳回备注 - @ApiModelProperty(value = "驳回备注") - private String comments; - - @ApiModelProperty(value = "车辆信息") - private VehicleMessageCO vehicleMessageCO; - - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java index 1099faa..df77980 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java @@ -4,79 +4,89 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @Data public class VehicleMessageCO extends ClientObject { //id @ApiModelProperty(value = "id") private Long id; - //业务id - @ApiModelProperty(value = "业务id") - private String vehicleMessageId; - //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") - private Integer licenceType; + //车牌类型数据字典 + @ApiModelProperty(value = "车牌类型数据字典") + private String licenceType; + //车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + @ApiModelProperty(value = "车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + private String licenceTypeName; //车牌号 @ApiModelProperty(value = "车牌号") private String licenceNo; //车辆类型 @ApiModelProperty(value = "车辆类型") private String vehicleType; - @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + //车辆类型-名字 + @ApiModelProperty(value = "车辆类型-名字") private String vehicleTypeName; - //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") - private Integer vehicleBelongType; - //所属车队ID - @ApiModelProperty(value = "所属车队ID") - private Long motorcadeId; - //是否危化车辆(0：否，1：是) - @ApiModelProperty(value = "是否危化车辆(0：否，1：是)") - private Integer isDangerous; - //通行港区(0-全部 1-东港区 2-西港区) - @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)") - private Integer portId; - //是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回) - @ApiModelProperty(value = "是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回)") - private Integer isAudit; - //进出港权限(1:有 2：无) - @ApiModelProperty(value = "进出港权限(1:有 2：无)") - private Integer mkmjPermission; - //访问起始时间 - @ApiModelProperty(value = "访问起始时间") + //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 + @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") + private String vehicleBelongType; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private Object gateLevelAuthArea; + //授权访问起始时间 + @ApiModelProperty(value = "授权访问起始时间") private Date visitStartTime; - //访问结束时间 - @ApiModelProperty(value = "访问结束时间") + //授权访问结束时间 + @ApiModelProperty(value = "授权访问结束时间") private Date visitEndTime; - //车辆所属部门id - @ApiModelProperty(value = "车辆所属部门id") - private Long vehicleDepartmentId; - //车辆所属部门名称 - @ApiModelProperty(value = "车辆所属部门名称") - private String vehicleDepartmentName; - //车辆所属人id(员工车辆) - @ApiModelProperty(value = "车辆所属人id(员工车辆)") - private Long employeeVehicleUserId; - //车辆所属人姓名(员工车辆) - @ApiModelProperty(value = "车辆所属人姓名(员工车辆)") - private String employeeVehicleUserName; - //企业ID - @ApiModelProperty(value = "企业ID") - private Long corpId; - //排放标准: - @ApiModelProperty(value = "排放标准:") - private String emissionStandards; - //附件地址 - @ApiModelProperty(value = "附件地址") - private String attachmentUrl; - + //车辆申请id + @ApiModelProperty(value = "车辆申请id") + private Long vehicleApplyId; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //对接状态，1对接完成，2未对接 + @ApiModelProperty(value = "对接状态，1对接完成，2未对接") + private Integer syncStatus; + //对接说明 + @ApiModelProperty(value = "对接说明") + private String syncRemarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleStatusCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleStatusCO.java deleted file mode 100644 index 24ec4f3..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleStatusCO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import lombok.Data; - -/** - * 车辆状态数据传输对象 - */ -@Data -public class VehicleStatusCO { - - /** - * 车牌号 - */ - private String licenceNo; - - /** - * 启用状态车辆数量 - */ - private int enabledCount; -} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsCO.java index 82c3267..2b596ae 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsCO.java @@ -1,46 +1,86 @@ package com.zcloud.primeport.dto.clientobject; import com.alibaba.cola.dto.ClientObject; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Date; - /** * web-client * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:28 + * @Author makejava + * @Date 2026-03-05 11:33:28 */ @Data public class VehicleViolationsCO extends ClientObject { - //车辆违规记录表的id - @ApiModelProperty(value = "车辆违规记录表的id") + //车辆违规记录id + @ApiModelProperty(value = "车辆违规记录id") private Long id; - //车辆信息表（t_vehicle_message）的主键id - @ApiModelProperty(value = "车辆信息表（t_vehicle_message）的主键id") + //车辆信息表（vehicle_apply）的主键id + @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id") private Long vehicleId; - //违规类型（0-未按规定车道行驶，1-违规停车） - @ApiModelProperty(value = "违规类型（0-未按规定车道行驶，1-违规停车）") - private Integer violationType; + //车辆所属人姓名（临时车） + @ApiModelProperty(value = "车辆所属人姓名（临时车）") + private String employeeVehicleUserName; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //违规类型 + @ApiModelProperty(value = "违规类型") + private String violationType; + //违规类型名称 + @ApiModelProperty(value = "违规类型名称") + private String violationTypeName; //违规区域（位置） @ApiModelProperty(value = "违规区域（位置）") private String location; //违规图片的存储路径 @ApiModelProperty(value = "违规图片的存储路径") - private String filepath; + private String illegalImagesId; //违规说明 @ApiModelProperty(value = "违规说明") private String describeMessage; //违规时间 @ApiModelProperty(value = "违规时间") - @JsonFormat(pattern = "yyyy-MM-dd") private Date violationtime; + //违规处理状态，1已处理2未处理 + @ApiModelProperty(value = "违规处理状态，1已处理2未处理") + private Integer violationProcessingStatus; //删除标识 @ApiModelProperty(value = "删除标识") private String deleteEnum; - + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsListCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsListCO.java deleted file mode 100644 index d054c74..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsListCO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zcloud.primeport.dto.clientobject; - -import com.alibaba.cola.dto.ClientObject; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.sql.Date; - - -/** - * web-client - * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:28 - */ -@Data -public class VehicleViolationsListCO extends ClientObject { - @ApiModelProperty(value = "id") - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //业务id - @ApiModelProperty(value = "业务id") - private String vehicleMessageId; - //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") - private Integer licenceType; - //车牌号 - @ApiModelProperty(value = "车牌号") - private String licenceNo; - //车辆类型 - @ApiModelProperty(value = "车辆类型") - private String vehicleType; - @ApiModelProperty(value = "车辆类型-名字") - private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") - private Integer vehicleBelongType; - @ApiModelProperty(value = "违规数量") - private String violationsCount; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateVideoCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VideoCO.java similarity index 83% rename from web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateVideoCO.java rename to web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VideoCO.java index 8663575..034ca2f 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateVideoCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VideoCO.java @@ -8,20 +8,17 @@ import lombok.Data; /** * web-client * - * @Author fangjiakai - * @Date 2025-11-14 17:16:03 + * @Author makejava + * @Date 2026-03-05 11:33:30 */ @Data -public class MkmjGateVideoCO extends ClientObject { +public class VideoCO extends ClientObject { //主键 @ApiModelProperty(value = "主键") private Long id; - //闸机摄像头id - @ApiModelProperty(value = "闸机摄像头id") - private String gateVideoId; - //口门/闸机id - @ApiModelProperty(value = "口门/闸机id") - private String areaGateId; + //口门/闸机id 外键id + @ApiModelProperty(value = "口门/闸机id 外键id ") + private Long foreignId; //设备类型（1-口门 2-闸机） @ApiModelProperty(value = "设备类型（1-口门 2-闸机）") private Integer deviceType; @@ -34,9 +31,6 @@ public class MkmjGateVideoCO extends ClientObject { //摄像头类型（1-移动 2-平台） @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）") private Integer videoType; - //企业id - @ApiModelProperty(value = "企业id") - private String corpinfoId; //经度 @ApiModelProperty(value = "经度") private String longitude; 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 new file mode 100644 index 0000000..c8b6cd4 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java @@ -0,0 +1,48 @@ +package com.zcloud.primeport.domain.enums; + +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @author zhangyue + * @date 2025/12/6 13:48 + */ +@Getter +public enum MenuEnum { + + + ; + + private final String path; + private final String menuKey; + + private static final Map PATH_MAP = Arrays.stream(values()).collect(Collectors.toMap(MenuEnum::getPath, Function.identity())); + + MenuEnum(String path, String menuKey) { + this.path = path; + this.menuKey = menuKey; + } + + public String getPath() { + return path; + } + + public String getMenuKey() { + return menuKey; + } + + // 通过name获取枚举 + public static MenuEnum getByPath(String path) { + return PATH_MAP.get(path); + } + + // 通过path获取age + public static String getMenuKeyByPath(String path) { + MenuEnum entry = PATH_MAP.get(path); + return entry != null ? entry.getMenuKey() : null; + } +} diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/EmployeeMessageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/EmployeeMessageGateway.java deleted file mode 100644 index 1811e04..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/EmployeeMessageGateway.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.EmployeeMessageE; - -/** -* web-domain -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -public interface EmployeeMessageGateway { - - /** - * 新增 - */ - Boolean add(EmployeeMessageE employeeMessageE) ; - - /** - * 修改 - */ - Boolean update(EmployeeMessageE employeeMessageE); - - /** - * 更新状态 - */ - Boolean updateStatus(EmployeeMessageE employeeMessageE); - - /** - * 删除 - */ - Boolean deletedEmployeeMessageById(Long id); - Boolean deletedEmployeeMessageByIds(Long[] id); -} \ No newline at end of file diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/EnclosedAreaGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/EnclosedAreaGateway.java deleted file mode 100644 index bb67546..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/EnclosedAreaGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.EnclosedAreaE; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -public interface EnclosedAreaGateway { - - /** - * 新增 - */ - Boolean add(EnclosedAreaE enclosedAreaE); - - /** - * 修改 - */ - Boolean update(EnclosedAreaE enclosedAreaE); - - /** - * 删除 - */ - Boolean deletedEnclosedAreaById(Long id); - - Boolean deletedEnclosedAreaByIds(Long[] id); -} - 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 deleted file mode 100644 index e2a8cf4..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/GatePersonAuthLevelOneGateway.java +++ /dev/null @@ -1,28 +0,0 @@ -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/InspectionDeptGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java deleted file mode 100644 index bcba9ae..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.InspectionDeptE; - -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -public interface InspectionDeptGateway { - - /** - * 新增 - */ - InspectionDeptE add(InspectionDeptE inspectionDeptE); - - /** - * 修改 - */ - Boolean update(InspectionDeptE inspectionDeptE); - - /** - * 删除 - */ - Boolean deletedInspectionDeptById(Long id); - - Boolean deletedInspectionDeptByIds(Long[] id); -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionVehicleGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionVehicleGateway.java deleted file mode 100644 index 79954f6..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionVehicleGateway.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - - -import com.zcloud.primeport.domain.model.InspectionVehicleE; - -import java.util.List; - -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -public interface InspectionVehicleGateway { - - /** - * 新增 - */ - Boolean add(InspectionVehicleE inspectionVehicleE); - - /** - * 修改 - */ - Boolean update(InspectionVehicleE inspectionVehicleE); - - /** - * 删除 - */ - Boolean deletedInspectionVehicleById(Long id); - - Boolean deletedInspectionVehicleByIds(Long[] id); - -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjApprovalUserGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjApprovalUserGateway.java index bc62d25..b49b2d1 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjApprovalUserGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjApprovalUserGateway.java @@ -1,11 +1,12 @@ package com.zcloud.primeport.domain.gateway; import com.zcloud.primeport.domain.model.MkmjApprovalUserE; + /** * web-domain * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:16 */ public interface MkmjApprovalUserGateway { diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjAreaGateGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjAreaGateGateway.java deleted file mode 100644 index 4a948eb..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjAreaGateGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.MkmjAreaGateE; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -public interface MkmjAreaGateGateway { - - /** - * 新增 - */ - Boolean add(MkmjAreaGateE mkmjAreaGateE); - - /** - * 修改 - */ - Boolean update(MkmjAreaGateE mkmjAreaGateE); - - /** - * 删除 - */ - Boolean deletedMkmjAreaGateById(Long id); - - Boolean deletedMkmjAreaGateByIds(Long[] id); -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjAreaGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjAreaGateway.java deleted file mode 100644 index bbbae7c..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjAreaGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.MkmjAreaE; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -public interface MkmjAreaGateway { - - /** - * 新增 - */ - Boolean add(MkmjAreaE mkmjAreaE); - - /** - * 修改 - */ - Boolean update(MkmjAreaE mkmjAreaE); - - /** - * 删除 - */ - Boolean deletedMkmjAreaById(Long id); - - Boolean deletedMkmjAreaByIds(Long[] id); -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjCarRecordGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjCarRecordGateway.java deleted file mode 100644 index 62117bb..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjCarRecordGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.MkmjCarRecordE; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -public interface MkmjCarRecordGateway { - - /** - * 新增 - */ - Boolean add(MkmjCarRecordE mkmjCarRecordE); - - /** - * 修改 - */ - Boolean update(MkmjCarRecordE mkmjCarRecordE); - - /** - * 删除 - */ - Boolean deletedMkmjCarRecordById(Long id); - - Boolean deletedMkmjCarRecordByIds(Long[] id); -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateGateway.java new file mode 100644 index 0000000..5cc6324 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.MkmjGateE; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +public interface MkmjGateGateway { + + /** + * 新增 + */ + Boolean add(MkmjGateE mkmjGateE); + + /** + * 修改 + */ + Boolean update(MkmjGateE mkmjGateE); + + /** + * 删除 + */ + Boolean deletedMkmjGateById(Long id); + + Boolean deletedMkmjGateByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateVideoGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateVideoGateway.java deleted file mode 100644 index cf3a221..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateVideoGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.MkmjGateVideoE; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -public interface MkmjGateVideoGateway { - - /** - * 新增 - */ - Boolean add(MkmjGateVideoE mkmjGateVideoE); - - /** - * 修改 - */ - Boolean update(MkmjGateVideoE mkmjGateVideoE); - - /** - * 删除 - */ - Boolean deletedMkmjGateVideoById(Long id); - - Boolean deletedMkmjGateVideoByIds(Long[] id); -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateway.java new file mode 100644 index 0000000..2fd6c27 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.MkmjE; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:15 + */ +public interface MkmjGateway { + + /** + * 新增 + */ + Boolean add(MkmjE mkmjE); + + /** + * 修改 + */ + Boolean update(MkmjE mkmjE); + + /** + * 删除 + */ + Boolean deletedMkmjById(Long id); + + Boolean deletedMkmjByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjPassageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjPassageGateway.java index 429b52b..aec7e21 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjPassageGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjPassageGateway.java @@ -5,8 +5,8 @@ import com.zcloud.primeport.domain.model.MkmjPassageE; /** * web-domain * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ public interface MkmjPassageGateway { diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjSwipeCardRecordGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjSwipeCardRecordGateway.java deleted file mode 100644 index abb25a8..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjSwipeCardRecordGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.MkmjSwipeCardRecordE; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -public interface MkmjSwipeCardRecordGateway { - - /** - * 新增 - */ - Boolean add(MkmjSwipeCardRecordE mkmjSwipeCardRecordE); - - /** - * 修改 - */ - Boolean update(MkmjSwipeCardRecordE mkmjSwipeCardRecordE); - - /** - * 删除 - */ - Boolean deletedMkmjSwipeCardRecordById(Long id); - - Boolean deletedMkmjSwipeCardRecordByIds(Long[] id); -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/PersonApplyGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/PersonApplyGateway.java new file mode 100644 index 0000000..5cf8f6f --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/PersonApplyGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.PersonApplyE; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +public interface PersonApplyGateway { + + /** + * 新增 + */ + Boolean add(PersonApplyE personApplyE); + + /** + * 修改 + */ + Boolean update(PersonApplyE personApplyE); + + /** + * 删除 + */ + Boolean deletedPersonApplyById(Long id); + + Boolean deletedPersonApplyByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/PersonMessageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/PersonMessageGateway.java new file mode 100644 index 0000000..52fb881 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/PersonMessageGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.PersonMessageE; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:20 + */ +public interface PersonMessageGateway { + + /** + * 新增 + */ + Boolean add(PersonMessageE personMessageE); + + /** + * 修改 + */ + Boolean update(PersonMessageE personMessageE); + + /** + * 删除 + */ + Boolean deletedPersonMessageById(Long id); + + Boolean deletedPersonMessageByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessEntourageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessEntourageGateway.java deleted file mode 100644 index 69364d9..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessEntourageGateway.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.TemporaryAccessEntourageE; -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -public interface TemporaryAccessEntourageGateway { - - /** - * 新增 - */ - Boolean add(TemporaryAccessEntourageE temporaryAccessEntourageE); - - /** - * 修改 - */ - Boolean update(TemporaryAccessEntourageE temporaryAccessEntourageE); - - /** - * 删除 - */ - Boolean deletedTemporaryAccessEntourageById(Long id); - - Boolean deletedTemporaryAccessEntourageByIds(Long[] id); -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessGateway.java deleted file mode 100644 index e248717..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.TemporaryAccessE; - -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -public interface TemporaryAccessGateway { - - /** - * 新增 - */ - Boolean add(TemporaryAccessE temporaryAccessE); - - /** - * 修改 - */ - Boolean update(TemporaryAccessE temporaryAccessE); - - /** - * 删除 - */ - Boolean deletedTemporaryAccessById(Long id); - - Boolean deletedTemporaryAccessByIds(Long[] id); -} - 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 new file mode 100644 index 0000000..aa36077 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.VehicleApplyE; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:23 + */ +public interface VehicleApplyGateway { + + /** + * 新增 + */ + Boolean add(VehicleApplyE vehicleApplyE); + + /** + * 修改 + */ + Boolean update(VehicleApplyE vehicleApplyE); + + /** + * 删除 + */ + Boolean deletedVehicleApplyById(Long id); + + Boolean deletedVehicleApplyByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditGateway.java new file mode 100644 index 0000000..b535051 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.VehicleAuditE; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +public interface VehicleAuditGateway { + + /** + * 新增 + */ + Boolean add(VehicleAuditE vehicleAuditE); + + /** + * 修改 + */ + Boolean update(VehicleAuditE vehicleAuditE); + + /** + * 删除 + */ + Boolean deletedVehicleAuditById(Long id); + + Boolean deletedVehicleAuditByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditLogGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditLogGateway.java deleted file mode 100644 index 65d6621..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditLogGateway.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zcloud.primeport.domain.gateway; -import com.zcloud.primeport.domain.model.VehicleAuditLogE; -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -public interface VehicleAuditLogGateway { - - /** - * 新增 - */ - Boolean add(VehicleAuditLogE vehicleAuditLogE); - - /** - * 修改 - */ - Boolean update(VehicleAuditLogE vehicleAuditLogE); - - /** - * 删除 - */ - Boolean deletedVehicleAuditLogById(Long id); - - Boolean deletedVehicleAuditLogByIds(Long[] id); - /** - * 查询 - */ - VehicleAuditLogE queryVehicleAuditLogByVehicleMessageId(Long vehicleMessageId); -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java index 911757c..b1d4d19 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java @@ -1,12 +1,12 @@ package com.zcloud.primeport.domain.gateway; - import com.zcloud.primeport.domain.model.VehicleBlackE; + /** * web-domain * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ public interface VehicleBlackGateway { @@ -26,11 +26,5 @@ public interface VehicleBlackGateway { Boolean deletedVehicleBlackById(Long id); Boolean deletedVehicleBlackByIds(Long[] id); - - /** - * 详情 - */ - VehicleBlackE getInfoById(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 72c109e..1dcef79 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 @@ -3,47 +3,28 @@ package com.zcloud.primeport.domain.gateway; import com.zcloud.primeport.domain.model.VehicleMessageE; /** -* web-domain -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:27 + */ public interface VehicleMessageGateway { /** - * 新增 - */ - VehicleMessageE add(VehicleMessageE vehicleMessageE) ; + * 新增 + */ + Boolean add(VehicleMessageE vehicleMessageE); /** - * 修改 - */ + * 修改 + */ Boolean update(VehicleMessageE vehicleMessageE); /** - * 删除 - */ + * 删除 + */ Boolean deletedVehicleMessageById(Long id); + Boolean deletedVehicleMessageByIds(Long[] id); - - /** - * 详情 - */ - VehicleMessageE getInfoById(Long id); - - /** - * 根据车牌查询车辆信息 - * @param licenceNo - * @return - */ - VehicleMessageE getInfoByLicenceNo(String licenceNo); - - Integer countEnabledByLicenceNo(String licenceNo); - - /** - * 根据用户ID获取这个用户有多少车辆 - * @param userId 用户ID - * @return 车辆数量 - */ - Integer countByUserId(Long userId); - } + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleViolationsGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleViolationsGateway.java index 88816c8..8f94da0 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleViolationsGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleViolationsGateway.java @@ -1,13 +1,12 @@ package com.zcloud.primeport.domain.gateway; - import com.zcloud.primeport.domain.model.VehicleViolationsE; /** * web-domain * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ public interface VehicleViolationsGateway { @@ -27,12 +26,5 @@ public interface VehicleViolationsGateway { Boolean deletedVehicleViolationsById(Long id); Boolean deletedVehicleViolationsByIds(Long[] id); - - /** - * 查询违规记录次数 - * @param vehicleId - * @return - */ - Long getCountByVehicleId(Long vehicleId); } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VideoGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VideoGateway.java new file mode 100644 index 0000000..db1beb1 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VideoGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.VideoE; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:30 + */ +public interface VideoGateway { + + /** + * 新增 + */ + Boolean add(VideoE videoE); + + /** + * 修改 + */ + Boolean update(VideoE videoE); + + /** + * 删除 + */ + Boolean deletedVideoById(Long id); + + Boolean deletedVideoByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/EmployeeMessageE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/EmployeeMessageE.java deleted file mode 100644 index 4f69d76..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/EmployeeMessageE.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zcloud.primeport.domain.model; -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; -/** -* web-domain -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Data -public class EmployeeMessageE extends BaseE { - //用户ID - private Long userId; - //是否有进入一级口门的权限(0-无权限;1有权限) - private Integer isPermission; - //是否有人脸权限 - private Integer isUserFace; - //可以进入的口门信息 - private String mkmjScope; - //状态：0-停用 1-启用 - private Integer status; -} \ No newline at end of file diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/EnclosedAreaE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/EnclosedAreaE.java deleted file mode 100644 index 2c8a290..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/EnclosedAreaE.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -@Data -public class EnclosedAreaE extends BaseE { - //父级id - private Long parentId; - //父级名称 - private String parentName; - //封闭区域名称 - private String name; - //封闭区域类型 - private String type; - //封闭区域类型 - private String typeName; - //管辖单位 - private Long corpinfoId; - //管辖单位 - private String corpinfoName; - //经度 - private String longitude; - //纬度 - private String latitude; -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/GateCountE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/GateCountE.java deleted file mode 100644 index 04b2140..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/GateCountE.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -/** - * @author fangjiakai - * @date 2025/11/14 10:24 - */ -@Data -public class GateCountE extends BaseE { - private String passageId; - private Long count; -} 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 deleted file mode 100644 index a3930b2..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/GatePersonAuthLevelOneE.java +++ /dev/null @@ -1,34 +0,0 @@ -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/InspectionDeptE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionDeptE.java deleted file mode 100644 index c767752..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionDeptE.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.alibaba.cola.domain.Entity; -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -@Data -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -public class InspectionDeptE extends BaseE { - //主键 - private Long id; - //名称 - private String name; - -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java deleted file mode 100644 index 5c63f18..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zcloud.primeport.domain.model; - - -import com.alibaba.cola.domain.Entity; -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -public class InspectionVehicleE extends BaseE { - //主键 - private Long id; - //检查部门ID - private Long inspectionDeptId; - //车辆id - private Long vehicleMessageId; - - - public void addDeptInspection(Long inspectionDeptId, Long vehicleMessageId) { - this.inspectionDeptId = inspectionDeptId; - this.vehicleMessageId = vehicleMessageId; - - } - -} - 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 f63bc16..e265fd6 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 @@ -1,42 +1,41 @@ package com.zcloud.primeport.domain.model; - import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * web-domain * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:16 */ @Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class MkmjApprovalUserE extends BaseE { - - //审批人部门ID - private String deptName; - //审批人部门 + //主键ID + private Long id; + //审批人企业id + private Long corpId; + //审批人企业名称 + private String corpName; + //审批人部门id private Long deptId; - //审批人姓名 - private String name; - //审批人 - private String userName; - //审批人名字 + //审批人部门名称 + private String deptName; + //审批人id private Long userId; - //岗位名称 - private String postName; - //岗位id - private Long postId; - //企业id - private Long corpinfoId; - //删除标识 - private String deleteEnum; - //人员审核权限(0-无权限,1-有权限) - private Integer isPersonnelPermission; - //车辆审核权限(0-无权限,1-有权限) - private Integer isVehiclePermission; - //临时审核权限(0-无权限,1-有权限) - private Integer isTemporaryPermission; - - + //审批人名称 + private String userName; + //人员审核权限(1-无权限,2-有权限) + private Integer personnelPermissionFlag; + //车辆审核权限(1-无权限,2-有权限) + private Integer vehiclePermissionFlag; + //临时审核权限(1-无权限,2-有权限) + private Integer temporaryPermissionFlag; } + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjAreaE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjAreaE.java deleted file mode 100644 index e4abd1d..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjAreaE.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-14 09:51:10 - */ -@Data -public class MkmjAreaE extends BaseE { - //业务主键id - private String areaId; - //区域名称 - private String areaName; - //区域范围 - private String areaRange; - //区域级别 1-一级 2-二级 3-三级 - private Integer areaLevel; - //上级区域id(当area_level=1时，此字段为字典bianma) - private String areaParentId; - //上级区域 - private String areaParentName; - //口门类型 1-人行 2-车行 3-综合 - private Integer areaType; - //区域状态 0-停用 1-正常 2-暂时关闭 - private Integer areaStatus; - //入方向区域 - private Long inDirectionArea; - //出方向区域 - private Long outDirectionArea; - //经度 - private String longitude; - //纬度 - private String latitude; - - private Long corpinfoId; - private String corpinfoName; -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjAreaGateE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjAreaGateE.java deleted file mode 100644 index 61a8726..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjAreaGateE.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-14 16:01:00 - */ -@Data -public class MkmjAreaGateE extends BaseE { - //业务主键id - private String areaGateId; - //企业id - private String corpinfoId; - //口门区域id - private String areaId; - //通道id - private String passageId; - //闸机标识 - private String gateNumber; - //闸机名称 - private String gateName; - //闸机类型 1-入 2出 - private Integer gateType; - //闸机状态 0- 停用 1-正常 2-暂时关闭 - private Integer gateStatus; - //闸机类别 0-人行口门 1-车行口门 2-综合口门 - private Integer gateCategory; - //闸机型号 - private String gateModel; - //闸机位置 - private String gatePosition; - //是否相邻区域 0否 1是 - private Integer isAdjacent; - //相邻区域id - private String adjacentAreaId; - //经度 - private String longitude; - //纬度 - private String latitude; -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjCarRecordE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjCarRecordE.java deleted file mode 100644 index d746f83..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjCarRecordE.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -import java.sql.Date; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Data -public class MkmjCarRecordE extends BaseE { - //车辆id - private String vehicleRecordId; - //车辆牌照号码 - private String vehiclePlateNumber; - //车辆行驶证号码 - private String vehicleRegistrationNumber; - //车辆类型名称 - private String vehicleCategoryName; - //车辆联系人姓名 - private String vehicleContactName; - //车辆联系人电话 - private String vehicleContactPhoneNumber; - //车辆备案信息录入单位 - private String vehicleFilingInfoRecordingOrg; - //车辆牌照颜色名称 - private String vehiclePlateColor; - //车辆入港闸口 - private String vehicleArrivalBarrier; - private String regexArrivalBarrier; - //车辆入港时间 - private String vehicleArrivalTime; - //车辆离港闸口 - private String vehicleDepartureBarrier; - private String regexDepartureBarrier; - //车辆离港时间 - private String vehicleDepartureTime; - //车辆备案方式 - private String vehicleFilingMethod; - //车辆在港状态 - private String vehicleArrivalStatus; - //数据来源 - private String edwDataSource; - //数据创建日期 - private String edwCreateDate; - //数据更新日期 - private String edwLastUpdate; - //数据有效标识 - private String edwValidFlag; - //分区列 - private Long dataVersion; - //同步时间 - private Date accLastUpdateDate; - //自增长id主键 - private Long idSequence; - //同步时间 - private String synctime; -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjE.java new file mode 100644 index 0000000..d514a79 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjE.java @@ -0,0 +1,51 @@ +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; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:15 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder + +public class MkmjE extends BaseE { + //主键 + private Long id; + //口门名称 + private String mkmjName; + //口门级别 1-一级 2-二级 + private Integer mkmjLevel; + //口门类型 1-人行 2-车行 3-综合 + private String mkmjType; + //口门类型名称1-人行 2-车行 3-综合 + private String mkmjTypeName; + private String hgAuthArea; + private String hgAuthAreaName; + //口门状态 1-停用 2-正常 + private Integer mkmjStatus; + //入方向区域- 二级有用 + private Long inDirectionArea; + //入方向区域名称- 二级有用 + private Long inDirectionAreaName; + //出方向区域- 二级有用 + private Long outDirectionArea; + //出方向区域名称- 二级有用 + private Long outDirectionAreaName; + //经度 + private String longitude; + //纬度 + private String latitude; +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateE.java new file mode 100644 index 0000000..6acc74d --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateE.java @@ -0,0 +1,49 @@ +package com.zcloud.primeport.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class MkmjGateE extends BaseE { + //主键 + private Long id; + //口门区域id + private String mkmjId; + //通道id + private String passageId; + //闸机标识 + private String gateNumber; + //闸机名称 + private String gateName; + //闸机类型 + private String gateType; + //闸机类型名称 + private String gateTypeName; + //闸机状态 1- 停用 2-正常 + private Integer gateStatus; + //闸机类别 + private String gateCategory; + //闸机类别名称 + private String gateCategoryName; + //闸机型号 + private String gateModel; + //闸机位置 + private String gatePosition; + //经度 + private String longitude; + //纬度 + private String latitude; +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjPassageE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjPassageE.java index ddf3086..910b967 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjPassageE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjPassageE.java @@ -1,30 +1,32 @@ package com.zcloud.primeport.domain.model; -import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * web-domain * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class MkmjPassageE extends BaseE { - //业务主键id - private String passageId; + //主键 + private Long id; //通道名称 private String passageName; //通道类型 1-人行 2-车行 3-综合 private Integer passageType; - //通道状态 0-停用 1-正常 2-暂时关闭 + //通道状态 1-停用 2-正常 private Integer passageStatus; //口门区域id - private String areaId; - //企业id - private String corpinfoId; + private String mkmjId; //经度 private String longitude; //纬度 diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjStatisticsE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjStatisticsE.java deleted file mode 100644 index c2e0c61..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjStatisticsE.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.alibaba.cola.dto.ClientObject; -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -import java.io.Serializable; - -/** - * @author fangjiakai - * @date 2025/11/17 9:44 - */ -@Data -public class MkmjStatisticsE implements Serializable { - private static final long serialVersionUID = 1L; - private String id; - private Long carInCount; - private Long carOutCount; - private Long personInCount; - private Long personOutCount; -} diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjSwipeCardRecordE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjSwipeCardRecordE.java deleted file mode 100644 index c725b4f..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjSwipeCardRecordE.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Data -public class MkmjSwipeCardRecordE extends BaseE { - //节点编码 - private String nodecode; - //报警编号 - private String alarmcode; - //报警图片路径 - private String alarmpicture; - //节点类型 - private String nodetype; - //报警时间，10位时间戳 - private Integer alarmdate; - //报警等级 1：严重，2：一般，3：轻微 - private Integer alarmgrade; - //单元类型 - private Integer unittype; - //报警类型 - private Integer alarmtype; - //通道序号 - private Integer channelseq; - //通道名称 - private String channelname; - //报警状态 1：报警产生，2：报警消失 - private Integer alarmstat; - //部门名称 - private String deptname; - //通道编号 - private String acschannelcode; - //口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知 - private Integer maskstate; - //进出门类型: 详见 读卡器业务类型字典 - private String enterorexit; - //开门类型字符串 - private String opentypestr; - //刷卡时间，格式：yyyy-MM:dd HH:mm:ss - private String swingtime; - //设备名称 - private String devicename; - //人员编号 - private String personcode; - //开门类型, 详见开门类型 字典 - private String opentype; - //组织编码 - private String orgcode; - //证件类型 - private String papertype; - //证件号 - private String papernumber; - //错误详情 - private String errordetail; - //开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码 - private String openfailedcod; - //固定值：evo-accesscontrol - private String from; - //extendId标识 - private Long extendid; - //开始时间, 13位时间戳 - private Long begintime; - //通道名称 - private String acschannelname; - //预留字段，暂未使用，默认值为0 - private Integer cardstatus; - //组织名称 - private String orgname; - //性别 1 男，2 女， 0 未知 - private Integer sex; - //人员部门id - private Integer deptid; - //卡类型 - private Integer cardtype; - //设备编号 - private String devicecode; - //人员姓名 - private String personname; - //刷卡人在平台上的图片，相对路径 - private String personimg; - //开门结果 0 失败 1 成功 - private Integer openresult; - //人员id - private Integer personid; - //抓拍图，相对路径 - private String recordimage1; - //卡介质 0 IC 1 有源RFID 2 CPU - private String category; - //卡号 - private String cardnumber; - //rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物 - private Integer rfidtype; - //年龄 - private Integer age; - //0-非访客，1-访客 - private Integer vrecordflag; -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/PassageCountE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/PassageCountE.java deleted file mode 100644 index b208c9b..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/PassageCountE.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -/** - * @author fangjiakai - * @date 2025/11/14 10:24 - */ -@Data -public class PassageCountE extends BaseE { - private String areaId; - private Long count; -} diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java new file mode 100644 index 0000000..70f5ebc --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java @@ -0,0 +1,61 @@ +package com.zcloud.primeport.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class PersonApplyE extends BaseE { + //id + private Long id; + //1股份2分公司3相关方4临时人员 + private Object personBelongType; + //授权范围港区与区域 + private Object gateLevelAuthArea; + //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）) + private Integer auditFlag; + //进出港权限(1:有 2：无) + private Integer mkmjPermission; + //访问起始时间 + private Date visitStartTime; + //访问结束时间 + private Date visitEndTime; + //待审批人员所属企业ID + private Long personCorpId; + //待审批人员所属企业名称 + private String personCorpName; + //待审批人员所属部门id + private Long personDepartmentId; + //待审批人员部门名称 + private String personDepartmentName; + //待审批人员id + private Long employeePersonUserId; + //待审批人员姓名 + private String employeePersonUserName; + //头像 + private String userFaceUrl; + //手机号 + private String userPhone; + //身份证号码 + private String userCard; + //告知签字 + private Long informSignId; + //项目id + private Long projectId; + //项目名称 + private String projectName; +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonMessageE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonMessageE.java new file mode 100644 index 0000000..a2094db --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonMessageE.java @@ -0,0 +1,43 @@ +package com.zcloud.primeport.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:20 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class PersonMessageE extends BaseE { + //id + private Object id; + //人员申请id + private Long personApplyId; + //1股份2分公司3相关方4临时人员 + private Object personBelongType; + //头像 + private String userFaceUrl; + //身份证号码 + private String userCard; + //授权范围港区与区域 + private String gateLevelAuthArea; + //授权访问起始时间 + private Date visitStartTime; + //授权访问结束时间 + private Date visitEndTime; + //对接状态，1对接完成，2未对接 + private Integer syncStatus; + //对接说明 + private String syncRemarks; +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessE.java deleted file mode 100644 index 858b58d..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessE.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Data -public class TemporaryAccessE extends BaseE { - //审批人ID - private Long userId; - //审批人姓名 - private String userName; - //手机号 - private String phone; - //身份证号 - private String idCard; - //企业ID - private String corpId; - //企业名称 - private String corpName; - //部门id - private String deptId; - //部门名称 - private String deptName; - //车牌号 - private String carNo; - //车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌) - private String carPlantType; - //车辆类型(0：货车，1：轿车，2：大巴客车) - private String carType; - //访问起始时间 - private String visitStartTime; - //访问结束时间 - private String visitEndTime; - //口门ID - private String doorId; - //口门名称 - private String doorName; - //驾驶证照片 - private String drivingLicensePath; - //身份证正面 - private String idCardFrontPath; - //身份证反面 - private String idCardFlipsidePath; - //访问类型(1：人员，2：车辆) - private String temporaryType; - //访问来源(0：监管，1：企业，2：相关方，3：驻港单位) - private String temporaryFrom; - //来访事由 - private String visitReason; - //排放标准: - private String emissionStandards; -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessEntourageE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessEntourageE.java deleted file mode 100644 index 0d6194a..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessEntourageE.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Data -public class TemporaryAccessEntourageE extends BaseE { - private Long entourageId; - //临时访问表id - private Long temporaryId; - //姓名 - private String name; - //手机号 - private String phone; - //工作单位 - private String jobName; -} - 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 new file mode 100644 index 0000000..c915b93 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java @@ -0,0 +1,76 @@ +package com.zcloud.primeport.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:23 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class VehicleApplyE extends BaseE { + //id + private Long id; + //车辆状态(1未启用,2启用) + private Integer statusFlag; + //车牌类型数据字典 + private String licenceType; + //车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + private String licenceTypeName; + //车牌号 + private String licenceNo; + //车辆类型 + private String vehicleType; + //车辆类型-名字 + private String vehicleTypeName; + //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 + private String vehicleBelongType; + //授权范围港区与区域 + private Object gateLevelAuthArea; + //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）) + private Integer auditFlag; + //进出港权限(1:有 2：无) + private Integer mkmjPermission; + //访问起始时间 + private Date visitStartTime; + //访问结束时间 + private Date visitEndTime; + //车辆所属企业ID + private Long vehicleCorpId; + //车辆所属企业名称 + private String vehicleCorpName; + //车辆所属部门id + private Long vehicleDepartmentId; + //车辆所属部门名称 + private String vehicleDepartmentName; + //车辆所属人id(员工车辆/驾驶人id) + private Long employeeVehicleUserId; + //车辆所属人姓名(员工车辆/驾驶人名称) + private String employeeVehicleUserName; + //排放标准名称 + private String emissionStandards; + private String emissionStandardsName; + //行驶证照片 + private Long drivingLicenseId; + //车辆照片 + private Long attachmentId; + //告知签字 + private Long informSignId; + //项目id + private Long projectId; + //项目名称 + private String projectName; + //1被拉黑2未拉黑 + private Integer blockedFlag; +} + 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 new file mode 100644 index 0000000..5444e1e --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditE.java @@ -0,0 +1,47 @@ +package com.zcloud.primeport.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * web-domain + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class VehicleAuditE extends BaseE { + //id + private Long id; + //车辆申请id + private String vehicleApplyId; + //审批批次(1.普通车辆.2危险化学品车辆) + private Integer batchType; + //审批状态(1,申请;2.更新) + private Integer batchState; + //审批人id + private Long auditUserId; + //审批人姓名 + private String auditUserName; + //审批部门id + private Long auditDeptId; + //审批部门名称 + private String auditDeptName; + //审批人企业id + private Long auditCorpId; + //审批人企业名称 + private String auditCorpName; + //审批状态(1,未开始,2通过,3不通过) + private Integer auditStatus; + //待审核信息 + private String changeAfter; + //变更前信息 + private String changeBefore; +} + 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 deleted file mode 100644 index 8c8df64..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditLogE.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.zcloud.primeport.domain.model; - - -import com.alibaba.cola.domain.Entity; -import com.jjb.saas.framework.domain.model.BaseE; -import com.zcloud.gbscommon.utils.Tools; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * web-domain - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Data -public class VehicleAuditLogE extends BaseE { - //id - private Long id; - //业务id - private String vehicleAuditLogId; - //审批批次(1.普通车辆.2危险化学品车辆) - private Integer batchType; - //审批状态(0,申请;2.更新) - private Integer batchState; - //车辆id - private Long vehicleMessageId; - //审批人id - private Long userId; - //审批人姓名 - private String userName; - //审批部门id - private Long deptId; - //审批部门名称 - private String deptName; - //审批步骤排序 - private Integer stepSort; - //审批状态(1未开始.2通过.3不通过) - private Integer status; - //审批状态(0正常,1.废除) - private Integer stepType; - //驳回备注 - private String comments; - /** - * - */ - public Long approvalUserId; - public String approvalUserName; - public Long approvalDeptId; - public String approvalDeptName; - - /** - * 监管端申请 - * 申请车辆的时候,审批信息. - * - * @param examTypeE - */ - public void addFroVehicleLog(VehicleAuditLogE examTypeE, Long vehicleMessageId, Integer batchState) { - this.userId = approvalUserId; - this.userName = approvalUserName; - this.deptId = approvalDeptId; - this.deptName = approvalDeptName; - this.batchState = batchState; //审批状态(0,申请;2.更新) - this.batchType = 1; //审批批次(1.普通车辆.2危险化学品车辆) - this.vehicleMessageId = vehicleMessageId; // //车辆id - this.status = 1; //审批状态(1未开始.2通过.3不通过) - this.stepType = 0; //审批状态(0正常,1.废除) - this.stepSort = 1; //审批步骤排序 - } - - - public VehicleAuditLogE approvalTongguo(Long id) { - this.id = id; - this.status = 2; - return this; - } - - public VehicleAuditLogE approvalNoTongguo(Long id, String comments) { - this.id = id; - this.status = 3; - this.comments = comments; - return this; - } -} - diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleBlackE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleBlackE.java index 15cfd1f..169b0bd 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleBlackE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleBlackE.java @@ -1,20 +1,29 @@ package com.zcloud.primeport.domain.model; - -import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * web-domain * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class VehicleBlackE extends BaseE { - //车辆信息表（t_vehicle_message）的主键id + //id + private Long id; + //车辆信息表（vehicle_apply）的主键id private Long vehicleId; + //车辆所属人姓名（临时车） + private String employeeVehicleUserName; + //车牌号 + private String licenceNo; } 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 42efb63..7a642fa 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 @@ -1,91 +1,49 @@ package com.zcloud.primeport.domain.model; - import com.jjb.saas.framework.domain.model.BaseE; -import com.zcloud.gbscommon.utils.DateUtil; -import com.zcloud.gbscommon.utils.Tools; -import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; -import javax.tools.Tool; import java.util.Date; - -@Data /** * web-domain * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class VehicleMessageE extends BaseE { //id private Long id; - //业务id - private String vehicleMessageId; - //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 - private Integer licenceType; + //车牌类型数据字典 + private String licenceType; + //车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + private String licenceTypeName; //车牌号 private String licenceNo; //车辆类型 private String vehicleType; + //车辆类型-名字 private String vehicleTypeName; - //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 5 检查车 - private Integer vehicleBelongType; - //所属车队ID - private Long motorcadeId; - //是否危化车辆(0：否，1：是) - private Integer isDangerous; - //通行港区(0-全部 1-东港区 2-西港区) - private Integer portId; - //是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回) - private Integer isAudit; - //进出港权限(1:有 2：无) - private Integer mkmjPermission; - //访问起始时间 + //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 + private String vehicleBelongType; + //授权范围港区与区域 + private Object gateLevelAuthArea; + //授权访问起始时间 private Date visitStartTime; - //访问结束时间 + //授权访问结束时间 private Date visitEndTime; - //车辆所属部门id - private Long vehicleDepartmentId; - //车辆所属部门名称 - private String vehicleDepartmentName; - //车辆所属人id(员工车辆) - private Long employeeVehicleUserId; - //车辆所属人姓名(员工车辆) - private String employeeVehicleUserName; - //企业ID - private Long corpId; - //排放标准: - private String emissionStandards; - //附件地址 - private String attachmentUrl; - - /** - * 添加车辆信息 给监管端和企业端 - * @param e - * @return - */ - public VehicleMessageE VehicleMessageForCorpE( VehicleMessageE e) { - this.isAudit = 0;//未审核 - this.isDangerous = 0; //是否危化车辆(0：否，1：是) - this.mkmjPermission = 2;//进出港权限(1:有 2：无) - this.visitStartTime = DateUtil.fomatDate(String.valueOf(new Date())); - this.visitEndTime = DateUtil.fomatDate(DateUtil.getCurrYearLast()); - return e; - } - public VehicleMessageE updateFromCorp( VehicleMessageE e) { - this.isAudit = 0;//未审核 - return e; - } - - - public void VehicleMessageForInspection( VehicleMessageE e) { - this.vehicleBelongType = 5;//未审核 - this.isDangerous = 0; - this.portId = 0; - this.isAudit = 2 ; - this.mkmjPermission = 2; - } + //车辆申请id + private Long vehicleApplyId; + //对接状态，1对接完成，2未对接 + private Integer syncStatus; + //对接说明 + private String syncRemarks; } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleViolationsE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleViolationsE.java index 7c462cf..99b4059 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleViolationsE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleViolationsE.java @@ -1,33 +1,45 @@ package com.zcloud.primeport.domain.model; - - -import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.util.Date; /** * web-domain * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class VehicleViolationsE extends BaseE { - //车辆信息表（t_vehicle_message）的主键id + //车辆违规记录id + private Long id; + //车辆信息表（vehicle_apply）的主键id private Long vehicleId; - //违规类型（0-未按规定车道行驶，1-违规停车） - private Integer violationType; + //车辆所属人姓名（临时车） + private String employeeVehicleUserName; + //车牌号 + private String licenceNo; + //违规类型 + private String violationType; + //违规类型名称 + private String violationTypeName; //违规区域（位置） private String location; //违规图片的存储路径 - private String filepath; + private String illegalImagesId; //违规说明 private String describeMessage; //违规时间 private Date violationtime; + //违规处理状态，1已处理2未处理 + private Integer violationProcessingStatus; } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoCountE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoCountE.java deleted file mode 100644 index f2293ba..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoCountE.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zcloud.primeport.domain.model; - -import com.jjb.saas.framework.domain.model.BaseE; -import lombok.Data; - -/** - * @author fangjiakai - * @date 2025/11/14 10:24 - */ -@Data -public class VideoCountE extends BaseE { - private String areaGateId; - private Long count; -} diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateVideoE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoE.java similarity index 61% rename from web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateVideoE.java rename to web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoE.java index b70cfdf..92f6ace 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateVideoE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoE.java @@ -1,20 +1,26 @@ package com.zcloud.primeport.domain.model; import com.jjb.saas.framework.domain.model.BaseE; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * web-domain * - * @Author fangjiakai - * @Date 2025-11-14 17:16:03 + * @Author makejava + * @Date 2026-03-05 11:33:30 */ @Data -public class MkmjGateVideoE extends BaseE { - //闸机摄像头id - private String gateVideoId; - //口门/闸机id - private String areaGateId; +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class VideoE extends BaseE { + //主键 + private Long id; + //口门/闸机id 外键id + private Long foreignId; //设备类型（1-口门 2-闸机） private Integer deviceType; //摄像头id @@ -23,8 +29,6 @@ public class MkmjGateVideoE extends BaseE { private String videoResourceName; //摄像头类型（1-移动 2-平台） private Integer videoType; - //企业id - private String corpinfoId; //经度 private String longitude; //纬度 diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/EmployeeMessageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/EmployeeMessageGatewayImpl.java deleted file mode 100644 index b341cfc..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/EmployeeMessageGatewayImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.EmployeeMessageGateway; -import com.zcloud.primeport.domain.model.EmployeeMessageE; -import com.zcloud.primeport.persistence.dataobject.EmployeeMessageDO; -import com.zcloud.primeport.persistence.repository.EmployeeMessageRepository; -import lombok.AllArgsConstructor; -import com.zcloud.gbscommon.utils.Tools; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; - -/** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Service -@AllArgsConstructor -public class EmployeeMessageGatewayImpl implements EmployeeMessageGateway { - private final EmployeeMessageRepository employeeMessageRepository; - - @Override - public Boolean add(EmployeeMessageE employeeMessageE) { - EmployeeMessageDO d = new EmployeeMessageDO(); - BeanUtils.copyProperties(employeeMessageE, d); - employeeMessageRepository.save(d); - return true; - } - - @Override - public Boolean update(EmployeeMessageE employeeMessageE) { - EmployeeMessageDO d = new EmployeeMessageDO(); - BeanUtils.copyProperties(employeeMessageE, d); - employeeMessageRepository.updateById(d); - return true; - } - - @Override - public Boolean updateStatus(EmployeeMessageE employeeMessageE) { - EmployeeMessageDO d = new EmployeeMessageDO(); - d.setId(employeeMessageE.getId()); - d.setStatus(employeeMessageE.getStatus()); - employeeMessageRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedEmployeeMessageById(Long id) { - return employeeMessageRepository.removeById(id); - } - - @Override - public Boolean deletedEmployeeMessageByIds(Long[] ids) { - return employeeMessageRepository.removeByIds(Arrays.asList(ids)); - } -} diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/EnclosedAreaGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/EnclosedAreaGatewayImpl.java deleted file mode 100644 index 0da2ec1..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/EnclosedAreaGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.primeport.domain.gateway.EnclosedAreaGateway; -import com.zcloud.primeport.domain.model.EnclosedAreaE; -import com.zcloud.primeport.persistence.dataobject.EnclosedAreaDO; -import com.zcloud.primeport.persistence.repository.EnclosedAreaRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Collections; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -@Service -@AllArgsConstructor -public class EnclosedAreaGatewayImpl implements EnclosedAreaGateway { - private final EnclosedAreaRepository enclosedAreaRepository; - - @Override - public Boolean add(EnclosedAreaE enclosedAreaE) { - EnclosedAreaDO d = new EnclosedAreaDO(); - BeanUtils.copyProperties(enclosedAreaE, d); - enclosedAreaRepository.save(d); - return true; - } - - @Override - public Boolean update(EnclosedAreaE enclosedAreaE) { - EnclosedAreaDO d = new EnclosedAreaDO(); - BeanUtils.copyProperties(enclosedAreaE, d); - enclosedAreaRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedEnclosedAreaById(Long id) { - return enclosedAreaRepository.removeById(id); - } - - @Override - public Boolean deletedEnclosedAreaByIds(Long[] ids) { - return enclosedAreaRepository.removeByIds(Collections.singletonList(ids)); - } -} - 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 deleted file mode 100644 index 4810f42..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/GatePersonAuthLevelOneGatewayImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -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/InspectionDeptGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java deleted file mode 100644 index 2435131..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; -import com.zcloud.primeport.domain.model.InspectionDeptE; -import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; -import com.zcloud.primeport.persistence.repository.InspectionDeptRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Service -@AllArgsConstructor -public class InspectionDeptGatewayImpl implements InspectionDeptGateway { - private final InspectionDeptRepository inspectionDeptRepository; - - @Override - public InspectionDeptE add(InspectionDeptE inspectionDeptE) { - InspectionDeptDO d = new InspectionDeptDO(); - BeanUtils.copyProperties(inspectionDeptE, d); - inspectionDeptRepository.save(d); - BeanUtils.copyProperties(d, inspectionDeptE); - return inspectionDeptE; - } - - @Override - public Boolean update(InspectionDeptE inspectionDeptE) { - InspectionDeptDO d = new InspectionDeptDO(); - BeanUtils.copyProperties(inspectionDeptE, d); - inspectionDeptRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedInspectionDeptById(Long id) { - return inspectionDeptRepository.removeById(id); - } - - @Override - public Boolean deletedInspectionDeptByIds(Long[] ids) { - return inspectionDeptRepository.removeByIds(Arrays.asList(ids)); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionVehicleGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionVehicleGatewayImpl.java deleted file mode 100644 index 98e112d..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionVehicleGatewayImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; -import com.zcloud.primeport.domain.model.InspectionVehicleE; -import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; -import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Service -@AllArgsConstructor -public class InspectionVehicleGatewayImpl implements InspectionVehicleGateway { - private final InspectionVehicleRepository inspectionVehicleRepository; - - @Override - public Boolean add(InspectionVehicleE inspectionVehicleE) { - InspectionVehicleDO d = new InspectionVehicleDO(); - BeanUtils.copyProperties(inspectionVehicleE, d); - inspectionVehicleRepository.save(d); - return true; - } - - @Override - public Boolean update(InspectionVehicleE inspectionVehicleE) { - InspectionVehicleDO d = new InspectionVehicleDO(); - BeanUtils.copyProperties(inspectionVehicleE, d); - inspectionVehicleRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedInspectionVehicleById(Long id) { - return inspectionVehicleRepository.removeById(id); - } - - @Override - public Boolean deletedInspectionVehicleByIds(Long[] ids) { - return inspectionVehicleRepository.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 c84e58d..c5f2765 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,7 +1,5 @@ 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; @@ -10,14 +8,13 @@ import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.List; +import java.util.Collections; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ @Service @AllArgsConstructor @@ -27,12 +24,6 @@ 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; @@ -47,16 +38,13 @@ public class MkmjApprovalUserGatewayImpl implements MkmjApprovalUserGateway { } @Override - public Boolean deletedMkmjApprovalUserById(Long id) { - MkmjApprovalUserDO d = new MkmjApprovalUserDO(); - d.setDeleteEnum("TRUE"); - d.setId(id); - return mkmjApprovalUserRepository.updateById(d); + public Boolean deletedMkmjApprovalUserById(String id) { + return mkmjApprovalUserRepository.removeById(id); } @Override - public Boolean deletedMkmjApprovalUserByIds(Long[] ids) { - return mkmjApprovalUserRepository.removeByIds(Arrays.asList(ids)); + public Boolean deletedMkmjApprovalUserByIds(String[] ids) { + return mkmjApprovalUserRepository.removeByIds(Collections.singletonList(ids)); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjAreaGateGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjAreaGateGatewayImpl.java deleted file mode 100644 index e98ad3e..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjAreaGateGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.MkmjAreaGateGateway; -import com.zcloud.primeport.domain.model.MkmjAreaGateE; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaGateDO; -import com.zcloud.primeport.persistence.repository.MkmjAreaGateRepository; -import lombok.AllArgsConstructor; -import com.zcloud.gbscommon.utils.Tools; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Collections; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Service -@AllArgsConstructor -public class MkmjAreaGateGatewayImpl implements MkmjAreaGateGateway { - private final MkmjAreaGateRepository mkmjAreaGateRepository; - - @Override - public Boolean add(MkmjAreaGateE mkmjAreaGateE) { - MkmjAreaGateDO d = new MkmjAreaGateDO(Tools.get32UUID()); - BeanUtils.copyProperties(mkmjAreaGateE, d, "areaGateId"); - mkmjAreaGateRepository.save(d); - return true; - } - - @Override - public Boolean update(MkmjAreaGateE mkmjAreaGateE) { - MkmjAreaGateDO d = new MkmjAreaGateDO(); - BeanUtils.copyProperties(mkmjAreaGateE, d); - mkmjAreaGateRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedMkmjAreaGateById(Long id) { - return mkmjAreaGateRepository.removeById(id); - } - - @Override - public Boolean deletedMkmjAreaGateByIds(Long[] ids) { - return mkmjAreaGateRepository.removeByIds(Collections.singletonList(ids)); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjAreaGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjAreaGatewayImpl.java deleted file mode 100644 index 860dd90..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjAreaGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.MkmjAreaGateway; -import com.zcloud.primeport.domain.model.MkmjAreaE; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaDO; -import com.zcloud.primeport.persistence.repository.MkmjAreaRepository; -import lombok.AllArgsConstructor; -import com.zcloud.gbscommon.utils.Tools; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Collections; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -@Service -@AllArgsConstructor -public class MkmjAreaGatewayImpl implements MkmjAreaGateway { - private final MkmjAreaRepository mkmjAreaRepository; - - @Override - public Boolean add(MkmjAreaE mkmjAreaE) { - MkmjAreaDO d = new MkmjAreaDO(Tools.get32UUID()); - BeanUtils.copyProperties(mkmjAreaE, d, "areaId"); - mkmjAreaRepository.save(d); - return true; - } - - @Override - public Boolean update(MkmjAreaE mkmjAreaE) { - MkmjAreaDO d = new MkmjAreaDO(); - BeanUtils.copyProperties(mkmjAreaE, d); - mkmjAreaRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedMkmjAreaById(Long id) { - return mkmjAreaRepository.removeById(id); - } - - @Override - public Boolean deletedMkmjAreaByIds(Long[] ids) { - return mkmjAreaRepository.removeByIds(Collections.singletonList(ids)); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjCarRecordGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjCarRecordGatewayImpl.java deleted file mode 100644 index eaec76b..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjCarRecordGatewayImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.MkmjCarRecordGateway; -import com.zcloud.primeport.domain.model.MkmjCarRecordE; -import com.zcloud.primeport.persistence.dataobject.MkmjCarRecordDO; -import com.zcloud.primeport.persistence.repository.MkmjCarRecordRepository; -import lombok.AllArgsConstructor; -import com.zcloud.gbscommon.utils.Tools; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Collections; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Service -@AllArgsConstructor -public class MkmjCarRecordGatewayImpl implements MkmjCarRecordGateway { - private final MkmjCarRecordRepository mkmjCarRecordRepository; - - @Override - public Boolean add(MkmjCarRecordE mkmjCarRecordE) { - MkmjCarRecordDO d = new MkmjCarRecordDO(); - BeanUtils.copyProperties(mkmjCarRecordE, d); - mkmjCarRecordRepository.save(d); - return true; - } - - @Override - public Boolean update(MkmjCarRecordE mkmjCarRecordE) { - MkmjCarRecordDO d = new MkmjCarRecordDO(); - BeanUtils.copyProperties(mkmjCarRecordE, d); - mkmjCarRecordRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedMkmjCarRecordById(Long id) { - return mkmjCarRecordRepository.removeById(id); - } - - @Override - public Boolean deletedMkmjCarRecordByIds(Long[] ids) { - return mkmjCarRecordRepository.removeByIds(Collections.singletonList(ids)); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateGatewayImpl.java new file mode 100644 index 0000000..3f682cc --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.primeport.domain.gateway.MkmjGateGateway; +import com.zcloud.primeport.domain.model.MkmjGateE; +import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; +import com.zcloud.primeport.persistence.repository.MkmjGateRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +@Service +@AllArgsConstructor +public class MkmjGateGatewayImpl implements MkmjGateGateway { + private final MkmjGateRepository mkmjGateRepository; + + @Override + public Boolean add(MkmjGateE mkmjGateE) { + MkmjGateDO d = new MkmjGateDO(); + BeanUtils.copyProperties(mkmjGateE, d); + mkmjGateRepository.save(d); + return true; + } + + @Override + public Boolean update(MkmjGateE mkmjGateE) { + MkmjGateDO d = new MkmjGateDO(); + BeanUtils.copyProperties(mkmjGateE, d); + mkmjGateRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedMkmjGateById(String id) { + return mkmjGateRepository.removeById(id); + } + + @Override + public Boolean deletedMkmjGateByIds(String[] ids) { + return mkmjGateRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateVideoGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateVideoGatewayImpl.java deleted file mode 100644 index 072ec60..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateVideoGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.MkmjGateVideoGateway; -import com.zcloud.primeport.domain.model.MkmjGateVideoE; -import com.zcloud.primeport.persistence.dataobject.MkmjGateVideoDO; -import com.zcloud.primeport.persistence.repository.MkmjGateVideoRepository; -import lombok.AllArgsConstructor; -import com.zcloud.gbscommon.utils.Tools; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Collections; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Service -@AllArgsConstructor -public class MkmjGateVideoGatewayImpl implements MkmjGateVideoGateway { - private final MkmjGateVideoRepository mkmjGateVideoRepository; - - @Override - public Boolean add(MkmjGateVideoE mkmjGateVideoE) { - MkmjGateVideoDO d = new MkmjGateVideoDO(); - BeanUtils.copyProperties(mkmjGateVideoE, d); - mkmjGateVideoRepository.save(d); - return true; - } - - @Override - public Boolean update(MkmjGateVideoE mkmjGateVideoE) { - MkmjGateVideoDO d = new MkmjGateVideoDO(); - BeanUtils.copyProperties(mkmjGateVideoE, d); - mkmjGateVideoRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedMkmjGateVideoById(Long id) { - return mkmjGateVideoRepository.removeById(id); - } - - @Override - public Boolean deletedMkmjGateVideoByIds(Long[] ids) { - return mkmjGateVideoRepository.removeByIds(Collections.singletonList(ids)); - } -} - 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 new file mode 100644 index 0000000..5133af8 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGatewayImpl.java @@ -0,0 +1,51 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.primeport.domain.gateway.MkmjGateway; +import com.zcloud.primeport.domain.model.MkmjE; +import com.zcloud.primeport.persistence.dataobject.MkmjDO; +import com.zcloud.primeport.persistence.repository.MkmjRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:15 + */ +@Service +@AllArgsConstructor +public class MkmjGatewayImpl implements MkmjGateway { + private final MkmjRepository mkmjRepository; + + @Override + public Boolean add(MkmjE mkmjE) { + MkmjDO d = new MkmjDO(); + BeanUtils.copyProperties(mkmjE, d); + mkmjRepository.save(d); + return true; + } + + @Override + public Boolean update(MkmjE mkmjE) { + MkmjDO d = new MkmjDO(); + BeanUtils.copyProperties(mkmjE, d); + mkmjRepository.updateById(d); + return true; + } + + + @Override + public Boolean deletedMkmjById(Long id) { + return mkmjRepository.removeById(id); + } + + @Override + public Boolean deletedMkmjByIds(Long[] ids) { + return mkmjRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjPassageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjPassageGatewayImpl.java index a41cde5..ad40d90 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjPassageGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjPassageGatewayImpl.java @@ -5,7 +5,6 @@ import com.zcloud.primeport.domain.model.MkmjPassageE; import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; import com.zcloud.primeport.persistence.repository.MkmjPassageRepository; import lombok.AllArgsConstructor; -import com.zcloud.gbscommon.utils.Tools; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -14,8 +13,8 @@ import java.util.Collections; /** * web-infrastructure * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Service @AllArgsConstructor @@ -24,8 +23,8 @@ public class MkmjPassageGatewayImpl implements MkmjPassageGateway { @Override public Boolean add(MkmjPassageE mkmjPassageE) { - MkmjPassageDO d = new MkmjPassageDO(Tools.get32UUID()); - BeanUtils.copyProperties(mkmjPassageE, d, "passageId"); + MkmjPassageDO d = new MkmjPassageDO(); + BeanUtils.copyProperties(mkmjPassageE, d); mkmjPassageRepository.save(d); return true; } @@ -39,12 +38,12 @@ public class MkmjPassageGatewayImpl implements MkmjPassageGateway { } @Override - public Boolean deletedMkmjPassageById(Long id) { + public Boolean deletedMkmjPassageById(String id) { return mkmjPassageRepository.removeById(id); } @Override - public Boolean deletedMkmjPassageByIds(Long[] ids) { + public Boolean deletedMkmjPassageByIds(String[] ids) { return mkmjPassageRepository.removeByIds(Collections.singletonList(ids)); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjSwipeCardRecordGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjSwipeCardRecordGatewayImpl.java deleted file mode 100644 index e2f933a..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjSwipeCardRecordGatewayImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.MkmjSwipeCardRecordGateway; -import com.zcloud.primeport.domain.model.MkmjSwipeCardRecordE; -import com.zcloud.primeport.persistence.dataobject.MkmjSwipeCardRecordDO; -import com.zcloud.primeport.persistence.repository.MkmjSwipeCardRecordRepository; -import lombok.AllArgsConstructor; -import com.zcloud.gbscommon.utils.Tools; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Collections; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Service -@AllArgsConstructor -public class MkmjSwipeCardRecordGatewayImpl implements MkmjSwipeCardRecordGateway { - private final MkmjSwipeCardRecordRepository mkmjSwipeCardRecordRepository; - - @Override - public Boolean add(MkmjSwipeCardRecordE mkmjSwipeCardRecordE) { - MkmjSwipeCardRecordDO d = new MkmjSwipeCardRecordDO(); - BeanUtils.copyProperties(mkmjSwipeCardRecordE, d); - mkmjSwipeCardRecordRepository.save(d); - return true; - } - - @Override - public Boolean update(MkmjSwipeCardRecordE mkmjSwipeCardRecordE) { - MkmjSwipeCardRecordDO d = new MkmjSwipeCardRecordDO(); - BeanUtils.copyProperties(mkmjSwipeCardRecordE, d); - mkmjSwipeCardRecordRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedMkmjSwipeCardRecordById(Long id) { - return mkmjSwipeCardRecordRepository.removeById(id); - } - - @Override - public Boolean deletedMkmjSwipeCardRecordByIds(Long[] ids) { - return mkmjSwipeCardRecordRepository.removeByIds(Collections.singletonList(ids)); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java new file mode 100644 index 0000000..6d11eb3 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.primeport.domain.gateway.PersonApplyGateway; +import com.zcloud.primeport.domain.model.PersonApplyE; +import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import com.zcloud.primeport.persistence.repository.PersonApplyRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@Service +@AllArgsConstructor +public class PersonApplyGatewayImpl implements PersonApplyGateway { + private final PersonApplyRepository personApplyRepository; + + @Override + public Boolean add(PersonApplyE personApplyE) { + PersonApplyDO d = new PersonApplyDO(); + BeanUtils.copyProperties(personApplyE, d); + personApplyRepository.save(d); + return true; + } + + @Override + public Boolean update(PersonApplyE personApplyE) { + PersonApplyDO d = new PersonApplyDO(); + BeanUtils.copyProperties(personApplyE, d); + personApplyRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedPersonApplyById(String id) { + return personApplyRepository.removeById(id); + } + + @Override + public Boolean deletedPersonApplyByIds(String[] ids) { + return personApplyRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonMessageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonMessageGatewayImpl.java new file mode 100644 index 0000000..0f8d1cf --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonMessageGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.primeport.domain.gateway.PersonMessageGateway; +import com.zcloud.primeport.domain.model.PersonMessageE; +import com.zcloud.primeport.persistence.dataobject.PersonMessageDO; +import com.zcloud.primeport.persistence.repository.PersonMessageRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:20 + */ +@Service +@AllArgsConstructor +public class PersonMessageGatewayImpl implements PersonMessageGateway { + private final PersonMessageRepository personMessageRepository; + + @Override + public Boolean add(PersonMessageE personMessageE) { + PersonMessageDO d = new PersonMessageDO(); + BeanUtils.copyProperties(personMessageE, d); + personMessageRepository.save(d); + return true; + } + + @Override + public Boolean update(PersonMessageE personMessageE) { + PersonMessageDO d = new PersonMessageDO(); + BeanUtils.copyProperties(personMessageE, d); + personMessageRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedPersonMessageById(String id) { + return personMessageRepository.removeById(id); + } + + @Override + public Boolean deletedPersonMessageByIds(String[] ids) { + return personMessageRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessEntourageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessEntourageGatewayImpl.java deleted file mode 100644 index 6251fcf..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessEntourageGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.primeport.domain.gateway.TemporaryAccessEntourageGateway; -import com.zcloud.primeport.domain.model.TemporaryAccessEntourageE; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; -import com.zcloud.primeport.persistence.repository.TemporaryAccessEntourageRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Service -@AllArgsConstructor -public class TemporaryAccessEntourageGatewayImpl implements TemporaryAccessEntourageGateway { - private final TemporaryAccessEntourageRepository temporaryAccessEntourageRepository; - - @Override - public Boolean add(TemporaryAccessEntourageE temporaryAccessEntourageE) { - TemporaryAccessEntourageDO d = new TemporaryAccessEntourageDO(); - BeanUtils.copyProperties(temporaryAccessEntourageE, d, "${uuid}"); - temporaryAccessEntourageRepository.save(d); - return true; - } - - @Override - public Boolean update(TemporaryAccessEntourageE temporaryAccessEntourageE) { - TemporaryAccessEntourageDO d = new TemporaryAccessEntourageDO(); - BeanUtils.copyProperties(temporaryAccessEntourageE, d); - temporaryAccessEntourageRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedTemporaryAccessEntourageById(Long id) { - return temporaryAccessEntourageRepository.removeById(id); - } - - @Override - public Boolean deletedTemporaryAccessEntourageByIds(Long[] ids) { - return temporaryAccessEntourageRepository.removeByIds(Arrays.asList(ids)); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessGatewayImpl.java deleted file mode 100644 index b3e656c..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessGatewayImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.TemporaryAccessGateway; -import com.zcloud.primeport.domain.model.TemporaryAccessE; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; -import com.zcloud.primeport.persistence.repository.TemporaryAccessRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Service -@AllArgsConstructor -public class TemporaryAccessGatewayImpl implements TemporaryAccessGateway { - private final TemporaryAccessRepository temporaryAccessRepository; - - @Override - public Boolean add(TemporaryAccessE temporaryAccessE) { - TemporaryAccessDO d = new TemporaryAccessDO(); - BeanUtils.copyProperties(temporaryAccessE, d, "${uuid}"); - temporaryAccessRepository.save(d); - return true; - } - - @Override - public Boolean update(TemporaryAccessE temporaryAccessE) { - TemporaryAccessDO d = new TemporaryAccessDO(); - BeanUtils.copyProperties(temporaryAccessE, d); - temporaryAccessRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedTemporaryAccessById(Long id) { - return temporaryAccessRepository.removeById(id); - } - - @Override - public Boolean deletedTemporaryAccessByIds(Long[] ids) { - return temporaryAccessRepository.removeByIds(Arrays.asList(ids)); - } -} - 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 new file mode 100644 index 0000000..0ba12e2 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; +import com.zcloud.primeport.domain.model.VehicleApplyE; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:23 + */ +@Service +@AllArgsConstructor +public class VehicleApplyGatewayImpl implements VehicleApplyGateway { + private final VehicleApplyRepository vehicleApplyRepository; + + @Override + public Boolean add(VehicleApplyE vehicleApplyE) { + VehicleApplyDO d = new VehicleApplyDO(); + BeanUtils.copyProperties(vehicleApplyE, d); + vehicleApplyRepository.save(d); + return true; + } + + @Override + public Boolean update(VehicleApplyE vehicleApplyE) { + VehicleApplyDO d = new VehicleApplyDO(); + BeanUtils.copyProperties(vehicleApplyE, d); + vehicleApplyRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedVehicleApplyById(String id) { + return vehicleApplyRepository.removeById(id); + } + + @Override + public Boolean deletedVehicleApplyByIds(String[] ids) { + return vehicleApplyRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditGatewayImpl.java new file mode 100644 index 0000000..e1269c9 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; +import com.zcloud.primeport.domain.model.VehicleAuditE; +import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; +import com.zcloud.primeport.persistence.repository.VehicleAuditRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +@Service +@AllArgsConstructor +public class VehicleAuditGatewayImpl implements VehicleAuditGateway { + private final VehicleAuditRepository vehicleAuditRepository; + + @Override + public Boolean add(VehicleAuditE vehicleAuditE) { + VehicleAuditDO d = new VehicleAuditDO(); + BeanUtils.copyProperties(vehicleAuditE, d); + vehicleAuditRepository.save(d); + return true; + } + + @Override + public Boolean update(VehicleAuditE vehicleAuditE) { + VehicleAuditDO d = new VehicleAuditDO(); + BeanUtils.copyProperties(vehicleAuditE, d); + vehicleAuditRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedVehicleAuditById(String id) { + return vehicleAuditRepository.removeById(id); + } + + @Override + public Boolean deletedVehicleAuditByIds(String[] ids) { + return vehicleAuditRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditLogGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditLogGatewayImpl.java deleted file mode 100644 index eaa74f7..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditLogGatewayImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; -import com.zcloud.primeport.domain.model.VehicleAuditLogE; -import com.zcloud.primeport.persistence.dataobject.VehicleAuditLogDO; -import com.zcloud.primeport.persistence.repository.VehicleAuditLogRepository; -import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.Arrays; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Service -@AllArgsConstructor -public class VehicleAuditLogGatewayImpl implements VehicleAuditLogGateway { - private final VehicleAuditLogRepository vehicleAuditLogRepository; - - @Override - public Boolean add(VehicleAuditLogE vehicleAuditLogE) { - VehicleAuditLogDO d = new VehicleAuditLogDO(); - BeanUtils.copyProperties(vehicleAuditLogE, d); - vehicleAuditLogRepository.save(d); - return true; - } - - @Override - public Boolean update(VehicleAuditLogE vehicleAuditLogE) { - VehicleAuditLogDO d = new VehicleAuditLogDO(); - BeanUtils.copyProperties(vehicleAuditLogE, d); - vehicleAuditLogRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedVehicleAuditLogById(Long id) { - return vehicleAuditLogRepository.removeById(id); - } - - @Override - public Boolean deletedVehicleAuditLogByIds(Long[] ids) { - return vehicleAuditLogRepository.removeByIds(Arrays.asList(ids)); - } - - @Override - public VehicleAuditLogE queryVehicleAuditLogByVehicleMessageId(Long vehicleMessageId) { - VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); - VehicleAuditLogDO byVehicleMessageId = vehicleAuditLogRepository.getOne(new LambdaQueryWrapper<>(VehicleAuditLogDO.class) - .eq(VehicleAuditLogDO::getVehicleMessageId, vehicleMessageId) - .eq(VehicleAuditLogDO::getStatus, 1) - .last("limit 1")); - - - BeanUtils.copyProperties(byVehicleMessageId, vehicleAuditLogE); - return vehicleAuditLogE; - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java index 3df8994..0490e40 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java @@ -1,21 +1,20 @@ package com.zcloud.primeport.gatewayimpl; + import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.model.VehicleBlackE; import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO; -import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO; import com.zcloud.primeport.persistence.repository.VehicleBlackRepository; import lombok.AllArgsConstructor; -import com.zcloud.gbscommon.utils.Tools; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.Arrays; +import java.util.Collections; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @Service @AllArgsConstructor @@ -25,7 +24,7 @@ public class VehicleBlackGatewayImpl implements VehicleBlackGateway { @Override public Boolean add(VehicleBlackE vehicleBlackE) { VehicleBlackDO d = new VehicleBlackDO(); - BeanUtils.copyProperties(vehicleBlackE, d, "${uuid}"); + BeanUtils.copyProperties(vehicleBlackE, d); vehicleBlackRepository.save(d); return true; } @@ -39,24 +38,13 @@ public class VehicleBlackGatewayImpl implements VehicleBlackGateway { } @Override - public Boolean deletedVehicleBlackById(Long id) { - VehicleBlackDO d = new VehicleBlackDO(); - d.setId(id); - d.setDeleteEnum("TRUE"); - return vehicleBlackRepository.updateById(d); + public Boolean deletedVehicleBlackById(String id) { + return vehicleBlackRepository.removeById(id); } @Override - public Boolean deletedVehicleBlackByIds(Long[] ids) { - return vehicleBlackRepository.removeByIds(Arrays.asList(ids)); - } - - @Override - public VehicleBlackE getInfoById(Long id) { - VehicleBlackDO blackDO = vehicleBlackRepository.getById(id); - VehicleBlackE vehicleBlackE = new VehicleBlackE(); - BeanUtils.copyProperties( blackDO,vehicleBlackE); - return vehicleBlackE; + public Boolean deletedVehicleBlackByIds(String[] ids) { + return vehicleBlackRepository.removeByIds(Collections.singletonList(ids)); } } 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 6191364..7a575cf 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 @@ -8,13 +8,13 @@ import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.Arrays; +import java.util.Collections; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 + * @Author makejava + * @Date 2026-03-05 11:33:28 */ @Service @AllArgsConstructor @@ -22,12 +22,11 @@ public class VehicleMessageGatewayImpl implements VehicleMessageGateway { private final VehicleMessageRepository vehicleMessageRepository; @Override - public VehicleMessageE add(VehicleMessageE vehicleMessageE) { + public Boolean add(VehicleMessageE vehicleMessageE) { VehicleMessageDO d = new VehicleMessageDO(); BeanUtils.copyProperties(vehicleMessageE, d); vehicleMessageRepository.save(d); - BeanUtils.copyProperties( d,vehicleMessageE); - return vehicleMessageE; + return true; } @Override @@ -39,45 +38,13 @@ public class VehicleMessageGatewayImpl implements VehicleMessageGateway { } @Override - public Boolean deletedVehicleMessageById(Long id) { - VehicleMessageDO d = new VehicleMessageDO(); - d.setDeleteEnum("TRUE"); - d.setId( id); - boolean updateById = vehicleMessageRepository.updateById(d); - return updateById; + public Boolean deletedVehicleMessageById(String id) { + return vehicleMessageRepository.removeById(id); } @Override - public Boolean deletedVehicleMessageByIds(Long[] ids) { - return vehicleMessageRepository.removeByIds(Arrays.asList(ids)); + public Boolean deletedVehicleMessageByIds(String[] ids) { + return vehicleMessageRepository.removeByIds(Collections.singletonList(ids)); } - - @Override - public VehicleMessageE getInfoById(Long id) { - VehicleMessageDO repositoryById = vehicleMessageRepository.getById(id); - VehicleMessageE vehicleMessageE = new VehicleMessageE(); - BeanUtils.copyProperties(repositoryById, vehicleMessageE); - return vehicleMessageE; - } - - @Override - public VehicleMessageE getInfoByLicenceNo(String licenceNo) { - VehicleMessageDO repositoryOne = vehicleMessageRepository.getByLicenceNo(licenceNo); - VehicleMessageE vehicleMessageE = new VehicleMessageE(); - BeanUtils.copyProperties(repositoryOne, vehicleMessageE); - return vehicleMessageE; - } - - @Override - public Integer countEnabledByLicenceNo(String licenceNo) { - return vehicleMessageRepository.countEnabledByLicenceNo(licenceNo); - } - - @Override - public Integer countByUserId(Long userId) { - return vehicleMessageRepository.countByUserId(userId); - } - - - } + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleViolationsGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleViolationsGatewayImpl.java index fa0073b..9ba687c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleViolationsGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleViolationsGatewayImpl.java @@ -8,13 +8,13 @@ import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.Arrays; +import java.util.Collections; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Service @AllArgsConstructor @@ -24,7 +24,7 @@ public class VehicleViolationsGatewayImpl implements VehicleViolationsGateway { @Override public Boolean add(VehicleViolationsE vehicleViolationsE) { VehicleViolationsDO d = new VehicleViolationsDO(); - BeanUtils.copyProperties(vehicleViolationsE, d, "${uuid}"); + BeanUtils.copyProperties(vehicleViolationsE, d); vehicleViolationsRepository.save(d); return true; } @@ -38,26 +38,13 @@ public class VehicleViolationsGatewayImpl implements VehicleViolationsGateway { } @Override - public Boolean deletedVehicleViolationsById(Long id) { - VehicleViolationsDO d = new VehicleViolationsDO(); - d.setId(id); - d.setDeleteEnum("TRUE"); - boolean b = vehicleViolationsRepository.updateById(d); - return b; + public Boolean deletedVehicleViolationsById(String id) { + return vehicleViolationsRepository.removeById(id); } @Override - public Boolean deletedVehicleViolationsByIds(Long[] ids) { - return vehicleViolationsRepository.removeByIds(Arrays.asList(ids)); - } - - @Override - public Long getCountByVehicleId(Long vehicleId) { - long count = vehicleViolationsRepository.count( - vehicleViolationsRepository.lambdaQuery() - .eq(VehicleViolationsDO::getVehicleId, vehicleId) - ); - return count; + public Boolean deletedVehicleViolationsByIds(String[] ids) { + return vehicleViolationsRepository.removeByIds(Collections.singletonList(ids)); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VideoGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VideoGatewayImpl.java new file mode 100644 index 0000000..47f098b --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VideoGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.primeport.domain.gateway.VideoGateway; +import com.zcloud.primeport.domain.model.VideoE; +import com.zcloud.primeport.persistence.dataobject.VideoDO; +import com.zcloud.primeport.persistence.repository.VideoRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:30 + */ +@Service +@AllArgsConstructor +public class VideoGatewayImpl implements VideoGateway { + private final VideoRepository videoRepository; + + @Override + public Boolean add(VideoE videoE) { + VideoDO d = new VideoDO(); + BeanUtils.copyProperties(videoE, d); + videoRepository.save(d); + return true; + } + + @Override + public Boolean update(VideoE videoE) { + VideoDO d = new VideoDO(); + BeanUtils.copyProperties(videoE, d); + videoRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedVideoById(String id) { + return videoRepository.removeById(id); + } + + @Override + public Boolean deletedVideoByIds(String[] ids) { + return videoRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EmployeeMessageDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EmployeeMessageDO.java deleted file mode 100644 index 1bd1111..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EmployeeMessageDO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - - -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; -import lombok.NoArgsConstructor; - -/** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Data -@TableName("employee_message") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) - -public class EmployeeMessageDO extends BaseDO { - //用户ID - @ApiModelProperty(value = "用户ID") - private Long userId; - //是否有进入一级口门的权限(0-无权限;1有权限) - @ApiModelProperty(value = "是否有进入一级口门的权限(0-无权限;1有权限)") - private Integer isPermission; - //是否有人脸权限 - @ApiModelProperty(value = "是否有人脸权限") - private Integer isUserFace; - //可以进入的口门信息 - @ApiModelProperty(value = "可以进入的口门信息") - private String mkmjScope; - //状态：0-停用 1-启用 - @ApiModelProperty(value = "状态：0-停用 1-启用") - private Integer status; - - // 部门 - @ApiModelProperty(value = "部门") - private String department; - - // 姓名 - @ApiModelProperty(value = "姓名") - private String name; - - // 岗位 - @ApiModelProperty(value = "岗位") - private String post; - - // 手机号 - @ApiModelProperty(value = "手机号") - private String phoneNumber; - - // 车辆数 - @ApiModelProperty(value = "车辆数") - private Integer vehicleCount; - -// public EmployeeMessageDO(String ) { -// this. = ; -// } - -} diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EnclosedAreaDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EnclosedAreaDO.java deleted file mode 100644 index cef3ad0..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EnclosedAreaDO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -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; -import lombok.NoArgsConstructor; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -@Data -@TableName("enclosed_area") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class EnclosedAreaDO extends BaseDO { - //父级id - @ApiModelProperty(value = "父级id") - private Long parentId; - //父级名称 - @ApiModelProperty(value = "父级名称") - private String parentName; - //封闭区域名称 - @ApiModelProperty(value = "封闭区域名称") - private String name; - //封闭区域类型 - @ApiModelProperty(value = "封闭区域类型") - private String type; - //封闭区域类型 - @ApiModelProperty(value = "封闭区域类型") - private String typeName; - //管辖单位 - @ApiModelProperty(value = "管辖单位") - private Long corpinfoId; - //管辖单位 - @ApiModelProperty(value = "管辖单位") - private String corpinfoName; - //经度 - @ApiModelProperty(value = "经度") - private String longitude; - //纬度 - @ApiModelProperty(value = "纬度") - private String latitude; - -} - 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 deleted file mode 100644 index a46371d..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/GatePersonAuthLevelOneDO.java +++ /dev/null @@ -1,62 +0,0 @@ -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/InspectionDeptDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionDeptDO.java deleted file mode 100644 index a9467ba..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionDeptDO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.*; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 - */ -@Data -@TableName("inspection_dept") -@EqualsAndHashCode(callSuper = true) -public class InspectionDeptDO extends BaseDO { - //主键 - @ApiModelProperty(value = "主键") - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //名称 - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "检查部门下的车辆数量") - @TableField(exist = false) - private Integer vehicleCount; - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionVehicleDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionVehicleDO.java deleted file mode 100644 index ab556ce..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionVehicleDO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; -import com.baomidou.mybatisplus.annotation.*; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Data -@TableName("inspection_vehicle") -@EqualsAndHashCode(callSuper = true) -public class InspectionVehicleDO extends BaseDO { - //主键 - @ApiModelProperty(value = "主键") - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //检查部门ID - @ApiModelProperty(value = "检查部门ID") - private Long inspectionDeptId; - //车辆id - @ApiModelProperty(value = "车辆id") - private Long vehicleMessageId; - -} - 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 73bfe17..f54dc06 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 @@ -1,71 +1,87 @@ 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; -import java.util.Date; - /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:16 */ @Data @TableName("mkmj_approval_user") @EqualsAndHashCode(callSuper = true) public class MkmjApprovalUserDO extends BaseDO { - //审批人部门ID - @ApiModelProperty(value = "审批人部门ID") - @TableField(exist = false) - private String departmentName; - //审批人部门 - @ApiModelProperty(value = "审批人部门") - @TableField(exist = false) - private Long departmentId; - //审批人姓名 - @ApiModelProperty(value = "审批人姓名") - @TableField(exist = false) - private String name; - //审批人 - @ApiModelProperty(value = "审批人") - @TableField(exist = false) - private String userName; - //审批人名字 - @ApiModelProperty(value = "审批人名字") + //主键ID + @ApiModelProperty(value = "主键ID") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //审批人企业id + @ApiModelProperty(value = "审批人企业id") + private Long corpId; + //审批人企业名称 + @ApiModelProperty(value = "审批人企业名称") + private String corpName; + //审批人部门id + @ApiModelProperty(value = "审批人部门id") + private Long deptId; + //审批人部门名称 + @ApiModelProperty(value = "审批人部门名称") + private String deptName; + //审批人id + @ApiModelProperty(value = "审批人id") 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") - @TableField(exist = false) - private Long corpinfoId; - //人员审核权限(0-无权限,1-有权限) - @ApiModelProperty(value = "人员审核权限(0-无权限,1-有权限)") - private Integer isPersonnelPermission; - //车辆审核权限(0-无权限,1-有权限) - @ApiModelProperty(value = "车辆审核权限(0-无权限,1-有权限)") - private Integer isVehiclePermission; - //临时审核权限(0-无权限,1-有权限) - @ApiModelProperty(value = "临时审核权限(0-无权限,1-有权限)") - private Integer isTemporaryPermission; - //删除标识 - @ApiModelProperty(value = "删除标识") + //审批人名称 + @ApiModelProperty(value = "审批人名称") + private String userName; + //人员审核权限(1-无权限,2-有权限) + @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; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") private String deleteEnum; - @TableField(exist = false) - @ApiModelProperty(value = "待审批的数量") - private Integer pendingApprovalQuantity; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private Integer version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private Date updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; + } + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjAreaDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjAreaDO.java deleted file mode 100644 index 42e1457..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjAreaDO.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 09:51:10 - */ -@Data -@TableName("mkmj_area") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MkmjAreaDO extends BaseDO { - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String areaId; - //区域名称 - @ApiModelProperty(value = "口门名称") - private String areaName; - //区域范围 - @ApiModelProperty(value = "区域范围") - private String areaRange; - //区域级别 1-一级 2-二级 3-三级 - @ApiModelProperty(value = "区域级别 1-一级 2-二级 3-三级") - private Integer areaLevel; - //上级区域id(当area_level=1时，此字段为字典bianma) - @ApiModelProperty(value = "上级区域id(当area_level=1时，此字段为字典bianma)") - private String areaParentId; - //上级区域 - @ApiModelProperty(value = "上级区域") - private String areaParentName; - //口门类型 1-人行 2-车行 3-综合 - @ApiModelProperty(value = "口门类型 1-人行 2-车行 3-综合") - private Integer areaType; - //区域状态 0-停用 1-正常 2-暂时关闭 - @ApiModelProperty(value = "区域状态 0-停用 1-正常 2-暂时关闭") - private Integer areaStatus; - //入方向区域 - @ApiModelProperty(value = "入方向区域") - private Long inDirectionArea; - //出方向区域 - @ApiModelProperty(value = "出方向区域") - private Long outDirectionArea; - //企业id - @ApiModelProperty(value = "企业id") - private Long corpinfoId; - @ApiModelProperty(value = "企业名称") - private String corpinfoName; - //经度 - @ApiModelProperty(value = "经度") - private String longitude; - //纬度 - @ApiModelProperty(value = "纬度") - private String latitude; - - public MkmjAreaDO(String areaId) { - this.areaId = areaId; - } - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjAreaGateDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjAreaGateDO.java deleted file mode 100644 index f636230..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjAreaGateDO.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -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; -import lombok.NoArgsConstructor; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 16:01:00 - */ -@Data -@TableName("mkmj_area_gate") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MkmjAreaGateDO extends BaseDO { - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String areaGateId; - //企业id - @ApiModelProperty(value = "企业id") - private String corpinfoId; - //口门区域id - @ApiModelProperty(value = "口门区域id") - private String areaId; - //通道id - @ApiModelProperty(value = "通道id") - private String passageId; - //闸机标识 - @ApiModelProperty(value = "闸机标识") - private String gateNumber; - //闸机名称 - @ApiModelProperty(value = "闸机名称") - private String gateName; - //闸机类型 1-入 2出 - @ApiModelProperty(value = "闸机类型 1-入 2出") - private Integer gateType; - //闸机状态 0- 停用 1-正常 2-暂时关闭 - @ApiModelProperty(value = "闸机状态 0- 停用 1-正常 2-暂时关闭") - private Integer gateStatus; - //闸机类别 0-人行口门 1-车行口门 2-综合口门 - @ApiModelProperty(value = "闸机类别 0-人行口门 1-车行口门 2-综合口门") - private Integer gateCategory; - //闸机型号 - @ApiModelProperty(value = "闸机型号") - private String gateModel; - //闸机位置 - @ApiModelProperty(value = "闸机位置") - private String gatePosition; - //是否相邻区域 0否 1是 - @ApiModelProperty(value = "是否相邻区域 0否 1是") - private Integer isAdjacent; - //相邻区域id - @ApiModelProperty(value = "相邻区域id") - private String adjacentAreaId; - //经度 - @ApiModelProperty(value = "经度") - private String longitude; - //纬度 - @ApiModelProperty(value = "纬度") - private String latitude; - - public MkmjAreaGateDO(String areaGateId) { - this.areaGateId = areaGateId; - } - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjCarRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjCarRecordDO.java deleted file mode 100644 index 45e9971..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjCarRecordDO.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -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; -import lombok.NoArgsConstructor; - -import java.sql.Date; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Data -@TableName("mkmj_car_record") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MkmjCarRecordDO extends BaseDO { - //车辆id - @ApiModelProperty(value = "车辆id") - private String vehicleRecordId; - //车辆牌照号码 - @ApiModelProperty(value = "车辆牌照号码") - private String vehiclePlateNumber; - //车辆行驶证号码 - @ApiModelProperty(value = "车辆行驶证号码") - private String vehicleRegistrationNumber; - //车辆类型名称 - @ApiModelProperty(value = "车辆类型名称") - private String vehicleCategoryName; - //车辆联系人姓名 - @ApiModelProperty(value = "车辆联系人姓名") - private String vehicleContactName; - //车辆联系人电话 - @ApiModelProperty(value = "车辆联系人电话") - private String vehicleContactPhoneNumber; - //车辆备案信息录入单位 - @ApiModelProperty(value = "车辆备案信息录入单位") - private String vehicleFilingInfoRecordingOrg; - //车辆牌照颜色名称 - @ApiModelProperty(value = "车辆牌照颜色名称") - private String vehiclePlateColor; - //车辆入港闸口 - @ApiModelProperty(value = "车辆入港闸口") - private String vehicleArrivalBarrier; - private String regexArrivalBarrier; - //车辆入港时间 - @ApiModelProperty(value = "车辆入港时间") - private String vehicleArrivalTime; - //车辆离港闸口 - @ApiModelProperty(value = "车辆离港闸口") - private String vehicleDepartureBarrier; - private String regexDepartureBarrier; - //车辆离港时间 - @ApiModelProperty(value = "车辆离港时间") - private String vehicleDepartureTime; - //车辆备案方式 - @ApiModelProperty(value = "车辆备案方式") - private String vehicleFilingMethod; - //车辆在港状态 - @ApiModelProperty(value = "车辆在港状态") - private String vehicleArrivalStatus; - //数据来源 - @ApiModelProperty(value = "数据来源") - private String edwDataSource; - //数据创建日期 - @ApiModelProperty(value = "数据创建日期") - private String edwCreateDate; - //数据更新日期 - @ApiModelProperty(value = "数据更新日期") - private String edwLastUpdate; - //数据有效标识 - @ApiModelProperty(value = "数据有效标识") - private String edwValidFlag; - //分区列 - @ApiModelProperty(value = "分区列") - private Long dataVersion; - //同步时间 - @ApiModelProperty(value = "同步时间") - private Date accLastUpdateDate; - //自增长id主键 - @ApiModelProperty(value = "自增长id主键") - private Long idSequence; - //同步时间 - @ApiModelProperty(value = "同步时间") - private String synctime; - - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjDO.java new file mode 100644 index 0000000..cd7f191 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjDO.java @@ -0,0 +1,70 @@ +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; + +import javax.validation.constraints.NotEmpty; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:15 + */ +@Data +@TableName("mkmj") +@EqualsAndHashCode(callSuper = true) +public class MkmjDO extends BaseDO { + //口门名称 + @ApiModelProperty(value = "所属港区") + private String hgAuthArea; + @ApiModelProperty(value = "所属港区名称") + private String hgAuthAreaName; + @ApiModelProperty(value = "口门名称") + private String mkmjName; + //口门级别 1-一级 2-二级 + @ApiModelProperty(value = "口门级别 1-一级 2-二级") + private Integer mkmjLevel; + //口门类型 1-人行 2-车行 3-综合 + @ApiModelProperty(value = "口门类型") + private String mkmjType; + //口门类型名称1-人行 2-车行 3-综合 + @ApiModelProperty(value = "口门类型名称1-人行 2-车行 3-综合") + private String mkmjTypeName; + //口门状态 1-停用 2-正常 + @ApiModelProperty(value = "口门状态 1-停用 2-正常") + private Integer mkmjStatus; + //入方向区域- 二级有用 + @ApiModelProperty(value = "入方向区域- 二级有用") + private Long inDirectionArea; + //入方向区域名称- 二级有用 + @ApiModelProperty(value = "入方向区域名称- 二级有用") + private Long inDirectionAreaName; + //出方向区域- 二级有用 + @ApiModelProperty(value = "出方向区域- 二级有用") + private Long outDirectionArea; + //出方向区域名称- 二级有用 + @ApiModelProperty(value = "出方向区域名称- 二级有用") + private Long outDirectionAreaName; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + //摄像头数量 + @ApiModelProperty(value = "摄像头数量") + @TableField(exist = false) + private Integer videoCount; + //通道数量 + @ApiModelProperty(value = "通道数量") + @TableField(exist = false) + private Integer passageCount; +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateDO.java new file mode 100644 index 0000000..34a4bd4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateDO.java @@ -0,0 +1,99 @@ +package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +@Data +@TableName("mkmj_gate") +@EqualsAndHashCode(callSuper = true) +public class MkmjGateDO extends BaseDO { + //主键 + @ApiModelProperty(value = "主键") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //口门区域id + @ApiModelProperty(value = "口门区域id") + private String mkmjId; + //通道id + @ApiModelProperty(value = "通道id") + private String passageId; + //闸机标识 + @ApiModelProperty(value = "闸机标识") + private String gateNumber; + //闸机名称 + @ApiModelProperty(value = "闸机名称") + private String gateName; + //闸机类型 + @ApiModelProperty(value = "闸机类型") + private String gateType; + //闸机类型名称 + @ApiModelProperty(value = "闸机类型名称") + private String gateTypeName; + //闸机状态 1- 停用 2-正常 + @ApiModelProperty(value = "闸机状态 1- 停用 2-正常") + private Integer gateStatus; + //闸机类别 + @ApiModelProperty(value = "闸机类别") + private String gateCategory; + //闸机类别名称 + @ApiModelProperty(value = "闸机类别名称") + private String gateCategoryName; + //闸机型号 + @ApiModelProperty(value = "闸机型号") + private String gateModel; + //闸机位置 + @ApiModelProperty(value = "闸机位置") + private String gatePosition; + //经度 + @ApiModelProperty(value = "经度") + private String longitude; + //纬度 + @ApiModelProperty(value = "纬度") + private String latitude; + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateVideoDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateVideoDO.java deleted file mode 100644 index 1181612..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateVideoDO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -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; -import lombok.NoArgsConstructor; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 17:16:03 - */ -@Data -@TableName("mkmj_gate_video") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MkmjGateVideoDO extends BaseDO { - //闸机摄像头id - @ApiModelProperty(value = "闸机摄像头id") - private String gateVideoId; - //口门/闸机id - @ApiModelProperty(value = "口门/闸机id") - private String areaGateId; - //设备类型（1-口门 2-闸机） - @ApiModelProperty(value = "设备类型（1-口门 2-闸机）") - private Integer deviceType; - //摄像头id - @ApiModelProperty(value = "摄像头id") - private String videoResourceId; - //摄像头名称 - @ApiModelProperty(value = "摄像头名称") - private String videoResourceName; - //摄像头类型（1-移动 2-平台） - @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）") - private Integer videoType; - //企业id - @ApiModelProperty(value = "企业id") - private String corpinfoId; - //经度 - @ApiModelProperty(value = "经度") - private String longitude; - //纬度 - @ApiModelProperty(value = "纬度") - private String latitude; - - -} - 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 16ec049..e814520 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 @@ -1,51 +1,78 @@ package com.zcloud.primeport.persistence.dataobject; +import com.baomidou.mybatisplus.annotation.IdType; +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; -import lombok.NoArgsConstructor; /** * web-infrastructure * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Data @TableName("mkmj_passage") -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class MkmjPassageDO extends BaseDO { - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String passageId; + //主键 + @ApiModelProperty(value = "主键") + @TableId(type = IdType.ASSIGN_ID) + private Long id; //通道名称 @ApiModelProperty(value = "通道名称") private String passageName; //通道类型 1-人行 2-车行 3-综合 @ApiModelProperty(value = "通道类型 1-人行 2-车行 3-综合") private Integer passageType; - //通道状态 0-停用 1-正常 2-暂时关闭 - @ApiModelProperty(value = "通道状态 0-停用 1-正常 2-暂时关闭") + //通道状态 1-停用 2-正常 + @ApiModelProperty(value = "通道状态 1-停用 2-正常") private Integer passageStatus; //口门区域id @ApiModelProperty(value = "口门区域id") - private String areaId; - //企业id - @ApiModelProperty(value = "企业id") - private String corpinfoId; + private String mkmjId; //经度 @ApiModelProperty(value = "经度") private String longitude; //纬度 @ApiModelProperty(value = "纬度") private String latitude; - - public MkmjPassageDO(String passageId) { - this.passageId = passageId; - } + //删除标识true false + @ApiModelProperty(value = "删除标识true false") + private String deleteEnum; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //单位id + @ApiModelProperty(value = "单位id") + private Long orgId; + //版本 + @ApiModelProperty(value = "版本") + private String version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + private String env; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjSwipeCardRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjSwipeCardRecordDO.java deleted file mode 100644 index 410e658..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjSwipeCardRecordDO.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -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; -import lombok.NoArgsConstructor; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Data -@TableName("mkmj_swipe_card_record") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MkmjSwipeCardRecordDO extends BaseDO { - //节点编码 - @ApiModelProperty(value = "节点编码") - private String nodecode; - //报警编号 - @ApiModelProperty(value = "报警编号") - private String alarmcode; - //报警图片路径 - @ApiModelProperty(value = "报警图片路径") - private String alarmpicture; - //节点类型 - @ApiModelProperty(value = "节点类型") - private String nodetype; - //报警时间，10位时间戳 - @ApiModelProperty(value = "报警时间，10位时间戳") - private Integer alarmdate; - //报警等级 1：严重，2：一般，3：轻微 - @ApiModelProperty(value = "报警等级 1：严重，2：一般，3：轻微") - private Integer alarmgrade; - //单元类型 - @ApiModelProperty(value = "单元类型") - private Integer unittype; - //报警类型 - @ApiModelProperty(value = "报警类型") - private Integer alarmtype; - //通道序号 - @ApiModelProperty(value = "通道序号") - private Integer channelseq; - //通道名称 - @ApiModelProperty(value = "通道名称") - private String channelname; - //报警状态 1：报警产生，2：报警消失 - @ApiModelProperty(value = "报警状态 1：报警产生，2：报警消失") - private Integer alarmstat; - //部门名称 - @ApiModelProperty(value = "部门名称") - private String deptname; - //通道编号 - @ApiModelProperty(value = "通道编号") - private String acschannelcode; - //口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知 - @ApiModelProperty(value = "口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知") - private Integer maskstate; - //进出门类型: 详见 读卡器业务类型字典 - @ApiModelProperty(value = "进出门类型: 详见 读卡器业务类型字典") - private String enterorexit; - //开门类型字符串 - @ApiModelProperty(value = "开门类型字符串") - private String opentypestr; - //刷卡时间，格式：yyyy-MM:dd HH:mm:ss - @ApiModelProperty(value = "刷卡时间，格式：yyyy-MM:dd HH:mm:ss") - private String swingtime; - //设备名称 - @ApiModelProperty(value = "设备名称") - private String devicename; - //人员编号 - @ApiModelProperty(value = "人员编号") - private String personcode; - //开门类型, 详见开门类型 字典 - @ApiModelProperty(value = "开门类型, 详见开门类型 字典") - private String opentype; - //组织编码 - @ApiModelProperty(value = "组织编码") - private String orgcode; - //证件类型 - @ApiModelProperty(value = "证件类型") - private String papertype; - //证件号 - @ApiModelProperty(value = "证件号") - private String papernumber; - //错误详情 - @ApiModelProperty(value = "错误详情") - private String errordetail; - //开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码 - @ApiModelProperty(value = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码") - private String openfailedcod; - //固定值：evo-accesscontrol - @ApiModelProperty(value = "固定值：evo-accesscontrol") - private String from; - //extendId标识 - @ApiModelProperty(value = "extendId标识") - private Long extendid; - //开始时间, 13位时间戳 - @ApiModelProperty(value = "开始时间, 13位时间戳") - private Long begintime; - //通道名称 - @ApiModelProperty(value = "通道名称") - private String acschannelname; - //预留字段，暂未使用，默认值为0 - @ApiModelProperty(value = "预留字段，暂未使用，默认值为0") - private Integer cardstatus; - //组织名称 - @ApiModelProperty(value = "组织名称") - private String orgname; - //性别 1 男，2 女， 0 未知 - @ApiModelProperty(value = "性别 1 男，2 女， 0 未知") - private Integer sex; - //人员部门id - @ApiModelProperty(value = "人员部门id") - private Integer deptid; - //卡类型 - @ApiModelProperty(value = "卡类型") - private Integer cardtype; - //设备编号 - @ApiModelProperty(value = "设备编号") - private String devicecode; - //人员姓名 - @ApiModelProperty(value = "人员姓名") - private String personname; - //刷卡人在平台上的图片，相对路径 - @ApiModelProperty(value = "刷卡人在平台上的图片，相对路径") - private String personimg; - //开门结果 0 失败 1 成功 - @ApiModelProperty(value = "开门结果 0 失败 1 成功") - private Integer openresult; - //人员id - @ApiModelProperty(value = "人员id") - private Integer personid; - //抓拍图，相对路径 - @ApiModelProperty(value = "抓拍图，相对路径") - private String recordimage1; - //卡介质 0 IC 1 有源RFID 2 CPU - @ApiModelProperty(value = "卡介质 0 IC 1 有源RFID 2 CPU") - private String category; - //卡号 - @ApiModelProperty(value = "卡号") - private String cardnumber; - //rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物 - @ApiModelProperty(value = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物") - private Integer rfidtype; - //年龄 - @ApiModelProperty(value = "年龄") - private Integer age; - //0-非访客，1-访客 - @ApiModelProperty(value = "0-非访客，1-访客") - private Integer vrecordflag; - - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java new file mode 100644 index 0000000..638b639 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java @@ -0,0 +1,116 @@ +package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@Data +@TableName("person_apply") +@EqualsAndHashCode(callSuper = true) +public class PersonApplyDO extends BaseDO { + //id + @ApiModelProperty(value = "id") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //1股份2分公司3相关方4临时人员 + @ApiModelProperty(value = "1股份2分公司3相关方4临时人员") + private Object personBelongType; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private Object gateLevelAuthArea; + //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）) + @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)") + private Integer auditFlag; + //进出港权限(1:有 2：无) + @ApiModelProperty(value = "进出港权限(1:有 2：无)") + private Integer mkmjPermission; + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + private Date visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + private Date visitEndTime; + //待审批人员所属企业ID + @ApiModelProperty(value = "待审批人员所属企业ID") + private Long personCorpId; + //待审批人员所属企业名称 + @ApiModelProperty(value = "待审批人员所属企业名称") + private String personCorpName; + //待审批人员所属部门id + @ApiModelProperty(value = "待审批人员所属部门id") + private Long personDepartmentId; + //待审批人员部门名称 + @ApiModelProperty(value = "待审批人员部门名称") + private String personDepartmentName; + //待审批人员id + @ApiModelProperty(value = "待审批人员id") + private Long employeePersonUserId; + //待审批人员姓名 + @ApiModelProperty(value = "待审批人员姓名") + private String employeePersonUserName; + //头像 + @ApiModelProperty(value = "头像") + private String userFaceUrl; + //手机号 + @ApiModelProperty(value = "手机号") + private String userPhone; + //身份证号码 + @ApiModelProperty(value = "身份证号码") + private String userCard; + //告知签字 + @ApiModelProperty(value = "告知签字") + private Long informSignId; + //项目id + @ApiModelProperty(value = "项目id") + private Long projectId; + //项目名称 + @ApiModelProperty(value = "项目名称") + private String projectName; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //来访事由 + @ApiModelProperty(value = "来访事由") + private String remarks; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonMessageDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonMessageDO.java new file mode 100644 index 0000000..27bbf56 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonMessageDO.java @@ -0,0 +1,89 @@ +package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:20 + */ +@Data +@TableName("person_message") +@EqualsAndHashCode(callSuper = true) +public class PersonMessageDO extends BaseDO { + //id + @ApiModelProperty(value = "id") + @TableId(type = IdType.ASSIGN_ID) + private Object id; + //人员申请id + @ApiModelProperty(value = "人员申请id") + private Long personApplyId; + //1股份2分公司3相关方4临时人员 + @ApiModelProperty(value = "1股份2分公司3相关方4临时人员") + private Object personBelongType; + //头像 + @ApiModelProperty(value = "头像") + private String userFaceUrl; + //身份证号码 + @ApiModelProperty(value = "身份证号码") + private String userCard; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private Object gateLevelAuthArea; + //授权访问起始时间 + @ApiModelProperty(value = "授权访问起始时间") + private Date visitStartTime; + //授权访问结束时间 + @ApiModelProperty(value = "授权访问结束时间") + private Date visitEndTime; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //对接状态，1对接完成，2未对接 + @ApiModelProperty(value = "对接状态，1对接完成，2未对接") + private Integer syncStatus; + //对接说明 + @ApiModelProperty(value = "对接说明") + private String syncRemarks; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessDO.java deleted file mode 100644 index 6531954..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessDO.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.IdType; -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; -import lombok.NoArgsConstructor; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Data -@TableName("temporary_access") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class TemporaryAccessDO extends BaseDO { - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //审批人ID - @ApiModelProperty(value = "审批人ID") - private Long userId; - //审批人姓名 - @ApiModelProperty(value = "审批人姓名") - private String userName; - //手机号 - @ApiModelProperty(value = "手机号") - private String phone; - //身份证号 - @ApiModelProperty(value = "身份证号") - private String idCard; - //企业ID - @ApiModelProperty(value = "企业ID") - private String corpId; - //企业名称 - @ApiModelProperty(value = "企业名称") - private String corpName; - //部门id - @ApiModelProperty(value = "部门id") - private String deptId; - //部门名称 - @ApiModelProperty(value = "部门名称") - private String deptName; - //车牌号 - @ApiModelProperty(value = "车牌号") - private String carNo; - //车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌) - @ApiModelProperty(value = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)") - private String carPlantType; - //车辆类型(0：货车，1：轿车，2：大巴客车) - @ApiModelProperty(value = "车辆类型(0：货车，1：轿车，2：大巴客车)") - private String carType; - //访问起始时间 - @ApiModelProperty(value = "访问起始时间") - private String visitStartTime; - //访问结束时间 - @ApiModelProperty(value = "访问结束时间") - private String visitEndTime; - //口门ID - @ApiModelProperty(value = "口门ID") - private String doorId; - //口门名称 - @ApiModelProperty(value = "口门名称") - private String doorName; - //驾驶证照片 - @ApiModelProperty(value = "驾驶证照片") - private String drivingLicensePath; - //身份证正面 - @ApiModelProperty(value = "身份证正面") - private String idCardFrontPath; - //身份证反面 - @ApiModelProperty(value = "身份证反面") - private String idCardFlipsidePath; - //访问类型(1：人员，2：车辆) - @ApiModelProperty(value = "访问类型(1：人员，2：车辆)") - private String temporaryType; - //访问来源(0：监管，1：企业，2：相关方，3：驻港单位) - @ApiModelProperty(value = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)") - private String temporaryFrom; - //来访事由 - @ApiModelProperty(value = "来访事由") - private String visitReason; - //排放标准: - @ApiModelProperty(value = "排放标准:") - private String emissionStandards; - - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessEntourageDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessEntourageDO.java deleted file mode 100644 index 0f27ff6..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessEntourageDO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.IdType; -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; -import lombok.NoArgsConstructor; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Data -@TableName("temporary_access_entourage") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class TemporaryAccessEntourageDO extends BaseDO { - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //临时访问表id - @ApiModelProperty(value = "临时访问表id") - private Long temporaryId; - //姓名 - @ApiModelProperty(value = "姓名") - private String name; - //手机号 - @ApiModelProperty(value = "手机号") - private String phone; - //工作单位 - @ApiModelProperty(value = "工作单位") - private String jobName; - -} - 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 deleted file mode 100644 index c6b5bf9..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/UserViewDO.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -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; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * web-infrastructure - * User视图DO类 - * @Author guoyuepeng - * @Date 2025-12-18 14:32:14 - */ -@Data -@TableName("user") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class UserViewDO extends BaseDO { - - @ApiModelProperty(value = "用户ID") - private Long id; - - @ApiModelProperty(value = "用户ID") - private String userId; - - @ApiModelProperty(value = "用户名") - private String username; - - @ApiModelProperty(value = "姓名") - private String name; - - @ApiModelProperty(value = "企业ID") - private Long corpinfoId; - - @ApiModelProperty(value = "主企业标识") - private String mainCorpFlag; - - @ApiModelProperty(value = "用户类型") - private String userType; - - @ApiModelProperty(value = "部门ID") - private Long departmentId; - - @ApiModelProperty(value = "岗位ID") - private Long postId; - - @ApiModelProperty(value = "角色ID") - private Long roleId; - - @ApiModelProperty(value = "邮箱") - private String email; - - @ApiModelProperty(value = "电话") - private String phone; - - @ApiModelProperty(value = "人员类型") - private String personnelType; - - @ApiModelProperty(value = "人员类型名称") - private String personnelTypeName; - - @ApiModelProperty(value = "民族") - private String nation; - - @ApiModelProperty(value = "民族名称") - private String nationName; - - @ApiModelProperty(value = "身份证号") - private String userIdCard; - - @ApiModelProperty(value = "头像URL") - private String userAvatarUrl; - - @ApiModelProperty(value = "当前地址") - private String currentAddress; - - @ApiModelProperty(value = "定位地址") - private String locationAddress; - - @ApiModelProperty(value = "职级") - private String rankLevel; - - @ApiModelProperty(value = "职级名称") - private String rankLevelName; - - @ApiModelProperty(value = "排序") - private Integer sort; - - @ApiModelProperty(value = "版本") - private Integer version; -// -// @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; - - @ApiModelProperty(value = "副职领导标识") - private String deputyLeaderFlag; - - @ApiModelProperty(value = "文化程度") - private String culturalLevel; - - @ApiModelProperty(value = "文化程度名称") - private String culturalLevelName; - - @ApiModelProperty(value = "婚姻状况") - private String maritalStatus; - - @ApiModelProperty(value = "婚姻状况名称") - private String maritalStatusName; - - @ApiModelProperty(value = "政治面貌") - private String politicalAffiliation; - - @ApiModelProperty(value = "政治面貌名称") - private String politicalAffiliationName; - - @ApiModelProperty(value = "在职标识") - private String employmentFlag; -} \ No newline at end of file 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 new file mode 100644 index 0000000..12a0702 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java @@ -0,0 +1,152 @@ +package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:23 + */ +@Data +@TableName("vehicle_apply") +@EqualsAndHashCode(callSuper = true) +public class VehicleApplyDO extends BaseDO { + //id + @ApiModelProperty(value = "id") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //车辆状态(1未启用,2启用) + @ApiModelProperty(value = "车辆状态(1未启用,2启用)") + private Integer statusFlag; + //车牌类型数据字典 + @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 Object gateLevelAuthArea; + //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）) + @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)") + private Integer auditFlag; + //进出港权限(1:有 2：无) + @ApiModelProperty(value = "进出港权限(1:有 2：无)") + private Integer mkmjPermission; + //访问起始时间 + @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 emissionStandards; + //排放标准: + level1 ->国一 + level2 ->国二 + level3 ->国三 + level4 ->国四 + level5 ->国五 + level6 ->国六 + @ApiModelProperty(value = "排放标准: + level1 ->国一 + level2 ->国二 + level3 ->国三 + level4 ->国四 + level5 ->国五 + level6 ->国六") + private String emissionStandardsName; + //行驶证照片 + @ApiModelProperty(value = "行驶证照片") + private Long drivingLicenseId; + //车辆照片 + @ApiModelProperty(value = "车辆照片") + private Long attachmentId; + //告知签字 + @ApiModelProperty(value = "告知签字") + private Long informSignId; + //项目id + @ApiModelProperty(value = "项目id") + private Long projectId; + //项目名称 + @ApiModelProperty(value = "项目名称") + private String projectName; + //1被拉黑2未拉黑 + @ApiModelProperty(value = "1被拉黑2未拉黑") + private Integer blockedFlag; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + +} + 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 new file mode 100644 index 0000000..effb0d0 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java @@ -0,0 +1,98 @@ +package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +@Data +@TableName("vehicle_audit") +@EqualsAndHashCode(callSuper = true) +public class VehicleAuditDO extends BaseDO { + //id + @ApiModelProperty(value = "id") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //车辆申请id + @ApiModelProperty(value = "车辆申请id") + private String vehicleApplyId; + //审批批次(1.普通车辆.2危险化学品车辆) + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") + private Integer batchType; + //审批状态(1,申请;2.更新) + @ApiModelProperty(value = "审批状态(1,申请;2.更新)") + private Integer batchState; + //审批人id + @ApiModelProperty(value = "审批人id") + private Long auditUserId; + //审批人姓名 + @ApiModelProperty(value = "审批人姓名") + private String auditUserName; + //审批部门id + @ApiModelProperty(value = "审批部门id") + private Long auditDeptId; + //审批部门名称 + @ApiModelProperty(value = "审批部门名称") + private String auditDeptName; + //审批人企业id + @ApiModelProperty(value = "审批人企业id") + private Long auditCorpId; + //审批人企业名称 + @ApiModelProperty(value = "审批人企业名称") + private String auditCorpName; + //审批状态(1,未开始,2通过,3不通过) + @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)") + private Integer auditStatus; + //待审核信息 + @ApiModelProperty(value = "待审核信息") + private Object changeAfter; + //变更前信息 + @ApiModelProperty(value = "变更前信息") + private Object changeBefore; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Object version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditLogDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditLogDO.java deleted file mode 100644 index 773c7e6..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditLogDO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - - -import com.baomidou.mybatisplus.annotation.*; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Data -@TableName("vehicle_audit_log") -@EqualsAndHashCode(callSuper = true) -public class VehicleAuditLogDO extends BaseDO { - //id - @ApiModelProperty(value = "id") - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //业务id - @ApiModelProperty(value = "业务id") - private String vehicleAuditLogId; - //审批批次(1.普通车辆.2危险化学品车辆) - @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") - private Integer batchType; - //审批状态(0,申请;2.更新) - @ApiModelProperty(value = "审批状态(0,申请;2.更新)") - private Integer batchState; - //车辆id - @ApiModelProperty(value = "车辆id") - private Long vehicleMessageId; - //审批人id - @ApiModelProperty(value = "审批人id") - private Long userId; - //审批人姓名 - @ApiModelProperty(value = "审批人姓名") - private String userName; - //审批部门id - @ApiModelProperty(value = "审批部门id") - private Long deptId; - //审批部门名称 - @ApiModelProperty(value = "审批部门名称") - private String deptName; - //审批步骤排序 - @ApiModelProperty(value = "审批步骤排序") - private Integer stepSort; - //审批状态(1未开始.2通过.3不通过) - @ApiModelProperty(value = "审批状态(1未开始.2通过.3不通过)") - private Integer status; - //审批状态(0正常,1.废除) - @ApiModelProperty(value = "审批状态(0正常,1.废除)") - private Integer stepType; - //驳回备注 - @ApiModelProperty(value = "驳回备注") - private String comments; - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java index cdd8f2b..8987bdc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java @@ -1,26 +1,71 @@ package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +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; -import lombok.NoArgsConstructor; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @Data @TableName("vehicle_black") -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class VehicleBlackDO extends BaseDO { - //车辆信息表（t_vehicle_message）的主键id - @ApiModelProperty(value = "车辆信息表（t_vehicle_message）的主键id") + //id + @ApiModelProperty(value = "id") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //车辆信息表（vehicle_apply）的主键id + @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id") private Long vehicleId; - + //车辆所属人姓名（临时车） + @ApiModelProperty(value = "车辆所属人姓名（临时车）") + private String employeeVehicleUserName; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountByCorpDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountByCorpDO.java deleted file mode 100644 index 61e2452..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountByCorpDO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.IdType; -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; - -import java.util.Date; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 - */ -@Data -public class VehicleCountByCorpDO extends BaseDO { - - private String corpId; - private String corpName; - private String corpVehicleCount; - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountFromViolationsDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountFromViolationsDO.java deleted file mode 100644 index 570b268..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountFromViolationsDO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 - */ -@Data -public class VehicleCountFromViolationsDO extends BaseDO { - - @ApiModelProperty(value = "id") - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //业务id - @ApiModelProperty(value = "业务id") - private String vehicleMessageId; - //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") - private Integer licenceType; - //车牌号 - @ApiModelProperty(value = "车牌号") - private String licenceNo; - //车辆类型 - @ApiModelProperty(value = "车辆类型") - private String vehicleType; - @ApiModelProperty(value = "车辆类型-名字") - private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") - private Integer vehicleBelongType; - @ApiModelProperty(value = "违规数量") - private String violationsCount; - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java index 263de71..47a3347 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java @@ -4,17 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType; 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; -import java.util.Date; - /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @Data @TableName("vehicle_message") @@ -24,67 +21,78 @@ public class VehicleMessageDO extends BaseDO { @ApiModelProperty(value = "id") @TableId(type = IdType.ASSIGN_ID) private Long id; - //业务id - @ApiModelProperty(value = "业务id") - private String vehicleMessageId; - //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 - @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") - private Integer licenceType; + //车牌类型数据字典 + @ApiModelProperty(value = "车牌类型数据字典") + private String licenceType; + //车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + @ApiModelProperty(value = "车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + private String licenceTypeName; //车牌号 @ApiModelProperty(value = "车牌号") private String licenceNo; //车辆类型 @ApiModelProperty(value = "车辆类型") private String vehicleType; + //车辆类型-名字 @ApiModelProperty(value = "车辆类型-名字") private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") - private Integer vehicleBelongType; - //所属车队ID - @ApiModelProperty(value = "所属车队ID") - private Long motorcadeId; - //是否危化车辆(0：否，1：是) - @ApiModelProperty(value = "是否危化车辆(0：否，1：是)") - private Integer isDangerous; - //通行港区(0-全部 1-东港区 2-西港区) - @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)") - private Integer portId; - //是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回) - @ApiModelProperty(value = "是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回)") - private Integer isAudit; - //进出港权限(1:有 2：无) - @ApiModelProperty(value = "进出港权限(1:有 2：无)") - private Integer mkmjPermission; - //访问起始时间 - @ApiModelProperty(value = "访问起始时间") + //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 + @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") + private String vehicleBelongType; + //授权范围港区与区域 + @ApiModelProperty(value = "授权范围港区与区域") + private Object gateLevelAuthArea; + //授权访问起始时间 + @ApiModelProperty(value = "授权访问起始时间") private Date visitStartTime; - //访问结束时间 - @ApiModelProperty(value = "访问结束时间") + //授权访问结束时间 + @ApiModelProperty(value = "授权访问结束时间") private Date visitEndTime; - //车辆所属部门id - @ApiModelProperty(value = "车辆所属部门id") - private Long vehicleDepartmentId; - //车辆所属部门名称 - @ApiModelProperty(value = "车辆所属部门名称") - private String vehicleDepartmentName; - //车辆所属人id(员工车辆) - @ApiModelProperty(value = "车辆所属人id(员工车辆)") - private Long employeeVehicleUserId; - //车辆所属人姓名(员工车辆) - @ApiModelProperty(value = "车辆所属人姓名(员工车辆)") - private String employeeVehicleUserName; - //企业ID - @ApiModelProperty(value = "企业ID") - private Long corpId; - //排放标准: - @ApiModelProperty(value = "排放标准:") - private String emissionStandards; - //附件地址 - @ApiModelProperty(value = "附件地址") - private String attachmentUrl; + //车辆申请id + @ApiModelProperty(value = "车辆申请id") + private Long vehicleApplyId; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; //删除标识 @ApiModelProperty(value = "删除标识") private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //对接状态，1对接完成，2未对接 + @ApiModelProperty(value = "对接状态，1对接完成，2未对接") + private Integer syncStatus; + //对接说明 + @ApiModelProperty(value = "对接说明") + private String syncRemarks; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleViolationsDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleViolationsDO.java index bac834e..096c274 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleViolationsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleViolationsDO.java @@ -1,44 +1,92 @@ package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +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; -import lombok.NoArgsConstructor; - -import java.util.Date; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Data @TableName("vehicle_violations") -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class VehicleViolationsDO extends BaseDO { - //车辆信息表（t_vehicle_message）的主键id - @ApiModelProperty(value = "车辆信息表（t_vehicle_message）的主键id") + //车辆违规记录id + @ApiModelProperty(value = "车辆违规记录id") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //车辆信息表（vehicle_apply）的主键id + @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id") private Long vehicleId; - //违规类型（0-未按规定车道行驶，1-违规停车） - @ApiModelProperty(value = "违规类型（0-未按规定车道行驶，1-违规停车）") - private Integer violationType; + //车辆所属人姓名（临时车） + @ApiModelProperty(value = "车辆所属人姓名（临时车）") + private String employeeVehicleUserName; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //违规类型 + @ApiModelProperty(value = "违规类型") + private String violationType; + //违规类型名称 + @ApiModelProperty(value = "违规类型名称") + private String violationTypeName; //违规区域（位置） @ApiModelProperty(value = "违规区域（位置）") private String location; //违规图片的存储路径 @ApiModelProperty(value = "违规图片的存储路径") - private String filepath; + private String illegalImagesId; //违规说明 @ApiModelProperty(value = "违规说明") private String describeMessage; //违规时间 @ApiModelProperty(value = "违规时间") private Date violationtime; - - + //违规处理状态，1已处理2未处理 + @ApiModelProperty(value = "违规处理状态，1已处理2未处理") + private Integer violationProcessingStatus; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EnclosedAreaCO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VideoDO.java similarity index 54% rename from web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EnclosedAreaCO.java rename to web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VideoDO.java index e6fe769..7591d42 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/EnclosedAreaCO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VideoDO.java @@ -1,57 +1,47 @@ -package com.zcloud.primeport.dto.clientobject; +package com.zcloud.primeport.persistence.dataobject; -import com.alibaba.cola.dto.ClientObject; -import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; import lombok.Data; +import lombok.EqualsAndHashCode; /** - * web-client + * web-infrastructure * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 + * @Author makejava + * @Date 2026-03-05 11:33:30 */ @Data -public class EnclosedAreaCO extends ClientObject { +@TableName("video") +@EqualsAndHashCode(callSuper = true) +public class VideoDO extends BaseDO { //主键 @ApiModelProperty(value = "主键") + @TableId(type = IdType.ASSIGN_ID) private Long id; - //父级id - @ApiModelProperty(value = "父级id") - private Long parentId; - //父级名称 - @ApiModelProperty(value = "父级名称") - private String parentName; - //封闭区域名称 - @ApiModelProperty(value = "封闭区域名称") - private String name; - //封闭区域类型 - @ApiModelProperty(value = "封闭区域类型") - private String type; - //封闭区域类型 - @ApiModelProperty(value = "封闭区域类型") - private String typeName; - //管辖单位 - @ApiModelProperty(value = "管辖单位") - private Long corpinfoId; - //管辖单位 - @ApiModelProperty(value = "管辖单位") - private String corpinfoName; + //口门/闸机id 外键id + @ApiModelProperty(value = "口门/闸机id 外键id ") + private Long foreignId; + //设备类型（1-口门 2-闸机） + @ApiModelProperty(value = "设备类型（1-口门 2-闸机）") + private Integer deviceType; + //摄像头id + @ApiModelProperty(value = "摄像头id") + private String videoResourceId; + //摄像头名称 + @ApiModelProperty(value = "摄像头名称") + private String videoResourceName; + //摄像头类型（1-移动 2-平台） + @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）") + private Integer videoType; //经度 @ApiModelProperty(value = "经度") private String longitude; //纬度 @ApiModelProperty(value = "纬度") private String latitude; - // 子集数 - @ApiModelProperty(value = "子集数") - private Long childCount; - // 使用数 - @ApiModelProperty(value = "使用数") - private Long useCount; - - - - //删除标识true false @ApiModelProperty(value = "删除标识true false") private String deleteEnum; @@ -86,5 +76,6 @@ public class EnclosedAreaCO extends ClientObject { @ApiModelProperty(value = "修改人id") private Long updateId; private String env; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EmployeeMessageCustomMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EmployeeMessageCustomMapper.java deleted file mode 100644 index ae8f576..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EmployeeMessageCustomMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -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.EmployeeMessageDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.Map; - -/** - * web-infrastructure - * 自定义EmployeeMessageMapper接口，用于复杂查询 - * @Author guoyuepeng - * @Date 2025-12-18 14:32:14 - */ -@Mapper -public interface EmployeeMessageCustomMapper extends BaseMapper { - - /** - * 通过user视图和employee_message表关联查询分页数据 - * @param page 分页参数 - * @param params 查询参数 - * @return 分页结果 - */ - IPage selectPageFromUserView(IPage page, @Param("params") Map params); -} \ No newline at end of file diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EmployeeMessageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EmployeeMessageMapper.java deleted file mode 100644 index 1a5a6d3..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EmployeeMessageMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.primeport.persistence.dataobject.EmployeeMessageDO; -import org.apache.ibatis.annotations.Mapper; - -/** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-12-18 14:32:14 -*/ -@Mapper -public interface EmployeeMessageMapper extends BaseMapper { - - } - 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 deleted file mode 100644 index 10f97c9..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/GatePersonAuthLevelOneMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -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/InspectionVehicleMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionVehicleMapper.java deleted file mode 100644 index 1d3addf..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionVehicleMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Mapper -public interface InspectionVehicleMapper extends BaseMapper { - -} - 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 33a0fcb..89b04eb 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,24 +1,17 @@ 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 * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ @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/mapper/MkmjAreaGateMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjAreaGateMapper.java deleted file mode 100644 index 13f79fb..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjAreaGateMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.zcloud.primeport.domain.model.GateCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaGateDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Mapper -public interface MkmjAreaGateMapper extends BaseMapper { - - List listGateCountByPassageId(List ids); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjCarRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjCarRecordMapper.java deleted file mode 100644 index 98e8ea2..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjCarRecordMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.zcloud.primeport.domain.model.MkmjStatisticsE; -import com.zcloud.primeport.persistence.dataobject.MkmjCarRecordDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Mapper -public interface MkmjCarRecordMapper extends BaseMapper { - List statisticsByArea(@Param("ids") List ids); - - List statisticsByPassage(@Param("ids") List ids); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjAreaMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateMapper.java similarity index 52% rename from web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjAreaMapper.java rename to web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateMapper.java index 65fd4d0..70f97e5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjAreaMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateMapper.java @@ -1,17 +1,17 @@ package com.zcloud.primeport.persistence.mapper; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; import org.apache.ibatis.annotations.Mapper; /** * web-infrastructure * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 + * @Author makejava + * @Date 2026-03-05 11:33:18 */ @Mapper -public interface MkmjAreaMapper extends BaseMapper { +public interface MkmjGateMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateVideoMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateVideoMapper.java deleted file mode 100644 index bdb8624..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateVideoMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.zcloud.primeport.domain.model.VideoCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjGateVideoDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Mapper -public interface MkmjGateVideoMapper extends BaseMapper { - - List listVideoCountByAreaId(@Param("ids") List ids); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java new file mode 100644 index 0000000..fb52883 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java @@ -0,0 +1,27 @@ +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.MkmjDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:15 + */ +@Mapper +@DataScopes( + @DataScope(method = "listPage", menuPerms = "") +) +public interface MkmjMapper extends BaseMapper { + + IPage listPage(Page> page, Map parmas, String menuPerms); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java index f087683..1167cb0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java @@ -1,21 +1,17 @@ package com.zcloud.primeport.persistence.mapper; -import com.zcloud.primeport.domain.model.PassageCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - /** * web-infrastructure * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:19 */ @Mapper public interface MkmjPassageMapper extends BaseMapper { - List listPassageCountByAreaId(List ids); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjSwipeCardRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjSwipeCardRecordMapper.java deleted file mode 100644 index 86f7c8d..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjSwipeCardRecordMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.zcloud.primeport.domain.model.MkmjStatisticsE; -import com.zcloud.primeport.persistence.dataobject.MkmjSwipeCardRecordDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Mapper -public interface MkmjSwipeCardRecordMapper extends BaseMapper { - - List statisticsByArea(@Param("ids") List ids); - List statisticsByPassage(@Param("ids") List ids); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionDeptMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java similarity index 50% rename from web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionDeptMapper.java rename to web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java index 84fb469..6b14ab9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionDeptMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java @@ -1,17 +1,17 @@ package com.zcloud.primeport.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; +import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; import org.apache.ibatis.annotations.Mapper; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:07 + * @Author makejava + * @Date 2026-03-05 11:33:22 */ @Mapper -public interface InspectionDeptMapper extends BaseMapper { +public interface PersonApplyMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonMessageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonMessageMapper.java new file mode 100644 index 0000000..03c8e4f --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonMessageMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.PersonMessageDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Mapper +public interface PersonMessageMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessEntourageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessEntourageMapper.java deleted file mode 100644 index 6408a64..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessEntourageMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Mapper -public interface TemporaryAccessEntourageMapper extends BaseMapper { - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessMapper.java deleted file mode 100644 index baac596..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:14 - */ -@Mapper -public interface TemporaryAccessMapper extends BaseMapper { - -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/UserViewMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/UserViewMapper.java deleted file mode 100644 index ce808f4..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/UserViewMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.primeport.persistence.dataobject.UserViewDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * web-infrastructure - * User视图Mapper接口 - * @Author guoyuepeng - * @Date 2025-12-18 14:32:14 - */ -@Mapper -public interface UserViewMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EnclosedAreaMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java similarity index 51% rename from web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EnclosedAreaMapper.java rename to web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java index 2798581..edb2a16 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/EnclosedAreaMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java @@ -1,17 +1,17 @@ package com.zcloud.primeport.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.primeport.persistence.dataobject.EnclosedAreaDO; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import org.apache.ibatis.annotations.Mapper; /** * web-infrastructure * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 + * @Author makejava + * @Date 2026-03-05 11:33:23 */ @Mapper -public interface EnclosedAreaMapper extends BaseMapper { +public interface VehicleApplyMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditLogMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditLogMapper.java deleted file mode 100644 index dac51ce..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditLogMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zcloud.primeport.persistence.dataobject.VehicleAuditLogDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -@Mapper -public interface VehicleAuditLogMapper extends BaseMapper { - -} - 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 new file mode 100644 index 0000000..bd3c8e7 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +@Mapper +public interface VehicleAuditMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java index 1e9d5bd..81d0e53 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java @@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:08 + * @Author makejava + * @Date 2026-03-05 11:33:26 */ @Mapper public interface VehicleBlackMapper extends BaseMapper { diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java index b91f4e9..84e5b08 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java @@ -1,27 +1,17 @@ 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.VehicleCountByCorpDO; -import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Map; /** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:28 + */ @Mapper public interface VehicleMessageMapper extends BaseMapper { - IPage listCountFromCorp(Page> page, @Param("params") Map parmas); - - - IPage listFroViolations(Page> page, @Param("params") Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java index 996bb5e..9dd617b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java @@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Mapper public interface VehicleViolationsMapper extends BaseMapper { diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VideoMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VideoMapper.java new file mode 100644 index 0000000..0230ff6 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VideoMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.VideoDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:30 + */ +@Mapper +public interface VideoMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/EmployeeMessageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/EmployeeMessageRepository.java deleted file mode 100644 index a0e62bb..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/EmployeeMessageRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.EmployeeMessageDO; - -import java.util.Map; - -/** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-12-18 14:32:15 -*/ -public interface EmployeeMessageRepository extends BaseRepository { - PageResponse listPage(Map params); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/EnclosedAreaRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/EnclosedAreaRepository.java deleted file mode 100644 index b6c3b08..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/EnclosedAreaRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.primeport.persistence.dataobject.EnclosedAreaDO; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 - */ -public interface EnclosedAreaRepository extends BaseRepository { - PageResponse listPage(Map params); -} - 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 deleted file mode 100644 index e571154..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/GatePersonAuthLevelOneRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -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/InspectionDeptRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionDeptRepository.java deleted file mode 100644 index 98abd0b..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionDeptRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:08 - */ -public interface InspectionDeptRepository extends BaseRepository { - PageResponse listPage(Map parmas); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionVehicleRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionVehicleRepository.java deleted file mode 100644 index 61aa8a7..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionVehicleRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -public interface InspectionVehicleRepository extends BaseRepository { - PageResponse listPage(Map parmas); - - List queryInspectionVehicleByDeptId(Long deptId); -} - 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 097c39c..4a526b6 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 @@ -3,20 +3,15 @@ package com.zcloud.primeport.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; - -import java.util.List; import java.util.Map; /** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-11-14 10:09:22 -*/ + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:17 + */ public interface MkmjApprovalUserRepository extends BaseRepository { - PageResponse listPage(Map parmas); - - List listAll(Map parmas); - - List listDeptUser(Map qry); + PageResponse listPage(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjAreaGateRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjAreaGateRepository.java deleted file mode 100644 index 90d74fb..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjAreaGateRepository.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.zcloud.primeport.domain.model.GateCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaGateDO; -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -public interface MkmjAreaGateRepository extends BaseRepository { - PageResponse listPage(Map params); - - List listGateCountByPassageId(List ids); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjAreaRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjAreaRepository.java deleted file mode 100644 index 28ec519..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjAreaRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.zcloud.primeport.persistence.dataobject.MkmjAreaDO; -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -public interface MkmjAreaRepository extends BaseRepository { - PageResponse listPage(Map params); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjCarRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjCarRecordRepository.java deleted file mode 100644 index b948568..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjCarRecordRepository.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.zcloud.primeport.domain.model.MkmjStatisticsE; -import com.zcloud.primeport.persistence.dataobject.MkmjCarRecordDO; -import com.alibaba.cola.dto.PageResponse; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -public interface MkmjCarRecordRepository extends BaseRepository { - PageResponse listPage(Map params); - - List statisticsByArea(List ids); - - List statisticsByPassage(List ids); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateRepository.java new file mode 100644 index 0000000..b41b257 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateRepository.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:18 + */ +public interface MkmjGateRepository extends BaseRepository { + PageResponse listPage(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateVideoRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateVideoRepository.java deleted file mode 100644 index 0ca84a2..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateVideoRepository.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.zcloud.primeport.domain.model.VideoCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjGateVideoDO; -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -public interface MkmjGateVideoRepository extends BaseRepository { - PageResponse listPage(Map params); - - List listVideoCountByAreaId(List ids); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjPassageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjPassageRepository.java index 4b7ff3b..d588619 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjPassageRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjPassageRepository.java @@ -1,22 +1,17 @@ package com.zcloud.primeport.persistence.repository; -import com.zcloud.primeport.domain.model.PassageCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.List; +import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; import java.util.Map; /** * web-infrastructure * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:20 */ public interface MkmjPassageRepository extends BaseRepository { - PageResponse listPage(Map params); - - List listPassageCountByAreaId(List ids); + PageResponse listPage(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java new file mode 100644 index 0000000..f2d47db --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.MkmjDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ +public interface MkmjRepository extends BaseRepository { + PageResponse listPage(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjSwipeCardRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjSwipeCardRecordRepository.java deleted file mode 100644 index d1b08a3..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjSwipeCardRecordRepository.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.zcloud.primeport.domain.model.MkmjStatisticsE; -import com.zcloud.primeport.persistence.dataobject.MkmjSwipeCardRecordDO; -import com.alibaba.cola.dto.PageResponse; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.BaseRepository; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -public interface MkmjSwipeCardRecordRepository extends BaseRepository { - PageResponse listPage(Map params); - - List statisticsByArea(List ids); - - List statisticsByPassage(List ids); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java new file mode 100644 index 0000000..024c0c4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +public interface PersonApplyRepository extends BaseRepository { + PageResponse listPage(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonMessageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonMessageRepository.java new file mode 100644 index 0000000..8bab59a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonMessageRepository.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.PersonMessageDO; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +public interface PersonMessageRepository extends BaseRepository { + PageResponse listPage(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessEntourageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessEntourageRepository.java deleted file mode 100644 index c45a15d..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessEntourageRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -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.TemporaryAccessEntourageDO; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -public interface TemporaryAccessEntourageRepository extends BaseRepository { - PageResponse listPage(Map params); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessRepository.java deleted file mode 100644 index fb13683..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -public interface TemporaryAccessRepository extends BaseRepository { - PageResponse listPage(Map params); -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java new file mode 100644 index 0000000..73de20e --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:24 + */ +public interface VehicleApplyRepository extends BaseRepository { + PageResponse listPage(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditLogRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditLogRepository.java deleted file mode 100644 index a023501..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditLogRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -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.VehicleAuditLogDO; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 - */ -public interface VehicleAuditLogRepository extends BaseRepository { - PageResponse listPage(Map parmas); -} - 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 new file mode 100644 index 0000000..41c5528 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +public interface VehicleAuditRepository extends BaseRepository { + PageResponse listPage(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleBlackRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleBlackRepository.java index 49c81db..46170f1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleBlackRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleBlackRepository.java @@ -1,18 +1,17 @@ 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.VehicleBlackDO; - import java.util.Map; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:09 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ public interface VehicleBlackRepository extends BaseRepository { - PageResponse listPage(Map params); + PageResponse listPage(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java index ffbe292..42d4f0b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java @@ -1,46 +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.VehicleCountByCorpDO; -import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; -import java.util.List; import java.util.Map; - /** * web-infrastructure - * @Author guoyuepeng - * @Date 2025-11-15 11:41:21 + * + * @Author makejava + * @Date 2026-03-05 11:33:28 */ public interface VehicleMessageRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(Map parmas); +} - - PageResponse listCountFromCorp(Map parmas); - - - List listAll(Long [] ids); - - VehicleMessageDO getByLicenceNo(String licenceNo); - - PageResponse listPageFromViolations(Map parmas); - - /** - * 根据车牌号查询启用状态的数据数量 - * @param licenceNo 车牌号 - * @return 启用状态的数据数量，如果没有则返回0 - */ - int countEnabledByLicenceNo(String licenceNo); - - /** - * 根据用户ID查询该用户的车辆数量 - * @param userId 用户ID - * @return 车辆数量，如果没有则返回0 - */ - int countByUserId(Long userId); - -} \ No newline at end of file diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleStatusRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleStatusRepository.java deleted file mode 100644 index 558b8b6..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleStatusRepository.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; -import com.zcloud.primeport.persistence.mapper.VehicleMessageMapper; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -/** - * 车辆状态仓储类 - */ -@Repository -@RequiredArgsConstructor -public class VehicleStatusRepository { - - private final VehicleMessageMapper vehicleMessageMapper; - - /** - * 根据车牌号统计启用状态的车辆数量 - * @param licenceNo 车牌号 - * @return 启用状态的车辆数量 - */ - public int countEnabledByLicenceNo(String licenceNo) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("licence_no", licenceNo); - queryWrapper.eq("delete_enum", "FALSE"); - // 假设 isAudit 值为 2（审核通过）时表示启用状态 - queryWrapper.eq("is_audit", 2); - return vehicleMessageMapper.selectCount(queryWrapper).intValue(); - } -} \ No newline at end of file diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java index c4fae24..dc4e374 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java @@ -1,7 +1,6 @@ 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.VehicleViolationsDO; @@ -10,10 +9,10 @@ import java.util.Map; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ public interface VehicleViolationsRepository extends BaseRepository { - PageResponse listPage(Map params); + PageResponse listPage(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VideoRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VideoRepository.java new file mode 100644 index 0000000..2d29d2a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VideoRepository.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.VideoDO; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:31 + */ +public interface VideoRepository extends BaseRepository { + PageResponse listPage(Map parmas); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EmployeeMessageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EmployeeMessageRepositoryImpl.java deleted file mode 100644 index a74cf03..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EmployeeMessageRepositoryImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zcloud.primeport.persistence.repository.impl; - -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import com.zcloud.primeport.persistence.dataobject.EmployeeMessageDO; -import com.zcloud.primeport.persistence.mapper.EmployeeMessageCustomMapper; -import com.zcloud.primeport.persistence.mapper.EmployeeMessageMapper; -import com.zcloud.primeport.persistence.repository.EmployeeMessageRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import java.util.Map; - -/** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-12-18 14:32:15 -*/ -@Service -@RequiredArgsConstructor -public class EmployeeMessageRepositoryImpl extends BaseRepositoryImpl implements EmployeeMessageRepository { - private final EmployeeMessageMapper employeeMessageMapper; - private final EmployeeMessageCustomMapper employeeMessageCustomMapper; - - @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - // 使用自定义Mapper通过user视图和employee_message表关联查询 - IPage result = employeeMessageCustomMapper.selectPageFromUserView(iPage, params); - return PageHelper.pageToResponse(result, result.getRecords()); - } -} \ No newline at end of file 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 deleted file mode 100644 index b3febc9..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/GatePersonAuthLevelOneRepositoryImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -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/InspectionDeptRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionDeptRepositoryImpl.java deleted file mode 100644 index 718d435..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionDeptRepositoryImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -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.InspectionDeptDO; -import com.zcloud.primeport.persistence.mapper.InspectionDeptMapper; -import com.zcloud.primeport.persistence.repository.InspectionDeptRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:24:08 - */ -@Service -@RequiredArgsConstructor -public class InspectionDeptRepositoryImpl extends BaseRepositoryImpl implements InspectionDeptRepository { - private final InspectionDeptMapper inspectionDeptMapper; - - @Override - public PageResponse listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.select("inspection_dept.*", - "(SELECT COUNT(*) FROM inspection_vehicle WHERE inspection_vehicle.inspection_dept_id = inspection_dept.id)" + - " AS vehicle_count"); - queryWrapper.orderByDesc("create_time"); - IPage result = inspectionDeptMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionVehicleRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionVehicleRepositoryImpl.java deleted file mode 100644 index f5c635f..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionVehicleRepositoryImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -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.InspectionVehicleDO; -import com.zcloud.primeport.persistence.mapper.InspectionVehicleMapper; -import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-20 15:25:20 - */ -@Service -@RequiredArgsConstructor -public class InspectionVehicleRepositoryImpl extends BaseRepositoryImpl implements InspectionVehicleRepository { - private final InspectionVehicleMapper inspectionVehicleMapper; - - @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 = inspectionVehicleMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } - - @Override - public List queryInspectionVehicleByDeptId(Long deptId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("inspection_dept_id", deptId); - queryWrapper.orderByDesc("create_time"); - List list = inspectionVehicleMapper.selectList(queryWrapper); - return list; - } - - -} - 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 4609475..0bddd9e 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,27 +3,22 @@ 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; - +import com.zcloud.gbscommon.utils.Query; +import com.jjb.saas.framework.repository.common.PageHelper; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-14 10:09:22 + * @Author makejava + * @Date 2026-03-05 11:33:17 */ @Service @RequiredArgsConstructor @@ -33,40 +28,11 @@ 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("dept_id"); -// queryWrapper.orderByDesc("create_time"); - IPage result = mkmjApprovalUserMapper.listPage(iPage, parmas); -// IPage result = mkmjApprovalUserMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } - - @Override - public List 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); + IPage result = mkmjApprovalUserMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); } - - @Override - public List listDeptUser(Map qry) { - List data = mkmjApprovalUserMapper.listDeptUser(qry); - return data; - } - } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjAreaGateRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjAreaGateRepositoryImpl.java deleted file mode 100644 index cb41b2c..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjAreaGateRepositoryImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zcloud.primeport.persistence.repository.impl; - -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.primeport.domain.model.GateCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaGateDO; -import com.zcloud.primeport.persistence.mapper.MkmjAreaGateMapper; -import com.zcloud.primeport.persistence.repository.MkmjAreaGateRepository; -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Service -@RequiredArgsConstructor -public class MkmjAreaGateRepositoryImpl extends BaseRepositoryImpl implements MkmjAreaGateRepository { - private final MkmjAreaGateMapper mkmjAreaGateMapper; - - @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = mkmjAreaGateMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } - - @Override - public List listGateCountByPassageId(List ids){ - return mkmjAreaGateMapper.listGateCountByPassageId(ids); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjAreaRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjAreaRepositoryImpl.java deleted file mode 100644 index 3c4a3e5..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjAreaRepositoryImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zcloud.primeport.persistence.repository.impl; - -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.primeport.persistence.dataobject.MkmjAreaDO; -import com.zcloud.primeport.persistence.mapper.MkmjAreaMapper; -import com.zcloud.primeport.persistence.repository.MkmjAreaRepository; -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:42 - */ -@Service -@RequiredArgsConstructor -public class MkmjAreaRepositoryImpl extends BaseRepositoryImpl implements MkmjAreaRepository { - private final MkmjAreaMapper mkmjAreaMapper; - - @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.apply("FIELD(area_status, 1, 0, 2)") - .orderByDesc("create_time"); - IPage result = mkmjAreaMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjCarRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjCarRecordRepositoryImpl.java deleted file mode 100644 index be630f2..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjCarRecordRepositoryImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.persistence.repository.impl; - -import com.zcloud.primeport.domain.model.MkmjStatisticsE; -import com.zcloud.primeport.persistence.dataobject.MkmjCarRecordDO; -import com.zcloud.primeport.persistence.mapper.MkmjCarRecordMapper; -import com.zcloud.primeport.persistence.repository.MkmjCarRecordRepository; -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:09 - */ -@Service -@RequiredArgsConstructor -public class MkmjCarRecordRepositoryImpl extends BaseRepositoryImpl implements MkmjCarRecordRepository { - private final MkmjCarRecordMapper mkmjCarRecordMapper; - - @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = mkmjCarRecordMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } - - @Override - public List statisticsByArea(List ids){ - return mkmjCarRecordMapper.statisticsByArea(ids); - } - - @Override - public List statisticsByPassage(List ids){ - return mkmjCarRecordMapper.statisticsByPassage(ids); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditLogRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateRepositoryImpl.java similarity index 50% rename from web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditLogRepositoryImpl.java rename to web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateRepositoryImpl.java index 8e72cbf..72de42b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditLogRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateRepositoryImpl.java @@ -1,37 +1,37 @@ package com.zcloud.primeport.persistence.repository.impl; import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.gbscommon.utils.PageQueryHelper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import com.zcloud.gbscommon.utils.Query; -import com.zcloud.primeport.persistence.dataobject.VehicleAuditLogDO; -import com.zcloud.primeport.persistence.mapper.VehicleAuditLogMapper; -import com.zcloud.primeport.persistence.repository.VehicleAuditLogRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; +import com.zcloud.primeport.persistence.mapper.MkmjGateMapper; +import com.zcloud.primeport.persistence.repository.MkmjGateRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Map; +import java.util.Map; +import com.zcloud.gbscommon.utils.Query; +import com.jjb.saas.framework.repository.common.PageHelper; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-18 14:07:46 + * @Author makejava + * @Date 2026-03-05 11:33:18 */ @Service @RequiredArgsConstructor -public class VehicleAuditLogRepositoryImpl extends BaseRepositoryImpl implements VehicleAuditLogRepository { - private final VehicleAuditLogMapper vehicleAuditLogMapper; +public class MkmjGateRepositoryImpl extends BaseRepositoryImpl implements MkmjGateRepository { + private final MkmjGateMapper mkmjGateMapper; @Override - public PageResponse listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); - QueryWrapper queryWrapper = new QueryWrapper<>(); + 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 = vehicleAuditLogMapper.selectPage(iPage, queryWrapper); + IPage result = mkmjGateMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateVideoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateVideoRepositoryImpl.java deleted file mode 100644 index 60f17f7..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateVideoRepositoryImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.zcloud.primeport.persistence.repository.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.primeport.domain.model.VideoCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjGateVideoDO; -import com.zcloud.primeport.persistence.mapper.MkmjGateVideoMapper; -import com.zcloud.primeport.persistence.repository.MkmjGateVideoRepository; -import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Service -@RequiredArgsConstructor -public class MkmjGateVideoRepositoryImpl extends BaseRepositoryImpl implements MkmjGateVideoRepository { - private final MkmjGateVideoMapper mkmjGateVideoMapper; - - @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = mkmjGateVideoMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } - - @Override - public List listVideoCountByAreaId(List ids){ - return mkmjGateVideoMapper.listVideoCountByAreaId(ids); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjPassageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjPassageRepositoryImpl.java index 7d6a024..52d8ba6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjPassageRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjPassageRepositoryImpl.java @@ -1,28 +1,24 @@ package com.zcloud.primeport.persistence.repository.impl; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.primeport.domain.model.PassageCountE; -import com.zcloud.primeport.domain.model.VideoCountE; -import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; -import com.zcloud.primeport.persistence.mapper.MkmjPassageMapper; -import com.zcloud.primeport.persistence.repository.MkmjPassageRepository; import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; +import com.zcloud.primeport.persistence.mapper.MkmjPassageMapper; +import com.zcloud.primeport.persistence.repository.MkmjPassageRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.List; import java.util.Map; - +import com.zcloud.gbscommon.utils.Query; +import com.jjb.saas.framework.repository.common.PageHelper; /** * web-infrastructure * - * @Author fangjiakai - * @Date 2025-11-14 08:57:45 + * @Author makejava + * @Date 2026-03-05 11:33:20 */ @Service @RequiredArgsConstructor @@ -30,18 +26,13 @@ public class MkmjPassageRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { - IPage iPage = new Query().getPage(params); + public PageResponse listPage(Map parmas) { + IPage iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); queryWrapper.orderByDesc("create_time"); IPage result = mkmjPassageMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } - - @Override - public List listPassageCountByAreaId(List ids){ - return mkmjPassageMapper.listPassageCountByAreaId(ids); - } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java new file mode 100644 index 0000000..55997fb --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java @@ -0,0 +1,43 @@ +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.MkmjDO; +import com.zcloud.primeport.persistence.mapper.MkmjMapper; +import com.zcloud.primeport.persistence.repository.MkmjRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ +@Service +@RequiredArgsConstructor +public class MkmjRepositoryImpl extends BaseRepositoryImpl implements MkmjRepository { + private final MkmjMapper mkmjMapper; + + @Override + public PageResponse 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 iPage = mkmjMapper.listPage(page, parmas, menuPerms); +// IPage result = mkmjMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(iPage, iPage.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjSwipeCardRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjSwipeCardRecordRepositoryImpl.java deleted file mode 100644 index 7f8ae12..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjSwipeCardRecordRepositoryImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.zcloud.primeport.persistence.repository.impl; - -import com.zcloud.primeport.domain.model.MkmjStatisticsE; -import com.zcloud.primeport.persistence.dataobject.MkmjSwipeCardRecordDO; -import com.zcloud.primeport.persistence.mapper.MkmjSwipeCardRecordMapper; -import com.zcloud.primeport.persistence.repository.MkmjSwipeCardRecordRepository; -import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-17 13:42:10 - */ -@Service -@RequiredArgsConstructor -public class MkmjSwipeCardRecordRepositoryImpl extends BaseRepositoryImpl implements MkmjSwipeCardRecordRepository { - private final MkmjSwipeCardRecordMapper mkmjSwipeCardRecordMapper; - - @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = mkmjSwipeCardRecordMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } - - @Override - public List statisticsByArea(List ids){ - return mkmjSwipeCardRecordMapper.statisticsByArea(ids); - } - @Override - public List statisticsByPassage(List ids){ - return mkmjSwipeCardRecordMapper.statisticsByPassage(ids); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java new file mode 100644 index 0000000..d4c445a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java @@ -0,0 +1,38 @@ +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.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import com.zcloud.primeport.persistence.mapper.PersonApplyMapper; +import com.zcloud.primeport.persistence.repository.PersonApplyRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; +import com.zcloud.gbscommon.utils.Query; +import com.jjb.saas.framework.repository.common.PageHelper; +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@Service +@RequiredArgsConstructor +public class PersonApplyRepositoryImpl extends BaseRepositoryImpl implements PersonApplyRepository { + private final PersonApplyMapper personApplyMapper; + + @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 = personApplyMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonMessageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonMessageRepositoryImpl.java new file mode 100644 index 0000000..76052e5 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonMessageRepositoryImpl.java @@ -0,0 +1,38 @@ +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.primeport.persistence.dataobject.PersonMessageDO; +import com.zcloud.primeport.persistence.mapper.PersonMessageMapper; +import com.zcloud.primeport.persistence.repository.PersonMessageRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.zcloud.gbscommon.utils.Query; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Service +@RequiredArgsConstructor +public class PersonMessageRepositoryImpl extends BaseRepositoryImpl implements PersonMessageRepository { + private final PersonMessageMapper personMessageMapper; + + @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 = personMessageMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessEntourageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessEntourageRepositoryImpl.java deleted file mode 100644 index dbb8157..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessEntourageRepositoryImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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.TemporaryAccessEntourageDO; -import com.zcloud.primeport.persistence.mapper.TemporaryAccessEntourageMapper; -import com.zcloud.primeport.persistence.repository.TemporaryAccessEntourageRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:16 - */ -@Service -@RequiredArgsConstructor -public class TemporaryAccessEntourageRepositoryImpl extends BaseRepositoryImpl implements TemporaryAccessEntourageRepository { - private final TemporaryAccessEntourageMapper temporaryAccessEntourageMapper; - - @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = temporaryAccessEntourageMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessRepositoryImpl.java deleted file mode 100644 index 3f56dd5..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessRepositoryImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -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.TemporaryAccessDO; -import com.zcloud.primeport.persistence.mapper.TemporaryAccessMapper; -import com.zcloud.primeport.persistence.repository.TemporaryAccessRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * web-infrastructure - * - * @Author guoyuepeng - * @Date 2025-11-24 08:50:15 - */ -@Service -@RequiredArgsConstructor -public class TemporaryAccessRepositoryImpl extends BaseRepositoryImpl implements TemporaryAccessRepository { - private final TemporaryAccessMapper temporaryAccessMapper; - - @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - IPage result = temporaryAccessMapper.selectPage(iPage, queryWrapper); - return PageHelper.pageToResponse(result, result.getRecords()); - } -} - diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EnclosedAreaRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java similarity index 54% rename from web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EnclosedAreaRepositoryImpl.java rename to web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java index 86049c3..f1f30c7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EnclosedAreaRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java @@ -7,9 +7,9 @@ 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.EnclosedAreaDO; -import com.zcloud.primeport.persistence.mapper.EnclosedAreaMapper; -import com.zcloud.primeport.persistence.repository.EnclosedAreaRepository; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import com.zcloud.primeport.persistence.mapper.VehicleApplyMapper; +import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,21 +18,21 @@ import java.util.Map; /** * web-infrastructure * - * @Author fangjiakai - * @Date 2025-12-12 16:49:31 + * @Author makejava + * @Date 2026-03-05 11:33:24 */ @Service @RequiredArgsConstructor -public class EnclosedAreaRepositoryImpl extends BaseRepositoryImpl implements EnclosedAreaRepository { - private final EnclosedAreaMapper enclosedAreaMapper; +public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl implements VehicleApplyRepository { + private final VehicleApplyMapper vehicleApplyMapper; @Override - public PageResponse listPage(Map params) { - IPage iPage = new Query().getPage(params); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + 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 = enclosedAreaMapper.selectPage(iPage, queryWrapper); + IPage result = vehicleApplyMapper.selectPage(iPage, queryWrapper); 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 new file mode 100644 index 0000000..e1530a4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.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.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; +import com.zcloud.primeport.persistence.mapper.VehicleAuditMapper; +import com.zcloud.primeport.persistence.repository.VehicleAuditRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.zcloud.gbscommon.utils.Query; +import com.jjb.saas.framework.repository.common.PageHelper; + + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:25 + */ +@Service +@RequiredArgsConstructor +public class VehicleAuditRepositoryImpl extends BaseRepositoryImpl implements VehicleAuditRepository { + private final VehicleAuditMapper vehicleAuditMapper; + + @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 = vehicleAuditMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleBlackRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleBlackRepositoryImpl.java index d7a9af4..b469c70 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleBlackRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleBlackRepositoryImpl.java @@ -1,26 +1,25 @@ package com.zcloud.primeport.persistence.repository.impl; - import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; 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.primeport.persistence.dataobject.VehicleBlackDO; import com.zcloud.primeport.persistence.mapper.VehicleBlackMapper; import com.zcloud.primeport.persistence.repository.VehicleBlackRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.gbscommon.utils.PageQueryHelper; import java.util.Map; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:09 + * @Author makejava + * @Date 2026-03-05 11:33:27 */ @Service @RequiredArgsConstructor @@ -28,10 +27,10 @@ public class VehicleBlackRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { - IPage iPage = new Query().getPage(params); + public PageResponse listPage(Map parmas) { + IPage iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); queryWrapper.orderByDesc("create_time"); IPage result = vehicleBlackMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java index 7046087..19ca1c9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java @@ -3,93 +3,37 @@ 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.persistence.dataobject.VehicleCountByCorpDO; -import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import com.zcloud.primeport.persistence.mapper.VehicleMessageMapper; import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.List; import java.util.Map; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.gbscommon.utils.PageQueryHelper; /** -* web-infrastructure -* @Author guoyuepeng -* @Date 2025-11-15 11:41:21 -*/ + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:28 + */ @Service @RequiredArgsConstructor public class VehicleMessageRepositoryImpl extends BaseRepositoryImpl implements VehicleMessageRepository { private final VehicleMessageMapper vehicleMessageMapper; @Override - public PageResponse listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); + public PageResponse listPage(Map parmas) { + IPage iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByAsc("is_audit"); + queryWrapper.orderByDesc("create_time"); IPage result = vehicleMessageMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } - - @Override - public PageResponse listCountFromCorp(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),Integer.parseInt(parmas.get("pageSize").toString())); - IPage iPage = vehicleMessageMapper.listCountFromCorp(page, parmas); - return PageHelper.pageToResponse(iPage, iPage.getRecords()); - } - - @Override - public List listAll(Long[] ids) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("id", ids); - return vehicleMessageMapper.selectList(queryWrapper); - } - - @Override - public VehicleMessageDO getByLicenceNo(String licenceNo) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("licence_no", licenceNo); - queryWrapper.eq("delete_enum", "FALSE"); - return vehicleMessageMapper.selectOne(queryWrapper); - } - - /** - * 获取车辆违规记录数量 - * @param parmas - * @return - */ - @Override - public PageResponse listPageFromViolations(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),Integer.parseInt(parmas.get("pageSize").toString())); - IPage iPage = vehicleMessageMapper.listFroViolations(page, parmas); - return PageHelper.pageToResponse(iPage, iPage.getRecords()); - } - - @Override - public int countEnabledByLicenceNo(String licenceNo) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("licence_no", licenceNo); - queryWrapper.eq("delete_enum", "FALSE"); - // 假设 isAudit 值为 2（审核通过）时表示启用状态 - queryWrapper.eq("is_status", 1); - return vehicleMessageMapper.selectCount(queryWrapper).intValue(); - } - - @Override - public int countByUserId(Long userId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("employee_vehicle_user_id", userId); - queryWrapper.eq("delete_enum", "FALSE"); - queryWrapper.eq("is_status", 1); - return vehicleMessageMapper.selectCount(queryWrapper).intValue(); - } - } + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java index 3dca26e..00c3ff9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java @@ -1,11 +1,12 @@ package com.zcloud.primeport.persistence.repository.impl; + import com.alibaba.cola.dto.PageResponse; -import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; 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.VehicleViolationsDO; import com.zcloud.primeport.persistence.mapper.VehicleViolationsMapper; import com.zcloud.primeport.persistence.repository.VehicleViolationsRepository; @@ -17,8 +18,8 @@ import java.util.Map; /** * web-infrastructure * - * @Author guoyuepeng - * @Date 2025-11-21 16:34:29 + * @Author makejava + * @Date 2026-03-05 11:33:29 */ @Service @RequiredArgsConstructor @@ -26,10 +27,10 @@ public class VehicleViolationsRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { - IPage iPage = new Query().getPage(params); + public PageResponse listPage(Map parmas) { + IPage iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); queryWrapper.orderByDesc("create_time"); IPage result = vehicleViolationsMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VideoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VideoRepositoryImpl.java new file mode 100644 index 0000000..ba54d21 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VideoRepositoryImpl.java @@ -0,0 +1,39 @@ +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.VideoDO; +import com.zcloud.primeport.persistence.mapper.VideoMapper; +import com.zcloud.primeport.persistence.repository.VideoRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author makejava + * @Date 2026-03-05 11:33:31 + */ +@Service +@RequiredArgsConstructor +public class VideoRepositoryImpl extends BaseRepositoryImpl implements VideoRepository { + private final VideoMapper videoMapper; + + @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 = videoMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/resources/TableCreationDDL.sql b/web-infrastructure/src/main/resources/TableCreationDDL.sql index c0a9f9f..df57bc6 100644 --- a/web-infrastructure/src/main/resources/TableCreationDDL.sql +++ b/web-infrastructure/src/main/resources/TableCreationDDL.sql @@ -1,36 +1,330 @@ -CREATE TABLE `metric` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `user_id` varchar(64) NOT NULL COMMENT '域账号', - `main_metric` varchar(64) NOT NULL COMMENT '主度量', - `sub_metric` varchar(64) NOT NULL COMMENT '度量项', - `metric_item` json DEFAULT NULL COMMENT '度量项内容', - `creator` varchar(64) NOT NULL COMMENT '创建人', - `modifier` varchar(64) NOT NULL COMMENT '修改人', - `gmt_create` datetime NOT NULL COMMENT '创建时间', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `is_deleted` char(1) NOT NULL DEFAULT 'n' COMMENT '逻辑删除', - PRIMARY KEY (`id`), - KEY `idx_username` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8mb4 COMMENT='度量表'; - -CREATE TABLE `user_profile` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `user_id` varchar(64) NOT NULL COMMENT '工号', - `user_name` varchar(64) NOT NULL COMMENT '名字', - `dep` varchar(128) NOT NULL COMMENT '部门', - `role` varchar(6) NOT NULL COMMENT '角色', - `total_score` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '综合得分', - `app_quality_score` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '代码质量分', - `tech_influence_score` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '技术影响力分', - `tech_contribution_score` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '技术贡献分', - `dev_quality_score` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '开发质量分', - `checkin_code_quantity` decimal(9,2) NOT NULL DEFAULT '0.00' COMMENT 'checkin代码量', - `is_manager` char(1) DEFAULT NULL COMMENT '是否主管', - `creator` varchar(64) NOT NULL COMMENT '创建人', - `modifier` varchar(64) NOT NULL COMMENT '修改人', - `gmt_create` datetime NOT NULL COMMENT '创建时间', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `is_deleted` char(1) NOT NULL DEFAULT 'n' COMMENT '逻辑删除', - PRIMARY KEY (`id`), - KEY `idx_user_id` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8mb4 COMMENT='用户Profile表'; +CREATE TABLE `mkmj` ( + `id` bigint NOT NULL COMMENT '主键', + `hg_auth_area` varchar(255) DEFAULT NULL COMMENT '所属港区', + `hg_auth_area_name` varchar(255) DEFAULT NULL COMMENT '所属港区名称', + `mkmj_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '口门名称', + `mkmj_level` int DEFAULT NULL COMMENT '口门级别 1-一级 2-二级', + `mkmj_type` varchar(32) DEFAULT NULL COMMENT '口门类型 1-人行 2-车行 3-综合', + `mkmj_type_name` varchar(255) DEFAULT NULL COMMENT '口门类型名称1-人行 2-车行 3-综合', + `mkmj_status` int DEFAULT NULL COMMENT '口门状态 1-停用 2-正常', + `in_direction_area` bigint DEFAULT NULL COMMENT '入方向区域- 二级有用', + `in_direction_area_name` bigint DEFAULT NULL COMMENT '入方向区域名称- 二级有用', + `out_direction_area` bigint DEFAULT NULL COMMENT '出方向区域- 二级有用', + `out_direction_area_name` bigint DEFAULT NULL COMMENT '出方向区域名称- 二级有用', + `longitude` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '经度', + `latitude` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '纬度', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '删除标识true false', + `remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `org_id` bigint DEFAULT NULL COMMENT '单位id', + `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '版本', + `create_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建时间', + `update_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '修改时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人id', + `update_id` bigint DEFAULT NULL COMMENT '修改人id', + `env` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='门口信息管理表'; +CREATE TABLE `mkmj_approval_user` ( + `id` bigint NOT NULL COMMENT '主键ID', + `corp_id` bigint DEFAULT NULL COMMENT '审批人企业id', + `corp_name` varchar(255) DEFAULT NULL COMMENT '审批人企业名称', + `dept_id` bigint DEFAULT NULL COMMENT '审批人部门id', + `dept_name` varchar(255) DEFAULT NULL COMMENT '审批人部门名称', + `user_id` bigint DEFAULT NULL COMMENT '审批人id', + `user_name` varchar(255) DEFAULT NULL COMMENT '审批人名称', + `personnel_permission_flag` int DEFAULT NULL COMMENT '人员审核权限(1-无权限,2-有权限)', + `vehicle_permission_flag` int DEFAULT NULL COMMENT '车辆审核权限(1-无权限,2-有权限)', + `temporary_permission_flag` int DEFAULT NULL COMMENT '临时审核权限(1-无权限,2-有权限)', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '删除标识true false', + `remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', + `create_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `org_id` bigint DEFAULT NULL COMMENT '单位id', + `version` int DEFAULT NULL COMMENT '版本', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人id', + `update_id` bigint DEFAULT NULL COMMENT '修改人id', + `env` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='一级口门门禁审批人'; +CREATE TABLE `mkmj_gate` ( + `id` bigint NOT NULL COMMENT '主键', + `mkmj_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '口门区域id', + `passage_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '通道id', + `gate_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '闸机标识', + `gate_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '闸机名称', + `gate_type` varchar(32) DEFAULT NULL COMMENT '闸机类型', + `gate_type_name` varchar(32) DEFAULT NULL COMMENT '闸机类型名称', + `gate_status` int DEFAULT NULL COMMENT '闸机状态 1- 停用 2-正常', + `gate_category` varchar(32) DEFAULT NULL COMMENT '闸机类别', + `gate_category_name` varchar(255) DEFAULT NULL COMMENT '闸机类别名称', + `gate_model` varchar(255) DEFAULT NULL COMMENT '闸机型号', + `gate_position` varchar(255) DEFAULT NULL COMMENT '闸机位置', + `longitude` varchar(255) DEFAULT NULL COMMENT '经度', + `latitude` varchar(255) DEFAULT NULL COMMENT '纬度', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '删除标识true false', + `remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `org_id` bigint DEFAULT NULL COMMENT '单位id', + `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '版本', + `create_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建时间', + `update_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '修改时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人id', + `update_id` bigint DEFAULT NULL COMMENT '修改人id', + `env` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='门口闸机表'; +CREATE TABLE `mkmj_passage` ( + `id` bigint NOT NULL COMMENT '主键', + `passage_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '通道名称', + `passage_type` int DEFAULT NULL COMMENT '通道类型 1-人行 2-车行 3-综合', + `passage_status` int DEFAULT NULL COMMENT '通道状态 1-停用 2-正常', + `mkmj_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '口门区域id', + `longitude` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '经度', + `latitude` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '纬度', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '删除标识true false', + `remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `org_id` bigint DEFAULT NULL COMMENT '单位id', + `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '版本', + `create_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建时间', + `update_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '修改时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人id', + `update_id` bigint DEFAULT NULL COMMENT '修改人id', + `env` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='口门门禁通道表'; +CREATE TABLE `person_apply` ( + `id` bigint NOT NULL COMMENT 'id', + `person_belong_type` smallint unsigned DEFAULT NULL COMMENT '1股份2分公司3相关方4临时人员', + `gate_level_auth_area` json DEFAULT NULL COMMENT '授权范围港区与区域', + `audit_flag` int DEFAULT NULL COMMENT '审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)', + `mkmj_permission` int DEFAULT NULL COMMENT '进出港权限(1:有 2：无)', + `visit_start_time` date DEFAULT NULL COMMENT '访问起始时间', + `visit_end_time` date DEFAULT NULL COMMENT '访问结束时间', + `person_corp_id` bigint DEFAULT NULL COMMENT '待审批人员所属企业ID', + `person_corp_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '待审批人员所属企业名称', + `person_department_id` bigint DEFAULT NULL COMMENT '待审批人员所属部门id', + `person_department_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '待审批人员部门名称', + `employee_person_user_id` bigint DEFAULT NULL COMMENT '待审批人员id', + `employee_person_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '待审批人员姓名', + `user_face_url` varchar(255) DEFAULT NULL COMMENT '头像', + `user_phone` varchar(255) DEFAULT NULL COMMENT '手机号', + `user_card` varchar(32) DEFAULT NULL COMMENT '身份证号码', + `inform_sign_id` bigint DEFAULT NULL COMMENT '告知签字', + `project_id` bigint DEFAULT NULL COMMENT '项目id', + `project_name` varchar(255) DEFAULT NULL COMMENT '项目名称', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'FALSE' COMMENT '删除标识', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人ID', + `update_id` bigint DEFAULT NULL COMMENT '更新人ID', + `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'PROD' COMMENT '环境标识', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户ID', + `org_id` bigint DEFAULT NULL COMMENT '组织ID', + `version` int DEFAULT '0' COMMENT '版本号', + `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '来访事由', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='人员申请审批信息'; +CREATE TABLE `person_message` ( + `id` bigint unsigned NOT NULL COMMENT 'id', + `person_apply_id` bigint DEFAULT NULL COMMENT '人员申请id', + `person_belong_type` smallint unsigned DEFAULT NULL COMMENT '1股份2分公司3相关方4临时人员', + `user_face_url` varchar(255) DEFAULT NULL COMMENT '头像', + `user_card` varchar(32) DEFAULT NULL COMMENT '身份证号码', + `gate_level_auth_area` json DEFAULT NULL COMMENT '授权范围港区与区域', + `visit_start_time` date DEFAULT NULL COMMENT '授权访问起始时间', + `visit_end_time` date DEFAULT NULL COMMENT '授权访问结束时间', + `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '备注', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'FALSE' COMMENT '删除标识', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人ID', + `update_id` bigint DEFAULT NULL COMMENT '更新人ID', + `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'PROD' COMMENT '环境标识', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户ID', + `org_id` bigint DEFAULT NULL COMMENT '组织ID', + `version` int DEFAULT NULL COMMENT '版本号', + `sync_status` smallint DEFAULT NULL COMMENT '对接状态，1对接完成，2未对接', + `sync_remarks` text COMMENT '对接说明', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='审批通过的人员信息用于与门禁系统对接'; +CREATE TABLE `vehicle_apply` ( + `id` bigint NOT NULL COMMENT 'id', + `status_flag` int DEFAULT NULL COMMENT '车辆状态(1未启用,2启用)', + `licence_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车牌类型数据字典', + `licence_type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌', + `licence_no` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车牌号', + `vehicle_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆类型', + `vehicle_type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆类型-名字', + `vehicle_belong_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆', + `gate_level_auth_area` json DEFAULT NULL COMMENT '授权范围港区与区域', + `audit_flag` int DEFAULT NULL COMMENT '审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)', + `mkmj_permission` int DEFAULT NULL COMMENT '进出港权限(1:有 2：无)', + `visit_start_time` date DEFAULT NULL COMMENT '访问起始时间', + `visit_end_time` date DEFAULT NULL COMMENT '访问结束时间', + `vehicle_corp_id` bigint DEFAULT NULL COMMENT '车辆所属企业ID', + `vehicle_corp_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆所属企业名称', + `vehicle_department_id` bigint DEFAULT NULL COMMENT '车辆所属部门id', + `vehicle_department_name` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆所属部门名称', + `employee_vehicle_user_id` bigint DEFAULT NULL COMMENT '车辆所属人id(员工车辆/驾驶人id)', + `employee_vehicle_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆所属人姓名(员工车辆/驾驶人名称)', + `emission_standards` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '排放标准名称', + `emission_standards_name` varchar(255) DEFAULT NULL COMMENT '排放标准:\r\nlevel1 -> 国一\r\nlevel2 -> 国二\r\nlevel3 -> 国三\r\nlevel4 -> 国四\r\nlevel5 -> 国五\r\nlevel6 -> 国六', + `driving_license_id` bigint DEFAULT NULL COMMENT '行驶证照片', + `attachment_id` bigint DEFAULT NULL COMMENT '车辆照片', + `inform_sign_id` bigint DEFAULT NULL COMMENT '告知签字', + `project_id` bigint DEFAULT NULL COMMENT '项目id', + `project_name` varchar(255) DEFAULT NULL COMMENT '项目名称', + `blocked_flag` smallint DEFAULT NULL COMMENT '1被拉黑2未拉黑', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'FALSE' COMMENT '删除标识', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人ID', + `update_id` bigint DEFAULT NULL COMMENT '更新人ID', + `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'PROD' COMMENT '环境标识', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户ID', + `org_id` bigint DEFAULT NULL COMMENT '组织ID', + `version` int DEFAULT '0' COMMENT '版本号', + `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '备注', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='车辆申请审批信息'; +CREATE TABLE `vehicle_audit` ( + `id` bigint NOT NULL COMMENT 'id', + `vehicle_apply_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆申请id', + `batch_type` int DEFAULT NULL COMMENT '审批批次(1.普通车辆.2危险化学品车辆)', + `batch_state` int DEFAULT NULL COMMENT '审批状态(1,申请;2.更新)', + `audit_user_id` bigint DEFAULT NULL COMMENT '审批人id', + `audit_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审批人姓名', + `audit_dept_id` bigint DEFAULT NULL COMMENT '审批部门id', + `audit_dept_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审批部门名称', + `audit_corp_id` bigint DEFAULT NULL COMMENT '审批人企业id', + `audit_corp_name` varchar(255) DEFAULT NULL COMMENT '审批人企业名称', + `audit_status` int DEFAULT NULL COMMENT '审批状态(1,未开始,2通过,3不通过)', + `change_after` json DEFAULT NULL COMMENT '待审核信息', + `change_before` json DEFAULT NULL COMMENT '变更前信息', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'FALSE' COMMENT '删除标识', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人ID', + `update_id` bigint DEFAULT NULL COMMENT '更新人ID', + `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'PROD' COMMENT '环境标识', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户ID', + `org_id` bigint DEFAULT NULL COMMENT '组织ID', + `version` int unsigned DEFAULT NULL COMMENT '版本号', + `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '备注', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='车辆审批'; +CREATE TABLE `vehicle_black` ( + `id` bigint NOT NULL COMMENT 'id', + `vehicle_id` bigint DEFAULT NULL COMMENT '车辆信息表（vehicle_apply）的主键id', + `employee_vehicle_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆所属人姓名（临时车）', + `licence_no` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车牌号', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'FALSE' COMMENT '删除标识', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人ID', + `update_id` bigint DEFAULT NULL COMMENT '更新人ID', + `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'PROD' COMMENT '环境标识', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户ID', + `org_id` bigint DEFAULT NULL COMMENT '组织ID', + `version` int DEFAULT '0' COMMENT '版本号', + `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '备注', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='车辆黑名单管理'; +CREATE TABLE `vehicle_message` ( + `id` bigint NOT NULL COMMENT 'id', + `licence_type` varchar(255) DEFAULT NULL COMMENT '车牌类型数据字典', + `licence_type_name` varchar(255) DEFAULT NULL COMMENT '车牌类型名称 白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌', + `licence_no` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车牌号', + `vehicle_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆类型', + `vehicle_type_name` varchar(50) DEFAULT NULL COMMENT '车辆类型-名字', + `vehicle_belong_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆', + `gate_level_auth_area` json DEFAULT NULL COMMENT '授权范围港区与区域', + `visit_start_time` date DEFAULT NULL COMMENT '授权访问起始时间', + `visit_end_time` date DEFAULT NULL COMMENT '授权访问结束时间', + `vehicle_apply_id` bigint DEFAULT NULL COMMENT '车辆申请id', + `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '备注', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'FALSE' COMMENT '删除标识', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人ID', + `update_id` bigint DEFAULT NULL COMMENT '更新人ID', + `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'PROD' COMMENT '环境标识', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户ID', + `org_id` bigint DEFAULT NULL COMMENT '组织ID', + `version` int DEFAULT NULL COMMENT '版本号', + `sync_status` smallint DEFAULT NULL COMMENT '对接状态，1对接完成，2未对接', + `sync_remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '对接说明', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='审批通过的固化车辆信息用于与门禁系统对接'; +CREATE TABLE `vehicle_violations` ( + `id` bigint NOT NULL COMMENT '车辆违规记录id', + `vehicle_id` bigint DEFAULT NULL COMMENT '车辆信息表（vehicle_apply）的主键id', + `employee_vehicle_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车辆所属人姓名（临时车）', + `licence_no` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '车牌号', + `violation_type` varchar(255) DEFAULT NULL COMMENT '违规类型', + `violation_type_name` varchar(255) DEFAULT NULL COMMENT '违规类型名称', + `location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '违规区域（位置）', + `illegal_images_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '违规图片的存储路径', + `describe_message` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '违规说明', + `violationtime` datetime DEFAULT NULL COMMENT '违规时间', + `violation_processing_status` smallint DEFAULT NULL COMMENT '违规处理状态，1已处理2未处理', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'FALSE' COMMENT '删除标识', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人ID', + `update_id` bigint DEFAULT NULL COMMENT '更新人ID', + `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'PROD' COMMENT '环境标识', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户ID', + `org_id` bigint DEFAULT NULL COMMENT '组织ID', + `version` int DEFAULT '0' COMMENT '版本号', + `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '备注', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='车辆违规记录'; +CREATE TABLE `video` ( + `id` bigint NOT NULL COMMENT '主键', + `foreign_id` bigint DEFAULT NULL COMMENT '口门/闸机id 外键id ', + `device_type` int DEFAULT NULL COMMENT '设备类型（1-口门 2-闸机）', + `video_resource_id` varchar(32) DEFAULT NULL COMMENT '摄像头id', + `video_resource_name` varchar(50) DEFAULT NULL COMMENT '摄像头名称', + `video_type` smallint DEFAULT NULL COMMENT '摄像头类型（1-移动 2-平台）', + `longitude` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '经度', + `latitude` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '纬度', + `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '删除标识true false', + `remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', + `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `org_id` bigint DEFAULT NULL COMMENT '单位id', + `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '版本', + `create_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建时间', + `update_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '修改时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人id', + `update_id` bigint DEFAULT NULL COMMENT '修改人id', + `env` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='摄像头表'; \ No newline at end of file diff --git a/web-infrastructure/src/main/resources/mapper/EmployeeMessageCustomMapper.xml b/web-infrastructure/src/main/resources/mapper/EmployeeMessageCustomMapper.xml deleted file mode 100644 index 49d7121..0000000 --- a/web-infrastructure/src/main/resources/mapper/EmployeeMessageCustomMapper.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/EmployeeMessageMapper.xml b/web-infrastructure/src/main/resources/mapper/EmployeeMessageMapper.xml deleted file mode 100644 index 339c8c5..0000000 --- a/web-infrastructure/src/main/resources/mapper/EmployeeMessageMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/GatePersonAuthLevelOneMapper.xml b/web-infrastructure/src/main/resources/mapper/GatePersonAuthLevelOneMapper.xml deleted file mode 100644 index ab6ac78..0000000 --- a/web-infrastructure/src/main/resources/mapper/GatePersonAuthLevelOneMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/InspectionVehicleMapper.xml b/web-infrastructure/src/main/resources/mapper/InspectionVehicleMapper.xml deleted file mode 100644 index 38dcb3c..0000000 --- a/web-infrastructure/src/main/resources/mapper/InspectionVehicleMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/MkmjAreaMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml similarity index 92% rename from web-infrastructure/src/main/resources/mapper/MkmjAreaMapper.xml rename to web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml index 6bb1f5b..de9226e 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjAreaMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml @@ -2,7 +2,7 @@ - + diff --git a/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserMapper.xml deleted file mode 100644 index dfe42fa..0000000 --- a/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/MkmjAreaGateMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjAreaGateMapper.xml deleted file mode 100644 index f1a1f44..0000000 --- a/web-infrastructure/src/main/resources/mapper/MkmjAreaGateMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/MkmjCarRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjCarRecordMapper.xml deleted file mode 100644 index 2d700d6..0000000 --- a/web-infrastructure/src/main/resources/mapper/MkmjCarRecordMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/MkmjDO.xml b/web-infrastructure/src/main/resources/mapper/MkmjDO.xml new file mode 100644 index 0000000..aeeaf68 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/MkmjDO.xml @@ -0,0 +1,50 @@ + + + + + + + + diff --git a/web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml similarity index 68% rename from web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml rename to web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml index 694a1fc..2f01fc9 100644 --- a/web-infrastructure/src/main/resources/mybatis/RiskPointMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml @@ -2,6 +2,7 @@ - + + diff --git a/web-infrastructure/src/main/resources/mapper/MkmjGateVideoMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjGateVideoMapper.xml deleted file mode 100644 index df6e38d..0000000 --- a/web-infrastructure/src/main/resources/mapper/MkmjGateVideoMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/EnclosedAreaMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjPassageDO.xml similarity index 67% rename from web-infrastructure/src/main/resources/mapper/EnclosedAreaMapper.xml rename to web-infrastructure/src/main/resources/mapper/MkmjPassageDO.xml index 4db1ba1..791e758 100644 --- a/web-infrastructure/src/main/resources/mapper/EnclosedAreaMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjPassageDO.xml @@ -2,7 +2,7 @@ - + diff --git a/web-infrastructure/src/main/resources/mapper/MkmjPassageMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjPassageMapper.xml deleted file mode 100644 index 90c0208..0000000 --- a/web-infrastructure/src/main/resources/mapper/MkmjPassageMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/MkmjSwipeCardRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjSwipeCardRecordMapper.xml deleted file mode 100644 index 3249235..0000000 --- a/web-infrastructure/src/main/resources/mapper/MkmjSwipeCardRecordMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/InspectionDeptMapper.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml similarity index 67% rename from web-infrastructure/src/main/resources/mapper/InspectionDeptMapper.xml rename to web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml index 1b3b46c..b631d70 100644 --- a/web-infrastructure/src/main/resources/mapper/InspectionDeptMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml @@ -2,7 +2,7 @@ - + diff --git a/web-infrastructure/src/main/resources/mapper/PersonMessageDO.xml b/web-infrastructure/src/main/resources/mapper/PersonMessageDO.xml new file mode 100644 index 0000000..5d32bdd --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/PersonMessageDO.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/TemporaryAccessEntourageMapper.xml b/web-infrastructure/src/main/resources/mapper/TemporaryAccessEntourageMapper.xml deleted file mode 100644 index 0997c61..0000000 --- a/web-infrastructure/src/main/resources/mapper/TemporaryAccessEntourageMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/TemporaryAccessMapper.xml b/web-infrastructure/src/main/resources/mapper/TemporaryAccessMapper.xml deleted file mode 100644 index cf6472c..0000000 --- a/web-infrastructure/src/main/resources/mapper/TemporaryAccessMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditLogMapper.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml similarity index 92% rename from web-infrastructure/src/main/resources/mapper/VehicleAuditLogMapper.xml rename to web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 15e72a6..e5d21e3 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditLogMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -2,7 +2,7 @@ - + diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml new file mode 100644 index 0000000..1756243 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/VehicleBlackMapper.xml b/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml similarity index 100% rename from web-infrastructure/src/main/resources/mapper/VehicleBlackMapper.xml rename to web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml diff --git a/web-infrastructure/src/main/resources/mapper/VehicleMessageDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleMessageDO.xml new file mode 100644 index 0000000..01e3cd2 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/VehicleMessageDO.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml b/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml deleted file mode 100644 index 6796fb1..0000000 --- a/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/VehicleViolationsMapper.xml b/web-infrastructure/src/main/resources/mapper/VehicleViolationsDO.xml similarity index 100% rename from web-infrastructure/src/main/resources/mapper/VehicleViolationsMapper.xml rename to web-infrastructure/src/main/resources/mapper/VehicleViolationsDO.xml diff --git a/web-infrastructure/src/main/resources/mapper/VideoDO.xml b/web-infrastructure/src/main/resources/mapper/VideoDO.xml new file mode 100644 index 0000000..b6de3f2 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/VideoDO.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mybatis/employee_message.sql b/web-infrastructure/src/main/resources/mybatis/employee_message.sql deleted file mode 100644 index 0930240..0000000 --- a/web-infrastructure/src/main/resources/mybatis/employee_message.sql +++ /dev/null @@ -1,46 +0,0 @@ -/* - Navicat Premium Dump SQL - - Source Server : GBS数据库 - Source Server Type : MySQL - Source Server Version : 80038 (8.0.38) - Source Host : 192.168.20.100:33080 - Source Schema : zcloud-gbs-primeport - - Target Server Type : MySQL - Target Server Version : 80038 (8.0.38) - File Encoding : 65001 - - Date: 18/12/2025 15:08:25 -*/ - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for employee_message --- ---------------------------- -DROP TABLE IF EXISTS `employee_message`; -CREATE TABLE `employee_message` ( - `id` bigint NOT NULL COMMENT 'id', - `user_id` bigint NULL DEFAULT NULL COMMENT '用户ID', - `is_permission` int NULL DEFAULT NULL COMMENT '是否有进入一级口门的权限(0-无权限;1有权限)', - `is_user_face` int NULL DEFAULT NULL COMMENT '是否有人脸权限', - `mkmj_scope` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '可以进入的口门信息', - `status` int NULL DEFAULT 1 COMMENT '状态：0-停用 1-启用', - `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'FALSE' COMMENT '删除标识', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `create_id` bigint NULL DEFAULT NULL COMMENT '创建人ID', - `update_id` bigint NULL DEFAULT NULL COMMENT '更新人ID', - `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'PROD' COMMENT '环境标识', - `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人姓名', - `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人姓名', - `tenant_id` bigint NULL DEFAULT NULL COMMENT '租户ID', - `org_id` bigint NULL DEFAULT NULL COMMENT '组织ID', - `version` int NULL DEFAULT 0 COMMENT '版本号', - `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '用户的进入一级口门的信息' ROW_FORMAT = Dynamic; - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/web-infrastructure/src/main/resources/mybatis/mkmj_approval_user.sql b/web-infrastructure/src/main/resources/mybatis/mkmj_approval_user.sql deleted file mode 100644 index 8cb74b5..0000000 --- a/web-infrastructure/src/main/resources/mybatis/mkmj_approval_user.sql +++ /dev/null @@ -1,50 +0,0 @@ -/* - Navicat Premium Dump SQL - - Source Server : GBS数据库 - Source Server Type : MySQL - Source Server Version : 80038 (8.0.38) - Source Host : 192.168.20.100:33080 - Source Schema : zcloud-gbs-primeport - - Target Server Type : MySQL - Target Server Version : 80038 (8.0.38) - File Encoding : 65001 - - Date: 18/12/2025 13:52:24 -*/ - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for mkmj_approval_user --- ---------------------------- -DROP TABLE IF EXISTS `mkmj_approval_user`; -CREATE TABLE `mkmj_approval_user` ( - `id` bigint NOT NULL COMMENT '主键ID', - `dept_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审批人部门ID', - `dept_id` bigint NULL DEFAULT NULL COMMENT '审批人部门', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审批人姓名', - `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审批人', - `user_id` bigint NULL DEFAULT NULL COMMENT '审批人名字', - `corp_id` bigint NULL DEFAULT NULL COMMENT '企业id', - `is_personnel_permission` tinyint NULL DEFAULT NULL COMMENT '人员审核权限(0-无权限,1-有权限)', - `is_vehicle_permission` tinyint NULL DEFAULT NULL COMMENT '车辆审核权限(0-无权限,1-有权限)', - `is_temporary_permission` tinyint NULL DEFAULT NULL COMMENT '临时审核权限(0-无权限,1-有权限)', - `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'FALSE' COMMENT '删除标识', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `create_id` bigint NULL DEFAULT NULL COMMENT '创建人ID', - `update_id` bigint NULL DEFAULT NULL COMMENT '更新人ID', - `env` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'PROD' COMMENT '环境标识', - `create_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人姓名', - `update_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人姓名', - `tenant_id` bigint NULL DEFAULT NULL COMMENT '租户ID', - `org_id` bigint NULL DEFAULT NULL COMMENT '组织ID', - `version` int NULL DEFAULT 0 COMMENT '版本号', - `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '一级口门门禁审批人' ROW_FORMAT = Dynamic; - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/web-infrastructure/src/main/resources/mybatis/user.sql b/web-infrastructure/src/main/resources/mybatis/user.sql deleted file mode 100644 index 19dd6fd..0000000 --- a/web-infrastructure/src/main/resources/mybatis/user.sql +++ /dev/null @@ -1,50 +0,0 @@ -SELECT - `jjb-saas-zcloud-basic-info`.`user`.`id` AS `id`, - `jjb-saas-zcloud-basic-info`.`user`.`user_id` AS `user_id`, - `jjb-saas-zcloud-basic-info`.`user`.`username` AS `username`, - `jjb-saas-zcloud-basic-info`.`user`.`name` AS `name`, - `jjb-saas-zcloud-basic-info`.`user`.`corpinfo_id` AS `corpinfo_id`, - `jjb-saas-zcloud-basic-info`.`user`.`main_corp_flag` AS `main_corp_flag`, - `jjb-saas-zcloud-basic-info`.`user`.`user_type` AS `user_type`, - `jjb-saas-zcloud-basic-info`.`user`.`department_id` AS `department_id`, - `jjb-saas-zcloud-basic-info`.`user`.`post_id` AS `post_id`, - `jjb-saas-zcloud-basic-info`.`user`.`role_id` AS `role_id`, - `jjb-saas-zcloud-basic-info`.`user`.`email` AS `email`, - `jjb-saas-zcloud-basic-info`.`user`.`phone` AS `phone`, - `jjb-saas-zcloud-basic-info`.`user`.`personnel_type` AS `personnel_type`, - `jjb-saas-zcloud-basic-info`.`user`.`personnel_type_name` AS `personnel_type_name`, - `jjb-saas-zcloud-basic-info`.`user`.`nation` AS `nation`, - `jjb-saas-zcloud-basic-info`.`user`.`nation_name` AS `nation_name`, - `jjb-saas-zcloud-basic-info`.`user`.`user_id_card` AS `user_id_card`, - `jjb-saas-zcloud-basic-info`.`user`.`user_avatar_url` AS `user_avatar_url`, - `jjb-saas-zcloud-basic-info`.`user`.`current_address` AS `current_address`, - `jjb-saas-zcloud-basic-info`.`user`.`location_address` AS `location_address`, - `jjb-saas-zcloud-basic-info`.`user`.`rank_level` AS `rank_level`, - `jjb-saas-zcloud-basic-info`.`user`.`rank_level_name` AS `rank_level_name`, - `jjb-saas-zcloud-basic-info`.`user`.`sort` AS `sort`, - `jjb-saas-zcloud-basic-info`.`user`.`version` AS `version`, - `jjb-saas-zcloud-basic-info`.`user`.`create_id` AS `create_id`, - `jjb-saas-zcloud-basic-info`.`user`.`create_name` AS `create_name`, - `jjb-saas-zcloud-basic-info`.`user`.`create_time` AS `create_time`, - `jjb-saas-zcloud-basic-info`.`user`.`update_id` AS `update_id`, - `jjb-saas-zcloud-basic-info`.`user`.`update_name` AS `update_name`, - `jjb-saas-zcloud-basic-info`.`user`.`update_time` AS `update_time`, - `jjb-saas-zcloud-basic-info`.`user`.`remarks` AS `remarks`, - `jjb-saas-zcloud-basic-info`.`user`.`delete_enum` AS `delete_enum`, - `jjb-saas-zcloud-basic-info`.`user`.`tenant_id` AS `tenant_id`, - `jjb-saas-zcloud-basic-info`.`user`.`org_id` AS `org_id`, - `jjb-saas-zcloud-basic-info`.`user`.`env` AS `env`, - `jjb-saas-zcloud-basic-info`.`user`.`department_leader_flag` AS `department_leader_flag`, - `jjb-saas-zcloud-basic-info`.`user`.`deputy_leader_flag` AS `deputy_leader_flag`, - `jjb-saas-zcloud-basic-info`.`user`.`cultural_level` AS `cultural_level`, - `jjb-saas-zcloud-basic-info`.`user`.`cultural_level_name` AS `cultural_level_name`, - `jjb-saas-zcloud-basic-info`.`user`.`marital_status` AS `marital_status`, - `jjb-saas-zcloud-basic-info`.`user`.`marital_status_name` AS `marital_status_name`, - `jjb-saas-zcloud-basic-info`.`user`.`political_affiliation` AS `political_affiliation`, - `jjb-saas-zcloud-basic-info`.`user`.`political_affiliation_name` AS `political_affiliation_name`, - `jjb-saas-zcloud-basic-info`.`user`.`employment_flag` AS `employment_flag` -FROM - `jjb-saas-zcloud-basic-info`.`user` -WHERE - ( - `jjb-saas-zcloud-basic-info`.`user`.`delete_enum` = 'FALSE')