diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateLogController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateLogController.java deleted file mode 100644 index f4ae2da..0000000 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjGateLogController.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.zcloud.primeport.web; - - -import com.zcloud.primeport.api.MkmjGateLogServiceI; -import com.zcloud.primeport.dto.MkmjGateLogAddCmd; -import com.zcloud.primeport.dto.MkmjGateLogPageQry; -import com.zcloud.primeport.dto.MkmjGateLogUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjGateLogCO; -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 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:43 - */ -@Api(tags = "门口门禁闸机记录表") -@RequestMapping("/${application.gateway}/mkmjGateLog") -@RestController -@AllArgsConstructor -public class MkmjGateLogController { - private final MkmjGateLogServiceI mkmjGateLogService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody MkmjGateLogAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return mkmjGateLogService.add(cmd); - } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody MkmjGateLogPageQry qry) { - return mkmjGateLogService.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(mkmjGateLogService.queryById(id)); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public Response remove(@PathVariable("id") Long id) { - mkmjGateLogService.remove(id); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - mkmjGateLogService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody MkmjGateLogUpdateCmd mkmjGateLogUpdateCmd) { - mkmjGateLogService.edit(mkmjGateLogUpdateCmd); - return SingleResponse.buildSuccess(); - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateLogAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateLogAddExe.java deleted file mode 100644 index 79ff199..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateLogAddExe.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zcloud.primeport.command; - -import com.zcloud.primeport.domain.gateway.MkmjGateLogGateway; -import com.zcloud.primeport.domain.model.MkmjGateLogE; -import com.zcloud.primeport.dto.MkmjGateLogAddCmd; -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:43 - */ -@Component -@AllArgsConstructor -public class MkmjGateLogAddExe { - private final MkmjGateLogGateway mkmjGateLogGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(MkmjGateLogAddCmd cmd) { - MkmjGateLogE mkmjGateLogE = new MkmjGateLogE(); - BeanUtils.copyProperties(cmd, mkmjGateLogE); - boolean res = false; - try { - res = mkmjGateLogGateway.add(mkmjGateLogE); - } 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/MkmjGateLogRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateLogRemoveExe.java deleted file mode 100644 index b98d97e..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateLogRemoveExe.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zcloud.primeport.command; - -import com.zcloud.primeport.domain.gateway.MkmjGateLogGateway; -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 MkmjGateLogRemoveExe { - private final MkmjGateLogGateway mkmjGateLogGateway; - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long id) { - boolean res = mkmjGateLogGateway.deletedMkmjGateLogById(id); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } - - @Transactional(rollbackFor = Exception.class) - public boolean execute(Long[] ids) { - boolean res = mkmjGateLogGateway.deletedMkmjGateLogByIds(ids); - if (!res) { - throw new BizException("删除失败"); - } - return true; - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateLogUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateLogUpdateExe.java deleted file mode 100644 index 1be7bb8..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/MkmjGateLogUpdateExe.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zcloud.primeport.command; - -import com.alibaba.cola.exception.BizException; -import com.zcloud.primeport.domain.gateway.MkmjGateLogGateway; -import com.zcloud.primeport.domain.model.MkmjGateLogE; -import com.zcloud.primeport.dto.MkmjGateLogUpdateCmd; -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 MkmjGateLogUpdateExe { - private final MkmjGateLogGateway mkmjGateLogGateway; - - @Transactional(rollbackFor = Exception.class) - public void execute(MkmjGateLogUpdateCmd mkmjGateLogUpdateCmd) { - MkmjGateLogE mkmjGateLogE = new MkmjGateLogE(); - BeanUtils.copyProperties(mkmjGateLogUpdateCmd, mkmjGateLogE); - boolean res = mkmjGateLogGateway.update(mkmjGateLogE); - if (!res) { - throw new BizException("修改失败"); - } - } -} - diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateLogCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateLogCoConvertor.java deleted file mode 100644 index 8db8f8f..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjGateLogCoConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zcloud.primeport.command.convertor; - -import com.zcloud.primeport.dto.clientobject.MkmjGateLogCO; -import com.zcloud.primeport.persistence.dataobject.MkmjGateLogDO; -import org.mapstruct.Mapper; - -import java.util.List; - - -/** - * web-app - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Mapper(componentModel = "spring") -public interface MkmjGateLogCoConvertor { - /** - * @param mkmjGateLogDOs - * @return - */ - List converDOsToCOs(List mkmjGateLogDOs); - - MkmjGateLogCO converDOToCO(MkmjGateLogDO mkmjGateLogDO); -} - 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 index 87f502b..7b748bb 100644 --- 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 @@ -1,17 +1,22 @@ 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; /** @@ -46,6 +51,7 @@ public class MkmjAreaGateQueryExe { 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 index fe7dd24..847c97a 100644 --- 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 @@ -1,17 +1,20 @@ package com.zcloud.primeport.command.query; import com.zcloud.primeport.command.convertor.MkmjAreaCoConvertor; +import com.zcloud.primeport.domain.model.VideoCountE; import com.zcloud.primeport.dto.MkmjAreaPageQry; import com.zcloud.primeport.dto.clientobject.MkmjAreaCO; import com.zcloud.primeport.persistence.dataobject.MkmjAreaDO; import com.zcloud.primeport.persistence.repository.MkmjAreaRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; +import com.zcloud.primeport.persistence.repository.MkmjGateVideoRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -25,6 +28,7 @@ import java.util.Map; public class MkmjAreaQueryExe { private final MkmjAreaRepository mkmjAreaRepository; private final MkmjAreaCoConvertor mkmjAreaCoConvertor; + private final MkmjGateVideoRepository mkmjGateVideoRepository; /** * 根据id查询 @@ -46,6 +50,15 @@ public class MkmjAreaQueryExe { Map params = PageQueryHelper.toHashMap(mkmjAreaPageQry); PageResponse pageResponse = mkmjAreaRepository.listPage(params); List examCenterCOS = mkmjAreaCoConvertor.converDOsToCOs(pageResponse.getData()); + List ids = examCenterCOS.stream().map(MkmjAreaCO::getAreaId).collect(Collectors.toList()); + List videoCounts = mkmjGateVideoRepository.listVideoCountByAreaId(ids); + examCenterCOS.forEach(examCenterCO -> { + videoCounts.forEach(videoCount -> { + if (examCenterCO.getAreaId().equals(videoCount.getAreaGateId())) { + examCenterCO.setVideoNum(videoCount.getCount()); + } + }); + }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateLogQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateLogQueryExe.java deleted file mode 100644 index fd209f5..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjGateLogQueryExe.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zcloud.primeport.command.query; - -import com.zcloud.primeport.command.convertor.MkmjGateLogCoConvertor; -import com.zcloud.primeport.dto.MkmjGateLogPageQry; -import com.zcloud.primeport.dto.clientobject.MkmjGateLogCO; -import com.zcloud.primeport.persistence.dataobject.MkmjGateLogDO; -import com.zcloud.primeport.persistence.repository.MkmjGateLogRepository; -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 MkmjGateLogQueryExe { - private final MkmjGateLogRepository mkmjGateLogRepository; - private final MkmjGateLogCoConvertor mkmjGateLogCoConvertor; - - /** - * 根据id查询 - * - * @param id - * @return - */ - public MkmjGateLogCO queryById(Long id) { - return mkmjGateLogCoConvertor.converDOToCO(mkmjGateLogRepository.getById(id)); - } - - /** - * 分页 - * - * @param mkmjGateLogPageQry - * @return - */ - public PageResponse execute(MkmjGateLogPageQry mkmjGateLogPageQry) { - Map params = PageQueryHelper.toHashMap(mkmjGateLogPageQry); - PageResponse pageResponse = mkmjGateLogRepository.listPage(params); - List examCenterCOS = mkmjGateLogCoConvertor.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 0edbf6a..8cf1d6c 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,9 +1,11 @@ package com.zcloud.primeport.command.query; import com.zcloud.primeport.command.convertor.MkmjPassageCoConvertor; +import com.zcloud.primeport.domain.model.GateCountE; import com.zcloud.primeport.dto.MkmjPassagePageQry; import com.zcloud.primeport.dto.clientobject.MkmjPassageCO; import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; +import com.zcloud.primeport.persistence.repository.MkmjAreaGateRepository; import com.zcloud.primeport.persistence.repository.MkmjPassageRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; @@ -12,6 +14,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -25,6 +28,7 @@ import java.util.Map; public class MkmjPassageQueryExe { private final MkmjPassageRepository mkmjPassageRepository; private final MkmjPassageCoConvertor mkmjPassageCoConvertor; + private final MkmjAreaGateRepository mkmjAreaGateRepository; /** * 根据id查询 @@ -45,8 +49,17 @@ public class MkmjPassageQueryExe { public PageResponse execute(MkmjPassagePageQry mkmjPassagePageQry) { Map params = PageQueryHelper.toHashMap(mkmjPassagePageQry); PageResponse pageResponse = mkmjPassageRepository.listPage(params); - List examCenterCOS = mkmjPassageCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + 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()); } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateLogServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateLogServiceImpl.java deleted file mode 100644 index 37aad24..0000000 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjGateLogServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.zcloud.primeport.service; - -import com.zcloud.primeport.api.MkmjGateLogServiceI; -import com.zcloud.primeport.command.MkmjGateLogAddExe; -import com.zcloud.primeport.command.MkmjGateLogRemoveExe; -import com.zcloud.primeport.command.MkmjGateLogUpdateExe; -import com.zcloud.primeport.command.query.MkmjGateLogQueryExe; -import com.zcloud.primeport.dto.MkmjGateLogAddCmd; -import com.zcloud.primeport.dto.MkmjGateLogPageQry; -import com.zcloud.primeport.dto.MkmjGateLogUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjGateLogCO; - -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 MkmjGateLogServiceImpl implements MkmjGateLogServiceI { - private final MkmjGateLogAddExe mkmjGateLogAddExe; - private final MkmjGateLogUpdateExe mkmjGateLogUpdateExe; - private final MkmjGateLogRemoveExe mkmjGateLogRemoveExe; - private final MkmjGateLogQueryExe mkmjGateLogQueryExe; - - @Override - public MkmjGateLogCO queryById(Long id) { - return mkmjGateLogQueryExe.queryById(id); - } - - @Override - public PageResponse listPage(MkmjGateLogPageQry qry) { - - return mkmjGateLogQueryExe.execute(qry); - } - - @Override - public SingleResponse add(MkmjGateLogAddCmd cmd) { - - mkmjGateLogAddExe.execute(cmd); - return SingleResponse.buildSuccess(); - } - - @Override - public void edit(MkmjGateLogUpdateCmd mkmjGateLogUpdateCmd) { - mkmjGateLogUpdateExe.execute(mkmjGateLogUpdateCmd); - } - - @Override - public void remove(Long id) { - mkmjGateLogRemoveExe.execute(id); - } - - @Override - public void removeBatch(Long[] ids) { - mkmjGateLogRemoveExe.execute(ids); - } -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateLogServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateLogServiceI.java deleted file mode 100644 index c00ea5d..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjGateLogServiceI.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.api; - -import com.zcloud.primeport.dto.MkmjGateLogAddCmd; -import com.zcloud.primeport.dto.MkmjGateLogPageQry; -import com.zcloud.primeport.dto.MkmjGateLogUpdateCmd; -import com.zcloud.primeport.dto.clientobject.MkmjGateLogCO; - -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 MkmjGateLogServiceI { - MkmjGateLogCO queryById(Long id); - - PageResponse listPage(MkmjGateLogPageQry qry); - - SingleResponse add(MkmjGateLogAddCmd cmd); - - void edit(MkmjGateLogUpdateCmd cmd); - - void remove(Long id); - - void removeBatch(Long[] ids); -} - 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 index ba40351..97ac086 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaAddCmd.java @@ -7,13 +7,14 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:41 + * @Date 2025-11-14 09:51:09 */ @EqualsAndHashCode(callSuper = true) @Data @@ -36,6 +37,10 @@ public class MkmjAreaAddCmd extends Command { @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; @@ -44,10 +49,6 @@ public class MkmjAreaAddCmd extends Command { @NotNull(message = "区域状态 0-停用 1-正常 2-暂时关闭不能为空") private Integer areaStatus; - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") - private String corpinfoId; - @ApiModelProperty(value = "经度", name = "longitude", required = true) @NotEmpty(message = "经度不能为空") private String longitude; 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 index 588a0b4..8b86686 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateAddCmd.java @@ -7,13 +7,14 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:42 + * @Date 2025-11-14 16:01:00 */ @EqualsAndHashCode(callSuper = true) @Data @@ -21,7 +22,6 @@ import javax.validation.constraints.*; @AllArgsConstructor public class MkmjAreaGateAddCmd extends Command { @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") private String corpinfoId; @ApiModelProperty(value = "口门区域id", name = "areaId", required = true) @@ -33,7 +33,6 @@ public class MkmjAreaGateAddCmd extends Command { private String passageId; @ApiModelProperty(value = "闸机标识", name = "gateNumber", required = true) - @NotEmpty(message = "闸机标识不能为空") private String gateNumber; @ApiModelProperty(value = "闸机名称", name = "gateName", required = true) @@ -61,11 +60,9 @@ public class MkmjAreaGateAddCmd extends Command { private String gatePosition; @ApiModelProperty(value = "是否相邻区域 0否 1是", name = "isAdjacent", required = true) - @NotNull(message = "是否相邻区域 0否 1是不能为空") private Integer isAdjacent; @ApiModelProperty(value = "相邻区域id", name = "adjacentAreaId", required = true) - @NotEmpty(message = "相邻区域id不能为空") private String adjacentAreaId; @ApiModelProperty(value = "经度", name = "longitude", required = true) 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 index 3becef8..3242576 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGatePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGatePageQry.java @@ -24,6 +24,10 @@ public class MkmjAreaGatePageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeAreaGateId; + 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 index 0399a97..8296933 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaGateUpdateCmd.java @@ -7,13 +7,14 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:43 + * @Date 2025-11-14 16:01:00 */ @EqualsAndHashCode(callSuper = true) @Data @@ -27,7 +28,6 @@ public class MkmjAreaGateUpdateCmd extends Command { @NotEmpty(message = "业务主键id不能为空") private String areaGateId; @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") private String corpinfoId; @ApiModelProperty(value = "口门区域id", name = "areaId", required = true) @NotEmpty(message = "口门区域id不能为空") @@ -36,7 +36,6 @@ public class MkmjAreaGateUpdateCmd extends Command { @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 = "闸机名称不能为空") @@ -57,10 +56,8 @@ public class MkmjAreaGateUpdateCmd extends Command { @NotEmpty(message = "闸机位置不能为空") private String gatePosition; @ApiModelProperty(value = "是否相邻区域 0否 1是", name = "isAdjacent", required = true) - @NotNull(message = "是否相邻区域 0否 1是不能为空") private Integer isAdjacent; @ApiModelProperty(value = "相邻区域id", name = "adjacentAreaId", required = true) - @NotEmpty(message = "相邻区域id不能为空") private String adjacentAreaId; @ApiModelProperty(value = "经度", name = "longitude", required = true) @NotEmpty(message = "经度不能为空") 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 index 4aebf6d..47fc612 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaPageQry.java @@ -24,6 +24,10 @@ public class MkmjAreaPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeAreaId; + 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 index 75e9cb8..f89fdcd 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAreaUpdateCmd.java @@ -7,13 +7,14 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:42 + * @Date 2025-11-14 09:51:10 */ @EqualsAndHashCode(callSuper = true) @Data @@ -38,15 +39,15 @@ public class MkmjAreaUpdateCmd extends Command { @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 = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") - private String corpinfoId; @ApiModelProperty(value = "经度", name = "longitude", required = true) @NotEmpty(message = "经度不能为空") private String longitude; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogAddCmd.java deleted file mode 100644 index 2d0800d..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogAddCmd.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.*; - -/** - * web-client - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjGateLogAddCmd extends Command { - @ApiModelProperty(value = "闸机id", name = "areaGateId", required = true) - @NotEmpty(message = "闸机id不能为空") - private String areaGateId; - - @ApiModelProperty(value = "状态 0进 1出 2车辆进 3车辆出", name = "state", required = true) - @NotNull(message = "状态 0进 1出 2车辆进 3车辆出不能为空") - private Integer state; - - @ApiModelProperty(value = "时间", name = "logTime", required = true) - @NotNull(message = "时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date logTime; - - @ApiModelProperty(value = "人员id", name = "userId", required = true) - @NotEmpty(message = "人员id不能为空") - private String userId; - - @ApiModelProperty(value = "人员姓名", name = "userName", required = true) - @NotEmpty(message = "人员姓名不能为空") - private String userName; - - @ApiModelProperty(value = "闸机类型 1-入 2出", name = "gateType", required = true) - @NotNull(message = "闸机类型 1-入 2出不能为空") - private Integer gateType; - - @ApiModelProperty(value = "车牌号(车辆进出时使用)", name = "ex1", required = true) - @NotEmpty(message = "车牌号(车辆进出时使用)不能为空") - private String ex1; - - @ApiModelProperty(value = "备用字段2", name = "ex2", required = true) - @NotEmpty(message = "备用字段2不能为空") - private String ex2; - - @ApiModelProperty(value = "备用字段3", name = "ex3", required = true) - @NotEmpty(message = "备用字段3不能为空") - private String ex3; - - @ApiModelProperty(value = "备用字段4", name = "ex4", required = true) - @NotEmpty(message = "备用字段4不能为空") - private String ex4; - - @ApiModelProperty(value = "备用字段5", name = "ex5", required = true) - @NotEmpty(message = "备用字段5不能为空") - private String ex5; - -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogPageQry.java deleted file mode 100644 index f3d9bdc..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogPageQry.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 fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Data -public class MkmjGateLogPageQry extends PageQuery { - - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - private String likeAreaLogId; -} - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogUpdateCmd.java deleted file mode 100644 index de19abf..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateLogUpdateCmd.java +++ /dev/null @@ -1,64 +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 fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MkmjGateLogUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotNull(message = "主键不能为空") - private Long id; - @ApiModelProperty(value = "业务主键id", name = "areaLogId", required = true) - @NotEmpty(message = "业务主键id不能为空") - private String areaLogId; - @ApiModelProperty(value = "闸机id", name = "areaGateId", required = true) - @NotEmpty(message = "闸机id不能为空") - private String areaGateId; - @ApiModelProperty(value = "状态 0进 1出 2车辆进 3车辆出", name = "state", required = true) - @NotNull(message = "状态 0进 1出 2车辆进 3车辆出不能为空") - private Integer state; - @ApiModelProperty(value = "时间", name = "logTime", required = true) - @NotNull(message = "时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date logTime; - @ApiModelProperty(value = "人员id", name = "userId", required = true) - @NotEmpty(message = "人员id不能为空") - private String userId; - @ApiModelProperty(value = "人员姓名", name = "userName", required = true) - @NotEmpty(message = "人员姓名不能为空") - private String userName; - @ApiModelProperty(value = "闸机类型 1-入 2出", name = "gateType", required = true) - @NotNull(message = "闸机类型 1-入 2出不能为空") - private Integer gateType; - @ApiModelProperty(value = "车牌号(车辆进出时使用)", name = "ex1", required = true) - @NotEmpty(message = "车牌号(车辆进出时使用)不能为空") - private String ex1; - @ApiModelProperty(value = "备用字段2", name = "ex2", required = true) - @NotEmpty(message = "备用字段2不能为空") - private String ex2; - @ApiModelProperty(value = "备用字段3", name = "ex3", required = true) - @NotEmpty(message = "备用字段3不能为空") - private String ex3; - @ApiModelProperty(value = "备用字段4", name = "ex4", required = true) - @NotEmpty(message = "备用字段4不能为空") - private String ex4; - @ApiModelProperty(value = "备用字段5", name = "ex5", required = true) - @NotEmpty(message = "备用字段5不能为空") - private String ex5; -} - 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 index 31628e3..a558023 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoAddCmd.java @@ -7,13 +7,14 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:44 + * @Date 2025-11-14 17:16:03 */ @EqualsAndHashCode(callSuper = true) @Data @@ -36,6 +37,10 @@ public class MkmjGateVideoAddCmd extends Command { @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; 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 index 9e04dc7..0fdd04b 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoPageQry.java @@ -24,6 +24,8 @@ public class MkmjGateVideoPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likeGateVideoId; + 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 index 1f92365..efe3cc4 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateVideoUpdateCmd.java @@ -7,13 +7,14 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:44 + * @Date 2025-11-14 17:16:03 */ @EqualsAndHashCode(callSuper = true) @Data @@ -35,6 +36,9 @@ public class MkmjGateVideoUpdateCmd extends Command { @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; 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 479128f..410f3c3 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageAddCmd.java @@ -36,10 +36,6 @@ public class MkmjPassageAddCmd extends Command { @NotEmpty(message = "口门区域id不能为空") private String areaId; - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") - private String corpinfoId; - @ApiModelProperty(value = "经度", name = "longitude", required = true) @NotEmpty(message = "经度不能为空") private String longitude; 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 6eacadf..c4beee0 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 @@ -24,6 +24,9 @@ public class MkmjPassagePageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private String likePassageId; + 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 fafbc35..e773e80 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 @@ -38,9 +38,6 @@ public class MkmjPassageUpdateCmd extends Command { @ApiModelProperty(value = "口门区域id", name = "areaId", required = true) @NotEmpty(message = "口门区域id不能为空") private String areaId; - @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) - @NotEmpty(message = "企业id不能为空") - private String corpinfoId; @ApiModelProperty(value = "经度", name = "longitude", required = true) @NotEmpty(message = "经度不能为空") private String longitude; 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 new file mode 100644 index 0000000..f06f393 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/StatisticsByAreaCmd.java @@ -0,0 +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; + +/** + * @author fangjiakai + * @date 2025/11/17 9:41 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class StatisticsByAreaCmd extends Command { + String[] ids; +} 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 index 04967eb..b0a2e67 100644 --- 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 @@ -9,7 +9,7 @@ import lombok.Data; * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:41 + * @Date 2025-11-14 09:51:09 */ @Data public class MkmjAreaCO extends ClientObject { @@ -31,6 +31,9 @@ public class MkmjAreaCO extends ClientObject { //上级区域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; @@ -46,39 +49,8 @@ public class MkmjAreaCO extends ClientObject { //纬度 @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; + // 视频个数 + @ApiModelProperty(value = "视频个数") + private Long videoNum; } 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/MkmjAreaGateCO.java index fc28a19..48f687f 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/MkmjAreaGateCO.java @@ -9,7 +9,7 @@ import lombok.Data; * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:42 + * @Date 2025-11-14 16:01:00 */ @Data public class MkmjAreaGateCO extends ClientObject { diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateLogCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateLogCO.java deleted file mode 100644 index 28f9a23..0000000 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateLogCO.java +++ /dev/null @@ -1,91 +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 08:57:43 - */ -@Data -public class MkmjGateLogCO extends ClientObject { - //主键 - @ApiModelProperty(value = "主键") - private Long id; - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String areaLogId; - //闸机id - @ApiModelProperty(value = "闸机id") - private String areaGateId; - //状态 0进 1出 2车辆进 3车辆出 - @ApiModelProperty(value = "状态 0进 1出 2车辆进 3车辆出") - private Integer state; - //时间 - @ApiModelProperty(value = "时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date logTime; - //人员id - @ApiModelProperty(value = "人员id") - private String userId; - //人员姓名 - @ApiModelProperty(value = "人员姓名") - private String userName; - //闸机类型 1-入 2出 - @ApiModelProperty(value = "闸机类型 1-入 2出") - private Integer gateType; - //车牌号(车辆进出时使用) - @ApiModelProperty(value = "车牌号(车辆进出时使用)") - private String ex1; - //备用字段2 - @ApiModelProperty(value = "备用字段2") - private String ex2; - //备用字段3 - @ApiModelProperty(value = "备用字段3") - private String ex3; - //备用字段4 - @ApiModelProperty(value = "备用字段4") - private String ex4; - //备用字段5 - @ApiModelProperty(value = "备用字段5") - private String ex5; - //删除标识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/MkmjGateVideoCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateVideoCO.java index 87a781b..8663575 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/MkmjGateVideoCO.java @@ -9,7 +9,7 @@ import lombok.Data; * web-client * * @Author fangjiakai - * @Date 2025-11-14 08:57:44 + * @Date 2025-11-14 17:16:03 */ @Data public class MkmjGateVideoCO extends ClientObject { @@ -28,6 +28,9 @@ public class MkmjGateVideoCO extends ClientObject { //摄像头id @ApiModelProperty(value = "摄像头id") private String videoResourceId; + //摄像头名称 + @ApiModelProperty(value = "摄像头名称") + private String videoResourceName; //摄像头类型（1-移动 2-平台） @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）") private Integer videoType; 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 0a680d9..17339b0 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 @@ -40,39 +40,8 @@ public class MkmjPassageCO extends ClientObject { //纬度 @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; + // 设备数量 + @ApiModelProperty(value = "设备数量") + private Long gateNum; } 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 new file mode 100644 index 0000000..c0e7765 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjStatisticsCO.java @@ -0,0 +1,18 @@ +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-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateLogGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateLogGateway.java deleted file mode 100644 index 68bfbba..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/MkmjGateLogGateway.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zcloud.primeport.domain.gateway; - -import com.zcloud.primeport.domain.model.MkmjGateLogE; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -public interface MkmjGateLogGateway { - - /** - * 新增 - */ - Boolean add(MkmjGateLogE mkmjGateLogE); - - /** - * 修改 - */ - Boolean update(MkmjGateLogE mkmjGateLogE); - - /** - * 删除 - */ - Boolean deletedMkmjGateLogById(Long id); - - Boolean deletedMkmjGateLogByIds(Long[] id); -} - 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 new file mode 100644 index 0000000..04b2140 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/GateCountE.java @@ -0,0 +1,14 @@ +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/MkmjAreaE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjAreaE.java index c63e06a..8f695a5 100644 --- 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 @@ -1,15 +1,13 @@ 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; /** * web-domain * * @Author fangjiakai - * @Date 2025-11-14 08:57:42 + * @Date 2025-11-14 09:51:10 */ @Data public class MkmjAreaE extends BaseE { @@ -23,6 +21,8 @@ public class MkmjAreaE extends BaseE { private Integer areaLevel; //上级区域id(当area_level=1时，此字段为字典bianma) private String areaParentId; + //上级区域 + private String areaParentName; //口门类型 1-人行 2-车行 3-综合 private Integer areaType; //区域状态 0-停用 1-正常 2-暂时关闭 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 index 6ad6f12..61a8726 100644 --- 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 @@ -1,15 +1,13 @@ 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; /** * web-domain * * @Author fangjiakai - * @Date 2025-11-14 08:57:43 + * @Date 2025-11-14 16:01:00 */ @Data public class MkmjAreaGateE extends BaseE { diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateLogE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateLogE.java deleted file mode 100644 index ad4b7c9..0000000 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjGateLogE.java +++ /dev/null @@ -1,41 +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; - -/** - * web-domain - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Data -public class MkmjGateLogE extends BaseE { - //业务主键id - private String areaLogId; - //闸机id - private String areaGateId; - //状态 0进 1出 2车辆进 3车辆出 - private Integer state; - //时间 - private Date logTime; - //人员id - private String userId; - //人员姓名 - private String userName; - //闸机类型 1-入 2出 - private Integer gateType; - //车牌号(车辆进出时使用) - private String ex1; - //备用字段2 - private String ex2; - //备用字段3 - private String ex3; - //备用字段4 - private String ex4; - //备用字段5 - private String ex5; -} - 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/MkmjGateVideoE.java index 7ad877d..b70cfdf 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/MkmjGateVideoE.java @@ -1,15 +1,13 @@ 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; /** * web-domain * * @Author fangjiakai - * @Date 2025-11-14 08:57:44 + * @Date 2025-11-14 17:16:03 */ @Data public class MkmjGateVideoE extends BaseE { @@ -21,6 +19,8 @@ public class MkmjGateVideoE extends BaseE { private Integer deviceType; //摄像头id private String videoResourceId; + //摄像头名称 + private String videoResourceName; //摄像头类型（1-移动 2-平台） private Integer videoType; //企业id 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 new file mode 100644 index 0000000..a8be5a0 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjStatisticsE.java @@ -0,0 +1,18 @@ +package com.zcloud.primeport.domain.model; + +import com.alibaba.cola.dto.ClientObject; +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +/** + * @author fangjiakai + * @date 2025/11/17 9:44 + */ +@Data +public class MkmjStatisticsE extends BaseE { + 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/VideoCountE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoCountE.java new file mode 100644 index 0000000..f2293ba --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VideoCountE.java @@ -0,0 +1,14 @@ +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-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateLogGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateLogGatewayImpl.java deleted file mode 100644 index e594037..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGateLogGatewayImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zcloud.primeport.gatewayimpl; - -import com.zcloud.primeport.domain.gateway.MkmjGateLogGateway; -import com.zcloud.primeport.domain.model.MkmjGateLogE; -import com.zcloud.primeport.persistence.dataobject.MkmjGateLogDO; -import com.zcloud.primeport.persistence.repository.MkmjGateLogRepository; -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 MkmjGateLogGatewayImpl implements MkmjGateLogGateway { - private final MkmjGateLogRepository mkmjGateLogRepository; - - @Override - public Boolean add(MkmjGateLogE mkmjGateLogE) { - MkmjGateLogDO d = new MkmjGateLogDO(Tools.get32UUID()); - BeanUtils.copyProperties(mkmjGateLogE, d, "areaLogId"); - mkmjGateLogRepository.save(d); - return true; - } - - @Override - public Boolean update(MkmjGateLogE mkmjGateLogE) { - MkmjGateLogDO d = new MkmjGateLogDO(); - BeanUtils.copyProperties(mkmjGateLogE, d); - mkmjGateLogRepository.updateById(d); - return true; - } - - @Override - public Boolean deletedMkmjGateLogById(Long id) { - return mkmjGateLogRepository.removeById(id); - } - - @Override - public Boolean deletedMkmjGateLogByIds(Long[] ids) { - return mkmjGateLogRepository.removeByIds(Collections.singletonList(ids)); - } -} - 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 index 263dc4b..31a57cd 100644 --- 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 @@ -1,15 +1,17 @@ package com.zcloud.primeport.persistence.dataobject; -import com.baomidou.mybatisplus.annotation.*; +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:42 + * @Date 2025-11-14 09:51:10 */ @Data @TableName("mkmj_area") @@ -31,6 +33,9 @@ public class MkmjAreaDO extends BaseDO { //上级区域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; 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 index 065b99c..f636230 100644 --- 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 @@ -1,15 +1,17 @@ package com.zcloud.primeport.persistence.dataobject; -import com.baomidou.mybatisplus.annotation.*; +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:43 + * @Date 2025-11-14 16:01:00 */ @Data @TableName("mkmj_area_gate") diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateLogDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateLogDO.java deleted file mode 100644 index 0b17a77..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateLogDO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.zcloud.primeport.persistence.dataobject; - -import com.baomidou.mybatisplus.annotation.*; -import com.jjb.saas.framework.repository.basedo.BaseDO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:43 - */ -@Data -@TableName("mkmj_gate_log") -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class MkmjGateLogDO extends BaseDO { - //业务主键id - @ApiModelProperty(value = "业务主键id") - private String areaLogId; - //闸机id - @ApiModelProperty(value = "闸机id") - private String areaGateId; - //状态 0进 1出 2车辆进 3车辆出 - @ApiModelProperty(value = "状态 0进 1出 2车辆进 3车辆出") - private Integer state; - //时间 - @ApiModelProperty(value = "时间") - private Date logTime; - //人员id - @ApiModelProperty(value = "人员id") - private String userId; - //人员姓名 - @ApiModelProperty(value = "人员姓名") - private String userName; - //闸机类型 1-入 2出 - @ApiModelProperty(value = "闸机类型 1-入 2出") - private Integer gateType; - //车牌号(车辆进出时使用) - @ApiModelProperty(value = "车牌号(车辆进出时使用)") - private String ex1; - //备用字段2 - @ApiModelProperty(value = "备用字段2") - private String ex2; - //备用字段3 - @ApiModelProperty(value = "备用字段3") - private String ex3; - //备用字段4 - @ApiModelProperty(value = "备用字段4") - private String ex4; - //备用字段5 - @ApiModelProperty(value = "备用字段5") - private String ex5; - - public MkmjGateLogDO(String areaLogId) { - this.areaLogId = areaLogId; - } - -} - 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 index b552dfa..1181612 100644 --- 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 @@ -1,15 +1,17 @@ package com.zcloud.primeport.persistence.dataobject; -import com.baomidou.mybatisplus.annotation.*; +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:44 + * @Date 2025-11-14 17:16:03 */ @Data @TableName("mkmj_gate_video") @@ -28,6 +30,9 @@ public class MkmjGateVideoDO extends BaseDO { //摄像头id @ApiModelProperty(value = "摄像头id") private String videoResourceId; + //摄像头名称 + @ApiModelProperty(value = "摄像头名称") + private String videoResourceName; //摄像头类型（1-移动 2-平台） @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）") private Integer videoType; @@ -41,9 +46,6 @@ public class MkmjGateVideoDO extends BaseDO { @ApiModelProperty(value = "纬度") private String latitude; - public MkmjGateVideoDO(String) { - this. =; - } } 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 f4860b8..16ec049 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,9 +1,11 @@ package com.zcloud.primeport.persistence.dataobject; -import com.baomidou.mybatisplus.annotation.*; +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 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 index d1414d3..13f79fb 100644 --- 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 @@ -1,9 +1,12 @@ 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 * @@ -13,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MkmjAreaGateMapper extends BaseMapper { + List listGateCountByPassageId(List ids); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateLogMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateLogMapper.java deleted file mode 100644 index bb5571b..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateLogMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zcloud.primeport.persistence.mapper; - -import com.zcloud.primeport.persistence.dataobject.MkmjGateLogDO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * web-infrastructure - * - * @Author fangjiakai - * @Date 2025-11-14 08:57:44 - */ -@Mapper -public interface MkmjGateLogMapper 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 index e58bac9..bdb8624 100644 --- 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 @@ -1,8 +1,12 @@ 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 @@ -13,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MkmjGateVideoMapper extends BaseMapper { + List listVideoCountByAreaId(@Param("ids") List ids); } 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 index 977b4d5..90d74fb 100644 --- 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 @@ -1,9 +1,11 @@ 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; /** @@ -14,5 +16,7 @@ import java.util.Map; */ 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/MkmjGateLogRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateLogRepository.java deleted file mode 100644 index 2509bd6..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateLogRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zcloud.primeport.persistence.repository; - -import com.zcloud.primeport.persistence.dataobject.MkmjGateLogDO; -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:44 - */ -public interface MkmjGateLogRepository extends BaseRepository { - PageResponse listPage(Map params); -} - 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 index d0c1e69..0ca84a2 100644 --- 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 @@ -1,9 +1,11 @@ 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; /** @@ -14,5 +16,7 @@ import java.util.Map; */ 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/impl/MkmjAreaGateRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjAreaGateRepositoryImpl.java index 7fcf88f..cb41b2c 100644 --- 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 @@ -1,5 +1,7 @@ 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; @@ -12,6 +14,7 @@ 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; /** @@ -34,5 +37,10 @@ public class MkmjAreaGateRepositoryImpl extends BaseRepositoryImpl 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 index 901c365..5ae8de0 100644 --- 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 @@ -1,5 +1,6 @@ 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; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateLogRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateLogRepositoryImpl.java deleted file mode 100644 index 24473eb..0000000 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateLogRepositoryImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.zcloud.primeport.persistence.repository.impl; - -import com.zcloud.primeport.persistence.dataobject.MkmjGateLogDO; -import com.zcloud.primeport.persistence.mapper.MkmjGateLogMapper; -import com.zcloud.primeport.persistence.repository.MkmjGateLogRepository; -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:44 - */ -@Service -@RequiredArgsConstructor -public class MkmjGateLogRepositoryImpl extends BaseRepositoryImpl implements MkmjGateLogRepository { - private final MkmjGateLogMapper mkmjGateLogMapper; - - @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 = mkmjGateLogMapper.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 index 87746e9..a836b58 100644 --- 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 @@ -1,5 +1,8 @@ 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; @@ -12,6 +15,7 @@ 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; /** @@ -34,5 +38,11 @@ public class MkmjGateVideoRepositoryImpl extends BaseRepositoryImpl 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 399082e..a54d6d0 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,5 +1,6 @@ package com.zcloud.primeport.persistence.repository.impl; +import com.jjb.saas.framework.repository.common.PageHelper; import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; import com.zcloud.primeport.persistence.mapper.MkmjPassageMapper; import com.zcloud.primeport.persistence.repository.MkmjPassageRepository; diff --git a/web-infrastructure/src/main/resources/mapper/MkmjAreaGateMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjAreaGateMapper.xml index 0cc7dc9..f1a1f44 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjAreaGateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjAreaGateMapper.xml @@ -3,6 +3,18 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/web-infrastructure/src/main/resources/mapper/MkmjGateLogMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjGateLogMapper.xml deleted file mode 100644 index e938884..0000000 --- a/web-infrastructure/src/main/resources/mapper/MkmjGateLogMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/web-infrastructure/src/main/resources/mapper/MkmjGateVideoMapper.xml b/web-infrastructure/src/main/resources/mapper/MkmjGateVideoMapper.xml index 3f10f8e..dc439ef 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjGateVideoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjGateVideoMapper.xml @@ -4,5 +4,19 @@ + +