From 13be3b8bd13cfa77fa6552e9731949df5e657108 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 09:14:59 +0800
Subject: [PATCH] 调整配置文件, 修改绑定查询
---
cnas-device/src/main/java/com/ruoyi/device/pojo/DataConfig.java | 3 +++
ruoyi-admin/src/main/resources/application-test.yml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java | 3 ---
ruoyi-admin/src/main/resources/application-ztzb.yml | 2 +-
ruoyi-admin/src/main/resources/application-druid.yml | 21 ++++++++++++---------
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 2 +-
cnas-device/src/main/resources/mapper/DataConfigMapper.xml | 6 +++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java | 9 +--------
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
index d7925c9..9a58b5b 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
@@ -188,7 +188,7 @@
}
@ApiOperation(value = "鍒犻櫎鏁伴噰閰嶇疆")
- @DeleteMapping("/ ")
+ @DeleteMapping("/deleteDataAcquisitionConfiguration")
public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("ids") String ids) {
List<String> split = Arrays.asList(ids.split(","));
List<String> collect = split.stream().distinct().collect(Collectors.toList());
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DataConfig.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DataConfig.java
index 547679d..4732d1f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DataConfig.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DataConfig.java
@@ -77,4 +77,7 @@
@TableField(select = false, exist = false)
private Boolean isDevice;
+ @TableField(select = false, exist = false)
+ private String sample;
+
}
diff --git a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
index a24e029..b5dac74 100644
--- a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
@@ -14,10 +14,13 @@
<select id="selectDataConfigList" resultType="com.ruoyi.device.dto.DeviceConfigDtoPage">
SELECT ddc.*,
- d.device_name
+ d.device_name,
+ sip.sample
FROM device_data_config ddc
left join device d on ddc.device_id = d.id
+ left join structure_item_parameter sip on sip.id = ddc.structure_item_parameter_id
where d.id = #{deviceId}
+ order by ddc.id desc
</select>
<select id="deleteDataConfig" resultType="integer">
@@ -39,5 +42,6 @@
left join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
where d.id = #{deviceId}
and ddc.id is null
+ order by ip.sample
</select>
</mapper>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java
index 50e8481..cd5bec1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java
@@ -10,11 +10,8 @@
@Data
public class PersonDto {
-
private List<Person> person;
private List<Company> company;
-
- private Integer roleId;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java
index 120e899..3043d93 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java
@@ -35,8 +35,6 @@
public class PersonnelHeaderApi {
@Resource
- private RedisTemplate redisTemplate;
- @Resource
private PersonnelProperties personnelProperties;
@Resource
private CustomService customService;
@@ -55,7 +53,6 @@
try {
jsonNode = objectMapper.readTree(response.body());
String accessToken = jsonNode.get("access_token").asText();
- redisTemplate.opsForValue().set("personnelAccessToken:idToken:", accessToken, jsonNode.get("expires_in").asInt() - 60, TimeUnit.SECONDS);
return accessToken;
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
@@ -65,11 +62,7 @@
//鍒ゆ柇鏄惁瀛樺湪
public String getAccessToken() {
String accessToken;
- if (!redisTemplate.hasKey("personnelAccessToken:idToken:")) {
- accessToken = fetchNewAccessToken();
- } else {
- accessToken = redisTemplate.opsForValue().get("personnelAccessToken:idToken:") + "";
- }
+ accessToken = fetchNewAccessToken();
return accessToken;
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 5c423a9..c88c67b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -96,7 +96,7 @@
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
- log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# Swagger閰嶇疆
swagger:
@@ -134,14 +134,17 @@
# 浜轰簨绯荤粺
personnel:
- code:
- appId:
- appSecret:
- companies:
- simple:
- password:
- department:
- person:
+ # 姝ｅ紡鍦板潃
+ code: https://ztt-sso.ztt.cn/oauth2/token
+ # 瑁呭浜轰簨姝ｅ紡搴�
+ appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
+ appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03
+ companies: https://ztt-connector.ztt.cn/api/org/v1/companies
+ simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
+ # 浜哄憳瀵嗙爜鑾峰彇
+ password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/
+ department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments
+ person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/
# 浼佷笟寰俊閫氱煡
wechat:
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 824eb9f..95840c7 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -138,7 +138,7 @@
code: https://ztt-sso.ztt.cn/oauth2/token
# 瑁呭浜轰簨姝ｅ紡搴�
appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
- appSecret: 9b9c4735b1e5ee9d6a8544b9b38bb03
+ appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03
companies: https://ztt-connector.ztt.cn/api/org/v1/companies
simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
# 浜哄憳瀵嗙爜鑾峰彇
diff --git a/ruoyi-admin/src/main/resources/application-ztzb.yml b/ruoyi-admin/src/main/resources/application-ztzb.yml
index 1c07a13..ffa6d56 100644
--- a/ruoyi-admin/src/main/resources/application-ztzb.yml
+++ b/ruoyi-admin/src/main/resources/application-ztzb.yml
@@ -145,7 +145,7 @@
code: https://ztt-sso.ztt.cn/oauth2/token
# 瑁呭浜轰簨姝ｅ紡搴�
appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
- appSecret: 9b9c4735b1e5ee9d6a8544b9b38bb03
+ appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03
companies: https://ztt-connector.ztt.cn/api/org/v1/companies
simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
# 浜哄憳瀵嗙爜鑾峰彇
--
Gitblit v1.9.3