zbj//1.类名称调整

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/SuperDataMapper.java

@@ -5,8 +5,6 @@ import com.njcn.device.pq.pojo.param.BaseReamParam;
 import com.njcn.device.pq.pojo.param.SuperDataParam;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Map;
-
 /**
  * <p>
  * Mapper 接口
@@ -15,7 +13,7 @@ import java.util.Map;
  * @author zbj
  * @since 2023-04-12
  */
-public interface UserMapper {
+public interface SuperDataMapper {
 
     SuperDataParam getPointSuper(@Param("id") String id);
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pq.mapper.UserMapper">
+<mapper namespace="com.njcn.device.pq.mapper.SuperDataMapper">
 
 
     <select id="getPointSuper" resultType="com.njcn.device.pq.pojo.param.SuperDataParam">

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

@@ -53,9 +53,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -75,7 +72,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
     private final DeviceMapper deviceMapper;
 
-    private final UserMapper userMapper;
+    private final SuperDataMapper superDataMapper;
 
     private final IPqsTerminalLogsService iPqsTerminalLogsService;
 
@@ -746,7 +743,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
      */
     @Async
     public void queryUpdateAndInsertLog(String userName, String index, LineDetail newLine, LineDetail oldLine) {
-        SuperDataParam superDataParam = userMapper.getPointSuper(newLine.getId());
+        SuperDataParam superDataParam = superDataMapper.getPointSuper(newLine.getId());
         StringBuilder sb = new StringBuilder();
         sb.append(userName).append("修改了").append(superDataParam.getUrbanName()).append(" - ")
                 .append(superDataParam.getSubName()).append(" - ").append(superDataParam.getDevName()).append(" - ").append(superDataParam.getPName())

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

@@ -10,7 +10,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pq.mapper.DevFuctionMapper;
 import com.njcn.device.pq.mapper.TerminalMaintainMapper;
-import com.njcn.device.pq.mapper.UserMapper;
+import com.njcn.device.pq.mapper.SuperDataMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.*;
@@ -67,7 +67,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
 
     private final InfluxDbUtils influxDbUtils;
 
-    private final UserMapper userMapper;
+    private final SuperDataMapper superDataMapper;
 
     private final DicDataFeignClient dicDataFeignClient;
 
@@ -163,7 +163,7 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
                         //String userName = "zbj";
                         //String index = "1234567";
                         //获取上级信息
-                        SuperDataParam superDataParam = userMapper.getDeviceSuper(device.getId());
+                        SuperDataParam superDataParam = superDataMapper.getDeviceSuper(device.getId());
                         StringBuilder sb = new StringBuilder();
                         sb.append(userName).append("修改了").append(superDataParam.getUrbanName()).append(" - ")
                                 .append(superDataParam.getSubName()).append(" - ").append(superDataParam.getDevName()).append(" - 设备的参数;");
@@ -235,8 +235,8 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
                             String index = RequestUtil.getUserIndex();
                             //String userName = "zbj";
                             //String index = "1234567";
-                            BaseReamParam baseReam = userMapper.getBaseReam(newMeal.getLineId());
+                            BaseReamParam baseReam = superDataMapper.getBaseReam(newMeal.getLineId());
-                            SuperDataParam superDataParam = userMapper.getDeviceSuper(newMeal.getLineId());
+                            SuperDataParam superDataParam = superDataMapper.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(" 下的 ")