bonus
/
ah_jjzhgd_service
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新需求开发

This commit is contained in:
haozq 2025-10-13 09:37:57 +08:00
parent e25839b045
commit a287332425
19 changed files with 106 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
securitycontrol-auth/src/main/resources/bootstrap.yml
View File

@ -16,19 +16,19 @@ spring:
cloud: cloud:
nacos: nacos:
username: nacos username: nacos
password: nacos # password: nacos
# password: Jjsp@nacos2023 password: Jjsp@nacos2023
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
# server-addr: 127.0.0.1:18848 server-addr: 127.0.0.1:18848
# server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
namespace: jj_zhgd_test namespace: jjzhgd
config: config:
server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
# server-addr: 127.0.0.1:18848 server-addr: 127.0.0.1:18848
# server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
namespace: jj_zhgd_test namespace: jjzhgd
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

14
securitycontrol-gateway/src/main/resources/bootstrap.yml
View File

@ -16,22 +16,22 @@ spring:
cloud: cloud:
nacos: nacos:
username: nacos username: nacos
password: nacos password: Jjsp@nacos2023
# password: Jjsp@nacos2023 # password: Jjsp@nacos2023
discovery: discovery:
# 服务注册地址 # 服务注册地址
# server-addr: 127.0.0.1:18848 server-addr: 127.0.0.1:18848
server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
# server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
# server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
namespace: jj_zhgd_test namespace: jjzhgd
config: config:
# 配置中心地址 # 配置中心地址
# server-addr: 127.0.0.1:18848 server-addr: 127.0.0.1:18848
server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
# server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
# server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
namespace: jj_zhgd_test namespace: jjzhgd
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
#server-addr: 10.145.34.32:8848 #server-addr: 10.145.34.32:8848

6
securitycontrol-model/securitycontrol-Interface/pom.xml
View File

@ -136,11 +136,7 @@
<groupId>com.securitycontrol</groupId> <groupId>com.securitycontrol</groupId>
<artifactId>securitycontrol-commons-entity</artifactId> <artifactId>securitycontrol-commons-entity</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.securitycontrol</groupId>
<artifactId>securitycontrol-background</artifactId>
<version>3.6.1</version>
</dependency>
<dependency> <dependency>

2
securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/HCNetSDK.java
View File

@ -22,7 +22,7 @@ public interface HCNetSDK extends Library {
// /*** 宏定义 ***/ // /*** 宏定义 ***/
//常量 //常量
String windowsPath = "F:\\hkfile\\lib\\HCNetSDK.dll"; String windowsPath = "G:\\back\\hkfile\\lib\\HCNetSDK.dll";

9
securitycontrol-model/securitycontrol-Interface/src/main/resources/bootstrap.yml
View File

@ -1,6 +1,6 @@
# Tomcat # Tomcat
server: server:
port: 18087 port: 18079
management: management:
server: server:
port: -1 port: -1
@ -43,7 +43,12 @@ log:
file: logs/sys-back.log file: logs/sys-back.log
maxsize: 30MB maxsize: 30MB
file: file:
temp_file_path: /data/zhgd/file temp_file_path: /data/zhgd/file/
windwos:
upload_path: F:/files/zhgd/
linux:
upload_path: /data/zhgd/file/
pagehelper: pagehelper:
helper-dialect: mysql helper-dialect: mysql

BIN
securitycontrol-model/securitycontrol-background/lib/sgjdbc-20250604.6638.jar Normal file
View File

Binary file not shown.

3
securitycontrol-model/securitycontrol-background/pom.xml
View File

@ -52,7 +52,8 @@
<artifactId>sgjdbc_20230302</artifactId> <artifactId>sgjdbc_20230302</artifactId>
<version>1.0</version> <version>1.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/sgjdbc_20230302.jar</systemPath> <systemPath>${project.basedir}/lib/sgjdbc_dev.jar</systemPath>
<!-- <systemPath>${project.basedir}/lib/sgjdbc-20250604.6638.jar</systemPath>-->
</dependency> </dependency>
<!-- SpringBoot Actuator --> <!-- SpringBoot Actuator -->
<dependency> <dependency>

16
securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml
View File

@ -18,16 +18,16 @@ spring:
cloud: cloud:
nacos: nacos:
username: nacos username: nacos
password: nacos # password: nacos
# password: Jjsp@nacos2023 password: Jjsp@nacos2023
discovery: discovery:
# server-addr: 127.0.0.1:18848 server-addr: 127.0.0.1:18848
server-addr: 192.168.0.14:8848 #server-addr: 192.168.0.14:8848
namespace: jj_zhgd_test namespace: jjzhgd
config: config:
# server-addr: 127.0.0.1:18848 server-addr: 127.0.0.1:18848
server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
namespace: jj_zhgd_test namespace: jjzhgd
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

BIN
securitycontrol-model/securitycontrol-files/lib/sgjdbc-20250604.6638.jar Normal file
View File

Binary file not shown.

8
securitycontrol-model/securitycontrol-files/pom.xml
View File

@ -59,7 +59,15 @@
<version>1.0</version> <version>1.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/sgjdbc_dev.jar</systemPath> <systemPath>${project.basedir}/lib/sgjdbc_dev.jar</systemPath>
<!-- <systemPath>${project.basedir}/lib/sgjdbc-20250604.6638.jar</systemPath>-->
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>sgjdbc_dev</groupId>-->
<!-- <artifactId>sgjdbc_dev</artifactId>-->
<!-- <version>1.0</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${project.basedir}/lib/sgjdbc_dev.jar</systemPath>-->
<!-- </dependency>-->
<!-- SpringBoot Actuator --> <!-- SpringBoot Actuator -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

52
securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml
View File

@ -4,6 +4,11 @@ server:
# Spring # Spring
spring: spring:
security:
user:
name: admin
password: admin
roles: ADMIN
servlet: servlet:
multipart: multipart:
max-file-size: -1 max-file-size: -1
@ -17,14 +22,14 @@ spring:
cloud: cloud:
nacos: nacos:
username: nacos username: nacos
password: nacos password: Jjsp@nacos2023
discovery: discovery:
server-addr: 192.168.0.14:8848 server-addr: 127.0.0.1:18848
namespace: jj_zhgd_test namespace: jjzhgd
# server-addr: 27.50.49.56:21625 # server-addr: 27.50.49.56:21625
config: config:
server-addr: 192.168.0.14:8848 server-addr: 127.0.0.1:18848
namespace: jj_zhgd_test namespace: jjzhgd
# server-addr: 27.50.49.56:21625 # server-addr: 27.50.49.56:21625
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
@ -40,16 +45,35 @@ spring:
# password: Bonus@admin123! # password: Bonus@admin123!
file: file:
upload: upload:
# path: /home/zhgd/file/ path: /data/zhgd/file/
path: F:/File/ # path: F:/files/zhgd/
# data: #file:
# mongodb: # temp_file_path: /data/zhgd/file
# host: 47.115.207.135 # windwos:
# port: 27017 # upload_path: F:/files/zhgd/
# database: admin # linux:
# username: admin # upload_path: /data/zhgd/file
# password: Bonus@admin123! data:
mongodb:
host: 47.115.207.135
port: 27017
database: admin
username: admin
password: Bonus@admin123!
#加密组件 #加密组件
#management.security.enabled=true security.user.name=admin security.user.password=admin 2
jasypt: jasypt:
encryptor: encryptor:
password: Encrypt password: Encrypt
management:
server:
port: -1
endpoints:
web:
exposure:
exclude: []
enabled-by-default: false
endpoint:
beans:
enabled: false

BIN
securitycontrol-model/securitycontrol-screen/lib/sgjdbc-20250604.6638.jar Normal file
View File

Binary file not shown.

BIN
securitycontrol-model/securitycontrol-screen/lib/sgjdbc_20230302.jar
View File

Binary file not shown.

1
securitycontrol-model/securitycontrol-screen/pom.xml
View File

@ -42,6 +42,7 @@
<version>1.0</version> <version>1.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/sgjdbc_dev.jar</systemPath> <systemPath>${project.basedir}/lib/sgjdbc_dev.jar</systemPath>
<!-- <systemPath>${project.basedir}/lib/sgjdbc-20250604.6638.jar</systemPath>-->
</dependency> </dependency>
<!-- SpringCloud Alibaba Nacos Config --> <!-- SpringCloud Alibaba Nacos Config -->
<dependency> <dependency>

3
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java
View File

@ -205,7 +205,8 @@ public class XcIndexServiceImpl implements XcIndexService {
List<String> costList=new ArrayList<String>(); List<String> costList=new ArrayList<String>();
ProVo proVo=mapper.getProDetails(dto.getBidCode()); ProVo proVo=mapper.getProDetails(dto.getBidCode());
String startTime=proVo.getPlanStartTime(); String startTime=proVo.getPlanStartTime();
String time=DateTimeHelper.getNowMonth(); String time=proVo.getPlanEndTime();
time=time.substring(0,7);
String nowTime=startTime.substring(0,7); String nowTime=startTime.substring(0,7);
if(DateTimeHelper.compareMonth(startTime,time)){ if(DateTimeHelper.compareMonth(startTime,time)){
monList.add(nowTime); monList.add(nowTime);

20
securitycontrol-model/securitycontrol-screen/src/main/resources/bootstrap.yml
View File

@ -18,13 +18,13 @@ spring:
cloud: cloud:
nacos: nacos:
username: nacos username: nacos
password: nacos password: Jjsp@nacos2023
discovery: discovery:
server-addr: 192.168.0.14:8848 server-addr: 127.0.0.1:18848
namespace: jj_zhgd_test namespace: jjzhgd
config: config:
server-addr: 192.168.0.14:8848 server-addr: 127.0.0.1:18848
namespace: jj_zhgd_test namespace: jjzhgd
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置
@ -35,6 +35,14 @@ jasypt:
encryptor: encryptor:
password: Encrypt password: Encrypt
file:
temp_file_path: /data/zhgd/file
windwos:
upload_path: F:/files/zhgd/
linux:
upload_path: /data/zhgd/file/
pagehelper:
helper-dialect: mysql

3
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml
View File

@ -105,8 +105,7 @@
SELECT SELECT
ANY_VALUE(GROUP_CONCAT(tdd.mode_name)) AS modeName, ANY_VALUE(GROUP_CONCAT(tdd.mode_name)) AS modeName,
ANY_VALUE( GROUP_CONCAT(tdv.val)) AS val, ANY_VALUE( GROUP_CONCAT(tdv.val)) AS val,
ANY_VALUE( ttp.user_name)AS userName, ANY_VALUE( ttp.user_name)AS userName
ANY_VALUE(ttp.phone) phone
FROM tb_bd_device tbd FROM tb_bd_device tbd
INNER JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id AND tpb.del_flag = 0 AND tpb.bid_code = #{bidCode} INNER JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id AND tpb.del_flag = 0 AND tpb.bid_code = #{bidCode}
INNER JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0 INNER JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0

BIN
securitycontrol-model/securitycontrol-system/lib/sgjdbc-20250604.6638.jar Normal file
View File

Binary file not shown.

16
securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml
View File

@ -18,17 +18,17 @@ spring:
cloud: cloud:
nacos: nacos:
username: nacos username: nacos
password: nacos # password: nacos
# password: Jjsp@nacos2023 password: Jjsp@nacos2023
discovery: discovery:
# server-addr: 127.0.0.1:18848 server-addr: 127.0.0.1:18848
server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
namespace: jj_zhgd_test namespace: jjzhgd
config: config:
# server-addr: 127.0.0.1:18848 server-addr: 127.0.0.1:18848
server-addr: 192.168.0.14:8848 # server-addr: 192.168.0.14:8848
# server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
namespace: jj_zhgd_test namespace: jjzhgd
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置