最新设备ID集合缓存01

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/controller/LeanEventsHostController.java

@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 
- /**
+/**
  * @Description: 精益事件设备启停配置表
  * @Author: jeecg-boot
  * @Date:   2024-09-20
@@ -36,7 +36,7 @@ import java.util.List;
 public class LeanEventsHostController extends JeecgController<LeanEventsHost, ILeanEventsHostService> {
 	@Autowired
 	private ILeanEventsHostService leanEventsHostService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -50,15 +50,15 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 	@ApiOperation(value="精益事件设备启停配置表-分页列表查询", notes="精益事件设备启停配置表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<LeanEventsHost>> queryPageList(LeanEventsHost leanEventsHost,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
 		QueryWrapper<LeanEventsHost> queryWrapper = QueryGenerator.initQueryWrapper(leanEventsHost, req.getParameterMap());
 		Page<LeanEventsHost> page = new Page<LeanEventsHost>(pageNo, pageSize);
 		IPage<LeanEventsHost> pageList = leanEventsHostService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -71,9 +71,10 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody LeanEventsHost leanEventsHost) {
 		leanEventsHostService.save(leanEventsHost);
+		leanEventsHostService.updateEviceInformationCache();
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -88,7 +89,7 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 		leanEventsHostService.edit(leanEventsHostEditParam);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -101,9 +102,10 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		leanEventsHostService.removeById(id);
+		leanEventsHostService.updateEviceInformationCache();
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -115,9 +117,10 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.leanEventsHostService.removeByIds(Arrays.asList(ids.split(",")));
+		leanEventsHostService.updateEviceInformationCache();
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -135,41 +138,41 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 		return Result.OK(leanEventsHost);
 	}
 
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param leanEventsHost
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, LeanEventsHost leanEventsHost) {
-        return super.exportXls(request, leanEventsHost, LeanEventsHost.class, "精益事件设备启停配置表");
-    }
+	/**
+	 * 导出excel
+	 *
+	 * @param request
+	 * @param leanEventsHost
+	 */
+	@RequestMapping(value = "/exportXls")
+	public ModelAndView exportXls(HttpServletRequest request, LeanEventsHost leanEventsHost) {
+		return super.exportXls(request, leanEventsHost, LeanEventsHost.class, "精益事件设备启停配置表");
+	}
 
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	/**
+	 * 通过excel导入数据
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 	@ApiOperation(value="精益事件设备启停配置表-导入", notes="精益事件设备启停配置表-导入")
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, LeanEventsHost.class);
-    }
+	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		return super.importExcel(request, response, LeanEventsHost.class);
+	}
 
-	 /**
-	  *  获取精益事件设备启停配置
-	  *
-	  * @return
-	  */
-	 @AutoLog(value = "获取精益事件设备启停配置")
-	 @ApiOperation(value="获取精益事件设备启停配置", notes="获取精益事件设备启停配置")
-	 @GetMapping(value = "/getConfig")
-	 public Result<List<LeanEventsHost>> getConfig(String id) {
-		 List<LeanEventsHost> leanEventsHosts = leanEventsHostService.getConfig(id);
-		 return Result.OK(leanEventsHosts);
-	 }
+	/**
+	 *  获取精益事件设备启停配置
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "获取精益事件设备启停配置")
+	@ApiOperation(value="获取精益事件设备启停配置", notes="获取精益事件设备启停配置")
+	@GetMapping(value = "/getConfig")
+	public Result<List<LeanEventsHost>> getConfig(String id) {
+		List<LeanEventsHost> leanEventsHosts = leanEventsHostService.getConfig(id);
+		return Result.OK(leanEventsHosts);
+	}
 
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/ILeanEventsHostService.java

@@ -19,4 +19,6 @@ public interface ILeanEventsHostService extends IService<LeanEventsHost> {
 
     //获取精益事件设备启停配置
     List<LeanEventsHost> getConfig(String id);
+
+    void updateEviceInformationCache();
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/impl/LeanEventsHostServiceImpl.java

@@ -8,9 +8,12 @@ import org.jeecg.modules.events.entity.LeanEventsHostEditParam;
 import org.jeecg.modules.events.mapper.DeviceInformationMapper;
 import org.jeecg.modules.events.mapper.LeanEventsHostMapper;
 import org.jeecg.modules.events.service.ILeanEventsHostService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,6 +30,9 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
     @Resource
     private DeviceInformationMapper deviceInformationMapper;
 
+    @Autowired
+    public RedisTemplate redisTemplate;
+
     @Override
     public void edit(LeanEventsHostEditParam leanEventsHostEditParam) {
         if (oConvertUtils.listIsNotEmpty(leanEventsHostEditParam.getLeanEventsHosts())) {
@@ -39,6 +45,7 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
                 }
             });
         }
+        updateEviceInformationCache();
     }
 
     @Override
@@ -64,6 +71,27 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
         return leanEventsHosts;
     }
 
+    /**
+     * 更新 精益事件设备启停配置表 中的主设备ID集合、辅设备ID集合
+     */
+    @Override
+    public void updateEviceInformationCache() {
+        String keyMainString = String.format("sys:opcSynData::%s","deviceInformationMainIds");
+        String keySubString = String.format("sys:opcSynData::%s","deviceInformationSubIds");
+        List<LeanEventsHost> leanEventsHostList = baseMapper.selectList(new LambdaQueryWrapper<LeanEventsHost>().isNotNull(LeanEventsHost::getEventsId));
+        if (oConvertUtils.listIsNotEmpty(leanEventsHostList)){
+            List<String> mainDeviceInformationIds = leanEventsHostList.stream().map(LeanEventsHost::getDeviceInformationId).distinct().collect(Collectors.toList());
+            List<String> subDeviceInformationList = leanEventsHostList.stream().map(LeanEventsHost::getDeviceInformationList).collect(Collectors.toList());
+            List<String> allSubDeviceInformationList = new ArrayList<>();
+            subDeviceInformationList.forEach(x ->{
+                allSubDeviceInformationList.addAll(Arrays.asList(x.split(",")));
+            });
+            List<String> cacheSubDeviceInformationList = allSubDeviceInformationList.stream().distinct().collect(Collectors.toList());
+            redisTemplate.opsForValue().set(keyMainString, mainDeviceInformationIds);
+            redisTemplate.opsForValue().set(keySubString, cacheSubDeviceInformationList);
+        }
+    }
+
     /**
      * 检查字符串是否包含多个子字符串中的任意一个
      * @param str