Merge pull request 'master' (#40) from master into V3

Reviewed-on: http://git.lrdaiot.cn:9000/thing/thing_api/pulls/40

modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java

@@ -390,6 +390,8 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl<IotThingSourceMap
                                 .setTimeHorizonType(iotThingSourceEntity.getTimeHorizonType())
                                 .setGatherFrequency(iotThingSourceEntity.getGatherFrequency())
                                 .setRootId(iotThingSourceEntity.getRootId())
+                                .setThingAttrGroup(iotThingSourceEntity.getThingAttrGroup())
+                                .setStartStatus(iotThingSourceEntity.getStartStatus())
                                 .setConfigType(iotThingSourceEntity.getConfigType())
                                 .setDataTreatingMark(iotThingSourceEntity.getDataTreatingMark())
                                 .setDataDealConfig(iotThingSourceEntity.getDataDealConfig())

modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java

@@ -33,6 +33,8 @@ import com.thing.sys.security.context.UserContext;
 import com.thing.sys.security.domain.SecurityUser;
 import com.thing.sys.security.domain.UserDetail;
 import com.thing.sys.tenant.dto.SysTenantDTO;
+import com.thing.sys.tenant.dto.SysTenantDetailDTO;
+import com.thing.sys.tenant.service.SysTenantDetailService;
 import com.thing.sys.tenant.service.SysTenantService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -65,6 +67,7 @@ public class SysUserController {
 	private final SysRoleUserService sysRoleUserService;
 	private final SysUserPostService sysUserPostService;
 	private final SysTenantService sysTenantService;
+	private final SysTenantDetailService sysTenantDetailService;
 	private final SysUserMenuService sysUserMenuService;
 
 
@@ -134,20 +137,30 @@ public class SysUserController {
 		data.setTenantName(tenant.getTenantName());
         data.setDeptId(tenant.getTenantCode());
 		Long tcode = UserContext.getTenantCode();
-		SysUserMenuDTO userMenuDTO =sysUserMenuService.queryUrlByTenantcode(tcode);
-		if (ObjectUtil.isNotNull(userMenuDTO)){
-			data.setUrl(userMenuDTO.getUrl());
-			data.setLogo(StringUtils.isNotBlank(userMenuDTO.getLogo()) ? userMenuDTO.getLogo() : data.getLogo());
-			data.setName(StringUtils.isNotBlank(userMenuDTO.getName()) ? userMenuDTO.getName() : data.getName());
-			data.setShowLogo(userMenuDTO.getShowLogo());
-		}else {
-			SysUserMenuDTO sysUserMenuDTO = sysUserMenuService.getSysUserMenuByUserId(data.getId());
-			if (ObjectUtil.isNotNull(sysUserMenuDTO)){
-				data.setLogo(StringUtils.isNotBlank(sysUserMenuDTO.getLogo()) ? sysUserMenuDTO.getLogo() : null);
-				data.setName(StringUtils.isNotBlank(sysUserMenuDTO.getName()) ? sysUserMenuDTO.getName() : null);
-				data.setShowLogo(sysUserMenuDTO.getShowLogo());
-			}
+
+		//SysUserMenuDTO sysUserMenuDTO = sysUserMenuService.getSysUserMenuByUserId(data.getId());
+		SysTenantDetailDTO detail = sysTenantDetailService.getDetail(TenantContext.getTenantCode(user));
+		if (ObjectUtil.isNotNull(detail)){
+			data.setLogo(StringUtils.isNotBlank(detail.getLogoUrl()) ? detail.getLogoUrl() : null);
+			data.setName(StringUtils.isNotBlank(detail.getName()) ? detail.getName() : null);
+			data.setShowLogo(true);
+			data.setTitle(detail.getTitle());
 		}
+//		SysUserMenuDTO userMenuDTO =sysUserMenuService.queryUrlByTenantcode(tcode);
+//		if (ObjectUtil.isNotNull(userMenuDTO)){
+//			data.setUrl(userMenuDTO.getUrl());
+//			data.setLogo(StringUtils.isNotBlank(userMenuDTO.getLogo()) ? userMenuDTO.getLogo() : data.getLogo());
+//			data.setName(StringUtils.isNotBlank(userMenuDTO.getName()) ? userMenuDTO.getName() : data.getName());
+//			data.setShowLogo(userMenuDTO.getShowLogo());
+//		}else {
+//			//SysUserMenuDTO sysUserMenuDTO = sysUserMenuService.getSysUserMenuByUserId(data.getId());
+//			SysTenantDetailDTO detail = sysTenantDetailService.getDetail(TenantContext.getTenantCode(user));
+//			if (ObjectUtil.isNotNull(detail)){
+//				data.setLogo(StringUtils.isNotBlank(detail.getLogoUrl()) ? detail.getLogoUrl() : null);
+//				data.setName(StringUtils.isNotBlank(detail.getName()) ? detail.getName() : null);
+//				data.setShowLogo(true);
+//			}
+//		}
 		if(ObjectUtils.isNotEmpty(data.getLogo())){
 			data.setLogo(OSSFactory.splice(data.getLogo()));
 		}

modules/thing/src/main/java/com/thing/sys/biz/dto/SysUserDTO.java

@@ -126,4 +126,6 @@ public class SysUserDTO implements Serializable {
     @Schema(description = "授权可跳转的企业列表")
     private String tenantList;
 
+    private String title;
+
 }

modules/thing/src/main/java/com/thing/sys/tenant/dto/SysTenantDetailDTO.java

@@ -70,5 +70,6 @@ public class SysTenantDetailDTO implements Serializable {
     private String thingCode;
     @Schema( description= "企业英文名称")
     private String englishName;
+    private String title;
 
 }

modules/thing/src/main/java/com/thing/sys/tenant/entity/SysTenantDetailEntity.java

@@ -89,4 +89,6 @@ public class SysTenantDetailEntity extends BaseDateEntity {
 	 * 企業英文名
 	 */
 	private String englishName;
+
+	private String title;
 }

modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java

@@ -52,8 +52,7 @@ public class IotVisualGroupServiceImpl extends BaseServiceImpl<IotVisualGroupMap
     public QueryWrapper getWrapper(Map<String, Object> params){
         Long  tenantCode =  UserContext.getTenantCode();
         QueryWrapper wrapper = new QueryWrapper();
-        String name = MapUtils.getString(params,"name");
-        String names = MapUtils.getString(params,"names");
+        String names = MapUtils.getString(params,"name");
         List<String> nameList = null;
         if(StringUtils.isNotEmpty(names)){
             nameList = Arrays.asList(names.split(","));
@@ -61,9 +60,12 @@ public class IotVisualGroupServiceImpl extends BaseServiceImpl<IotVisualGroupMap
         String businessName = MapUtils.getString(params,"businessName");
         wrapper.eq(IotVisualGroupEntity::getType,MapUtils.getString(params,"type"));
         wrapper.and(IOT_VISUAL_GROUP_ENTITY.TENANT_CODE.eq(tenantCode).or(IOT_VISUAL_GROUP_ENTITY.IS_DEFAULT.eq("1")));
-        wrapper.like(IotVisualGroupEntity::getName,name, StringUtils.isNotEmpty(name));
         wrapper.like(IotVisualGroupEntity::getBusinessName,businessName, StringUtils.isNotEmpty(businessName));
-        wrapper.in(IotVisualGroupEntity::getName,nameList,ObjectUtils.isNotEmpty(nameList));
+        if(null!=nameList&&nameList.size()!=1){
+            wrapper.in(IotVisualGroupEntity::getName,nameList,ObjectUtils.isNotEmpty(nameList));
+        }else if(null != nameList) {
+            wrapper.like(IotVisualGroupEntity::getName,nameList.get(0), StringUtils.isNotEmpty(nameList.get(0)));
+        }
         wrapper.orderBy(IotVisualGroupEntity::getSort,true);
         wrapper.orderBy(IotVisualGroupEntity::getBsSort,true);
         return wrapper;
@@ -95,12 +97,12 @@ public class IotVisualGroupServiceImpl extends BaseServiceImpl<IotVisualGroupMap
                         .set(IotVisualGroupEntity::getThumbnailUrl,dto.getThumbnailUrl())
                         .set(IotVisualGroupEntity::getBusinessName,dto.getBusinessName())
                         .set(IotVisualGroupEntity::getRemark,dto.getRemark())
-                        .where(IotVisualGroupEntity::getName).eq(dto.getName()).eq(IotVisualGroupEntity::getBusinessName,dto.getOldName())
+                        .where(IotVisualGroupEntity::getName).eq(dto.getName()).eq(IotVisualGroupEntity::getBusinessName,dto.getOldBusinessName())
                         .update();
             }else {
                 UpdateChain.of(IotVisualGroupEntity.class)
                         .set(IotVisualGroupEntity::getBsSort, temp.getSort())
-                        .where(IotVisualGroupEntity::getName).eq(dto.getName()).eq(IotVisualGroupEntity::getBusinessName,dto.getOldName())
+                        .where(IotVisualGroupEntity::getName).eq(dto.getName()).eq(IotVisualGroupEntity::getBusinessName,temp.getName())
                         .update();
             }
         });