Browse Source

绑定相机支持前缀

lyhzzz 2 years ago
parent
commit
83bda7d689

+ 7 - 1
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -250,7 +250,13 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     public void bind(Integer cameraType, String snCodes, String username) {
         User user = userService.getByUserName(username);
         String[] snCodeArr = snCodes.split(",");
-        List<String> snCodeList = Arrays.asList(snCodeArr);
+        List<String> snCodeList = new ArrayList<>();
+        for (String snCode : snCodeArr) {
+            if(snCode.contains("_")){
+                snCode = snCode.split("_")[1];
+            }
+            snCodeList.add(snCode);
+        }
         LambdaUpdateWrapper<Camera> wrapper = new LambdaUpdateWrapper<>();
         wrapper.in(Camera::getSnCode,snCodeList);
         List<Camera> list = this.list(wrapper);

+ 3 - 3
src/main/java/com/fdkankan/ucenter/service/impl/MailTemplateServiceImpl.java

@@ -96,12 +96,12 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
             }
             StringBuilder webSites = new StringBuilder();
             for (ScenePro scenePro : proList) {
-                webSites.append(scenePro.getWebSite()).append("<p>&nbsp;</p>");
+                webSites.append(scenePro.getWebSite()).append("<br>");
             }
             for (ScenePlus scenePlus : plusList) {
                 ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
                 if(scenePlusExt != null){
-                    webSites.append(scenePlusExt.getWebSite()).append("<p>&nbsp;</p>");
+                    webSites.append(scenePlusExt.getWebSite()).append("<br>");
                 }
             }
             if(StringUtils.isBlank(webSites)){
@@ -131,7 +131,7 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
             StringBuilder snCodes = new StringBuilder();
             for (Long cameraId : cameraMap.keySet()) {
                 if(cameraMap.get(cameraId) != null){
-                    snCodes.append(cameraMap.get(cameraId).getSnCode()).append("<p>&nbsp;</p>");
+                    snCodes.append(cameraMap.get(cameraId).getSnCode()).append("<br>");
                 }
             }
             if(StringUtils.isBlank(snCodes)){