Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

saas-module/src/main/java/com/makeit/controller/saas/SaasPlatMenuController.java

@@ -78,7 +78,7 @@ public class SaasPlatMenuController {
     @Action(module = "saas端-租户资源管理(菜单)", name = "编辑", code = "saas:plat:menu:edit")
     @Action(module = "saas端-租户资源管理(菜单)", name = "编辑", code = "saas:plat:menu:edit")
     @ApiOperation("编辑")
     @ApiOperation("编辑")
     @PostMapping("edit")
     @PostMapping("edit")
-    public ApiResponseEntity<?> edit(@Validated @RequestBody PlatMenuDTOVO dto){
+    public ApiResponseEntity<Void> edit(@Validated @RequestBody PlatMenuDTOVO dto){
         platMenuService.edit(dto);
         platMenuService.edit(dto);
         saasOperationLogService.add("saas端-租户资源管理-编辑", null);
         saasOperationLogService.add("saas端-租户资源管理-编辑", null);
 
 

server-module/src/main/java/com/makeit/module/controller/wechat/elder/PlatElderRealTimeWechatController.java

@@ -73,8 +73,8 @@ public class PlatElderRealTimeWechatController {
 
 
     @ApiOperation("行为辐射")
     @ApiOperation("行为辐射")
     @PostMapping("behaviorDistribution")
     @PostMapping("behaviorDistribution")
-    public ApiResponseEntity<List<PlatElderBehaviorDistributionVO>> behaviorDistribution(@RequestBody PlatElderIdDTO platElderIdDTO) {
-        return null;
+    public ApiResponseEntity<List<PlatElderBehaviorDistributionVO>> behaviorDistribution(@RequestBody PlatElderReportDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderDayReportDayService.behaviorDistribution(platElderIdDTO));
     }
     }
 
 
 
 

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatRoleServiceImpl.java

@@ -327,7 +327,7 @@ implements PlatRoleService {
         List<PlatMenu> platMenuList = platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
         List<PlatMenu> platMenuList = platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
                 .in(StringUtils.isNotBlank(id), PlatMenu::getId, menuIdList)
                 .in(StringUtils.isNotBlank(id), PlatMenu::getId, menuIdList)
                 //.orderByAsc(PlatMenu::getParentId)
                 //.orderByAsc(PlatMenu::getParentId)
-                .orderByAsc(PlatMenu::getSort)
+                .orderByDesc(PlatMenu::getSort)
                 .orderByAsc(PlatMenu::getCreateDate)
                 .orderByAsc(PlatMenu::getCreateDate)
         );
         );
 
 

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -475,7 +475,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         return platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
         return platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
                 .in(PlatMenu::getId, menuIdList)
                 .in(PlatMenu::getId, menuIdList)
                 .eq(PlatMenu::getStatus, CommonEnum.YES.getValue())
                 .eq(PlatMenu::getStatus, CommonEnum.YES.getValue())
-                .orderByAsc(PlatMenu::getSort)
+                .orderByDesc(PlatMenu::getSort)
                 .orderByAsc(PlatMenu::getCreateDate)
                 .orderByAsc(PlatMenu::getCreateDate)
         );
         );
     }
     }
@@ -542,7 +542,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         List<PlatMenu> menuList = platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
         List<PlatMenu> menuList = platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
                 .in(PlatMenu::getId, menuIdList)
                 .in(PlatMenu::getId, menuIdList)
                 .eq(PlatMenu::getStatus, CommonEnum.YES.getValue())
                 .eq(PlatMenu::getStatus, CommonEnum.YES.getValue())
-                .orderByAsc(PlatMenu::getSort)
+                .orderByDesc(PlatMenu::getSort)
                 .orderByAsc(PlatMenu::getCreateDate)
                 .orderByAsc(PlatMenu::getCreateDate)
         );
         );
 
 

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -543,6 +543,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
     private void addOrEditExt(PlatElderDTOVO dto) {
     private void addOrEditExt(PlatElderDTOVO dto) {
         List<PlatElderSocialRelation> relationList = BeanDtoVoUtils.listVo(dto.getRelationList(), PlatElderSocialRelation.class);
         List<PlatElderSocialRelation> relationList = BeanDtoVoUtils.listVo(dto.getRelationList(), PlatElderSocialRelation.class);
         relationList.forEach(e -> {
         relationList.forEach(e -> {
+            e.setId(null);
             e.setElderId(dto.getId());
             e.setElderId(dto.getId());
         });
         });
 
 

server-service/src/main/java/com/makeit/service/saas/impl/PlatMenuServiceImpl.java

@@ -70,7 +70,7 @@ public class PlatMenuServiceImpl extends ServiceImpl<PlatMenuMapper, PlatMenu>
                 .eq(StringUtils.isNotBlank(dto.getStatus()), PlatMenu::getStatus, dto.getStatus())
                 .eq(StringUtils.isNotBlank(dto.getStatus()), PlatMenu::getStatus, dto.getStatus())
                 .in(StringUtils.isNotBlank(dto.getTenantId()), PlatMenu::getId, menuIdList)
                 .in(StringUtils.isNotBlank(dto.getTenantId()), PlatMenu::getId, menuIdList)
                 //.orderByAsc(PlatMenu::getParentId)
                 //.orderByAsc(PlatMenu::getParentId)
-                .orderByAsc(PlatMenu::getSort)
+                .orderByDesc(PlatMenu::getSort)
                 .orderByAsc(PlatMenu::getCreateDate)
                 .orderByAsc(PlatMenu::getCreateDate)
         );
         );