From 4f9263aeee1c7e5a87a7ff58d008fb1c47ceed6b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 28 九月 2025 10:12:19 +0800
Subject: [PATCH] 增加同步引流平台的开关的功能
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 41 ++++++---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java | 3
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java | 12 +++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java | 4
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 6
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 18 ++--
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 3
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 9 +-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 6 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 6 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 77 +++++++++++-------
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 6 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java | 4 +
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 1
16 files changed, 131 insertions(+), 70 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
index a0e15e4..daf0d37 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
@@ -11,6 +11,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -61,7 +62,7 @@
}
@Override
- public PageInfo<Site> getSiteListPaging(Integer PageNo, Integer PageSize, List<String> ids) {
+ public PageInfo<Site> getSiteListPaging(Integer PageNo, Integer PageSize, List<String> ids, Integer isOpenSynchronization) {
return null;
}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
index 30bc547..4a98941 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
@@ -54,7 +54,8 @@
@PostMapping("/site/getSiteListPaging")
PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo,
@RequestParam("PageSize") Integer PageSize,
- @RequestParam("ids") List<String> ids);
+ @RequestParam("ids") List<String> ids,
+ @RequestParam("isOpenSynchronization") Integer isOpenSynchronization);
/**
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java
index 5b58570..7e6c33f 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/Site.java
@@ -447,6 +447,18 @@
@TableField("supportOrder")
@ApiModelProperty(value = "2.0修改字段-是否支持预约 0不支持1支持")
private Integer supportOrder;
+ /**
+ * 高速路服务区编号
+ */
+ @TableField("serAreaCode")
+ @ApiModelProperty(value = "高速路服务区编号")
+ private String serAreaCode;
+ /**
+ * 引流平台数据同步（0=否，1=是）
+ */
+ @TableField("isOpenSynchronization")
+ @ApiModelProperty(value = "引流平台数据同步（0=否，1=是）")
+ private Integer isOpenSynchronization;
// /**
// * 换电设备信息
// */
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 6833418..bc201c9 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -19,6 +19,7 @@
import com.ruoyi.system.api.model.LoginUser;
import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
/**
* 登录校验方法
@@ -122,6 +123,7 @@
sysUser.setUserName(username);
sysUser.setNickName(username);
sysUser.setPassword(SecurityUtils.encryptPassword(password));
+ sysUser.setPassWordUpdate(new Date());
R<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
if (R.FAIL == registerResult.getCode()) {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index a690ee2..db25f62 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -439,6 +439,7 @@
sysUser.setNickName(companyUserListVo.getNickName());
sysUser.setCreateBy(SecurityUtils.getUsername());
sysUser.setCreateTime(new Date());
+ sysUser.setPassWordUpdate(new Date());
userService.insertUser(sysUser);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(20l);
@@ -474,6 +475,7 @@
sysUser.setObjectId(dto.getRepairId());
sysUser.setUserName(add.getPhonenumber());
sysUser.setNickName(add.getPhonenumber());
+ sysUser.setPassWordUpdate(new Date());
userService.insertUser(sysUser);
userIds.add(sysUser.getUserId().intValue());
}
@@ -718,6 +720,7 @@
if(null == user.getRoleType()){
user.setRoleType(1);
}
+ user.setPassWordUpdate(new Date());
userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(user.getRoleId());
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ed37278..d28e6be 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -494,6 +494,7 @@
BeanValidators.validateWithException(validator, user);
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
+ user.setPassWordUpdate(new Date());
userMapper.insertUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index ba262e6..f8f18c6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -60,7 +60,7 @@
</sql>
<select id="selectUserList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+ select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.passWordUpdate, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
<if test="phonenumber != null and phonenumber != ''">
@@ -69,7 +69,7 @@
</select>
<select id="selectAllocatedList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status,u.passWordUpdate, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -86,7 +86,7 @@
</select>
<select id="selectUnallocatedList" parameterType="com.ruoyi.system.api.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status,u.passWordUpdate, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -230,6 +230,7 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="forbiddenRemark != null">forbidden_remark = #{forbiddenRemark},</if>
+ <if test="passWordUpdate != null">passWordUpdate = #{passWordUpdate},</if>
update_time = now()
</set>
where user_id = #{userId}
@@ -244,7 +245,7 @@
</update>
<update id="resetUserPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
- update sys_user set password = #{password} where user_name = #{userName}
+ update sys_user set password = #{password}, passWordUpdate = now() where user_name = #{userName}
</update>
<delete id="deleteUserById" parameterType="Long">
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index e0e8174..c26fdc1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -636,9 +636,11 @@
*/
@PostMapping("/getSiteListPaging")
public PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize,
- @RequestParam("ids") List<String> ids){
+ @RequestParam("ids") List<String> ids, @RequestParam("isOpenSynchronization") Integer isOpenSynchronization){
PageInfo<Site> pageInfo = new PageInfo<>(PageNo, PageSize);
- PageInfo<Site> page = siteService.lambdaQuery().eq(Site::getStatus, 1).in(ids.size() > 0, Site::getId, ids)
+ PageInfo<Site> page = siteService.lambdaQuery().eq(Site::getStatus, 1)
+ .in(ids.size() > 0, Site::getId, ids)
+ .eq(-1 != isOpenSynchronization, Site::getIsOpenSynchronization, isOpenSynchronization)
.ne(Site::getSiteType, 2).page(pageInfo);
return page;
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index 64609a7..46fc1b1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -394,8 +394,10 @@
accountingStrategyService.removeById(one.getId());
//推送三方平台
- List<Integer> siteIds = list.stream().map(Site::getId).collect(Collectors.toList());
- tcecClient.notificationStationChange(siteIds);
+ List<Integer> siteIds = list.stream().filter(s->1 == s.getIsOpenSynchronization()).map(Site::getId).collect(Collectors.toList());
+ if(!siteIds.isEmpty()){
+ tcecClient.notificationStationChange(siteIds);
+ }
}
//硬件
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index 4ff6248..ae5bcf1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.chargingPile.api.model.TChargingGun;
-import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.chargingPile.api.model.TFaultMessage;
+import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
import com.ruoyi.chargingPile.api.vo.UpdateChargingPileStatusVo;
@@ -79,6 +77,9 @@
@Resource
private TCECClient tcecClient;
+
+ @Resource
+ private ISiteService siteService;
@Autowired
@@ -259,17 +260,20 @@
TChargingPile chargingPile = chargingPileService.getById(tChargingGun.getChargingPileId());
//枪处于离线或者故障，返回状态为正常，则修改其状态
if(0 == status && tChargingGun.getStatus() != 2){
+ Site site = siteService.getById(tChargingGun.getSiteId());
TChargingGun tChargingGun1 = new TChargingGun();
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(2);
chargingGunService.updateById(tChargingGun1);
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 2);
- }
- }).start();
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 2);
+ }
+ }).start();
+ }
if(chargingPile.getStatus() != 1){
TChargingPile chargingPile1 = new TChargingPile();
@@ -287,17 +291,21 @@
}
//枪处于正常，返回状态为故障，则修改其状态
if(1 == status && tChargingGun.getStatus() != 1 && tChargingGun.getStatus() != 7){
+ Site site = siteService.getById(tChargingGun.getSiteId());
TChargingGun tChargingGun1 = new TChargingGun();
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(7);
chargingGunService.updateById(tChargingGun1);
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 7);
- }
- }).start();
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 7);
+ }
+ }).start();
+ }
+
//桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
@@ -327,6 +335,7 @@
order.setStatusList(Arrays.asList(1, 2, 3, 4, 5));
List<TChargingOrder> orders = chargingOrderClient.getChargingOrder(order).getData();
if(orders.size() > 0){
+ Site site = siteService.getById(tChargingGun.getSiteId());
TChargingOrder chargingOrder = orders.get(0);
TChargingGun tChargingGun1 = new TChargingGun();
if(Arrays.asList(1, 2, 5).contains(chargingOrder.getStatus())){
@@ -344,25 +353,31 @@
tChargingGun1.setId(tChargingGun.getId());
chargingGunService.updateById(tChargingGun1);
}
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 5);
- }
- }).start();
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 5);
+ }
+ }).start();
+ }
+
}else{
+ Site site = siteService.getById(tChargingGun.getSiteId());
TChargingGun tChargingGun1 = new TChargingGun();
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(3);
chargingGunService.updateById(tChargingGun1);
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 3);
- }
- }).start();
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 3);
+ }
+ }).start();
+ }
}
List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingGunId, tChargingGun.getId())
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
index f56c4b4..c141231 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
@@ -139,6 +139,7 @@
user.setDelFlag("0");
user.setRoleId(partner.getRoleId().longValue());
user.setRoleType(2);
+ user.setPassWordUpdate(new Date());
R<Long> r = sysUserClient.addSysUser(user);
if(200 != r.getCode()){
throw new RuntimeException(r.getMsg());
@@ -248,6 +249,7 @@
user.setRoleId(partner.getRoleId().longValue());
user.setRoleType(2);
user.setObjectId(partner.getId());
+ user.setPassWordUpdate(new Date());
R r = sysUserClient.addSysUser(user);
if(200 != r.getCode()){
throw new RuntimeException(r.getMsg());
@@ -259,6 +261,7 @@
user.setAvatar(partner.getLogoUrl());
user.setPassword(partner.getPassword());
user.setRoleId(partner.getRoleId().longValue());
+ user.setPassWordUpdate(new Date());
R r = sysUserClient.updateSysUser(user);
if(200 != r.getCode()){
throw new RuntimeException(r.getMsg());
@@ -322,6 +325,7 @@
//修改登录账号的密码
SysUser user = sysUserClient.queryUserByUserName(partner.getAccount()).getData();
user.setPassword(partner.getPassword());
+ user.setPassWordUpdate(new Date());
sysUserClient.resetPassword(user);
return AjaxResult.success();
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index ed2cadc..532844b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -517,7 +517,9 @@
integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
}
- //推送三方平台
- tcecClient.notificationStationChange(Arrays.asList(id));
+ if(1 == site.getIsOpenSynchronization()){
+ //推送三方平台
+ tcecClient.notificationStationChange(Arrays.asList(id));
+ }
}
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 84337b6..5466368 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -729,13 +729,16 @@
chargingGun1.setId(chargingGun.getId());
chargingGun1.setStatus(1);
chargingGunService.updateById(chargingGun1);
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 1);
- }
- }).start();
+ Site site = siteService.getById(chargingGun.getSiteId());
+ if(1 == site.getIsOpenSynchronization()){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 1);
+ }
+ }).start();
+ }
//桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
TChargingPile chargingPile = this.getById(chargingGun.getChargingPileId());
@@ -764,7 +767,6 @@
faultMessageService.save(faultMessage);
// 发送故障短信
- Site site = siteService.getById(faultMessage.getSiteId());
String siteName = site.getName();
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setPhone(site.getPhone());
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
index 2be7fa8..6ba363b 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
@@ -298,7 +298,7 @@
if(null == pageSize){
pageSize = 10;
}
- PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize, new ArrayList<>());
+ PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize, new ArrayList<>(), 1);
List<TParkingLot> parkingLots = parkingLotClient.getAllParkingLot().getData();
QueryStationsInfoResult queryStationsInfoResult = new QueryStationsInfoResult();
queryStationsInfoResult.setPageNo(pageNo);
@@ -1828,7 +1828,7 @@
if(null == pageSize){
pageSize = 50;
}
- PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize, stationIDs);
+ PageInfo<Site> siteListPaging = siteClient.getSiteListPaging(pageNo, pageSize, stationIDs, -1);
List<TParkingLot> parkingLots = parkingLotClient.getAllParkingLot().getData();
QueryStationsInfoResult queryStationsInfoResult = new QueryStationsInfoResult();
queryStationsInfoResult.setPageNo(pageNo);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 4297ea2..6ade2d6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -797,6 +797,7 @@
String key = "AQJC_" + chargingOrder.getChargingGunId();
List<PlatformStartChargingReply> data = platformStartChargingReplyService.getPlatformStartChargingReply(code);
log.info(code + "：-------------------开始检查调起充电结果-------------------" + data.toString());
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
if (data.size() != 0) {
PlatformStartChargingReply platformStartChargingReply = data.get(1);
Integer startup_result = platformStartChargingReply.getStartup_result();
@@ -842,7 +843,7 @@
redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
//推送三方平台订单状态
- if (2 == chargingOrder.getOrderSource()) {
+ if (2 == chargingOrder.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
}
return true;
@@ -876,7 +877,7 @@
this.updateById(order);
redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
//推送三方平台订单状态
- if (2 == chargingOrder.getOrderSource()) {
+ if (2 == chargingOrder.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
}
return true;
@@ -917,6 +918,7 @@
if (order.getStatus() != 2) {
return;
}
+ Site site = siteClient.getSiteByIds(Arrays.asList(order.getSiteId())).getData().get(0);
String code = order.getCode();
PreChargeCheck preChargeCheck1 = redisService.getCacheObject("AQJC_" + order.getChargingGunId());
if (null != preChargeCheck1) {
@@ -940,8 +942,10 @@
TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
chargingGun.setStatus(4);
chargingGunClient.updateChargingGunById(chargingGun);
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 4);
+ if(1 == site.getIsOpenSynchronization()){
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 4);
+ }
}
redisService.setCacheObject("AQJC_" + order.getChargingGunId(), preChargeCheck1, 24L, TimeUnit.HOURS);
this.updateById(order);
@@ -963,9 +967,12 @@
result.setStartTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
Operator operator = operatorClient.getOperatorById(order.getOperatorId()).getData();
result.setOperatorID(operator.getOperatorId());
- tcecClient.notificationStartChargeResult(result);
+ if(1 == site.getIsOpenSynchronization()){
+ tcecClient.notificationStartChargeResult(result);
+ tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+ }
- tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+
}
}
@@ -1291,8 +1298,9 @@
log.info(code1 + "：-------------------远程停止充电请求-------------------");
log.info(platformStopCharging.toString());
});
+ Site site = siteClient.getSiteByIds(Arrays.asList(order.getSiteId())).getData().get(0);
//推送三方平台
- if (2 == order.getOrderSource()) {
+ if (2 == order.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
}
@@ -2594,9 +2602,9 @@
redisService.setCacheObject("chargingOrderStatus:" + vo.getTransaction_serial_number(), 5, 100L, TimeUnit.SECONDS);
chargingOrder = this.getById(chargingOrder.getId());
-
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
//推送三方平台
- if (2 == chargingOrder.getOrderSource()) {
+ if (2 == chargingOrder.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
TChargingOrder finalChargingOrder = chargingOrder;
new Thread(new Runnable() {
@Override
@@ -2632,7 +2640,7 @@
chargingGunClient.updateChargingGunById(chargingGun);
chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
//推送状态给三方平台
- if (2 == chargingOrder.getOrderSource()) {
+ if (2 == chargingOrder.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 2);
}
@@ -4108,9 +4116,11 @@
// scheduler.shutdown();
// }
// }, 5, 1, TimeUnit.SECONDS);
-
- //推送三方平台订单状态
- tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
+ if(1 == site.getIsOpenSynchronization()){
+ //推送三方平台订单状态
+ tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ }
return R.ok();
}
@@ -4138,7 +4148,10 @@
chargingOrder.setStatus(4);
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
- tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
+ if(1 == site.getIsOpenSynchronization()){
+ tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+ }
String code1 = order.getCode();
TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index 9de497a..eb84ab1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -579,9 +579,9 @@
chargingOrderService.updateById(order);
order = chargingOrderService.getById(order.getId());
-
+ Site site = siteClient.getSiteByIds(Arrays.asList(order.getSiteId())).getData().get(0);
//推送三方平台
- if (2 == order.getOrderSource()) {
+ if (2 == order.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
TChargingOrder finalChargingOrder = order;
new Thread(new Runnable() {
@Override
@@ -617,7 +617,7 @@
chargingGunClient.updateChargingGunById(chargingGun);
chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
//推送状态给三方平台
- if (2 == order.getOrderSource()) {
+ if (2 == order.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 2);
}
--
Gitblit v1.7.1