Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/syc/slm/slmbi/config/DataCenterConfig.java

@@ -23,12 +23,16 @@ public class DataCenterConfig {
 
     @Value("${dc_client.interfaces.positionListUrl}")
     private  String positionListUrl;
+
     @Value("${dc_client.interfaces.deptListUrl}")
     private  String deptListUrl;
+
     @Value("${dc_client.interfaces.userTree}")
     private  String userTree;
+
     @Value("${dc_client.interfaces.variableList}")
     private  String variableList;
+
     @Value("${dc_client.interfaces.deviceList}")
     private  String deviceList;
 
@@ -43,12 +47,16 @@ public class DataCenterConfig {
 
     @Value("${dc_client.interfaces.variableCodeHistoryList}")
     private  String variableHistoryDataList;
+
     @Value("${dc_client.interfaces.variableAllDataList}")
     private  String variableRealTimeDataList;
+
     @Value("${dc_client.interfaces.filedValue}")
     private  String filedValue;
+
     @Value("${dc_client.interfaces.send}")
     private  String send;
+
     @Value("${dc_client.interfaces.variableStatus}")
     private  String variableStatus;
 
@@ -61,4 +69,7 @@ public class DataCenterConfig {
     @Value("${dc_client.interfaces.variableStatusRealTimeDataList}")
     private  String variableStatusRealTimeDataList;
 
+    @Value("${dc_client.interfaces.systemAdminByAppId}")
+    private String systemAdminByAppId;
+
 }

src/main/java/com/syc/slm/slmbi/controller/InitController.java

@@ -34,8 +34,7 @@ public class InitController extends BaseRestController{
 
     @Autowired
     private InstrumentPanelInitService panelInitService;
-    @Autowired
-    private InstrumentPanelGroupService groupService;
+
 
     @GetMapping("/app-id")
     @ApiOperation("测试")
@@ -57,11 +56,8 @@ public class InitController extends BaseRestController{
     public R<Object> initPanel(HttpServletRequest request, @PathVariable String appId) {
         return call(()->{
             CurrentUser currentUser = getCurrentUser(request);
-            LambdaQueryWrapper<InstrumentPanelGroup> where = new LambdaQueryWrapper<>();
-            where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
-            where.eq(InstrumentPanelGroup::getName, "全部分组");
-            List<InstrumentPanelGroup> list = groupService.list(where);
-            list.forEach(x-> panelInitService.initOnePanel(x.getAppId(),currentUser.getToken(), request));
+            panelInitService.initBatchPanel(currentUser.getToken(), request,appId);
+
         });
     }
 }

src/main/java/com/syc/slm/slmbi/controller/TenantController.java

@@ -49,7 +49,7 @@ public class TenantController extends BaseRestController{
             groupDTO.setParentId(null);
             groupDTO.setName("全部分组");
             groupService.saveGroup(groupDTO, appId);
-            panelInitService.initOnePanel(appId,currentUser.getToken(),request);
+            panelInitService.initOnePanel(appId,currentUser.getToken(),request,appId);
         });
     }
 

src/main/java/com/syc/slm/slmbi/service/InstrumentPanelInitService.java

@@ -14,5 +14,7 @@ import javax.servlet.http.HttpServletRequest;
  **/
 public interface InstrumentPanelInitService extends IService<InstrumentPanel> {
 
-    String initOnePanel(String appId,String token, HttpServletRequest request);
+    String initOnePanel(String queryAppId,String token, HttpServletRequest request,String appId);
+
+    String initBatchPanel(String token, HttpServletRequest request,String appId);
 }

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelInitServiceImpl.java

@@ -4,13 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gson.reflect.TypeToken;
 import com.syc.slm.common.core.constant.SlmConstants;
+import com.syc.slm.common.core.util.R;
+import com.syc.slm.common.core.util.RestTemplateUtils;
+import com.syc.slm.slmbi.config.DataCenterConfig;
 import com.syc.slm.slmbi.dao.InstrumentPanelMapper;
 import com.syc.slm.slmbi.dto.*;
 import com.syc.slm.slmbi.entity.*;
 import com.syc.slm.slmbi.enums.AccessType;
 import com.syc.slm.slmbi.exception.SysException;
 import com.syc.slm.slmbi.service.*;
+import com.syc.slm.slmbi.vo.UserTreeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Map;
 
 /**
  * slm-bi
@@ -34,7 +41,6 @@ import java.util.List;
 public class InstrumentPanelInitServiceImpl extends ServiceImpl<InstrumentPanelMapper, InstrumentPanel>
     implements InstrumentPanelInitService {
 
-
     @Value("${initGroupName:默认模板}")
     private String initGroupName;
 
@@ -43,48 +49,62 @@ public class InstrumentPanelInitServiceImpl extends ServiceImpl<InstrumentPanelM
 
     @Value("${initPanelName2:售后服务综合看板}")
     private String initPanelName2;
+
     @Value("${initConfigId1:82752b5ba8b2bd379c771a72c83f4b3a}")
     private String initConfig1 ;
 
     @Value("${initConfigId2:29727c771a6fcb492d206a9e811e585d}")
     private String initConfig2;
 
-
-
     @Autowired
     private InstrumentPanelConfigService configService;
 
-
     @Autowired
     private InstrumentPanelGroupService panelGroupService;
+
     @Autowired
     private InstrumentPanelService panelService;
+
     @Autowired
     private InstrumentPanelTreeService treeService;
 
+    @Autowired
+    private DataCenterConfig dataCenterConfig;
 
+    @Autowired
+    private InstrumentPanelGroupService groupService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String initOnePanel(String appId, String token,HttpServletRequest request) {
-        CurrentUser currentUser = new CurrentUser();
+    public String initBatchPanel(String token, HttpServletRequest request, String appId) {
+        LambdaQueryWrapper<InstrumentPanelGroup> where = new LambdaQueryWrapper<>();
+        where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
+        where.eq(InstrumentPanelGroup::getName, "全部分组");
+        List<InstrumentPanelGroup> list = groupService.list(where);
+        list.forEach(x-> this.initOnePanel(x.getAppId(),token,request,appId));
+        return "true";
+    }
 
-        request.setAttribute(token,SlmConstants.gson.toJson(currentUser));
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String initOnePanel(String queryAppId, String token,HttpServletRequest request,String appId) {
+        // 初始化request域
+        this.setRequestAttribute(token,queryAppId,appId,request);
         LambdaQueryWrapper<InstrumentPanelGroup> groupWhere = new LambdaQueryWrapper<>();
         groupWhere.eq(InstrumentPanelGroup::getName, initGroupName);
         groupWhere.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
-        groupWhere.eq(BaseEntity::getAppId, appId);
+        groupWhere.eq(BaseEntity::getAppId, queryAppId);
         InstrumentPanelGroup one = panelGroupService.getOne(groupWhere);
         if(ObjectUtils.isEmpty(one)){
             LambdaQueryWrapper<InstrumentPanelGroup> where = new LambdaQueryWrapper<>();
             where.eq(InstrumentPanelGroup::getName, "全部分组");
             where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
-            where.eq(BaseEntity::getAppId, appId);
+            where.eq(BaseEntity::getAppId, queryAppId);
             InstrumentPanelGroup allGroup = panelGroupService.getOne(where);
             InstrumentPanelGroupDTO cGroup = new InstrumentPanelGroupDTO();
             cGroup.setParentId(allGroup.getId());
             cGroup.setName("默认模板");
-            String groupId = panelGroupService.saveGroup(cGroup, appId);
+            String groupId = panelGroupService.saveGroup(cGroup, queryAppId);
             one= panelGroupService.getById(groupId);
         }
 
@@ -145,4 +165,13 @@ public class InstrumentPanelInitServiceImpl extends ServiceImpl<InstrumentPanelM
         config.setPermission(permission);
         return config;
     }
+
+    private void setRequestAttribute(String token,String queryAppId,String appId,HttpServletRequest request){
+        Map<String,String> uriVariables = Maps.newHashMap();
+        uriVariables.put("queryAppId",queryAppId);
+        uriVariables.put("appId",appId);
+        String uri = dataCenterConfig.getDcClientHost() + dataCenterConfig.getSystemAdminByAppId();
+        R<CurrentUser> result = RestTemplateUtils.get(uri, new TypeToken<R<CurrentUser>>() {}.getType(), uriVariables);
+        request.setAttribute(token,SlmConstants.gson.toJson(result.detach()));
+    }
 }