diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/BaseReamParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/BaseReamParam.java new file mode 100644 index 000000000..a2f2706de --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/BaseReamParam.java @@ -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; + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/UserMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/UserMapper.java index 06ff43a6f..086586083 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/UserMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/UserMapper.java @@ -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); + } \ No newline at end of file diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/UserMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/UserMapper.xml index 9a38f683c..66505a6e4 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/UserMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/UserMapper.xml @@ -29,5 +29,14 @@ pl.Id = #{id} + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java index bc94336c2..cb4479e53 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java @@ -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 i private final RateOfFlowMapper rateOfFlowMapper; - private final IPqsTerminalLogsService iPqsTerminalLogsService; - - private final DicDataFeignClient dicDataFeignClient; - @Override public List getRateOfFlowData() { List rateOfFlowData = rateOfFlowMapper.getRateOfFlowData(); @@ -74,45 +62,6 @@ public class FlowMealServiceImpl extends ServiceImpl 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 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; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java index 9472c118a..a84859303 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java @@ -173,16 +173,16 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { String oldFlag = ""; if (device.getRunFlag() == 0) { newFlag = "投运"; - }else if (device.getRunFlag() == 1){ + } else if (device.getRunFlag() == 1) { newFlag = "热备用"; - }else if (device.getRunFlag() == 2){ + } else if (device.getRunFlag() == 2) { newFlag = "停运"; } if (device1.getRunFlag() == 0) { oldFlag = "投运"; - }else if (device1.getRunFlag() == 1){ + } else if (device1.getRunFlag() == 1) { oldFlag = "热备用"; - }else if (device1.getRunFlag() == 2){ + } else if (device1.getRunFlag() == 2) { oldFlag = "停运"; } sbNew.append("终端运行状态: ").append(newFlag).append(";"); @@ -209,6 +209,8 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { @Override public boolean updateFlowMeal(TerminalParam terminalParam) { List tem = new ArrayList<>(); + //修改前 + List 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 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 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 diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java index d56213dd3..da0707f5a 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java @@ -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 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 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 dicDataByCode = dicDataFeignClient.getDicDataByCode(DicDataEnum.WEB_ADD.getCode()); DictData data = dicDataByCode.getData(); //创建对象