diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java index 5b1f056..cca54a9 100644 --- a/src/main/java/com/whdc/controller/QXWarnController.java +++ b/src/main/java/com/whdc/controller/QXWarnController.java @@ -936,6 +936,7 @@ public class QXWarnController { } /** + * https://shdata.cloudowr.cn/sysuser/dologin * https://shdata.cloudowr.cn/shwarn/msg/totalquery?stm=2024-06-01&etm=2024-06-12 * * @return @@ -951,8 +952,16 @@ public class QXWarnController { QXWarnStatisticsVo vo = new QXWarnStatisticsVo(); + String s = HttpUtil.sendPost("https://shdata.cloudowr.cn/sysuser/dologin", "{\"phone\":\"18888888888\",\"password\":\"18888888888\"}"); + + String userobj = null; + JSONObject jsonObject = JSON.parseObject(s); + if (jsonObject != null && jsonObject.getInteger("ok") == 1) { + userobj = jsonObject.getString("results"); + } + String str = HttpUtil.getBySetCookie("https://shdata.cloudowr.cn/shwarn/msg/totalquery?stm=" + stm.toLocalDate().toString() + "&etm=" + etm.toLocalDate().toString(), - "userobj=%7B%22_id%22%3A%2260a7da8809d9cfa5622920a6%22%2C%22name%22%3A%22%E9%B2%A7%E7%9F%B3%E5%80%BC%E7%8F%AD%E4%B8%93%E7%94%A8%22%2C%22phone%22%3A%2218888888888%22%2C%22utype%22%3A0%2C%22dept%22%3A%22%E9%B2%A7%E7%9F%B3%22%2C%22tm%22%3A%222024-03-23T01%3A54%3A46.225Z%22%2C%22token%22%3A%226726a6d2e96b902d23381a19dcdc18cb%22%2C%22ctm%22%3A%222021-05-21T16%3A06%3A32.707Z%22%2C%22chkc%22%3Afalse%2C%22ywjk%22%3Afalse%2C%22yywh%22%3Afalse%7D; token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ3aXRoRXhwaXJlc0F0IjoxNzE4MzMzNTYzOTE3LCJleHAiOjE3MTgzMzM1NjMsInVzZXJuYW1lIjoiYWRtaW4ifQ.-leem8iPu0zzPuGtRTZ-Lp5m_mLBzX1UzJfLbDBSpjc"); + "userobj="+ userobj); JSONObject json = JSON.parseObject(str); if (json != null && json.getInteger("ok") == 1) { TotalQueryVo data = json.getJSONObject("results").toJavaObject(TotalQueryVo.class); diff --git a/src/main/java/com/whdc/model/entity/AddressBookOld.java b/src/main/java/com/whdc/model/entity/AddressBookOld.java index e7970dc..5a7898c 100644 --- a/src/main/java/com/whdc/model/entity/AddressBookOld.java +++ b/src/main/java/com/whdc/model/entity/AddressBookOld.java @@ -73,7 +73,7 @@ public class AddressBookOld extends Model implements Serializabl @ApiModelProperty(value = "盐") private String salt; - @Excel(name = "创建时间") +// @Excel(name = "创建时间") @TableField("CREATE_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "创建时间") diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 040aef2..6984b54 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,12 +10,12 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: dm.jdbc.driver.DmDriver - url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL - username: SYSDBA - password: SYSDBA001 -# url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL -# username: SHZH -# password: Shzh_890 +# url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL +# username: SYSDBA +# password: SYSDBA001 + url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL + username: SHZH + password: Shzh_890 druid: initialSize: 5 minIdle: 5 @@ -40,10 +40,10 @@ spring: # Redis redis: database: 5 -# host: 10.42.6.75 - host: 127.0.0.1 - password: -# password: Whdc_890 + host: 10.42.6.75 +# host: 127.0.0.1 +# password: + password: Whdc_890 port: 6379 servlet: