Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

zbj//1.流量套餐修改添加日志

Browse Source
This commit is contained in:
zhangbaojian
2023-04-13 15:28:00 +08:00
parent cba065d25c
commit 9aa8355364
5 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java
View File

@@ -4,13 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pq.api.PqsTerminalLogsClient;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.FlowMealMapper;
import com.njcn.device.pq.mapper.RateOfFlowMapper;
import com.njcn.device.pq.pojo.param.FlowMealParam;
import com.njcn.device.pq.pojo.po.FlowMeal;
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
import com.njcn.device.pq.pojo.vo.RateOfFlowVO;
import com.njcn.device.pq.service.FlowMealService;
import com.njcn.device.pq.service.IPqsTerminalLogsService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.pojo.po.DictData;
import com.njcn.web.utils.RequestUtil;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -19,6 +26,7 @@ import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
/**
* @version 1.0.0
@@ -31,6 +39,10 @@ public class FlowMealServiceImpl extends ServiceImpl<FlowMealMapper, FlowMeal> i
private final RateOfFlowMapper rateOfFlowMapper;
private final IPqsTerminalLogsService iPqsTerminalLogsService;
private final DicDataFeignClient dicDataFeignClient;
@Override
public List<RateOfFlowVO> getRateOfFlowData() {
List<RateOfFlowVO> rateOfFlowData = rateOfFlowMapper.getRateOfFlowData();
@@ -58,8 +70,53 @@ public class FlowMealServiceImpl extends ServiceImpl<FlowMealMapper, FlowMeal> i
BeanUtils.copyProperties(flowMealUpdateParam, flowMeal);
flowMeal.setUpdateBy(RequestUtil.getUserIndex());
flowMeal.setUpdateTime(LocalDateTime.now());
this.updateById(flowMeal);
return true;
//查询修改前的数据
FlowMeal newFlowMeal = this.getById(flowMeal.getId());
boolean b = this.updateById(flowMeal);
if (b) {
//查询修改后的数据
FlowMeal oldFlowMeal = this.getById(flowMeal.getId());
//获取用户信息
String userName = RequestUtil.getUsername();
String index = RequestUtil.getUserIndex();
//String userName = "zbj";
//String index = "123456";
StringBuilder sb = new StringBuilder();
sb.append(userName).append("修改了").append(newFlowMeal.getName()).append(" - ")
.append("套餐的参数;");
StringBuilder sbNew = new StringBuilder();
StringBuilder sbOld = new StringBuilder();
sbNew.append("操作历史,");
sbOld.append("修改后参数,");
if (!Objects.equals(newFlowMeal.getName(), oldFlowMeal.getName())) {
sbNew.append("套餐名: ").append(newFlowMeal.getName()).append(";");
sbOld.append("套餐名: ").append(oldFlowMeal.getName()).append(";");
}
if (!Objects.equals(newFlowMeal.getFlow(), oldFlowMeal.getFlow())) {
sbNew.append("套餐流量（MB）: ").append(newFlowMeal.getFlow()).append(";");
sbOld.append("套餐流量（MB）: ").append(oldFlowMeal.getFlow()).append(";");
}
if (!Objects.equals(newFlowMeal.getType(), oldFlowMeal.getType())) {
sbNew.append("套餐类型: ").append(newFlowMeal.getType() == 0 ? "基础套餐" : "扩展套餐").append(";");
sbOld.append("套餐类型: ").append(oldFlowMeal.getType() == 0 ? "基础套餐" : "扩展套餐").append(";");
}
sb.append(sbNew).append(sbOld);
HttpResult<DictData> dicDataByCode = dicDataFeignClient.getDicDataByCode(DicDataEnum.DATA_PLAN.getCode());
DictData data = dicDataByCode.getData();
//创建对象
PqsTerminalLogs terminalLogsNew = new PqsTerminalLogs();
terminalLogsNew.setObjIndex(newFlowMeal.getId());
terminalLogsNew.setTerminalDescribe(sb.toString());
terminalLogsNew.setCreateBy(index);
terminalLogsNew.setCreateTime(LocalDateTime.now());
terminalLogsNew.setTerminalType(data.getId());
terminalLogsNew.setState(1);
iPqsTerminalLogsService.saveLogs(terminalLogsNew);
return true;
} else {
return false;
}
}
@Override
@@ -96,6 +153,4 @@ public class FlowMealServiceImpl extends ServiceImpl<FlowMealMapper, FlowMeal> i
}
}

10
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -700,11 +700,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
}
//获取用户信息
String userName = RequestUtil.getUsername();
String loginName = RequestUtil.getLoginName();
String index = RequestUtil.getUserIndex();
//String userName = "zbj";
//String loginName = "njcnser";
//String index = "123456";
LineDetail lineDetailResOld = lineDetailMapper.selectById(lineId);
queryUpdateAndInsertLog(userName, loginName, lineDetailRes, lineDetailResOld);
queryUpdateAndInsertLog(userName, index, lineDetailRes, lineDetailResOld);
}
}
}
@@ -723,7 +723,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
* @return
*/
@Async
public void queryUpdateAndInsertLog(String userName, String loginName, LineDetail newLine, LineDetail oldLine) {
public void queryUpdateAndInsertLog(String userName, String index, LineDetail newLine, LineDetail oldLine) {
SuperDataParam superDataParam = userMapper.getPointSuper(newLine.getId());
StringBuilder sb = new StringBuilder();
sb.append(userName).append("修改了").append(superDataParam.getUrbanName()).append(" - ")
@@ -770,7 +770,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
PqsTerminalLogs terminalLogsNew = new PqsTerminalLogs();
terminalLogsNew.setObjIndex(newLine.getId());
terminalLogsNew.setTerminalDescribe(sb.toString());
terminalLogsNew.setCreateBy(loginName);
terminalLogsNew.setCreateBy(index);
terminalLogsNew.setCreateTime(LocalDateTime.now());
terminalLogsNew.setTerminalType(data.getId());
terminalLogsNew.setState(1);

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java
View File

@@ -156,9 +156,9 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
if (Objects.equals(device1.getId(), device.getId()) && !Objects.equals(device1.getRunFlag(), device.getRunFlag())) {
//获取用户信息
String userName = RequestUtil.getUsername();
String loginName = RequestUtil.getLoginName();
String index = RequestUtil.getUserIndex();
//String userName = "zbj";
//String loginName = "njcnser";
//String index = "1234567";
//获取上级信息
SuperDataParam superDataParam = userMapper.getDeviceSuper(device.getId());
StringBuilder sb = new StringBuilder();
@@ -194,7 +194,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
PqsTerminalLogs terminalLogsNew = new PqsTerminalLogs();
terminalLogsNew.setObjIndex(device.getId());
terminalLogsNew.setTerminalDescribe(sb.toString());
terminalLogsNew.setCreateBy(loginName);
terminalLogsNew.setCreateBy(index);
terminalLogsNew.setCreateTime(LocalDateTime.now());
terminalLogsNew.setTerminalType(data.getId());
terminalLogsNew.setState(1);

2
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
View File

@@ -308,6 +308,8 @@ public enum DicDataEnum {
LINE_PARAMETER("监测点参数修改","Line_Parameter"),
DEV_PARAMETER("设备状态修改","Dev_Parameter"),
WEB_ADD("web新增用户","Web_Add"),
DATA_PLAN("流量套餐修改","Data_Plan"),
/**
* 接线方式
*/

6
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

@@ -174,9 +174,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
if (result) {
//获取用户信息
String userName = RequestUtil.getUsername();
String loginName = RequestUtil.getLoginName();
String index = RequestUtil.getUserIndex();
//String userName = "zbj";
//String loginName = "njcnser";
//String index = "1234567";
StringBuilder sb = new StringBuilder();
sb.append(userName).append("新增了").append("用户名为: ").append(user.getName()).append(",")
.append("登录名为: ").append(user.getLoginName()).append(" - 的用户;");
@@ -186,7 +186,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
PqsTerminalLogs terminalLogsNew = new PqsTerminalLogs();
terminalLogsNew.setObjIndex(user.getId());
terminalLogsNew.setTerminalDescribe(sb.toString());
terminalLogsNew.setCreateBy(loginName);
terminalLogsNew.setCreateBy(index);
terminalLogsNew.setCreateTime(LocalDateTime.now());
terminalLogsNew.setTerminalType(data.getId());
terminalLogsNew.setState(1);