elink-star
/
epmet-plugins
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

变更推送地址

feature/visit_zhy
zhangyuan 3 years ago
parent
0dadf5d3b4
commit
be3f659f51
8 changed files with 165 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epmet-plugins-common/src/main/java/com/epmet/plugin/commons/redis/RedisKeys.java
  2. 23
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhChannelFormDTO.java
  3. 27
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhDeptFormDTO.java
  4. 29
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhIdentityFormDTO.java
  5. 27
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPlanFormDTO.java
  6. 28
      epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml
  7. 1
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java
  8. 62
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java

6
epmet-plugins-common/src/main/java/com/epmet/plugin/commons/redis/RedisKeys.java
View File

@ -23,21 +23,21 @@ public class RedisKeys {
* 海康accessToken
*/
public static String getHikTokenKey() {
return "hik:token";
return rootPrefix.concat("hik:token");
}
/**
* 大华publicKey
*/
public static String getDhPublicKey() {
return "dh:public";
return rootPrefix.concat("dh:public");
}
/**
* 大华token
*/
public static String getDhToken() {
return "dh:token";
return rootPrefix.concat("dh:token");
}
}

23
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhChannelFormDTO.java
View File

@ -0,0 +1,23 @@
package com.epmet.plugin.power.dto.visit.form;
import lombok.Data;
import java.io.Serializable;
/**
* 海康社区人员信息下放
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-20
*/
@Data
public class DhChannelFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer pageNum;
private Integer pageSize;
}

27
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhDeptFormDTO.java
View File

@ -0,0 +1,27 @@
package com.epmet.plugin.power.dto.visit.form;
import com.epmet.plugin.power.dto.visit.result.DhChannelResultDTO;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 海康社区人员信息下放
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-20
*/
@Data
public class DhDeptFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String name;
private String description;
private Long parentId;
}

29
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhIdentityFormDTO.java
View File

@ -0,0 +1,29 @@
package com.epmet.plugin.power.dto.visit.form;
import lombok.Data;
import java.io.Serializable;
/**
* 海康社区人员信息下放
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-20
*/
@Data
public class DhIdentityFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String name;
private Double subsidyAmount;
private Integer isCashRecharge;
private Integer isMachineRecharge;
private String description;
}

27
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/DhPlanFormDTO.java
View File

@ -0,0 +1,27 @@
package com.epmet.plugin.power.dto.visit.form;
import lombok.Data;
import java.io.Serializable;
/**
* 海康社区人员信息下放
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-20
*/
@Data
public class DhPlanFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String detail;
private String memo;
private String name;
private Integer type;
}

28
epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml
View File

@ -175,8 +175,8 @@
<hik.cloud.client>111</hik.cloud.client>
<hik.cloud.secret>222</hik.cloud.secret>
<!--大华-->
<dh.cloud.url>https://api2.hik-cloud.com</dh.cloud.url>
<dh.cloud.loginName>111</dh.cloud.loginName>
<dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
<dh.cloud.loginName>shundeju</dh.cloud.loginName>
</properties>
</profile>
<profile>
@ -190,10 +190,10 @@
<!-- 数据库配置-->
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/epmet_pli_power?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_pli_power?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>root</spring.datasource.druid.username>
<spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
<spring.datasource.druid.username>epmet_pli_power_user</spring.datasource.druid.username>
<spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>192.168.1.140</spring.redis.host>
@ -206,7 +206,7 @@
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>
<nacos.ip>192.168.43.186</nacos.ip>
<nacos.ip>192.168.43.84</nacos.ip>
<!--是否开启服务列表变更监听-->
<nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
@ -233,8 +233,8 @@
<hik.cloud.client>111</hik.cloud.client>
<hik.cloud.secret>222</hik.cloud.secret>
<!--大华-->
<dh.cloud.url>https://api2.hik-cloud.com</dh.cloud.url>
<dh.cloud.loginName>111</dh.cloud.loginName>
<dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
<dh.cloud.loginName>shundeju</dh.cloud.loginName>
</properties>
</profile>
<profile>
@ -295,8 +295,8 @@
<hik.cloud.client>111</hik.cloud.client>
<hik.cloud.secret>222</hik.cloud.secret>
<!--大华-->
<dh.cloud.url>https://api2.hik-cloud.com</dh.cloud.url>
<dh.cloud.loginName>111</dh.cloud.loginName>
<dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
<dh.cloud.loginName>shundeju</dh.cloud.loginName>
</properties>
</profile>
<profile>
@ -352,8 +352,8 @@
<hik.cloud.client>90688b09bb9d40088f7be404ccb347c7</hik.cloud.client>
<hik.cloud.secret>7b1940707a4240be9c794c5a967a30c9</hik.cloud.secret>
<!--大华-->
<dh.cloud.url>https://api2.hik-cloud.com</dh.cloud.url>
<dh.cloud.loginName>111</dh.cloud.loginName>
<dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
<dh.cloud.loginName>shundeju</dh.cloud.loginName>
</properties>
</profile>
<profile>
@ -412,8 +412,8 @@
<hik.cloud.client>90688b09bb9d40088f7be404ccb347c7</hik.cloud.client>
<hik.cloud.secret>7b1940707a4240be9c794c5a967a30c9</hik.cloud.secret>
<!--大华-->
<dh.cloud.url>https://api2.hik-cloud.com</dh.cloud.url>
<dh.cloud.loginName>111</dh.cloud.loginName>
<dh.cloud.url>http://112.6.213.175:8314</dh.cloud.url>
<dh.cloud.loginName>shundeju</dh.cloud.loginName>
</properties>
</profile>
</profiles>

1
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java
View File

@ -131,6 +131,7 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
entity.setAgencyPids(result.getData().getAgencyPids());
}
insert(entity);
send(dto);
}
@Override

62
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java
View File

@ -12,10 +12,7 @@ import com.epmet.commons.tools.utils.HttpClientManager;
import com.epmet.plugin.commons.redis.RedisKeys;
import com.epmet.plugin.power.config.DhCloudProperties;
import com.epmet.plugin.power.dto.visit.DhTokenDTO;
import com.epmet.plugin.power.dto.visit.form.DhAuthFormDTO;
import com.epmet.plugin.power.dto.visit.form.DhPersonCardFormDTO;
import com.epmet.plugin.power.dto.visit.form.DhPersonFormDTO;
import com.epmet.plugin.power.dto.visit.form.DhPersonImgFormDTO;
import com.epmet.plugin.power.dto.visit.form.*;
import com.epmet.plugin.power.dto.visit.result.DhChannelResultDTO;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.lang3.StringUtils;
@ -133,7 +130,7 @@ public class DhDeviceUtil {
}
/**
* 查询部门列表
* 新增部门
*
* @param
* @return java.lang.String
@ -146,8 +143,11 @@ public class DhDeviceUtil {
url = url + urlParam;
Map<String, String> paramsMap = new HashMap<>(4);
DhDeptFormDTO dto = new DhDeptFormDTO();
dto.setName("访客部门");
dto.setParentId(1L);
String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, StringUtils.EMPTY, paramsMap).getData();
String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
if (null == data) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询部门列表失败");
@ -162,11 +162,15 @@ public class DhDeviceUtil {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询部门列表失败");
}
Object registerResult = result.getData();
JSONArray jsonArray = JSON.parseArray(registerResult.toString());
JSONObject jsonObject = jsonArray.getJSONObject(0);
JSONObject jsonObject = JSON.parseObject(registerResult.toString());
if (null != jsonObject) {
return Long.parseLong(jsonObject.get("deptId").toString());
return Long.parseLong(jsonObject.toString());
}
// JSONArray jsonArray = JSON.parseArray(registerResult.toString());
// JSONObject jsonObject = jsonArray.getJSONObject(0);
// if (null != jsonObject) {
// return Long.parseLong(jsonObject.get("deptId").toString());
// }
return 0L;
}
@ -184,8 +188,13 @@ public class DhDeviceUtil {
url = url + urlParam;
Map<String, String> paramsMap = new HashMap<>(4);
DhIdentityFormDTO dto = new DhIdentityFormDTO();
dto.setName("访客");
dto.setSubsidyAmount(0D);
dto.setIsCashRecharge(1);
dto.setIsMachineRecharge(1);
String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, StringUtils.EMPTY, paramsMap).getData();
String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
if (null == data) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取身份列表失败");
@ -209,21 +218,25 @@ public class DhDeviceUtil {
}
/**
* 查询开门计划
* 新增开门计划
*
* @param
* @return java.lang.String
* @author zhy
* @date 2022/5/23 11:04
*/
public String getPlan() {
public Long getPlan() {
String url = dhCloudProperties.getUrl().concat(GET_DOOR_PLAN);
String urlParam = getDhUrlParams();
url = url + urlParam;
Map<String, String> paramsMap = new HashMap<>(4);
DhPlanFormDTO dto = new DhPlanFormDTO();
dto.setDetail("{\\\"monday\\\":[\\\"00:00-23:59\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\"],\\\"tuesday\\\":[\\\"00:00-23:59\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\"],\\\"wednesday\\\":[\\\"00:00-23:59\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\"],\\\"thursday\\\":[\\\"00:00-23:59\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\"],\\\"friday\\\":[\\\"00:00-23:59\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\"],\\\"saturday\\\":[\\\"00:00-23:59\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\"],\\\"sunday\\\":[\\\"00:00-23:59\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\",\\\"00:00-00:00\\\"]}");
dto.setName("访客计划");
dto.setType(1);
String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, StringUtils.EMPTY, paramsMap).getData();
String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
if (null == data) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询开门计划失败");
@ -238,12 +251,16 @@ public class DhDeviceUtil {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询开门计划失败");
}
Object registerResult = result.getData();
JSONArray jsonArray = JSON.parseArray(registerResult.toString());
JSONObject jsonObject = jsonArray.getJSONObject(0);
JSONObject jsonObject = JSON.parseObject(registerResult.toString());
if (null != jsonObject) {
return jsonObject.get("id").toString();
return Long.parseLong(jsonObject.toString());
}
return "";
// JSONArray jsonArray = JSON.parseArray(registerResult.toString());
// JSONObject jsonObject = jsonArray.getJSONObject(0);
// if (null != jsonObject) {
// return jsonObject.get("id").toString();
// }
return null;
}
/**
@ -260,8 +277,11 @@ public class DhDeviceUtil {
url = url + urlParam;
Map<String, String> paramsMap = new HashMap<>(4);
DhChannelFormDTO dto = new DhChannelFormDTO();
dto.setPageSize(1000);
dto.setPageSize(1);
String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, StringUtils.EMPTY, paramsMap).getData();
String data = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(dto), paramsMap).getData();
if (null == data) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询通道列表失败");
@ -449,7 +469,7 @@ public class DhDeviceUtil {
public String addPersonAuth(DhPersonFormDTO dto, String imgUrl) {
String personCard = addPersonCard(dto);
List<DhChannelResultDTO> channel = getChannel();
String plan = getPlan();
Long plan = getPlan();
if (StringUtils.isBlank(personCard)) {
return "开卡失败";
@ -459,7 +479,7 @@ public class DhDeviceUtil {
if (channel.isEmpty()) {
return "获取通道失败";
}
if (StringUtils.isBlank(plan)) {
if (plan == null) {
return "获取开门计划失败";
}
DhAuthFormDTO authFormDTO = new DhAuthFormDTO();
@ -468,7 +488,7 @@ public class DhDeviceUtil {
url = url + urlParam;
authFormDTO.setCardNumber(personCard);
authFormDTO.setTimeQuantumId(plan);
authFormDTO.setTimeQuantumId(plan.toString());
authFormDTO.setCardPrivilegeDetails(channel);
Map<String, String> paramsMap = new HashMap<>(4);

Write Preview
Loading…
Cancel
Save