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 19:10:30 +08:00
parent 1f1e262a14
commit 975f8af044
6 changed files with 108 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/BaseReamParam.java Normal file
View File

@@ -0,0 +1,42 @@
package com.njcn.device.pq.pojo.param;
import lombok.Data;
/**
*
* @author zbj
* @date 2023/4/13
*/
@Data
public class BaseReamParam {
/**
* 装置序号
*/
private String id;
/**
* 基础套餐Id
*/
private String baseMealId;
/**
* 基础套餐名称
*/
private String baseMealName;
/**
* 扩展套餐Id
*/
private String extendMealId;
/**
* 扩展套餐名称
*/
private String extendMealName;
/**
* 基础套餐流量（MB）
*/
private Float baseMealFlow;
/**
* 扩展套餐流量（MB）
*/
private Float extendMealFlow;
}

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/UserMapper.java
View File

@@ -1,6 +1,7 @@
package com.njcn.device.pq.mapper;
import com.njcn.device.pq.pojo.param.BaseReamParam;
import com.njcn.device.pq.pojo.param.SuperDataParam;
import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,7 @@ public interface UserMapper {
SuperDataParam getPointSuper(@Param("id") String id);
SuperDataParam getDeviceSuper(@Param("id") String id);
BaseReamParam getBaseReam(@Param("id") String id);
}

9
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/UserMapper.xml
View File

@@ -29,5 +29,14 @@
pl.Id = #{id}
</select>
<select id="getBaseReam" resultType="com.njcn.device.pq.pojo.param.BaseReamParam">
SELECT cdm.Line_Id "id",cdm.Base_Meal_Id "baseMealId",cdm.Ream_Meal_Id "extendMealId",cfm.`Name` "baseMealName",cfm1.`Name` "extendMealName",cfm.Flow "baseMealFlow",cfm1.Flow "extendMealFlow"
FROM cld_dev_meal cdm
left join cld_flow_meal cfm on cdm.Base_Meal_Id = cfm.Id
left join cld_flow_meal cfm1 on cdm.Ream_Meal_Id = cfm1.Id
where cdm.Line_Id = #{id}
</select>
</mapper>

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

@@ -4,20 +4,13 @@ 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;
@@ -26,7 +19,6 @@ import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
/**
* @version 1.0.0
@@ -39,10 +31,6 @@ 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();
@@ -74,45 +62,6 @@ public class FlowMealServiceImpl extends ServiceImpl<FlowMealMapper, FlowMeal> i
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;

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

@@ -209,6 +209,8 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
@Override
public boolean updateFlowMeal(TerminalParam terminalParam) {
List<DevMeal> tem = new ArrayList<>();
//修改前
List<DevMeal> newDevmeal = iDevMealService.listByIds(terminalParam.getIds());
iDevMealService.removeByIds(terminalParam.getIds());
terminalParam.getIds().forEach(item -> {
DevMeal devMeal = new DevMeal();
@@ -217,7 +219,48 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
devMeal.setReamMealId(terminalParam.getExtendMealId());
tem.add(devMeal);
});
return iDevMealService.saveBatch(tem);
boolean b = iDevMealService.saveBatch(tem);
if (b) {
//修改后
List<DevMeal> oldDevmeal = iDevMealService.listByIds(terminalParam.getIds());
for (DevMeal newMeal : newDevmeal) {
for (DevMeal oldMeal : oldDevmeal) {
if (Objects.equals(newMeal.getLineId(),oldMeal.getLineId())){
if (!Objects.equals(newMeal.getBaseMealId(),oldMeal.getBaseMealId())||!Objects.equals(newMeal.getReamMealId(),oldMeal.getReamMealId())){
//获取用户信息
String userName = RequestUtil.getUsername();
String index = RequestUtil.getUserIndex();
//String userName = "zbj";
//String index = "1234567";
BaseReamParam baseReam = userMapper.getBaseReam(newMeal.getLineId());
SuperDataParam superDataParam = userMapper.getDeviceSuper(newMeal.getLineId());
if (Objects.nonNull(superDataParam.getUrbanName())&&Objects.nonNull(superDataParam.getSubName())&&Objects.nonNull(superDataParam.getDevName())) {
StringBuilder sb = new StringBuilder();
sb.append(userName).append("将").append(superDataParam.getUrbanName()).append(" 下的 ")
.append(superDataParam.getSubName()).append(" 下的 ").append(superDataParam.getDevName())
.append(" 基础流量套餐设置为: ").append(baseReam.getBaseMealFlow()).append(";").append(" 扩展流量套餐设置为: ")
.append(baseReam.getExtendMealFlow());
HttpResult<DictData> dicDataByCode = dicDataFeignClient.getDicDataByCode(DicDataEnum.DATA_PLAN.getCode());
DictData data = dicDataByCode.getData();
//创建对象
PqsTerminalLogs terminalLogsNew = new PqsTerminalLogs();
terminalLogsNew.setObjIndex(newMeal.getLineId());
terminalLogsNew.setTerminalDescribe(sb.toString());
terminalLogsNew.setCreateBy(index);
terminalLogsNew.setCreateTime(LocalDateTime.now());
terminalLogsNew.setTerminalType(data.getId());
terminalLogsNew.setState(1);
iPqsTerminalLogsService.save(terminalLogsNew);
}
}
}
}
}
return true;
} else {
return false;
}
}
@Override

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

@@ -29,6 +29,7 @@ import com.njcn.system.pojo.po.DictData;
import com.njcn.user.enums.UserResponseEnum;
import com.njcn.user.enums.UserStatusEnum;
import com.njcn.user.mapper.UserMapper;
import com.njcn.user.mapper.UserRoleMapper;
import com.njcn.user.pojo.constant.UserState;
import com.njcn.user.pojo.constant.UserType;
import com.njcn.user.pojo.dto.UserDTO;
@@ -70,6 +71,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
private final IUserRoleService userRoleService;
private final UserRoleMapper userRoleMapper;
private final IUserStrategyService userStrategyService;
private final IDeptService deptService;
@@ -175,11 +178,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
//获取用户信息
String userName = RequestUtil.getUsername();
String index = RequestUtil.getUserIndex();
//String userName = "zbj";
//String userName = "业务管理员";
//String index = "1234567";
StringBuilder sb = new StringBuilder();
sb.append(userName).append("新增了").append("用户名为: ").append(user.getName()).append(",")
.append("登录名为: ").append(user.getLoginName()).append(" - 的用户;");
sb.append(userName).append("新增了").append(user.getName()).append("用户");
HttpResult<DictData> dicDataByCode = dicDataFeignClient.getDicDataByCode(DicDataEnum.WEB_ADD.getCode());
DictData data = dicDataByCode.getData();
//创建对象