Merge branch '84-integrate' into 'develop'

84 integrate







See merge request !69

smsb-customer-manager-adapter/src/main/java/com/inspur/customer/web/controller/keyclaok/KeycloakDepartmentController.java

@@ -80,6 +80,7 @@ public class KeycloakDepartmentController {
         Response checkResponse = departmentService.checkOperationAuthority(userId, departmentService.getOneById(id).getTenant());
         if(!checkResponse.isSuccess()){return checkResponse;}
         departmentService.deleteDepartment(userId , id);
+        keycloakService.addAttributesByUserId(userId , "org" , null);
         return SingleResponse.buildSuccess();
     }
 

smsb-customer-manager-app/pom.xml

@@ -79,6 +79,12 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.inspur</groupId>
+            <artifactId>smsb-oss-manage-service</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

smsb-customer-manager-app/src/main/java/com/inspur/customer/service/org/SmsbDepartmentServiceImpl.java

@@ -19,6 +19,7 @@ import com.inspur.customer.object.org.*;
 import com.inspur.device.client.core.manage.SmsbDeviceService;
 import com.inspur.device.client.core.manage.SmsbUsersDeviceAttentionService;
 import com.inspur.device.client.core.relation.DeviceAllocateService;
+import com.inspur.service.MinioDataProviderService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -55,6 +56,9 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
     @DubboReference
     private SmsbDeviceService deviceService;
 
+    @DubboReference
+    private MinioDataProviderService minioDataProviderService;
+
     @Override
     public Response addDepartment(String userId , SmsbDepartmentAdd smsbDepartmentAdd) {
         List<SmsbDepartmentDO> departments = this.list(new LambdaQueryWrapper<>(SmsbDepartmentDO.class)
@@ -80,6 +84,8 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
         deviceAllocateService.deleteRelatedOrg(department.getPath());
         // 3、删除部门
         removeDepartment(userId , Collections.singletonList(id));
+        // 删除媒资分享
+        minioDataProviderService.removeSharingByOrg(department.getPath());
     }
 
     private void removeDepartment(String userId, List<Long> ids){
@@ -356,15 +362,16 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
         // 1. 获取对应部门树
         SmsbDepartmentCO department = this.queryDepartment(departmentCmd.getTenant() , departmentCmd.getOrg());
         DeviceDepartmentSimpleDto deviceDepartmentSimpleDto = new DeviceDepartmentSimpleDto();
+        Integer orderFlag = departmentCmd.getOrderFlag();
         // 2. 获取部门-List<设备id> map
         if(StringUtils.isEmpty(departmentCmd.getOrg()) && department.getId() == null){
             // 根节点为租户，该租户下未被分配的设备
-            deviceDepartmentSimpleDto.setDevices(deviceService.ListDeviceUnboundSimple(departmentCmd.getTenant() , departmentCmd.getActivate()));
+            deviceDepartmentSimpleDto.setDevices(deviceService.ListDeviceUnboundSimple(departmentCmd.getTenant() , departmentCmd.getActivate(),orderFlag));
         }else {
             // 根节点为部门
-            deviceDepartmentSimpleDto.setDevices(deviceService.ListDeviceBindSimple(department.getPath() , departmentCmd.getActivate()));
+            deviceDepartmentSimpleDto.setDevices(deviceService.ListDeviceBindSimple(department.getPath() , departmentCmd.getActivate(),orderFlag ));
         }
-        deviceDepartmentSimpleDto.setChildren(childRecurrenceHandleSimple(department.getChildren() , departmentCmd.getActivate()));
+        deviceDepartmentSimpleDto.setChildren(childRecurrenceHandleSimple(department.getChildren() , departmentCmd.getActivate(), orderFlag));
         // 3. 组装设备信息并返回
         deviceDepartmentSimpleDto.setTenant(department.getTenant());
         return deviceDepartmentSimpleDto;
@@ -376,14 +383,14 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
      * @param activate
      * @return
      */
-    private List<DeviceDepartmentSimpleDto> childRecurrenceHandleSimple(List<SmsbDepartmentCO> children , Boolean activate){
+    private List<DeviceDepartmentSimpleDto> childRecurrenceHandleSimple(List<SmsbDepartmentCO> children , Boolean activate, Integer orderFlag){
         List<DeviceDepartmentSimpleDto> childrenList = Lists.newArrayList();
         if(!CollectionUtils.isEmpty(children)){
             children.forEach(child->{
                 DeviceDepartmentSimpleDto deviceDepartmentSimpleDto = new DeviceDepartmentSimpleDto();
                 BeanUtils.copyProperties(child , deviceDepartmentSimpleDto);
-                deviceDepartmentSimpleDto.setDevices(deviceService.ListDeviceBind(child.getPath() , activate));
-                deviceDepartmentSimpleDto.setChildren(childRecurrenceHandleSimple(child.getChildren() , activate));
+                deviceDepartmentSimpleDto.setDevices(deviceService.ListDeviceBindSimple(child.getPath() , activate,orderFlag));
+                deviceDepartmentSimpleDto.setChildren(childRecurrenceHandleSimple(child.getChildren() , activate,orderFlag));
                 childrenList.add(deviceDepartmentSimpleDto);
             });
         }

smsb-customer-manager-app/src/main/java/com/inspur/customer/service/wechat/WeChatServiceImpl.java

@@ -1,7 +1,6 @@
 package com.inspur.customer.service.wechat;
 
 import com.inspur.customer.client.wechat.IWeChatService;
-import com.inspur.customer.context.HttpUrlConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Value;
@@ -23,15 +22,17 @@ import javax.annotation.Resource;
 @Slf4j
 @DubboService(interfaceClass = IWeChatService.class)
 public class WeChatServiceImpl implements IWeChatService {
+    @Value("${msr.idms.ASK_USER}")
+    public String ASK_USER;
+
+    @Value("${msr.idms.QUERY_TICKET}")
+    public String QUERY_TICKET;
     @Resource
     private RestTemplate restTemplate;
 
-    @Value("${msr.idms.top}")
-    private String MSR_IDMS_TOP;
-
     @Override
     public String queryTicket(String appKey, String userId, String authorization) {
-        String url = String.format(HttpUrlConstant.QUERY_TICKET.replace("MSR_IDMS_TOP", MSR_IDMS_TOP), userId, appKey);
+        String url = String.format(QUERY_TICKET, userId, appKey);
         HttpHeaders header = new HttpHeaders();
         // header.add("Authorization", authorization);
         ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<String>(header), String.class);
@@ -41,6 +42,6 @@ public class WeChatServiceImpl implements IWeChatService {
 
     @Override
     public String askUser(String userId) {
-        return restTemplate.getForObject(String.format(HttpUrlConstant.ASK_USER.replace("MSR_IDMS_TOP", MSR_IDMS_TOP), userId), String.class);
+        return restTemplate.getForObject(String.format(ASK_USER, userId), String.class);
     }
 }

smsb-customer-manager-client/src/main/java/com/inspur/customer/context/HttpUrlConstant.java

@@ -2,11 +2,10 @@ package com.inspur.customer.context;
 
 /**
  * url统一管理
+ *
  * @author wangbo13
  */
 public class HttpUrlConstant {
 
-    public static final String QUERY_TICKET = "https://MSR_IDMS_TOP/prod-api/notice/ticket/%s/%s";
 
-    public static final String ASK_USER = "https://MSR_IDMS_TOP/prod-api/notice/ask/%s";
 }

smsb-customer-manager-client/src/main/java/com/inspur/customer/object/org/DeviceDepartmentCmd.java

@@ -1,9 +1,6 @@
 package com.inspur.customer.object.org;
 
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.Serializable;
 
 /**
  * @Author wangbo13
@@ -23,4 +20,6 @@ public class DeviceDepartmentCmd extends OperationAuthority {
      * 设备是否激活
      */
     private Boolean activate;
+
+    private Integer orderFlag;
 }