saas菜单启用接口

db/inti-elder.sql

@@ -244,7 +244,7 @@ CREATE TABLE `plat_device`
     registration_date datetime     NOT NULL COMMENT '注册时间',
     last_online_data  datetime     NOT NULL COMMENT '最后上线时间',
     description       VARCHAR(1024) DEFAULT NULL COMMENT '说明',
-    status            char(1)      NOT NULL COMMENT '状态 数据字典 1 在线 0离线',
+    status varchar(36) DEFAULT NULL COMMENT '状态 DeviceState',
     org_id            varchar(64)  NULL COMMENT '组织id',
     city_org_id       varchar(64)  NULL COMMENT '城市组织id',
     district_org_id   varchar(64)  NULL COMMENT '区组织id',

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

@@ -2,6 +2,7 @@ package com.makeit.controller.saas;
 
 
 import com.makeit.common.dto.BaseIdDTO;
+import com.makeit.common.dto.StatusDTO;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.global.annotation.Action;
@@ -33,47 +34,47 @@ import java.util.List;
 public class SaasMenuController {
 
     @Autowired
-    private SaasMenuService platMenuService;
+    private SaasMenuService saasMenuService;
 
-    @Action(module = "saas端-菜单", name = "列表", code = "plat:menu:list")
+    @Action(module = "saas端-菜单", name = "列表", code = "saas:menu:list")
     @ApiOperation("列表")
     @PostMapping("list")
     public ApiResponseEntity<List<SaasMenuDTOVO>> list(@RequestBody SaasMenuQueryDTO dto) {
-        return ApiResponseUtils.success(platMenuService.list(dto));
+        return ApiResponseUtils.success(saasMenuService.list(dto));
     }
 
-    @Action(module = "saas端-菜单", name = "树形列表", code = "plat:menu:tree")
+    @Action(module = "saas端-菜单", name = "树形列表", code = "saas:menu:tree")
     @ApiOperation("树形列表")
     @PostMapping("tree")
     public ApiResponseEntity<List<SaasMenuDTOVO>> tree(@RequestBody SaasMenuQueryDTO dto) {
-        return ApiResponseUtils.success(platMenuService.tree(dto));
+        return ApiResponseUtils.success(saasMenuService.tree(dto));
     }
 
     @ApiOperation("列表(AuthIgnore)")
     @PostMapping("listAuthIgnore")
     public ApiResponseEntity<List<SaasMenuDTOVO>> listAuthIgnore(@RequestBody SaasMenuQueryDTO dto) {
-        return ApiResponseUtils.success(platMenuService.list(dto));
+        return ApiResponseUtils.success(saasMenuService.list(dto));
     }
 
     @ApiOperation("树形列表(AuthIgnore)")
     @PostMapping("treeAuthIgnore")
     public ApiResponseEntity<List<SaasMenuDTOVO>> treeAuthIgnore(@RequestBody SaasMenuQueryDTO dto) {
-        return ApiResponseUtils.success(platMenuService.tree(dto));
+        return ApiResponseUtils.success(saasMenuService.tree(dto));
     }
 
-    @Action(module = "saas端-菜单", name = "新增", code = "plat:menu:add")
+    @Action(module = "saas端-菜单", name = "新增", code = "saas:menu:add")
     @ApiOperation("新增")
     @PostMapping("add")
     public ApiResponseEntity<String> add(@Validated @RequestBody SaasMenuDTOVO dto) {
-        String id = platMenuService.add(dto);
+        String id = saasMenuService.add(dto);
         return ApiResponseUtils.success(id);
     }
 
-    @Action(module = "saas端-菜单", name = "编辑", code = "plat:menu:edit")
+    @Action(module = "saas端-菜单", name = "编辑", code = "saas:menu:edit")
     @ApiOperation("编辑")
     @PostMapping("edit")
     public ApiResponseEntity<?> edit(@Validated @RequestBody SaasMenuDTOVO dto) {
-        platMenuService.edit(dto);
+        saasMenuService.edit(dto);
         return ApiResponseUtils.success();
     }
 
@@ -81,21 +82,29 @@ public class SaasMenuController {
     @ApiOperation("详情")
     @PostMapping("view")
     public ApiResponseEntity<SaasMenuDTOVO> view(@RequestBody BaseIdDTO dto) {
-        return ApiResponseUtils.success(platMenuService.view(dto.getId()));
+        return ApiResponseUtils.success(saasMenuService.view(dto.getId()));
     }
 
-    @Action(module = "saas端-菜单", name = "删除", code = "plat:menu:del")
+    @Action(module = "saas端-菜单", name = "删除", code = "saas:menu:del")
     @ApiOperation("删除")
     @PostMapping("del")
     public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto) {
-        platMenuService.del(dto.getId());
+        saasMenuService.del(dto.getId());
+        return ApiResponseUtils.success();
+    }
+
+    @Action(module = "saas端-菜单", name = "启用禁用", code = "saas:menu:changeStatus")
+    @ApiOperation("启用禁用")
+    @PostMapping("changeStatus")
+    public ApiResponseEntity<Void> changeStatus(@RequestBody StatusDTO dto) {
+        saasMenuService.changeStatus(dto);
         return ApiResponseUtils.success();
     }
 
     @ApiOperation("同步")
     @PostMapping("sync")
     public ApiResponseEntity<?> sync() {
-        platMenuService.sync();
+        saasMenuService.sync();
         return ApiResponseUtils.success();
     }
 

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmConfigServiceImpl.java

@@ -14,17 +14,13 @@ import com.makeit.enums.id.IdConst;
 import com.makeit.exception.BusinessException;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.mapper.platform.alarm.PlatAlarmConfigMapper;
-import com.makeit.module.admin.dto.plat.PlatTenantDTOVO;
-import com.makeit.module.system.entity.SysConfig;
-import com.makeit.module.system.entity.SysConfigCategory;
 import com.makeit.service.platform.alarm.PlatAlarmConfigService;
 import com.makeit.service.platform.auth.PlatUserService;
+import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.StreamUtil;
-import com.makeit.utils.data.validate.MapUtil;
 import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.sql.join.JoinUtil;
-import com.makeit.utils.user.plat.PlatUserVO;
 import com.makeit.vo.platform.alarm.PlatAlarmConfigListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiConsumer;
 
 /**
@@ -49,6 +44,9 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
     @Autowired
     private PlatUserService platUserService;
 
+    @Autowired
+    private AlarmConfigCacheUtil alarmConfigUtil;
+
     @Override
     public List<PlatAlarmConfigListVO> list(PlatAlarmConfigQueryDTO dto) {
 
@@ -76,6 +74,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
 
         save(alarmConfig);
 
+        alarmConfigUtil.put(alarmConfig);
+
     }
 
     @Override
@@ -91,12 +91,19 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
 
         updateById(alarmConfig);
 
+        alarmConfigUtil.put(alarmConfig);
+
+
     }
 
     @Override
     @Transactional
     public void edit(PlatAlarmConfigDTOVO dto) {
-        updateById(BeanDtoVoUtils.convert(dto, PlatAlarmConfig.class));
+        PlatAlarmConfig alarmConfig = BeanDtoVoUtils.convert(dto, PlatAlarmConfig.class);
+        updateById(alarmConfig);
+
+        alarmConfigUtil.put(alarmConfig);
+
     }
 
     @Override
@@ -144,6 +151,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
 
         alarmConfig.setStatus(dto.getStatus());
         updateById(alarmConfig);
+
+        alarmConfigUtil.put(alarmConfig);
     }
 
     @Override
@@ -162,6 +171,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
         alarmConfig.setContentAudit(null);
 
         updateById(alarmConfig);
+
+        alarmConfigUtil.put(alarmConfig);
     }
 
     @Transactional
@@ -193,6 +204,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
         });
 
         saveBatch(configList);
+
+        alarmConfigUtil.putAll(configList);
     }
 
 }

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

@@ -519,6 +519,8 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
     private LambdaQueryWrapper<PlatOrg> getLambdaQueryWrapper(PlatOrgQueryDTO dto) {
         LambdaQueryWrapper<PlatOrg> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(dto.getParentId()), PlatOrg::getParentId, dto.getParentId())
+                .like(StringUtils.isNotBlank(dto.getName()),PlatOrg::getName,dto.getName())
+                .eq(StringUtils.isNotBlank(dto.getType()),PlatOrg::getType,dto.getType())
                 .orderByDesc(BaseEntity::getUpdateDate);
         return queryWrapper;
     }
@@ -529,15 +531,26 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
 
         LambdaQueryWrapper<PlatOrg> queryWrapper = getLambdaQueryWrapper(platOrgQueryDTO);
         List<PlatOrg> list = list(queryWrapper);
-        List<PlatOrg> orgTree = createOrgTree2(list);
+        if(CollectionUtils.isEmpty(list)){
+            return new ArrayList<>();
+        }
+        Set<String> filterSet = list.stream().flatMap(vo -> {
+            String path = vo.getPath()+","+vo.getId();
+            String[] split = path.split(",");
+            return Stream.of(split);
+        }).collect(Collectors.toSet());
+        List<PlatOrg> total = list();
+        List<PlatOrg> orgTree = createOrgTree2(total,filterSet);
         return orgTree;
     }
 
-    private List<PlatOrg> createOrgTree2(List<PlatOrg> orgList){
+    private List<PlatOrg> createOrgTree2(List<PlatOrg> orgList,Set<String> filterSet){
         if(CollectionUtils.isEmpty(orgList)){
             return new ArrayList<>();
         }
-        Map<String, List<PlatOrg>> parentMap = orgList.stream().collect(Collectors.groupingBy(PlatOrg::getParentId));
+        Map<String, List<PlatOrg>> parentMap = orgList.stream()
+                .filter(vo->filterSet.contains(vo.getId()))
+                .collect(Collectors.groupingBy(PlatOrg::getParentId));
         orgList.forEach(vo->{
             vo.setChildren(parentMap.get(vo.getId()));
         });

server-service/src/main/java/com/makeit/service/saas/SaasMenuService.java

 package com.makeit.service.saas;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.common.dto.StatusDTO;
 import com.makeit.entity.saas.SaasMenu;
 import com.makeit.module.admin.dto.saas.SaasMenuDTOVO;
 import com.makeit.module.admin.dto.saas.SaasMenuQueryDTO;
@@ -30,4 +31,6 @@ public interface SaasMenuService extends IService<SaasMenu> {
 
     void sync();
 
+    void changeStatus(StatusDTO dto);
+
 }

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

@@ -2,6 +2,7 @@ package com.makeit.service.saas.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.common.dto.StatusDTO;
 import com.makeit.entity.saas.SaasMenu;
 import com.makeit.entity.saas.SaasRoleMenu;
 import com.makeit.enums.CodeMessageEnum;
@@ -332,5 +333,20 @@ public class SaasMenuServiceImpl extends ServiceImpl<SaasMenuMapper, SaasMenu> i
         return button;
     }
 
+    @Transactional
+    @Override
+    public void changeStatus(StatusDTO dto) {
+        if (Arrays.stream(CommonEnum.values()).noneMatch(e -> e.getValue().equals(dto.getStatus()))) {
+            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR);
+        }
+        SaasMenu saasMenu = getById(dto.getId());
+        if (saasMenu.getStatus().equals(dto.getStatus())) {
+            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR);
+        }
+
+        saasMenu.setStatus(dto.getStatus());
+        updateById(saasMenu);
+    }
+
 
 }

server-service/src/main/java/com/makeit/task/IotSyncTask.java

@@ -47,7 +47,7 @@ public class IotSyncTask {
      * 启用状态的租户才同步
      * 新增和更新平台端设备表
      */
-    @Scheduled(cron = "0 0 */1 * * ?")
+   // @Scheduled(cron = "0 0 */1 * * ?")
     @TenantIdIgnore
     public void syncEquipmentInfo() {
         log.info("开始执行同步设备信息接口");
@@ -131,5 +131,10 @@ public class IotSyncTask {
         });
         return deviceMap.values();
     }
+    /**
+     * 床位id 绑定的所有设备
+     * 房间id 绑定的所有设备
+     *
+     */
 
 }

server-service/src/main/java/com/makeit/utils/AlarmConfigCacheUtil.java

+package com.makeit.utils;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.makeit.entity.platform.alarm.PlatAlarmConfig;
+import com.makeit.enums.CommonEnum;
+import com.makeit.global.aspect.tenant.TenantIdIgnore;
+import com.makeit.service.platform.alarm.PlatAlarmConfigService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class AlarmConfigCacheUtil implements ApplicationRunner {
+
+    /**
+     * key orgId|type
+     * todo 放redis
+     */
+    private static final ConcurrentHashMap<String, PlatAlarmConfig> CACHE = new ConcurrentHashMap<>(16);
+
+    @Autowired
+    private PlatAlarmConfigService platAlarmConfigService;
+
+    public List<PlatAlarmConfig> getAll() {
+        List<PlatAlarmConfig> list = platAlarmConfigService.list(new LambdaQueryWrapper<PlatAlarmConfig>().eq(PlatAlarmConfig::getStatus, CommonEnum.YES.getValue()));
+        return list;
+    }
+
+    public void put(PlatAlarmConfig alarmConfig) {
+        if (StringUtils.equals(CommonEnum.YES.getValue(),alarmConfig.getStatus())) {
+            CACHE.put(alarmConfig.getOrgId() + "|" + alarmConfig.getAlarmType(),alarmConfig);
+        } else {
+            CACHE.remove(alarmConfig.getOrgId() + "|" + alarmConfig.getAlarmType());
+        }
+    }
+
+    public void putAll(List<PlatAlarmConfig> alarmConfigs) {
+        alarmConfigs.forEach(vo -> {
+            put(vo);
+        });
+    }
+
+    public PlatAlarmConfig get(String orgIdType) {
+        return CACHE.get(orgIdType);
+    }
+
+
+    /**
+     * Callback used to run the bean.
+     *
+     * @param args incoming application arguments
+     * @throws Exception on error
+     */
+    @Override
+    @TenantIdIgnore
+    public void run(ApplicationArguments args) throws Exception {
+        List<PlatAlarmConfig> list = getAll();
+        list.stream().forEach(vo -> {
+            put(vo);
+        });
+    }
+}

server-service/src/main/java/com/makeit/utils/DeviceCacheUtil.java

+package com.makeit.utils;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.makeit.entity.platform.device.PlatDevice;
+import com.makeit.global.aspect.tenant.TenantIdIgnore;
+import com.makeit.service.platform.device.PlatDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class DeviceCacheUtil implements ApplicationRunner {
+    /**
+     * key
+     * todo 放redis
+     */
+    private static final ConcurrentHashMap<String, PlatDevice> CACHE = new ConcurrentHashMap<>(16);
+    @Autowired
+    private PlatDeviceService platDeviceService;
+
+    public List<PlatDevice> getAll() {
+        List<PlatDevice> list = platDeviceService.list(new LambdaQueryWrapper<PlatDevice>());
+        return list;
+    }
+
+    public void put(PlatDevice platDevice) {
+        CACHE.put(platDevice.getOriDeviceId(), platDevice);
+    }
+
+    public void putAll(List<PlatDevice> platDevices) {
+        platDevices.forEach(vo -> {
+            put(vo);
+        });
+    }
+
+    public PlatDevice get(String oriDeviceId) {
+        return CACHE.get(oriDeviceId);
+    }
+
+
+    /**
+     * Callback used to run the bean.
+     *
+     * @param args incoming application arguments
+     * @throws Exception on error
+     */
+    @Override
+    @TenantIdIgnore
+    public void run(ApplicationArguments args) throws Exception {
+        List<PlatDevice> list = getAll();
+        list.stream().forEach(vo -> {
+            put(vo);
+        });
+    }
+}