Merge remote-tracking branch 'origin/master'

wente

2024-12-05 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597

Merge remote-tracking branch 'origin/master'

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/controller/SysMysqlController.java

@@ -6,14 +6,7 @@
import com.zt.common.constant.Constant;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.sys.model.SysChangeLog;
import com.zt.life.modules.mainPart.sys.model.SysMysql;
import com.zt.life.modules.mainPart.sys.service.SysChangeLogService;
import com.zt.life.modules.mainPart.sys.service.SysMysqlService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sys/dao/SysMysqlDao.java

@@ -2,7 +2,6 @@


import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.sys.model.SysChangeLog;
import com.zt.life.modules.mainPart.sys.model.SysMysql;
import org.apache.ibatis.annotations.Mapper;


 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java

@@ -885,7 +885,8 @@
        for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
            Element taskTag = tasksTag.addElement("task");
            taskTag.addAttribute("duration", String.valueOf(taskPhaseModel.getOperatConditDuration()));
            taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
//            taskTag.addAttribute("model", taskPhaseModel.getOperatConditId().toString());
            taskTag.addAttribute("model", taskPhaseModel.getId().toString());
            if (null != taskPhaseModel.getPhaseConstraints() && taskPhaseModel.getPhaseConstraints().size() > 0) {
                taskTag.addAttribute("NAM",
                        taskPhaseModel.getPhaseConstraints().stream().map(item ->
@@ -1011,7 +1012,8 @@
        Element modelsTag = root.addElement("models");
        for (TaskPhaseModel taskPhaseModel : taskPhaseModelAll) {
            Element modelTag = modelsTag.addElement("model");
            modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
//            modelTag.addAttribute("name", taskPhaseModel.getOperatConditId().toString());
            modelTag.addAttribute("name", taskPhaseModel.getId().toString());
            List<OperatConditModel> gkModelsAssembled = operatConditModelDao.getGKModelAssembled(
                    taskPhaseModel.getOperatConditId());
            OperatConditModel gkModelTop = gkModelsAssembled.stream().filter(item ->
@@ -1100,7 +1102,8 @@
                ParamData paramData = paramDataList.stream().filter(item ->
                        dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
                Double ratio = paramData.getTaskMtbcfOperatingRatio();
                if (null != ratio && ratio > 0) {
//                if (null != ratio && ratio > 0) {
                if (null != ratio && ratio != 1.0) {
                    // 间断型设备的处理
                    double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
                    double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;