Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -498,6 +498,11 @@ public class ExcelTabController extends BladeController {
         ExcelTab excelTab = new ExcelTab();
         if (wbsExclTabParmVO.getId() != null) {// 修改
             excelTab = excelTabService.getById(wbsExclTabParmVO.getId());
+            if(excelTab.getTabId()!=null){
+                if(!excelTab.getName().equals(wbsExclTabParmVO.getNodeName())){
+                    throw new ServiceException("当前清表已存在元素表，不允许修改");
+                }
+            }
             excelTab.setName(wbsExclTabParmVO.getNodeName());
             excelTab.setTabType(wbsExclTabParmVO.getTabType());
         } else { // 新增
@@ -5157,7 +5162,7 @@ public class ExcelTabController extends BladeController {
         return R.data(query);
     }
 
-    @Scheduled(cron = "0 16  18 * * ?")
+    //@Scheduled(cron = "0 25  11 * * ?")
     @GetMapping("/checkAllNodeDate")
     public void checkAllNodeDate() throws Exception {
         String sql="select * from m_wbs_tree_contract where is_deleted=0 and type=2 and date_is_complete=2 AND html_url is not null and p_id is not null";
@@ -5173,11 +5178,11 @@ public class ExcelTabController extends BladeController {
             if(parent==null){
                 continue;
             }
-            String informationSql="select * from u_information_query where wbs_id="+parent.getPKeyId()+" and contract_id="+parent.getContractId()+" and is_deleted=0";
-            List<InformationQuery> query = jdbcTemplate.query(informationSql, new BeanPropertyRowMapper<>(InformationQuery.class));
-            if(query.isEmpty()||query.get(0).getStatus()!=0){
-                continue;
-            }
+//            String informationSql="select * from u_information_query where wbs_id="+parent.getPKeyId()+" and contract_id="+parent.getContractId()+" and is_deleted=0";
+//            List<InformationQuery> query = jdbcTemplate.query(informationSql, new BeanPropertyRowMapper<>(InformationQuery.class));
+//            if(query.isEmpty()||query.get(0).getStatus()!=0){
+//                continue;
+//            }
             List<WbsTreeContract> wbsTreeContractList = entry.getValue();
             boolean flag=true;
             for (WbsTreeContract contract : wbsTreeContractList) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -3448,21 +3448,21 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
     @Override
     public boolean checkNodeAllDate(WbsTreeContract contract) {
-        List<Integer> tableOwners = new ArrayList<>();
-        if (StringUtils.isEmpty(contract.getTableOwner())) {
-            tableOwners.add(1);
-            tableOwners.add(2);
-            tableOwners.add(3);
-        } else if (contract.getTableOwner().contains("1") || contract.getTableOwner().contains("2") || contract.getTableOwner().contains("3")) {
-            tableOwners.add(1);
-            tableOwners.add(2);
-            tableOwners.add(3);
-        } else {
-            tableOwners.add(4);
-            tableOwners.add(5);
-            tableOwners.add(6);
-        }
-        List<WbsTreeContract> list = baseMapper.selectList(new LambdaQueryWrapper<>(WbsTreeContract.class).eq(WbsTreeContract::getPId, contract.getPKeyId()).in(WbsTreeContract::getTableOwner, tableOwners).ne(WbsTreeContract::getIsBussShow, 2));
+//        List<Integer> tableOwners = new ArrayList<>();
+//        if (StringUtils.isEmpty(contract.getTableOwner())) {
+//            tableOwners.add(1);
+//            tableOwners.add(2);
+//            tableOwners.add(3);
+//        } else if (contract.getTableOwner().contains("1") || contract.getTableOwner().contains("2") || contract.getTableOwner().contains("3")) {
+//            tableOwners.add(1);
+//            tableOwners.add(2);
+//            tableOwners.add(3);
+//        } else {
+//            tableOwners.add(4);
+//            tableOwners.add(5);
+//            tableOwners.add(6);
+//        }
+        List<WbsTreeContract> list = baseMapper.selectList(new LambdaQueryWrapper<>(WbsTreeContract.class).eq(WbsTreeContract::getPId, contract.getPKeyId()).ne(WbsTreeContract::getIsBussShow, 2));//.in(WbsTreeContract::getTableOwner, tableOwners);
         if (!list.isEmpty()) {
             boolean b = list.stream().anyMatch(w -> w.getDateIsComplete() != null && w.getDateIsComplete() == 2);
             String ancestorsPId = contract.getAncestorsPId();

blade-service/blade-meter/src/main/java/org/springblade/meter/config/RedissonConfig.java

@@ -3,6 +3,7 @@ package org.springblade.meter.config;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
+import org.springblade.common.utils.SystemUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,8 +12,14 @@ public class RedissonConfig {
     @Bean
     public RedissonClient redissonClient() {
         Config config = new Config();
-        config.useSingleServer()
-                .setAddress("redis://127.0.0.1:6379");
+        if(SystemUtils.isLinux()){
+            config.useSingleServer()
+                    .setAddress("redis://127.0.0.1:6378")
+                    .setPassword("123456");
+        }else {
+            config.useSingleServer()
+                    .setAddress("redis://127.0.0.1:6379");
+        }
         return Redisson.create(config);
     }
 }