Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/util/baseHzInterfaceDictEntity.java

@@ -17,8 +17,7 @@ import java.util.Date;
@Entity
@Table(name = "base_hz_interface_dict")
@SequenceGenerator(name="id_generated", sequenceName="seq_base_hz_interface_dict")
public class baseHzInterfaceDictEntity extends IdEntity {
public class BaseHzInterfaceDictEntity extends IdEntity {
    private String url;//接口地址
    private String code;//接口code

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/device/BaseHzInterfaceDictDao.java

@@ -1,13 +1,13 @@
package com.yihu.jw.care.dao.device;
import com.yihu.jw.entity.util.baseHzInterfaceDictEntity;
import com.yihu.jw.entity.util.BaseHzInterfaceDictEntity;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by wsl on 2022/6/29
 */
public interface BaseHzInterfaceDictDao extends PagingAndSortingRepository<baseHzInterfaceDictEntity,Long>,
        JpaSpecificationExecutor<baseHzInterfaceDictEntity> {
public interface BaseHzInterfaceDictDao extends PagingAndSortingRepository<BaseHzInterfaceDictEntity,Long>,
        JpaSpecificationExecutor<BaseHzInterfaceDictEntity> {
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/hz/HzInterfaceService.java

@@ -5,15 +5,13 @@ import com.yihu.jw.care.dao.device.BaseHzInterfaceDictDao;
import com.yihu.jw.care.util.DSLUtils;
import com.yihu.jw.care.util.HttpToolUtil;
import com.yihu.jw.care.util.MD5Utils;
import com.yihu.jw.entity.util.baseHzInterfaceDictEntity;
import com.yihu.jw.entity.util.BaseHzInterfaceDictEntity;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -62,7 +60,7 @@ public class HzInterfaceService {
    }
    private JSONObject getAreaApi(String date) throws Exception{
        baseHzInterfaceDictEntity dbkey = requestDBKEY();
        BaseHzInterfaceDictEntity dbkey = requestDBKEY();
        //判断是否过期 或者 是否不存在
        if(expire(dbkey.getCode()) > 0?false:true||redisTemplate.hasKey(dbkey.getCode())){
            PopBasicInfo();
@@ -84,10 +82,9 @@ public class HzInterfaceService {
        String s = httpURLConnectionPOST(url, json);
        logger.info("自己封装的请求方式:" + s);
        HttpEntity<JSONObject> response = httpClientUtil.assesTokenPostHttp(url, json, HttpMethod.POST);
        String response = httpClientUtil.postBody(url, json);
        logger.info("电表接口调用结果----> "+response);
        JSONObject responseBody = response.getBody();
        logger.info("电表接口调用结果Body----> "+responseBody);
        JSONObject responseBody = JSONObject.parseObject(response);
        return JSONObject.parseObject(responseBody.get("data").toString());
    }
@@ -96,7 +93,7 @@ public class HzInterfaceService {
    // 刷新密钥还存在时可以调用这个方法
    private String refreshKey(baseHzInterfaceDictEntity refreshdbkey,baseHzInterfaceDictEntity requestdbkey){
    private String refreshKey(BaseHzInterfaceDictEntity refreshdbkey, BaseHzInterfaceDictEntity requestdbkey){
        Map<String, String> params = new HashMap<String, String>();
        String appkey = refreshdbkey.getAppKey();   //appKey
        String requstSecret = refreshdbkey.getRefreshSecret();//刷新密钥
@@ -122,8 +119,8 @@ public class HzInterfaceService {
    @Transactional(rollbackFor = Exception.class)
    public String PopBasicInfo() {
        Map<String, String> params = new HashMap<String, String>();
        baseHzInterfaceDictEntity requestdbkey = requestDBKEY();
        baseHzInterfaceDictEntity refreshdbkey = refreshDBKEY();
        BaseHzInterfaceDictEntity requestdbkey = requestDBKEY();
        BaseHzInterfaceDictEntity refreshdbkey = refreshDBKEY();
        /*if(redisTemplate.hasKey(refreshdbkey.getCode())){
            return refreshKey(refreshdbkey,requestdbkey);
@@ -161,15 +158,15 @@ public class HzInterfaceService {
    }
    // 请求密钥 15分钟过期
    public baseHzInterfaceDictEntity requestDBKEY(){
    public BaseHzInterfaceDictEntity requestDBKEY(){
        String sql = "SELECT * FROM base_hz_interface_dict WHERE `status` = 1 AND `code` = 'dbmyhq'";
        return jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(baseHzInterfaceDictEntity.class));
        return jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(BaseHzInterfaceDictEntity.class));
    }
    // 刷新密钥 48小时过期
    public baseHzInterfaceDictEntity refreshDBKEY(){
    public BaseHzInterfaceDictEntity refreshDBKEY(){
        String sql = "SELECT * FROM base_hz_interface_dict WHERE `status` = 1 AND `code` = 'dbmysxhq'";
        return jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(baseHzInterfaceDictEntity.class));
        return jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(BaseHzInterfaceDictEntity.class));
    }