Merge remote-tracking branch 'origin/lihb' into test-merge-02

blade-service/blade-manager/src/main/java/org/springblade/manager/job/SystemMsgJob.java

@@ -10,6 +10,7 @@ import org.springblade.manager.entity.SystemMsg;
 import org.springblade.manager.service.ISystemMsgService;
 import org.springblade.websocket.vo.MsgVO;
 import org.springblade.websocket.vo.SystMsgVO;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -34,11 +35,18 @@ public class SystemMsgJob {
 
     private final JdbcTemplate jdbcTemplate;
 
+    // 读取配置并设置默认值
+    @Value("${scheduler.enabled:true}")
+    private boolean schedulerEnabled;
+
     /**
      *  定时推送公告-取消公告-修改公告状态,不想污染日志，使用jdbc
      */
    // @Scheduled(cron = "0/10 * * * * ?")
     public void autoUpdateMsgStatus(){
+        // 本地环境跳过执行（可添加日志输出）
+        if (!schedulerEnabled) return;
+
         /** 普通公告推送*/
         String sql1 = "select * from m_system_msg where is_deleted = 0 and msg_type = 2 and push_status = 1 and now()<=push_end_date_time and now()>=push_date_time ";
         List<SystemMsg> list1 = jdbcTemplate.query(sql1,new BeanPropertyRowMapper<>(SystemMsg.class));

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

@@ -1871,20 +1871,22 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                         //设计标高
                                         designedElevationNewMap.put(rowNum, new BigDecimal(split2[0]));
                                     } else if (keys.get(i).equals(heightDeviationNew)){
-                                        double v = Double.parseDouble(split2[0]);
-                                        //随机+ - 0/1
-                                        Random random = new Random();
-                                        int adjustment = random.nextInt(2);
-                                        if(v > 0){
-                                            v = v - adjustment;
-                                        }else{
-                                            v = v + adjustment;
-                                        }
+                                        if(StringUtils.isNotEmpty(split2[0])){
+                                            double v = Double.parseDouble(split2[0]);
+                                            //随机+ - 0/1
+                                            Random random = new Random();
+                                            int adjustment = random.nextInt(2);
+                                            if(v > 0){
+                                                v = v - adjustment;
+                                            }else{
+                                                v = v + adjustment;
+                                            }
 
-                                        //高度偏差
-                                        heightDeviationNewMap.put(rowNum, BigDecimal.valueOf(v));
+                                            //高度偏差
+                                            heightDeviationNewMap.put(rowNum, BigDecimal.valueOf(v));
 
-                                        heightDeviationList.add(v + "_^_"+ split2[1]);
+                                            heightDeviationList.add(new BigDecimal(v).setScale(0,RoundingMode.HALF_UP).intValue() + "_^_"+ split2[1]);
+                                        }
                                     }
                                 }
                                 //设置偏高的值
@@ -1964,23 +1966,25 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                     }else if(rowMin > rowNum){
                                         rowMin = rowNum;
                                     }
-                                    Integer v = Integer.parseInt(split2[0]);
-                                    //随机+ - 0/1
-                                    Random random = new Random();
-                                    int adjustment = random.nextInt(2);
-                                    if(v > 0){
-                                        v = v - adjustment;
-                                    }else{
-                                        v = v + adjustment;
-                                    }
-                                    if (keys.get(i).equals(differenceNewX)) {
-                                        //偏差X
-                                        differenceNewXMap.put(rowNum, new BigDecimal(split2[0]));
-                                    } else if (keys.get(i).equals(differenceNewY)){
-                                        //偏差Y
-                                        differenceNewYMap.put(rowNum, BigDecimal.valueOf(v));
+                                    if(StringUtils.isNotEmpty(split2[0])){
+                                        Integer v = Integer.parseInt(split2[0]);
+                                        //随机+ - 0/1
+                                        Random random = new Random();
+                                        int adjustment = random.nextInt(2);
+                                        if(v > 0){
+                                            v = v - adjustment;
+                                        }else{
+                                            v = v + adjustment;
+                                        }
+                                        if (keys.get(i).equals(differenceNewX)) {
+                                            //偏差X
+                                            differenceNewXMap.put(rowNum, new BigDecimal(split2[0]));
+                                        } else if (keys.get(i).equals(differenceNewY)){
+                                            //偏差Y
+                                            differenceNewYMap.put(rowNum, BigDecimal.valueOf(v));
+                                        }
+                                        list.add(v + "_^_"+ split2[1]);
                                     }
-                                    list.add(v + "_^_"+ split2[1]);
                                 }
                                 values.set(i, String.join("☆",list));
                             }

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

@@ -16,6 +16,7 @@ import org.springblade.manager.mapper.*;
 import org.springblade.manager.service.WbsTreeSynchronousRecordService;
 import org.springblade.manager.vo.WbsTreeSynchronousRecordVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -225,12 +226,18 @@ public class WbsTreeSynchronousRecordServiceImpl extends ServiceImpl<WbsTreeSync
         return returnData;
     }
 
+    // 读取配置并设置默认值
+    @Value("${scheduler.enabled:true}")
+    private boolean schedulerEnabled;
     /**
      * 同步节点表单
      * 定时检查同步任务，状态为1的数据如果最后更新时间与当前时间超过10分钟，则修改状态为1
      */
     @Scheduled(fixedDelay = 10000)
     public void syncInit() {
+        // 本地环境跳过执行（可添加日志输出）
+        if (!schedulerEnabled) return;
+
         List<WbsTreeSynchronousRecord> wbsTreeSynchronousRecords = baseMapper.selectList(new QueryWrapper<WbsTreeSynchronousRecord>().lambda()
                 .in(WbsTreeSynchronousRecord::getStatus, 0, 1)
                 .eq(WbsTreeSynchronousRecord::getIsDeleted, 0)