调整配置文件, 修改绑定查询

zhuo

2025-04-03 13be3b8bd13cfa77fa6552e9731949df5e657108

调整配置文件, 修改绑定查询

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

 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;

}

 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>

 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;

}

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


 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:

 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=
  # 人员密码获取

 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=
  # 人员密码获取