zcloud_gbs
/
zcloud-gbs-primeport
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0703 - bug修改

koumen
tianxinlei 2026-07-03 15:01:43 +08:00
parent 5620914fb1
commit 2847068115
36 changed files with 371 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -35,6 +35,13 @@
<artifactId>jjb-saas-framework-job</artifactId>
</dependency>
<!-- 大华 SDK -->
<dependency>
<groupId>com.dahuatech.icc</groupId>
<artifactId>java-sdk-oauth</artifactId>
<version>1.0.13.15</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>

1
start/src/main/java/com/zcloud/primeport/Application.java
View File

@ -2,6 +2,7 @@ package com.zcloud.primeport;
import com.jjb.saas.base.starter.bootstart.JJBSpringbootApplication;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
/**
* Spring Boot Starter

10
start/src/main/resources/sdk.yml
View File

@ -63,3 +63,13 @@ openapi:
apiCode: test:01
#多个可以逗号隔开，可以为空
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

6
start/src/main/resources/templates/primeport-h5.html
View File

@ -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 = {
antd: {
'ant-prefix': 'micro-temp',
@ -7,7 +7,7 @@
borderRadius: parseInt('2')
},
appKey: '',
basename: 'primeport-h5',
basename: 'primeport',
API_HOST: ''
};
APP_ENV.API_HOST = sessionStorage.API_HOST || APP_ENV.API_HOST || window.location.origin;
@ -20,4 +20,4 @@
redirect: '',
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>

1
start/src/main/resources/templates/primeport-h5/static/js/main.071ecfece4da1b57.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/primeport-h5/static/js/main.2d9f4c71974741a1.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/primeport-h5/static/js/main.3d17e04b1ee0d3cd.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/primeport-h5/static/js/main.9ebd3d16c2373b3d.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/primeport-h5/static/js/main.d63746fa3b2c0c15.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/primeport/static/js/main.4a9b58a5b07ec8b5.js Normal file
View File

File diff suppressed because one or more lines are too long

2
web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java
View File

@ -107,7 +107,7 @@ public class VehicleApplyController {
}
@ApiOperation("分公司统计")
@GetMapping("/fgsCount")
@PostMapping("/fgsCount")
public PageResponse<FgsVehicleCountCo> fgsCount(@RequestParam HashMap<String,String> qry) {
return vehicleApplyService.fgsCount(qry);
}

7
web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaPersonApplyController.java
View File

@ -9,6 +9,7 @@ import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuditCmd;
import com.zcloud.primeport.dto.ClosedAreaPersonApplyAuthCmd;
import com.zcloud.primeport.dto.ClosedAreaPersonApplyPageQry;
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.UserDto;
import io.swagger.annotations.Api;
@ -74,6 +75,12 @@ public class ClosedAreaPersonApplyController {
return closedAreaPersonApplyService.listPage(qry);
}
@ApiOperation("申请记录部门分页")
@GetMapping("/pendingApprovalDeptList")
public MultiResponse<ClosedAreaPersonApplyDeptCO> pendingApprovalDeptList() {
return closedAreaPersonApplyService.deptList();
}
// @ApiOperation("所有数据")
// @GetMapping("/listAll")
// public MultiResponse<ClosedAreaPersonApplyCO> listAll() {

6
web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java
View File

@ -81,6 +81,11 @@ public class ClosedTmpApplyController {
}
}
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())) {
VehicleApplyAddCmd vehicleApplyAddCmd = new VehicleApplyAddCmd();
BeanUtils.copyProperties(cmd, vehicleApplyAddCmd);
@ -104,6 +109,7 @@ public class ClosedTmpApplyController {
vehicleApplyAddCmd.setLsUserIdcard(cmd.getUserCard());
vehicleApplyAddCmd.setLsUserPhone(cmd.getUserPhone());
vehicleApplyAddCmd.setEmployeeVehicleUserName(cmd.getApplyPersonUserName());
vehicleApplyAddCmd.setDrivingUserName(cmd.getDrivingUserName());
vehicleApplyAddCmd.setRemarks(cmd.getApplyReason());
SingleResponse<VehicleApplyE> add = vehicleApplyServiceI.add(vehicleApplyAddCmd);
id = add.getData().getId();

1
web-app/src/main/java/com/zcloud/primeport/command/convertor/ClosedAreaPersonApplyCoConvertor.java
View File

@ -25,5 +25,6 @@ public interface ClosedAreaPersonApplyCoConvertor {
List<UserCo> converUserDtosToUserCos(List<UserDto> closedAreaPersonApplyDOs);
ClosedAreaPersonApplyCO converDOToCO(ClosedAreaPersonApplyDO closedAreaPersonApplyDO);
}

28
web-app/src/main/java/com/zcloud/primeport/command/convertor/ClosedAreaPersonApplyDeptCoConvertor.java Normal file
View File

@ -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);
}

21
web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaPersonApplyQueryExe.java
View File

@ -1,17 +1,17 @@
package com.zcloud.primeport.command.query;
import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.SingleResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jjb.saas.framework.auth.utils.AuthContext;
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.ClosedAreaPersonApplyPageQry;
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.ClosedAreaFgsPersonAreaDO;
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.dataobject.*;
import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAreaRepository;
import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAuthRepository;
import com.zcloud.primeport.persistence.repository.ClosedAreaPersonApplyRepository;
@ -38,6 +38,7 @@ public class ClosedAreaPersonApplyQueryExe {
private final ClosedAreaFgsPersonAuthRepository closedAreaFgsPersonAuthRepository;
private final ClosedAreaFgsPersonAreaRepository closedAreaFgsPersonAreaRepository;
private final ClosedAreaPersonApplyCoConvertor closedAreaPersonApplyCoConvertor;
private final ClosedAreaPersonApplyDeptCoConvertor closedAreaPersonApplyDeptCoConvertor;
/**
* 根据id查询
@ -49,6 +50,18 @@ public class ClosedAreaPersonApplyQueryExe {
return closedAreaPersonApplyCoConvertor.converDOToCO(closedAreaPersonApplyRepository.getById(id));
}
/**
* 获取全部部门
*
* @return
*/
public MultiResponse <ClosedAreaPersonApplyDeptCO> obtainDeptList() {
List <ClosedAreaPersonApplyDeptDO> closedAreaPersonApplyDeptDOs = closedAreaPersonApplyRepository.deptList();
return MultiResponse.of(closedAreaPersonApplyDeptCoConvertor.converDOsToCOs(closedAreaPersonApplyDeptDOs));
}
/**
* 分页
*

19
web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java
View File

@ -13,8 +13,11 @@ import com.zcloud.primeport.persistence.repository.MkmjApprovalUserRepository;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@ -64,7 +67,21 @@ public class MkmjApprovalUserQueryExe {
}
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) {

21
web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java
View File

@ -7,7 +7,9 @@ import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.primeport.command.convertor.VehicleAuditCoConvertor;
import com.zcloud.primeport.dto.VehicleAuditPageQry;
import com.zcloud.primeport.dto.clientobject.VehicleAuditCO;
import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO;
import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO;
import com.zcloud.primeport.persistence.repository.VehicleApplyRepository;
import com.zcloud.primeport.persistence.repository.VehicleAuditRepository;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
@ -26,6 +28,7 @@ import java.util.Map;
@AllArgsConstructor
public class VehicleAuditQueryExe {
private final VehicleAuditRepository vehicleAuditRepository;
private final VehicleApplyRepository vehicleApplyRepository;
private final VehicleAuditCoConvertor vehicleAuditCoConvertor;
/**
@ -38,6 +41,13 @@ public class VehicleAuditQueryExe {
Map<String, Object> parmas = PageQueryHelper.toHashMap(vehicleAuditPageQry);
PageResponse<VehicleAuditDO> pageResponse = vehicleAuditRepository.listPage(parmas);
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();
if (!examCenterCOS.isEmpty()) {
examCenterCOS.forEach(item -> {
@ -61,7 +71,16 @@ public class VehicleAuditQueryExe {
}
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;
}
}

1
web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java
View File

@ -73,6 +73,7 @@ public class ClosedAreaCarApplyServiceImpl implements ClosedAreaCarApplyServiceI
public Long saveTmpCarApply(ClosedTmpApplyAddCmd cmd) {
ClosedAreaCarApplyAddCmd closedAreaCarApplyAddCmd = new ClosedAreaCarApplyAddCmd();
BeanUtils.copyProperties(cmd, closedAreaCarApplyAddCmd);
closedAreaCarApplyAddCmd.setApplyPersonUserName(cmd.getDrivingUserName());
closedAreaCarApplyAddCmd.setCarBelongType(CloseCarBelongTypeEnum.TEMPORARY_VEHICLES.getCode());
return closedAreaCarApplyAddExe.execute(closedAreaCarApplyAddCmd);
}

7
web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaPersonApplyServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.zcloud.primeport.service;
import com.alibaba.cola.dto.MultiResponse;
import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI;
import com.zcloud.primeport.command.ClosedAreaPersonApplyAddExe;
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.SingleResponse;
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyDeptCO;
import com.zcloud.primeport.dto.clientobject.UserCo;
import com.zcloud.primeport.persistence.dataobject.UserDto;
import lombok.AllArgsConstructor;
@ -41,6 +43,11 @@ public class ClosedAreaPersonApplyServiceImpl implements ClosedAreaPersonApplySe
return closedAreaPersonApplyQueryExe.execute(qry);
}
@Override
public MultiResponse <ClosedAreaPersonApplyDeptCO> deptList(){
return closedAreaPersonApplyQueryExe.obtainDeptList();
}
@Override
public SingleResponse add(ClosedAreaPersonApplyAddCmd cmd) {
closedAreaPersonApplyAddExe.execute(cmd);

4
web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaPersonApplyServiceI.java
View File

@ -1,10 +1,12 @@
package com.zcloud.primeport.api;
import com.alibaba.cola.dto.MultiResponse;
import com.zcloud.primeport.dto.*;
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.SingleResponse;
import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyDeptCO;
import com.zcloud.primeport.dto.clientobject.UserCo;
/**
@ -17,6 +19,8 @@ public interface ClosedAreaPersonApplyServiceI {
PageResponse<ClosedAreaPersonApplyCO> listPage(ClosedAreaPersonApplyPageQry qry);
MultiResponse <ClosedAreaPersonApplyDeptCO> deptList();
SingleResponse<ClosedAreaPersonApplyCO> add(ClosedAreaPersonApplyAddCmd cmd);
void edit(ClosedAreaPersonApplyUpdateCmd cmd);

2
web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyPageQry.java
View File

@ -36,6 +36,8 @@ public class ClosedAreaCarApplyPageQry extends PageQuery {
private Integer carBelongType;
@ApiModelProperty(value = "申请人公司名称", name = "applyPersonCorpName")
private String applyPersonCorpName;
@ApiModelProperty(value = "项目名称", name = "projectName")
private String projectName;
private String menuPath;
}

2
web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPageQry.java
View File

@ -14,6 +14,8 @@ import lombok.Data;
@Data
public class ClosedAreaPageQry extends PageQuery {
@ApiModelProperty(value = "所属港区",name = "closedArea")
private String closedArea;
@ApiModelProperty(value = "封闭区域名称",name = "closedAreaName")
private String closedAreaName;
@ApiModelProperty(value = "所属港区",name = "hgAuthArea")

2
web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyPageQry.java
View File

@ -41,6 +41,8 @@ public class ClosedAreaPersonApplyPageQry extends PageQuery {
private Integer personBelongType;
@ApiModelProperty(value = " 1有图片", name = "hasFaceUrl", required = true)
private Integer hasFaceUrl;
@ApiModelProperty(value = "项目名称", name = "projectName", required = true)
private String projectName;
private String menuPath;
}

28
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyDeptCO.java Normal file
View File

@ -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;
}

26
web-domain/src/main/java/com/zcloud/primeport/domain/config/DaHuaOauthProperties.java Normal file
View File

@ -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;
}

34
web-domain/src/main/java/com/zcloud/primeport/domain/config/DaHuaSdkConfig.java Normal file
View File

@ -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()
);
}
}

41
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaPersonApplyDeptDO.java Normal file
View File

@ -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;
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java
View File

@ -6,6 +6,7 @@ import com.jjb.saas.framework.datascope.annotation.DataScope;
import com.jjb.saas.framework.datascope.annotation.DataScopes;
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
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.plan.mjDevice.TwoPersonUtil;
import com.zcloud.primeport.plan.mjDevice.dto.TwoLevelUser;
@ -32,6 +33,8 @@ public interface ClosedAreaPersonApplyMapper extends BaseMapper<ClosedAreaPerson
List<TwoLevelUser> getDockAuthInfoById(Long applyId);
List<ClosedAreaPersonApplyDeptDO> deptList();
List<TwoLevelUser> getDockAuthTmpInfoById(Long applyId);
}

4
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java
View File

@ -1,8 +1,10 @@
package com.zcloud.primeport.persistence.repository;
import com.alibaba.cola.dto.MultiResponse;
import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
import com.alibaba.cola.dto.PageResponse;
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.plan.mjDevice.TwoPersonUtil;
import com.zcloud.primeport.plan.mjDevice.dto.TwoLevelUser;
@ -19,6 +21,8 @@ import java.util.Map;
public interface ClosedAreaPersonApplyRepository extends BaseRepository<ClosedAreaPersonApplyDO> {
PageResponse<ClosedAreaPersonApplyDO> listPage(Map<String,Object> params);
List <ClosedAreaPersonApplyDeptDO> deptList();
PageResponse<UserDto> getCorpUserList(Map<String, Object> params);
List<TwoLevelUser> getDockAuthInfoById(Long applyId);

9
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java
View File

@ -1,8 +1,10 @@
package com.zcloud.primeport.persistence.repository.impl;
import com.alibaba.cola.dto.MultiResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zcloud.primeport.domain.enums.MenuEnum;
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.UserDto;
import com.zcloud.primeport.persistence.mapper.ClosedAreaPersonApplyMapper;
@ -48,6 +50,13 @@ public class ClosedAreaPersonApplyRepositoryImpl extends BaseRepositoryImpl<Clos
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public List <ClosedAreaPersonApplyDeptDO> deptList() {
return closedAreaPersonApplyMapper.deptList();
}
@Override
public PageResponse<UserDto> getCorpUserList(Map<String, Object> params) {
IPage<ClosedAreaPersonApplyDO> iPage = new Query<ClosedAreaPersonApplyDO>().getPage(params);

20
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjSwipeCardRecordRepositoryImpl.java
View File

@ -32,10 +32,22 @@ public class MkmjSwipeCardRecordRepositoryImpl extends BaseRepositoryImpl<MkmjSw
public PageResponse<MkmjSwipeCardRecordDO> listPage(Map<String, Object> params) {
IPage<MkmjSwipeCardRecordDO> iPage = new Query<MkmjSwipeCardRecordDO>().getPage(params);
QueryWrapper<MkmjSwipeCardRecordDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
queryWrapper.eq("paper_number", Base64.decodeToString(String.valueOf(params.get("cardNo"))));
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("likeId") != null) {
queryWrapper.eq("id", params.get("likeId"));
}
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");
IPage<MkmjSwipeCardRecordDO> result = mkmjSwipeCardRecordMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());

36
web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/DaHuaSdkUtil.java Normal file
View File

@ -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注销、销毁连接
}
// 其他设备查询、回放、抓拍等业务方法
}

5
web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
View File

@ -9,7 +9,7 @@
where c.delete_enum = 'FALSE'
<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.processOrRecord != null">
<if test="params.processOrRecord == 1">
@ -42,6 +42,9 @@
<if test="params.applyPersonUserName != null and params.applyPersonUserName != ''">
AND c.apply_person_user_name like CONCAT('%', #{params.applyPersonUserName}, '%')
</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 != ''">
AND c.licence_no like CONCAT('%', #{params.licenceNo}, '%')
</if>

3
web-infrastructure/src/main/resources/mapper/ClosedAreaMapper.xml
View File

@ -45,6 +45,9 @@
<if test="params.parentId != null">
AND c.parent_id = #{params.parentId}
</if>
<if test="params.closedArea != null">
AND c.hg_auth_area = #{params.closedArea}
</if>
<if test="params.hgAuthArea != null and params.hgAuthArea != ''">
AND C.hg_auth_area = #{params.hgAuthArea}
</if>

27
web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml
View File

@ -11,7 +11,10 @@
u.`name`,
u.corpinfo_id corpId,
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,
d.id dept_Id,
d.`name` dept_Name,
@ -26,6 +29,7 @@
`user` AS u
LEFT JOIN corp_info c ON u.corpinfo_id = c.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 (
SELECT
@ -66,8 +70,12 @@
from closed_area_person_apply c
where c.delete_enum = 'FALSE'
<if test="params.applyPersonCorpName != null">
AND c.apply_person_corp_name like CONCAT('%', #{params.applyPersonCorpName}, '%')
<if test="params.applyPersonCorpName != null and 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 test="params.deptId != null">
AND c.apply_person_department_id = #{params.deptId}
@ -102,6 +110,19 @@
</if>
order by c.id desc
</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
capa.id,