0703 - bug修改
parent
5620914fb1
commit
2847068115
7
pom.xml
7
pom.xml
|
|
@ -35,6 +35,13 @@
|
||||||
<artifactId>jjb-saas-framework-job</artifactId>
|
<artifactId>jjb-saas-framework-job</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 大华 SDK -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.dahuatech.icc</groupId>
|
||||||
|
<artifactId>java-sdk-oauth</artifactId>
|
||||||
|
<version>1.0.13.15</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package com.zcloud.primeport;
|
||||||
|
|
||||||
import com.jjb.saas.base.starter.bootstart.JJBSpringbootApplication;
|
import com.jjb.saas.base.starter.bootstart.JJBSpringbootApplication;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring Boot Starter
|
* Spring Boot Starter
|
||||||
|
|
|
||||||
|
|
@ -63,3 +63,13 @@ openapi:
|
||||||
apiCode: test:01
|
apiCode: test:01
|
||||||
#多个可以逗号隔开,可以为空
|
#多个可以逗号隔开,可以为空
|
||||||
tenantIds: 1838408702262321152
|
tenantIds: 1838408702262321152
|
||||||
|
# 大华平台配置
|
||||||
|
dahua:
|
||||||
|
oauth:
|
||||||
|
host: 192.168.1.100
|
||||||
|
client-id: your-client-id
|
||||||
|
client-secret: your-secret
|
||||||
|
username: admin
|
||||||
|
password: 123456
|
||||||
|
http: false
|
||||||
|
port: 443
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/6/23 13:49:31] App_Identifier[primeport-h5]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
|
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/3 14:46:37] App_Identifier[primeport]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>临时访客申请</title><script>(function () {
|
||||||
const APP_ENV = {
|
const APP_ENV = {
|
||||||
antd: {
|
antd: {
|
||||||
'ant-prefix': 'micro-temp',
|
'ant-prefix': 'micro-temp',
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
borderRadius: parseInt('2')
|
borderRadius: parseInt('2')
|
||||||
},
|
},
|
||||||
appKey: '',
|
appKey: '',
|
||||||
basename: 'primeport-h5',
|
basename: 'primeport',
|
||||||
API_HOST: ''
|
API_HOST: ''
|
||||||
};
|
};
|
||||||
APP_ENV.API_HOST = sessionStorage.API_HOST || APP_ENV.API_HOST || window.location.origin;
|
APP_ENV.API_HOST = sessionStorage.API_HOST || APP_ENV.API_HOST || window.location.origin;
|
||||||
|
|
@ -20,4 +20,4 @@
|
||||||
redirect: '',
|
redirect: '',
|
||||||
FRAMEWORK: APP_ENV.antd
|
FRAMEWORK: APP_ENV.antd
|
||||||
};
|
};
|
||||||
})();</script><script defer="defer" src="/primeport-h5/static/js/942.02e830144bca35fa.js"></script><script defer="defer" src="/primeport-h5/static/js/98.d3878dfe7429795b.js"></script><script defer="defer" src="/primeport-h5/static/js/main.8d63c1a19d83b0f8.js"></script><link href="/primeport-h5/static/css/main.de5125c7f5780dd6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/6/23 13:49:31] App_Identifier[primeport-h5] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
})();</script><script defer="defer" src="/primeport/static/js/942.000313a5011c30f5.js"></script><script defer="defer" src="/primeport/static/js/98.90d75146a9ca149f.js"></script><script defer="defer" src="/primeport/static/js/main.4a9b58a5b07ec8b5.js"></script><link href="/primeport/static/css/main.de5125c7f5780dd6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/3 14:46:37] App_Identifier[primeport] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -107,7 +107,7 @@ public class VehicleApplyController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation("分公司统计")
|
@ApiOperation("分公司统计")
|
||||||
@GetMapping("/fgsCount")
|
@PostMapping("/fgsCount")
|
||||||
public PageResponse<FgsVehicleCountCo> fgsCount(@RequestParam HashMap<String,String> qry) {
|
public PageResponse<FgsVehicleCountCo> fgsCount(@RequestParam HashMap<String,String> qry) {
|
||||||
return vehicleApplyService.fgsCount(qry);
|
return vehicleApplyService.fgsCount(qry);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuditCmd;
|
||||||
import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuthCmd;
|
import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuthCmd;
|
||||||
import com.zcloud.primeport.dto.ClosedAreaPersonApplyPageQry;
|
import com.zcloud.primeport.dto.ClosedAreaPersonApplyPageQry;
|
||||||
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
||||||
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyDeptCO;
|
||||||
import com.zcloud.primeport.dto.clientobject.UserCo;
|
import com.zcloud.primeport.dto.clientobject.UserCo;
|
||||||
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
|
@ -74,6 +75,12 @@ public class ClosedAreaPersonApplyController {
|
||||||
return closedAreaPersonApplyService.listPage(qry);
|
return closedAreaPersonApplyService.listPage(qry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation("申请记录部门分页")
|
||||||
|
@GetMapping("/pendingApprovalDeptList")
|
||||||
|
public MultiResponse<ClosedAreaPersonApplyDeptCO> pendingApprovalDeptList() {
|
||||||
|
return closedAreaPersonApplyService.deptList();
|
||||||
|
}
|
||||||
|
|
||||||
// @ApiOperation("所有数据")
|
// @ApiOperation("所有数据")
|
||||||
// @GetMapping("/listAll")
|
// @GetMapping("/listAll")
|
||||||
// public MultiResponse<ClosedAreaPersonApplyCO> listAll() {
|
// public MultiResponse<ClosedAreaPersonApplyCO> listAll() {
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,11 @@ public class ClosedTmpApplyController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (cmd.getTmpApplyType().equals(TmpApplyEnum.CAR_APPLY.getCode())) {
|
if (cmd.getTmpApplyType().equals(TmpApplyEnum.CAR_APPLY.getCode())) {
|
||||||
|
|
||||||
|
if (cmd.getApplyPersonUserName() == null) {
|
||||||
|
cmd.setApplyPersonUserName(cmd.getDrivingUserName());
|
||||||
|
}
|
||||||
|
|
||||||
if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_CAR_APPLY.getCode())) {
|
if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_CAR_APPLY.getCode())) {
|
||||||
VehicleApplyAddCmd vehicleApplyAddCmd = new VehicleApplyAddCmd();
|
VehicleApplyAddCmd vehicleApplyAddCmd = new VehicleApplyAddCmd();
|
||||||
BeanUtils.copyProperties(cmd, vehicleApplyAddCmd);
|
BeanUtils.copyProperties(cmd, vehicleApplyAddCmd);
|
||||||
|
|
@ -104,6 +109,7 @@ public class ClosedTmpApplyController {
|
||||||
vehicleApplyAddCmd.setLsUserIdcard(cmd.getUserCard());
|
vehicleApplyAddCmd.setLsUserIdcard(cmd.getUserCard());
|
||||||
vehicleApplyAddCmd.setLsUserPhone(cmd.getUserPhone());
|
vehicleApplyAddCmd.setLsUserPhone(cmd.getUserPhone());
|
||||||
vehicleApplyAddCmd.setEmployeeVehicleUserName(cmd.getApplyPersonUserName());
|
vehicleApplyAddCmd.setEmployeeVehicleUserName(cmd.getApplyPersonUserName());
|
||||||
|
vehicleApplyAddCmd.setDrivingUserName(cmd.getDrivingUserName());
|
||||||
vehicleApplyAddCmd.setRemarks(cmd.getApplyReason());
|
vehicleApplyAddCmd.setRemarks(cmd.getApplyReason());
|
||||||
SingleResponse<VehicleApplyE> add = vehicleApplyServiceI.add(vehicleApplyAddCmd);
|
SingleResponse<VehicleApplyE> add = vehicleApplyServiceI.add(vehicleApplyAddCmd);
|
||||||
id = add.getData().getId();
|
id = add.getData().getId();
|
||||||
|
|
|
||||||
|
|
@ -25,5 +25,6 @@ public interface ClosedAreaPersonApplyCoConvertor {
|
||||||
List<UserCo> converUserDtosToUserCos(List<UserDto> closedAreaPersonApplyDOs);
|
List<UserCo> converUserDtosToUserCos(List<UserDto> closedAreaPersonApplyDOs);
|
||||||
|
|
||||||
ClosedAreaPersonApplyCO converDOToCO(ClosedAreaPersonApplyDO closedAreaPersonApplyDO);
|
ClosedAreaPersonApplyCO converDOToCO(ClosedAreaPersonApplyDO closedAreaPersonApplyDO);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
package com.zcloud.primeport.command.convertor;
|
||||||
|
|
||||||
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
||||||
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyDeptCO;
|
||||||
|
import com.zcloud.primeport.dto.clientobject.UserCo;
|
||||||
|
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
||||||
|
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDeptDO;
|
||||||
|
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
||||||
|
import org.mapstruct.Mapper;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* web-app
|
||||||
|
* @Author dearLin
|
||||||
|
* @Date 2026-03-19 13:59:16
|
||||||
|
*/
|
||||||
|
@Mapper(componentModel = "spring")
|
||||||
|
public interface ClosedAreaPersonApplyDeptCoConvertor {
|
||||||
|
/**
|
||||||
|
* @param closedAreaPersonApplyDOs
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<ClosedAreaPersonApplyDeptCO> converDOsToCOs(List<ClosedAreaPersonApplyDeptDO> closedAreaPersonApplyDOs);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
package com.zcloud.primeport.command.query;
|
package com.zcloud.primeport.command.query;
|
||||||
|
|
||||||
|
import com.alibaba.cola.dto.MultiResponse;
|
||||||
import com.alibaba.cola.dto.SingleResponse;
|
import com.alibaba.cola.dto.SingleResponse;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||||
import com.zcloud.primeport.command.convertor.ClosedAreaPersonApplyCoConvertor;
|
import com.zcloud.primeport.command.convertor.ClosedAreaPersonApplyCoConvertor;
|
||||||
|
import com.zcloud.primeport.command.convertor.ClosedAreaPersonApplyDeptCoConvertor;
|
||||||
import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuthCmd;
|
import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuthCmd;
|
||||||
import com.zcloud.primeport.dto.ClosedAreaPersonApplyPageQry;
|
import com.zcloud.primeport.dto.ClosedAreaPersonApplyPageQry;
|
||||||
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
||||||
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyDeptCO;
|
||||||
import com.zcloud.primeport.dto.clientobject.UserCo;
|
import com.zcloud.primeport.dto.clientobject.UserCo;
|
||||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaFgsPersonAreaDO;
|
import com.zcloud.primeport.persistence.dataobject.*;
|
||||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaFgsPersonAuthDO;
|
|
||||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
|
||||||
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
|
||||||
import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAreaRepository;
|
import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAreaRepository;
|
||||||
import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAuthRepository;
|
import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAuthRepository;
|
||||||
import com.zcloud.primeport.persistence.repository.ClosedAreaPersonApplyRepository;
|
import com.zcloud.primeport.persistence.repository.ClosedAreaPersonApplyRepository;
|
||||||
|
|
@ -38,6 +38,7 @@ public class ClosedAreaPersonApplyQueryExe {
|
||||||
private final ClosedAreaFgsPersonAuthRepository closedAreaFgsPersonAuthRepository;
|
private final ClosedAreaFgsPersonAuthRepository closedAreaFgsPersonAuthRepository;
|
||||||
private final ClosedAreaFgsPersonAreaRepository closedAreaFgsPersonAreaRepository;
|
private final ClosedAreaFgsPersonAreaRepository closedAreaFgsPersonAreaRepository;
|
||||||
private final ClosedAreaPersonApplyCoConvertor closedAreaPersonApplyCoConvertor;
|
private final ClosedAreaPersonApplyCoConvertor closedAreaPersonApplyCoConvertor;
|
||||||
|
private final ClosedAreaPersonApplyDeptCoConvertor closedAreaPersonApplyDeptCoConvertor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据id查询
|
* 根据id查询
|
||||||
|
|
@ -49,6 +50,18 @@ public class ClosedAreaPersonApplyQueryExe {
|
||||||
return closedAreaPersonApplyCoConvertor.converDOToCO(closedAreaPersonApplyRepository.getById(id));
|
return closedAreaPersonApplyCoConvertor.converDOToCO(closedAreaPersonApplyRepository.getById(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取全部部门
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public MultiResponse <ClosedAreaPersonApplyDeptCO> obtainDeptList() {
|
||||||
|
|
||||||
|
List <ClosedAreaPersonApplyDeptDO> closedAreaPersonApplyDeptDOs = closedAreaPersonApplyRepository.deptList();
|
||||||
|
|
||||||
|
return MultiResponse.of(closedAreaPersonApplyDeptCoConvertor.converDOsToCOs(closedAreaPersonApplyDeptDOs));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页
|
* 分页
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,11 @@ import com.zcloud.primeport.persistence.repository.MkmjApprovalUserRepository;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -64,7 +67,21 @@ public class MkmjApprovalUserQueryExe {
|
||||||
|
|
||||||
}
|
}
|
||||||
List<MkmjApprovalUserDO> dataList = mkmjApprovalUserRepository.list(mkmjApprovalUserCOQueryWrapper);
|
List<MkmjApprovalUserDO> dataList = mkmjApprovalUserRepository.list(mkmjApprovalUserCOQueryWrapper);
|
||||||
return mkmjApprovalUserCoConvertor.converDOsToCOs(dataList);
|
|
||||||
|
// 去重
|
||||||
|
// 保留第一次出现的 userId
|
||||||
|
List<MkmjApprovalUserDO> distinctList = new ArrayList <>(
|
||||||
|
dataList.stream()
|
||||||
|
.collect(Collectors.toMap(
|
||||||
|
MkmjApprovalUserDO::getUserId, // key:去重依据 userId
|
||||||
|
obj -> obj, // value:当前对象
|
||||||
|
(existing, replacement) -> existing, // 重复时保留旧对象(第一条)
|
||||||
|
LinkedHashMap::new // 保证原有顺序
|
||||||
|
))
|
||||||
|
.values()
|
||||||
|
);
|
||||||
|
|
||||||
|
return mkmjApprovalUserCoConvertor.converDOsToCOs(distinctList);
|
||||||
}
|
}
|
||||||
|
|
||||||
public MkmjApprovalUserCO getInfoById(Long id) {
|
public MkmjApprovalUserCO getInfoById(Long id) {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,9 @@ import com.zcloud.gbscommon.utils.PageQueryHelper;
|
||||||
import com.zcloud.primeport.command.convertor.VehicleAuditCoConvertor;
|
import com.zcloud.primeport.command.convertor.VehicleAuditCoConvertor;
|
||||||
import com.zcloud.primeport.dto.VehicleAuditPageQry;
|
import com.zcloud.primeport.dto.VehicleAuditPageQry;
|
||||||
import com.zcloud.primeport.dto.clientobject.VehicleAuditCO;
|
import com.zcloud.primeport.dto.clientobject.VehicleAuditCO;
|
||||||
|
import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO;
|
||||||
import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO;
|
import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO;
|
||||||
|
import com.zcloud.primeport.persistence.repository.VehicleApplyRepository;
|
||||||
import com.zcloud.primeport.persistence.repository.VehicleAuditRepository;
|
import com.zcloud.primeport.persistence.repository.VehicleAuditRepository;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
@ -26,6 +28,7 @@ import java.util.Map;
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class VehicleAuditQueryExe {
|
public class VehicleAuditQueryExe {
|
||||||
private final VehicleAuditRepository vehicleAuditRepository;
|
private final VehicleAuditRepository vehicleAuditRepository;
|
||||||
|
private final VehicleApplyRepository vehicleApplyRepository;
|
||||||
private final VehicleAuditCoConvertor vehicleAuditCoConvertor;
|
private final VehicleAuditCoConvertor vehicleAuditCoConvertor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -38,6 +41,13 @@ public class VehicleAuditQueryExe {
|
||||||
Map<String, Object> parmas = PageQueryHelper.toHashMap(vehicleAuditPageQry);
|
Map<String, Object> parmas = PageQueryHelper.toHashMap(vehicleAuditPageQry);
|
||||||
PageResponse<VehicleAuditDO> pageResponse = vehicleAuditRepository.listPage(parmas);
|
PageResponse<VehicleAuditDO> pageResponse = vehicleAuditRepository.listPage(parmas);
|
||||||
List<VehicleAuditCO> examCenterCOS = vehicleAuditCoConvertor.converDOsToCOs(pageResponse.getData());
|
List<VehicleAuditCO> examCenterCOS = vehicleAuditCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||||
|
|
||||||
|
for (VehicleAuditCO item : examCenterCOS) {
|
||||||
|
if (item.getApplyUserName() == null || item.getApplyUserName().isEmpty()) {
|
||||||
|
item.setApplyUserName(item.getEmployeeVehicleUserName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Long userId = AuthContext.getUserId();
|
Long userId = AuthContext.getUserId();
|
||||||
if (!examCenterCOS.isEmpty()) {
|
if (!examCenterCOS.isEmpty()) {
|
||||||
examCenterCOS.forEach(item -> {
|
examCenterCOS.forEach(item -> {
|
||||||
|
|
@ -61,7 +71,16 @@ public class VehicleAuditQueryExe {
|
||||||
}
|
}
|
||||||
|
|
||||||
public VehicleAuditCO getInfoById(Long id) {
|
public VehicleAuditCO getInfoById(Long id) {
|
||||||
return vehicleAuditCoConvertor.converDOToCO(vehicleAuditRepository.getById(id));
|
|
||||||
|
VehicleAuditDO vehicleAudit = vehicleAuditRepository.getById(id);
|
||||||
|
|
||||||
|
VehicleApplyDO vehicleApplyDO = vehicleApplyRepository.getById(vehicleAudit.getVehicleApplyId());
|
||||||
|
|
||||||
|
VehicleAuditCO vehicleAuditCO = vehicleAuditCoConvertor.converDOToCO(vehicleAudit);
|
||||||
|
vehicleAuditCO.setMkmjId(vehicleApplyDO.getMkmjId());
|
||||||
|
vehicleAuditCO.setMkmjName(vehicleApplyDO.getMkmjName());
|
||||||
|
|
||||||
|
return vehicleAuditCO;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@ public class ClosedAreaCarApplyServiceImpl implements ClosedAreaCarApplyServiceI
|
||||||
public Long saveTmpCarApply(ClosedTmpApplyAddCmd cmd) {
|
public Long saveTmpCarApply(ClosedTmpApplyAddCmd cmd) {
|
||||||
ClosedAreaCarApplyAddCmd closedAreaCarApplyAddCmd = new ClosedAreaCarApplyAddCmd();
|
ClosedAreaCarApplyAddCmd closedAreaCarApplyAddCmd = new ClosedAreaCarApplyAddCmd();
|
||||||
BeanUtils.copyProperties(cmd, closedAreaCarApplyAddCmd);
|
BeanUtils.copyProperties(cmd, closedAreaCarApplyAddCmd);
|
||||||
|
closedAreaCarApplyAddCmd.setApplyPersonUserName(cmd.getDrivingUserName());
|
||||||
closedAreaCarApplyAddCmd.setCarBelongType(CloseCarBelongTypeEnum.TEMPORARY_VEHICLES.getCode());
|
closedAreaCarApplyAddCmd.setCarBelongType(CloseCarBelongTypeEnum.TEMPORARY_VEHICLES.getCode());
|
||||||
return closedAreaCarApplyAddExe.execute(closedAreaCarApplyAddCmd);
|
return closedAreaCarApplyAddExe.execute(closedAreaCarApplyAddCmd);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package com.zcloud.primeport.service;
|
package com.zcloud.primeport.service;
|
||||||
|
|
||||||
|
import com.alibaba.cola.dto.MultiResponse;
|
||||||
import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI;
|
import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI;
|
||||||
import com.zcloud.primeport.command.ClosedAreaPersonApplyAddExe;
|
import com.zcloud.primeport.command.ClosedAreaPersonApplyAddExe;
|
||||||
import com.zcloud.primeport.command.ClosedAreaPersonApplyRemoveExe;
|
import com.zcloud.primeport.command.ClosedAreaPersonApplyRemoveExe;
|
||||||
|
|
@ -11,6 +12,7 @@ import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
||||||
|
|
||||||
import com.alibaba.cola.dto.PageResponse;
|
import com.alibaba.cola.dto.PageResponse;
|
||||||
import com.alibaba.cola.dto.SingleResponse;
|
import com.alibaba.cola.dto.SingleResponse;
|
||||||
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyDeptCO;
|
||||||
import com.zcloud.primeport.dto.clientobject.UserCo;
|
import com.zcloud.primeport.dto.clientobject.UserCo;
|
||||||
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
|
@ -41,6 +43,11 @@ public class ClosedAreaPersonApplyServiceImpl implements ClosedAreaPersonApplySe
|
||||||
return closedAreaPersonApplyQueryExe.execute(qry);
|
return closedAreaPersonApplyQueryExe.execute(qry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public MultiResponse <ClosedAreaPersonApplyDeptCO> deptList(){
|
||||||
|
return closedAreaPersonApplyQueryExe.obtainDeptList();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SingleResponse add(ClosedAreaPersonApplyAddCmd cmd) {
|
public SingleResponse add(ClosedAreaPersonApplyAddCmd cmd) {
|
||||||
closedAreaPersonApplyAddExe.execute(cmd);
|
closedAreaPersonApplyAddExe.execute(cmd);
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,12 @@
|
||||||
package com.zcloud.primeport.api;
|
package com.zcloud.primeport.api;
|
||||||
|
|
||||||
|
import com.alibaba.cola.dto.MultiResponse;
|
||||||
import com.zcloud.primeport.dto.*;
|
import com.zcloud.primeport.dto.*;
|
||||||
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
|
||||||
|
|
||||||
import com.alibaba.cola.dto.PageResponse;
|
import com.alibaba.cola.dto.PageResponse;
|
||||||
import com.alibaba.cola.dto.SingleResponse;
|
import com.alibaba.cola.dto.SingleResponse;
|
||||||
|
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyDeptCO;
|
||||||
import com.zcloud.primeport.dto.clientobject.UserCo;
|
import com.zcloud.primeport.dto.clientobject.UserCo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -17,6 +19,8 @@ public interface ClosedAreaPersonApplyServiceI {
|
||||||
|
|
||||||
PageResponse<ClosedAreaPersonApplyCO> listPage(ClosedAreaPersonApplyPageQry qry);
|
PageResponse<ClosedAreaPersonApplyCO> listPage(ClosedAreaPersonApplyPageQry qry);
|
||||||
|
|
||||||
|
MultiResponse <ClosedAreaPersonApplyDeptCO> deptList();
|
||||||
|
|
||||||
SingleResponse<ClosedAreaPersonApplyCO> add(ClosedAreaPersonApplyAddCmd cmd);
|
SingleResponse<ClosedAreaPersonApplyCO> add(ClosedAreaPersonApplyAddCmd cmd);
|
||||||
|
|
||||||
void edit(ClosedAreaPersonApplyUpdateCmd cmd);
|
void edit(ClosedAreaPersonApplyUpdateCmd cmd);
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,8 @@ public class ClosedAreaCarApplyPageQry extends PageQuery {
|
||||||
private Integer carBelongType;
|
private Integer carBelongType;
|
||||||
@ApiModelProperty(value = "申请人公司名称", name = "applyPersonCorpName")
|
@ApiModelProperty(value = "申请人公司名称", name = "applyPersonCorpName")
|
||||||
private String applyPersonCorpName;
|
private String applyPersonCorpName;
|
||||||
|
@ApiModelProperty(value = "项目名称", name = "projectName")
|
||||||
|
private String projectName;
|
||||||
private String menuPath;
|
private String menuPath;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@ import lombok.Data;
|
||||||
@Data
|
@Data
|
||||||
public class ClosedAreaPageQry extends PageQuery {
|
public class ClosedAreaPageQry extends PageQuery {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "所属港区",name = "closedArea")
|
||||||
|
private String closedArea;
|
||||||
@ApiModelProperty(value = "封闭区域名称",name = "closedAreaName")
|
@ApiModelProperty(value = "封闭区域名称",name = "closedAreaName")
|
||||||
private String closedAreaName;
|
private String closedAreaName;
|
||||||
@ApiModelProperty(value = "所属港区",name = "hgAuthArea")
|
@ApiModelProperty(value = "所属港区",name = "hgAuthArea")
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,8 @@ public class ClosedAreaPersonApplyPageQry extends PageQuery {
|
||||||
private Integer personBelongType;
|
private Integer personBelongType;
|
||||||
@ApiModelProperty(value = " 1有图片", name = "hasFaceUrl", required = true)
|
@ApiModelProperty(value = " 1有图片", name = "hasFaceUrl", required = true)
|
||||||
private Integer hasFaceUrl;
|
private Integer hasFaceUrl;
|
||||||
|
@ApiModelProperty(value = "项目名称", name = "projectName", required = true)
|
||||||
|
private String projectName;
|
||||||
private String menuPath;
|
private String menuPath;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
package com.zcloud.primeport.dto.clientobject;
|
||||||
|
|
||||||
|
import com.alibaba.cola.dto.ClientObject;
|
||||||
|
import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuthCmd;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* web-client
|
||||||
|
*
|
||||||
|
* @Author dearLin
|
||||||
|
* @Date 2026-03-19 13:59:16
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class ClosedAreaPersonApplyDeptCO extends ClientObject {
|
||||||
|
|
||||||
|
//待审批人员所属部门id
|
||||||
|
@ApiModelProperty(value = "待审批人员所属部门id")
|
||||||
|
private Long applyPersonDepartmentId;
|
||||||
|
//申请人员部门名称
|
||||||
|
@ApiModelProperty(value = "申请人员部门名称")
|
||||||
|
private String applyPersonDepartmentName;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
package com.zcloud.primeport.domain.config;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description:
|
||||||
|
* @Date: 2026/7/2
|
||||||
|
* @User: tianxinlei
|
||||||
|
*/
|
||||||
|
@Component
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@ConfigurationProperties(prefix = "dahua.oauth")
|
||||||
|
public class DaHuaOauthProperties {
|
||||||
|
private String host;
|
||||||
|
private String clientId;
|
||||||
|
private String clientSecret;
|
||||||
|
private String username;
|
||||||
|
private String password;
|
||||||
|
private boolean http;
|
||||||
|
private String port;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
package com.zcloud.primeport.domain.config;
|
||||||
|
|
||||||
|
import com.dahuatech.icc.oauth.model.v202010.OauthConfigUserPwdInfo;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description:
|
||||||
|
* @Date: 2026/7/2
|
||||||
|
* @User: tianxinlei
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
public class DaHuaSdkConfig {
|
||||||
|
|
||||||
|
private final DaHuaOauthProperties dahuaOauthProperties;
|
||||||
|
|
||||||
|
// 构造注入配置属性
|
||||||
|
public DaHuaSdkConfig(DaHuaOauthProperties dahuaOauthProperties) {
|
||||||
|
this.dahuaOauthProperties = dahuaOauthProperties;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public OauthConfigUserPwdInfo daHuaOauthConfig() {
|
||||||
|
return new OauthConfigUserPwdInfo(
|
||||||
|
dahuaOauthProperties.getHost(),
|
||||||
|
dahuaOauthProperties.getClientId(),
|
||||||
|
dahuaOauthProperties.getClientSecret(),
|
||||||
|
dahuaOauthProperties.getUsername(),
|
||||||
|
dahuaOauthProperties.getPassword(),
|
||||||
|
dahuaOauthProperties.isHttp(),
|
||||||
|
dahuaOauthProperties.getPort()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
package com.zcloud.primeport.persistence.dataobject;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
|
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 dearLin
|
||||||
|
* @Date 2026-03-19 13:59:16
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@TableName("closed_area_person_apply")
|
||||||
|
@NoArgsConstructor
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class ClosedAreaPersonApplyDeptDO extends BaseDO {
|
||||||
|
//申请人员所属企业ID
|
||||||
|
@ApiModelProperty(value = "申请人员所属企业ID")
|
||||||
|
private Long applyPersonCorpId;
|
||||||
|
//申请人员所属企业名称
|
||||||
|
@ApiModelProperty(value = "申请人员所属企业名称")
|
||||||
|
private String applyPersonCorpName;
|
||||||
|
//待审批人员所属部门id
|
||||||
|
@ApiModelProperty(value = "待审批人员所属部门id")
|
||||||
|
private Long applyPersonDepartmentId;
|
||||||
|
//申请人员部门名称
|
||||||
|
@ApiModelProperty(value = "申请人员部门名称")
|
||||||
|
private String applyPersonDepartmentName;
|
||||||
|
//申请人员id
|
||||||
|
@ApiModelProperty(value = "申请人员id")
|
||||||
|
private Long applyPersonUserId;
|
||||||
|
//申请人员姓名
|
||||||
|
@ApiModelProperty(value = "申请人员姓名")
|
||||||
|
private String applyPersonUserName;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -6,6 +6,7 @@ import com.jjb.saas.framework.datascope.annotation.DataScope;
|
||||||
import com.jjb.saas.framework.datascope.annotation.DataScopes;
|
import com.jjb.saas.framework.datascope.annotation.DataScopes;
|
||||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDeptDO;
|
||||||
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
||||||
import com.zcloud.primeport.plan.mjDevice.TwoPersonUtil;
|
import com.zcloud.primeport.plan.mjDevice.TwoPersonUtil;
|
||||||
import com.zcloud.primeport.plan.mjDevice.dto.TwoLevelUser;
|
import com.zcloud.primeport.plan.mjDevice.dto.TwoLevelUser;
|
||||||
|
|
@ -32,6 +33,8 @@ public interface ClosedAreaPersonApplyMapper extends BaseMapper<ClosedAreaPerson
|
||||||
|
|
||||||
List<TwoLevelUser> getDockAuthInfoById(Long applyId);
|
List<TwoLevelUser> getDockAuthInfoById(Long applyId);
|
||||||
|
|
||||||
|
List<ClosedAreaPersonApplyDeptDO> deptList();
|
||||||
|
|
||||||
List<TwoLevelUser> getDockAuthTmpInfoById(Long applyId);
|
List<TwoLevelUser> getDockAuthTmpInfoById(Long applyId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
package com.zcloud.primeport.persistence.repository;
|
package com.zcloud.primeport.persistence.repository;
|
||||||
|
|
||||||
|
import com.alibaba.cola.dto.MultiResponse;
|
||||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
||||||
import com.alibaba.cola.dto.PageResponse;
|
import com.alibaba.cola.dto.PageResponse;
|
||||||
import com.jjb.saas.framework.repository.repo.BaseRepository;
|
import com.jjb.saas.framework.repository.repo.BaseRepository;
|
||||||
|
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDeptDO;
|
||||||
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
||||||
import com.zcloud.primeport.plan.mjDevice.TwoPersonUtil;
|
import com.zcloud.primeport.plan.mjDevice.TwoPersonUtil;
|
||||||
import com.zcloud.primeport.plan.mjDevice.dto.TwoLevelUser;
|
import com.zcloud.primeport.plan.mjDevice.dto.TwoLevelUser;
|
||||||
|
|
@ -19,6 +21,8 @@ import java.util.Map;
|
||||||
public interface ClosedAreaPersonApplyRepository extends BaseRepository<ClosedAreaPersonApplyDO> {
|
public interface ClosedAreaPersonApplyRepository extends BaseRepository<ClosedAreaPersonApplyDO> {
|
||||||
PageResponse<ClosedAreaPersonApplyDO> listPage(Map<String,Object> params);
|
PageResponse<ClosedAreaPersonApplyDO> listPage(Map<String,Object> params);
|
||||||
|
|
||||||
|
List <ClosedAreaPersonApplyDeptDO> deptList();
|
||||||
|
|
||||||
PageResponse<UserDto> getCorpUserList(Map<String, Object> params);
|
PageResponse<UserDto> getCorpUserList(Map<String, Object> params);
|
||||||
|
|
||||||
List<TwoLevelUser> getDockAuthInfoById(Long applyId);
|
List<TwoLevelUser> getDockAuthInfoById(Long applyId);
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
package com.zcloud.primeport.persistence.repository.impl;
|
package com.zcloud.primeport.persistence.repository.impl;
|
||||||
|
|
||||||
|
import com.alibaba.cola.dto.MultiResponse;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.zcloud.primeport.domain.enums.MenuEnum;
|
import com.zcloud.primeport.domain.enums.MenuEnum;
|
||||||
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
|
||||||
|
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDeptDO;
|
||||||
import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO;
|
import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO;
|
||||||
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
import com.zcloud.primeport.persistence.dataobject.UserDto;
|
||||||
import com.zcloud.primeport.persistence.mapper.ClosedAreaPersonApplyMapper;
|
import com.zcloud.primeport.persistence.mapper.ClosedAreaPersonApplyMapper;
|
||||||
|
|
@ -48,6 +50,13 @@ public class ClosedAreaPersonApplyRepositoryImpl extends BaseRepositoryImpl<Clos
|
||||||
return PageHelper.pageToResponse(result, result.getRecords());
|
return PageHelper.pageToResponse(result, result.getRecords());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List <ClosedAreaPersonApplyDeptDO> deptList() {
|
||||||
|
|
||||||
|
return closedAreaPersonApplyMapper.deptList();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResponse<UserDto> getCorpUserList(Map<String, Object> params) {
|
public PageResponse<UserDto> getCorpUserList(Map<String, Object> params) {
|
||||||
IPage<ClosedAreaPersonApplyDO> iPage = new Query<ClosedAreaPersonApplyDO>().getPage(params);
|
IPage<ClosedAreaPersonApplyDO> iPage = new Query<ClosedAreaPersonApplyDO>().getPage(params);
|
||||||
|
|
|
||||||
|
|
@ -32,10 +32,22 @@ public class MkmjSwipeCardRecordRepositoryImpl extends BaseRepositoryImpl<MkmjSw
|
||||||
public PageResponse<MkmjSwipeCardRecordDO> listPage(Map<String, Object> params) {
|
public PageResponse<MkmjSwipeCardRecordDO> listPage(Map<String, Object> params) {
|
||||||
IPage<MkmjSwipeCardRecordDO> iPage = new Query<MkmjSwipeCardRecordDO>().getPage(params);
|
IPage<MkmjSwipeCardRecordDO> iPage = new Query<MkmjSwipeCardRecordDO>().getPage(params);
|
||||||
QueryWrapper<MkmjSwipeCardRecordDO> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<MkmjSwipeCardRecordDO> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
|
if (params.get("likeId") != null) {
|
||||||
queryWrapper.eq("paper_number", Base64.decodeToString(String.valueOf(params.get("cardNo"))));
|
queryWrapper.eq("id", params.get("likeId"));
|
||||||
queryWrapper.ge(Tools.notEmpty(String.valueOf(params.get("swingTimeStart"))),"swing_time", params.get("swingTimeStart"));
|
}
|
||||||
queryWrapper.le(Tools.notEmpty(String.valueOf(params.get("swingTimeEnd"))),"swing_time", params.get("swingTimeEnd"));
|
if (params.get("cardNo") != null) {
|
||||||
|
// queryWrapper.eq("paper_number", Base64.decodeToString(String.valueOf(params.get("cardNo"))));
|
||||||
|
queryWrapper.eq("paper_number", params.get("cardNo"));
|
||||||
|
}
|
||||||
|
if (params.get("likeDeviceName") != null) {
|
||||||
|
queryWrapper.like("device_name", params.get("likeDeviceName"));
|
||||||
|
}
|
||||||
|
if (params.get("swingTimeStart") != null) {
|
||||||
|
queryWrapper.ge("swing_time", params.get("swingTimeStart"));
|
||||||
|
}
|
||||||
|
if (params.get("swingTimeEnd") != null) {
|
||||||
|
queryWrapper.le("swing_time", params.get("swingTimeEnd"));
|
||||||
|
}
|
||||||
queryWrapper.orderByDesc("swing_time");
|
queryWrapper.orderByDesc("swing_time");
|
||||||
IPage<MkmjSwipeCardRecordDO> result = mkmjSwipeCardRecordMapper.selectPage(iPage, queryWrapper);
|
IPage<MkmjSwipeCardRecordDO> result = mkmjSwipeCardRecordMapper.selectPage(iPage, queryWrapper);
|
||||||
return PageHelper.pageToResponse(result, result.getRecords());
|
return PageHelper.pageToResponse(result, result.getRecords());
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
package com.zcloud.primeport.plan.mjDevice;
|
||||||
|
|
||||||
|
import com.dahuatech.icc.oauth.model.v202010.OauthConfigUserPwdInfo;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description:
|
||||||
|
* @Date: 2026/7/2
|
||||||
|
* @User: tianxinlei
|
||||||
|
*/
|
||||||
|
@Component
|
||||||
|
public class DaHuaSdkUtil {
|
||||||
|
|
||||||
|
private final OauthConfigUserPwdInfo oauthConfig;
|
||||||
|
|
||||||
|
public DaHuaSdkUtil(OauthConfigUserPwdInfo oauthConfig) {
|
||||||
|
this.oauthConfig = oauthConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 初始化登录
|
||||||
|
*/
|
||||||
|
public String login() {
|
||||||
|
// 内部使用 oauthConfig 执行登录逻辑,返回token
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 释放SDK资源
|
||||||
|
*/
|
||||||
|
public void logout() {
|
||||||
|
// SDK注销、销毁连接
|
||||||
|
}
|
||||||
|
|
||||||
|
// 其他设备查询、回放、抓拍等业务方法
|
||||||
|
}
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
where c.delete_enum = 'FALSE'
|
where c.delete_enum = 'FALSE'
|
||||||
|
|
||||||
<if test="params.applyPersonCorpName != null and params.applyPersonCorpName != ''">
|
<if test="params.applyPersonCorpName != null and params.applyPersonCorpName != ''">
|
||||||
AND c.apply_person_corp_name like CONCAT('%', #{params.applyPersonCorpName}, '%')
|
AND c.jurisdictional_corp_name like CONCAT('%', #{params.applyPersonCorpName}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="params.processOrRecord != null">
|
<if test="params.processOrRecord != null">
|
||||||
<if test="params.processOrRecord == 1">
|
<if test="params.processOrRecord == 1">
|
||||||
|
|
@ -42,6 +42,9 @@
|
||||||
<if test="params.applyPersonUserName != null and params.applyPersonUserName != ''">
|
<if test="params.applyPersonUserName != null and params.applyPersonUserName != ''">
|
||||||
AND c.apply_person_user_name like CONCAT('%', #{params.applyPersonUserName}, '%')
|
AND c.apply_person_user_name like CONCAT('%', #{params.applyPersonUserName}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
<if test="params.projectName != null and params.projectName != ''">
|
||||||
|
AND c.project_name like CONCAT('%', #{params.projectName}, '%')
|
||||||
|
</if>
|
||||||
<if test="params.licenceNo != null and params.licenceNo != ''">
|
<if test="params.licenceNo != null and params.licenceNo != ''">
|
||||||
AND c.licence_no like CONCAT('%', #{params.licenceNo}, '%')
|
AND c.licence_no like CONCAT('%', #{params.licenceNo}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,9 @@
|
||||||
<if test="params.parentId != null">
|
<if test="params.parentId != null">
|
||||||
AND c.parent_id = #{params.parentId}
|
AND c.parent_id = #{params.parentId}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="params.closedArea != null">
|
||||||
|
AND c.hg_auth_area = #{params.closedArea}
|
||||||
|
</if>
|
||||||
<if test="params.hgAuthArea != null and params.hgAuthArea != ''">
|
<if test="params.hgAuthArea != null and params.hgAuthArea != ''">
|
||||||
AND C.hg_auth_area = #{params.hgAuthArea}
|
AND C.hg_auth_area = #{params.hgAuthArea}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,10 @@
|
||||||
u.`name`,
|
u.`name`,
|
||||||
u.corpinfo_id corpId,
|
u.corpinfo_id corpId,
|
||||||
u.post_id,
|
u.post_id,
|
||||||
u.post_name,
|
CASE
|
||||||
|
WHEN c.type IN (3,4,5) THEN u.post_name
|
||||||
|
ELSE p.post_name
|
||||||
|
END AS post_name,
|
||||||
c.corp_name,
|
c.corp_name,
|
||||||
d.id dept_Id,
|
d.id dept_Id,
|
||||||
d.`name` dept_Name,
|
d.`name` dept_Name,
|
||||||
|
|
@ -26,6 +29,7 @@
|
||||||
`user` AS u
|
`user` AS u
|
||||||
LEFT JOIN corp_info c ON u.corpinfo_id = c.id
|
LEFT JOIN corp_info c ON u.corpinfo_id = c.id
|
||||||
LEFT JOIN department d ON u.department_id = d.id
|
LEFT JOIN department d ON u.department_id = d.id
|
||||||
|
LEFT JOIN post p ON p.id = u.post_id
|
||||||
LEFT JOIN closed_area_fgs_person_auth cafpa on cafpa.user_id = u.id and cafpa.delete_enum = 'FALSE'
|
LEFT JOIN closed_area_fgs_person_auth cafpa on cafpa.user_id = u.id and cafpa.delete_enum = 'FALSE'
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT
|
SELECT
|
||||||
|
|
@ -66,8 +70,12 @@
|
||||||
from closed_area_person_apply c
|
from closed_area_person_apply c
|
||||||
where c.delete_enum = 'FALSE'
|
where c.delete_enum = 'FALSE'
|
||||||
|
|
||||||
<if test="params.applyPersonCorpName != null">
|
<if test="params.applyPersonCorpName != null and params.applyPersonCorpName != ''">
|
||||||
AND c.apply_person_corp_name like CONCAT('%', #{params.applyPersonCorpName}, '%')
|
AND c.jurisdictional_corp_name like CONCAT('%', #{params.applyPersonCorpName}, '%')
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="params.projectName != null and params.projectName != ''">
|
||||||
|
AND c.project_name like CONCAT('%', #{params.projectName}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="params.deptId != null">
|
<if test="params.deptId != null">
|
||||||
AND c.apply_person_department_id = #{params.deptId}
|
AND c.apply_person_department_id = #{params.deptId}
|
||||||
|
|
@ -102,6 +110,19 @@
|
||||||
</if>
|
</if>
|
||||||
order by c.id desc
|
order by c.id desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="deptList" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDeptDO">
|
||||||
|
SELECT DISTINCT
|
||||||
|
apply_person_corp_id,
|
||||||
|
apply_person_corp_name,
|
||||||
|
apply_person_department_id,
|
||||||
|
apply_person_department_name
|
||||||
|
FROM closed_area_person_apply
|
||||||
|
WHERE delete_enum = 'FALSE'
|
||||||
|
AND apply_person_department_id IS NOT NULL
|
||||||
|
ORDER BY apply_person_department_id DESC
|
||||||
|
</select>
|
||||||
|
|
||||||
<select id="getDockAuthInfoById" resultType="com.zcloud.primeport.plan.mjDevice.dto.TwoLevelUser">
|
<select id="getDockAuthInfoById" resultType="com.zcloud.primeport.plan.mjDevice.dto.TwoLevelUser">
|
||||||
SELECT
|
SELECT
|
||||||
capa.id,
|
capa.id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue