slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/CommonService.java

@@ -86,7 +86,7 @@ public class CommonService {
         /**
          * {"companyId":"198","companyName":"四川金顶集团","createBy":"2","createName":"600678","updateBy":"2","updateName":"600678","mountainId":"198"}
          */
-        String uInfo = request.getHeader("u_info");
+        String uInfo = request.getHeader("u-info");
 //        String uInfo = "eyJjb21wYW55SWQiOiIxOTgiLCJjb21wYW55TmFtZSI6IuWbm+W3nemHkemhtumbhuWboiIsImNyZWF0ZUJ5IjoiMiIsImNyZWF0ZU5hbWUiOiI2MDA2NzgiLCJ1cGRhdGVCeSI6IjIiLCJ1cGRhdGVOYW1lIjoiNjAwNjc4IiwibW91bnRhaW5JZCI6IjE5OCJ9";
 //        if (StringUtils.isBlank(uInfo)) {
 //            throw new BusinessException("数据请求异常!");

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/ProjectService.java

@@ -431,6 +431,7 @@ public class ProjectService {
                 String companyAllCode = kwsCompany.getCompanyAllCode();
                 String maxDeviceCode = deviceMapper.getMaxDeviceCodeAndSplit(15, 6);
                 if (org.apache.commons.lang3.StringUtils.isNotBlank(maxDeviceCode)) {
+                    maxDeviceCode = StringUtils.addZeroForNum(String.valueOf(Long.parseLong(maxDeviceCode) + 1), 6);
                     deviceCode = companyAllCode + maxDeviceCode;
                 } else {
                     deviceCode = companyAllCode + StringUtils.addZeroForNum("1", 6);
@@ -446,7 +447,9 @@ public class ProjectService {
                     kwsDevice.setRelevanceLevel(level);
                     kwsDevice.setUpdateTime(LocalDateTime.now());
                     kwsDevice.setUpdateBy(headerData.getUpdateBy() == null ? null : Long.parseLong(headerData.getUpdateBy()));
-                    level = "2";
+                    if (!String.valueOf(id).equals(bindDeviceId)){
+                        level = "2";
+                    }
                     deviceMapper.updateById(kwsDevice);
                 }
                 KwsDevice kwsDevice = deviceMapper.selectByPrimaryKey(id);
@@ -1819,7 +1822,9 @@ public class ProjectService {
                     kwsDevice.setOnline(0);
                     kwsDevice.setUpdateTime(LocalDateTime.now());
                     kwsDevice.setUpdateBy(headerData.getUpdateBy() == null ? null : Long.parseLong(headerData.getUpdateBy()));
-                    level = "2";
+                    if (!String.valueOf(id).equals(bindDeviceId)) {
+                        level = "2";
+                    }
                     deviceMapper.updateById(kwsDevice);
                 }
                 KwsDevice kwsDevice = deviceMapper.selectByPrimaryKey(id);