From 991a2c14f0e118112a3ea60ff7c464fba1512b5b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 20 三月 2024 16:37:32 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseModelDao.xml | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/service/SysPictureBaseService.java | 6
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java | 8
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/dao/SysPictureBaseDao.java | 4
modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelRbdDao.xml | 6
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelRbdService.java | 8
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 7 -
web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue | 9 -
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/model/SysPictureBase.java | 8 -
web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java | 4
web/src/views/modules/basicInfo/XhProductModel.vue | 12 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNodeAlgorithm.java | 5
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java | 5
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java | 8
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelLineDao.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java | 8
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 4
web/src/views/modules/taskReliability/ModelRbd.vue | 7 +
web/src/views/modules/basicInfo/TyProductModel.vue | 6
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeDao.java | 4
modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml | 4
modules/mainPart/src/main/resources/mapper/basicInfo/sysPictureBase/SysPictureBaseDao.xml | 4
modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeAlgorithmDao.xml | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java | 8
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseModelController.java | 8
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseModelDao.java | 4
web/src/views/modules/basicInfo/ParamData.vue | 19 ++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java | 7 -
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelRbdController.java | 10
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java | 4
modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseDao.xml | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java | 19 --
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Algorithm.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ModelLinePair.java | 10 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java | 5
modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeDao.xml | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 11 -
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java | 5
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelLine.java | 5
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java | 5
/dev/null | 10 -
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java | 8
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 9
modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/AlgorithmDao.xml | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/AlgorithmDao.java | 4
web/src/views/modules/basicInfo/SelectTyModel.vue | 3
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 8
modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelLineDao.xml | 4
54 files changed, 146 insertions(+), 189 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java
index 81e35c6..2e447d6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java
@@ -42,6 +42,10 @@
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
+ @ApiImplicitParam(name = "reliabDistribType", value = "鍙潬鎬у垎甯�", dataType = Constant.QT.STRING, format = "reliab_distrib_type^EQ"),
+ @ApiImplicitParam(name = "repairDistribType", value = "缁翠慨鍒嗗竷", dataType = Constant.QT.STRING, format = "repair_distrib_type^EQ"),
+ @ApiImplicitParam(name = "repairable", value = "鍙淮淇�", dataType = Constant.QT.STRING, format = "repairable^EQ"),
+ @ApiImplicitParam(name = "basicJoinCompute", value = "鍙備笌璁＄畻", dataType = Constant.QT.STRING, format = "basic_join_compute^EQ"),
@ApiImplicitParam(name = "nodeType", value = "绫诲瀷", dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "srcId", value = "涓婄骇ID", dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "pageCode", value = "", dataType = Constant.QT.STRING)})
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
index dca2ce2..2243a17 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
@@ -6,7 +6,6 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
@@ -14,21 +13,17 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.TyProductModelService;
-import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
+import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
-import com.zt.modules.sys.model.SysMenu;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
-import java.util.Objects;
/**
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index 6325f6f..5656750 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -6,29 +6,24 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.servlet.PageResult;
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.basicInfo.model.ProductImg;
-import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
-import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
+import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
index c1bf358..7a00033 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
@@ -3,7 +3,6 @@
import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index a5c1c22..cf4c438 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -6,14 +6,10 @@
import com.zt.common.utils.TreeUtils;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
-import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
-import com.zt.modules.sys.model.SysMenu;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java
similarity index 88%
rename from modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java
index 6b70d7d..36df92b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java
@@ -1,34 +1,21 @@
-package com.zt.life.modules.sysPictureBase.controller;
+package com.zt.life.modules.mainPart.sysPictureBase.controller;
-import com.spire.xls.Workbook;
import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.servlet.PageResult;
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.sysPictureBase.model.SysPictureBase;
-import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
-import com.zt.life.sys.dto.OssDto;
+import com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase;
+import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.life.sys.service.SysOssConfigService;
-import com.zt.modules.oss.enums.CloudChannel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/dao/SysPictureBaseDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/dao/SysPictureBaseDao.java
similarity index 78%
rename from modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/dao/SysPictureBaseDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/dao/SysPictureBaseDao.java
index 0ccbb40..804675e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/dao/SysPictureBaseDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/dao/SysPictureBaseDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.sysPictureBase.dao;
+package com.zt.life.modules.mainPart.sysPictureBase.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
+import com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/model/SysPictureBase.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/model/SysPictureBase.java
similarity index 78%
rename from modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/model/SysPictureBase.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/model/SysPictureBase.java
index 755d19e..d7ea7cf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/model/SysPictureBase.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/model/SysPictureBase.java
@@ -1,16 +1,10 @@
-package com.zt.life.modules.sysPictureBase.model;
+package com.zt.life.modules.mainPart.sysPictureBase.model;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import com.zt.life.sys.dto.OssDto;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Date;
/**
* sys_picture_base
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/service/SysPictureBaseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/service/SysPictureBaseService.java
similarity index 84%
rename from modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/service/SysPictureBaseService.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/service/SysPictureBaseService.java
index d6dafbc..7a8eeb4 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/service/SysPictureBaseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/service/SysPictureBaseService.java
@@ -1,8 +1,8 @@
-package com.zt.life.modules.sysPictureBase.service;
+package com.zt.life.modules.mainPart.sysPictureBase.service;
import com.zt.common.service.BaseService;
-import com.zt.life.modules.sysPictureBase.dao.SysPictureBaseDao;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
+import com.zt.life.modules.mainPart.sysPictureBase.dao.SysPictureBaseDao;
+import com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase;
import com.zt.modules.oss.service.SysOssService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/ModelLineController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java
similarity index 91%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/ModelLineController.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java
index 2704eca..dd90610 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/ModelLineController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java
@@ -1,4 +1,4 @@
-package com.zt.life.modules.taskReliability.controller;
+package com.zt.life.modules.mainPart.taskReliability.controller;
import com.zt.common.annotation.LogOperation;
@@ -12,9 +12,9 @@
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.taskReliability.model.ModelLine;
-import com.zt.life.modules.taskReliability.model.ModelRbd;
-import com.zt.life.modules.taskReliability.service.ModelLineService;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelLine;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
+import com.zt.life.modules.mainPart.taskReliability.service.ModelLineService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,9 +22,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/ModelRbdController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelRbdController.java
similarity index 85%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/ModelRbdController.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelRbdController.java
index e5e1dcb..336690c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/ModelRbdController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelRbdController.java
@@ -1,4 +1,4 @@
-package com.zt.life.modules.taskReliability.controller;
+package com.zt.life.modules.mainPart.taskReliability.controller;
import com.zt.common.annotation.LogOperation;
@@ -6,14 +6,13 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.servlet.PageResult;
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.taskReliability.model.ModelRbd;
-import com.zt.life.modules.taskReliability.service.ModelRbdService;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
+import com.zt.life.modules.mainPart.taskReliability.service.ModelRbdService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -45,6 +43,8 @@
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "productId", value = "鑺傜偣ID", dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "modelName", value = "妯″瀷鍚嶇О", dataType = Constant.QT.STRING, format = "model_name^LK"),
+ @ApiImplicitParam(name = "modelTag", value = "妯″瀷鏍囪瘑", dataType = Constant.QT.STRING, format = "model_tag^LK"),
})
public Result<List<ModelRbd>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
similarity index 90%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskController.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
index c4ab96a..9bdcaf5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
@@ -1,4 +1,4 @@
-package com.zt.life.modules.taskReliability.controller;
+package com.zt.life.modules.mainPart.taskReliability.controller;
import com.zt.common.annotation.LogOperation;
@@ -6,14 +6,13 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.servlet.PageResult;
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.taskReliability.model.Task;
-import com.zt.life.modules.taskReliability.service.TaskService;
+import com.zt.life.modules.mainPart.taskReliability.model.Task;
+import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskPhaseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java
similarity index 90%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskPhaseController.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java
index d60510f..f86ab94 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskPhaseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java
@@ -1,4 +1,4 @@
-package com.zt.life.modules.taskReliability.controller;
+package com.zt.life.modules.mainPart.taskReliability.controller;
import com.zt.common.annotation.LogOperation;
@@ -6,14 +6,13 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.servlet.PageResult;
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.taskReliability.model.TaskPhase;
-import com.zt.life.modules.taskReliability.service.TaskPhaseService;
+import com.zt.life.modules.mainPart.taskReliability.model.TaskPhase;
+import com.zt.life.modules.mainPart.taskReliability.service.TaskPhaseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskPhaseModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseModelController.java
similarity index 91%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskPhaseModelController.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseModelController.java
index 2588615..f6959f7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskPhaseModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseModelController.java
@@ -1,4 +1,4 @@
-package com.zt.life.modules.taskReliability.controller;
+package com.zt.life.modules.mainPart.taskReliability.controller;
import com.zt.common.annotation.LogOperation;
@@ -6,14 +6,13 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.servlet.PageResult;
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.taskReliability.model.TaskPhaseModel;
-import com.zt.life.modules.taskReliability.service.TaskPhaseModelService;
+import com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel;
+import com.zt.life.modules.mainPart.taskReliability.service.TaskPhaseModelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/AlgorithmDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/AlgorithmDao.java
similarity index 67%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/AlgorithmDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/AlgorithmDao.java
index bd4140e..b7006e9 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/AlgorithmDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/AlgorithmDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.taskReliability.dao;
+package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.taskReliability.model.Algorithm;
+import com.zt.life.modules.mainPart.taskReliability.model.Algorithm;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelLineDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelLineDao.java
similarity index 74%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelLineDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelLineDao.java
index 328a86d..f85fb54 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelLineDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelLineDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.taskReliability.dao;
+package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.taskReliability.model.ModelLine;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelLine;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelNodeAlgorithmDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java
similarity index 74%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelNodeAlgorithmDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java
index 8f49533..3134636 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelNodeAlgorithmDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.taskReliability.dao;
+package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.taskReliability.model.ModelNodeAlgorithm;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelNodeAlgorithm;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelNodeDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeDao.java
similarity index 74%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelNodeDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeDao.java
index 4d7d814..1901fe9 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelNodeDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.taskReliability.dao;
+package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.taskReliability.model.ModelNode;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelNode;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelRbdDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java
similarity index 76%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelRbdDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java
index 50a7792..fdbe55c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelRbdDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.taskReliability.dao;
+package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.taskReliability.model.ModelRbd;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java
similarity index 71%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java
index ba4daf9..cc354b7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.taskReliability.dao;
+package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.taskReliability.model.Task;
+import com.zt.life.modules.mainPart.taskReliability.model.Task;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskPhaseDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
similarity index 72%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskPhaseDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
index 4cf7e50..a7bba5c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskPhaseDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.taskReliability.dao;
+package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.taskReliability.model.TaskPhase;
+import com.zt.life.modules.mainPart.taskReliability.model.TaskPhase;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskPhaseModelDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseModelDao.java
similarity index 72%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskPhaseModelDao.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseModelDao.java
index 8499209..7c74423 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskPhaseModelDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseModelDao.java
@@ -1,7 +1,7 @@
-package com.zt.life.modules.taskReliability.dao;
+package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.taskReliability.model.TaskPhaseModel;
+import com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ModelLinePair.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ModelLinePair.java
new file mode 100644
index 0000000..04562fc
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ModelLinePair.java
@@ -0,0 +1,10 @@
+package com.zt.life.modules.mainPart.taskReliability.dto;
+
+import com.zt.life.modules.mainPart.taskReliability.model.ModelLine;
+import lombok.Data;
+
+@Data
+public class ModelLinePair {
+ private ModelLine line1;
+ private ModelLine line2;
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/Algorithm.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Algorithm.java
similarity index 91%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/Algorithm.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Algorithm.java
index 6316e0c..7ae4562 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/Algorithm.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Algorithm.java
@@ -1,12 +1,10 @@
-package com.zt.life.modules.taskReliability.model;
+package com.zt.life.modules.mainPart.taskReliability.model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.List;
/**
* model_line
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelLine.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelLine.java
similarity index 88%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelLine.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelLine.java
index 267afc2..5cc3411 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelLine.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelLine.java
@@ -1,13 +1,10 @@
-package com.zt.life.modules.taskReliability.model;
+package com.zt.life.modules.mainPart.taskReliability.model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.Date;
/**
* model_line
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelNode.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
similarity index 95%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelNode.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
index ce3acb4..57121a1 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelNode.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
@@ -1,4 +1,4 @@
-package com.zt.life.modules.taskReliability.model;
+package com.zt.life.modules.mainPart.taskReliability.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelNodeAlgorithm.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNodeAlgorithm.java
similarity index 85%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelNodeAlgorithm.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNodeAlgorithm.java
index eb6a38a..0166d6b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelNodeAlgorithm.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNodeAlgorithm.java
@@ -1,9 +1,6 @@
-package com.zt.life.modules.taskReliability.model;
+package com.zt.life.modules.mainPart.taskReliability.model;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
similarity index 88%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
index 637a9ce..14da070 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
@@ -1,14 +1,11 @@
-package com.zt.life.modules.taskReliability.model;
+package com.zt.life.modules.mainPart.taskReliability.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.Date;
/**
* model_rbd
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/Task.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
similarity index 87%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/Task.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
index 2f76607..4074cc3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/Task.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
@@ -1,13 +1,10 @@
-package com.zt.life.modules.taskReliability.model;
+package com.zt.life.modules.mainPart.taskReliability.model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.Date;
/**
* task
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/TaskPhase.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
similarity index 89%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/TaskPhase.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
index 7f310a4..c4407fe 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/TaskPhase.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
@@ -1,14 +1,11 @@
-package com.zt.life.modules.taskReliability.model;
+package com.zt.life.modules.mainPart.taskReliability.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.Date;
/**
* task_phase
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/TaskPhaseModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
similarity index 88%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/TaskPhaseModel.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
index ccdb590..dc5ccd4 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/TaskPhaseModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
@@ -1,14 +1,11 @@
-package com.zt.life.modules.taskReliability.model;
+package com.zt.life.modules.mainPart.taskReliability.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.Date;
/**
* task_phase_model
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
similarity index 99%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
index f6fe271..6f04591 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
@@ -1,15 +1,14 @@
-package com.zt.life.modules.taskReliability.service;
+package com.zt.life.modules.mainPart.taskReliability.service;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.zt.common.service.BaseService;
import com.zt.common.utils.JsonUtils2;
import com.zt.common.utils.UUIDUtil;
-import com.zt.life.modules.taskReliability.dao.*;
-import com.zt.life.modules.taskReliability.dto.ModelLinePair;
-import com.zt.life.modules.taskReliability.model.*;
+import com.zt.life.modules.mainPart.taskReliability.dao.*;
+import com.zt.life.modules.mainPart.taskReliability.dto.ModelLinePair;
+import com.zt.life.modules.mainPart.taskReliability.model.*;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelRbdService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelRbdService.java
similarity index 76%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelRbdService.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelRbdService.java
index 36aea45..5dbc012 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelRbdService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelRbdService.java
@@ -1,11 +1,11 @@
-package com.zt.life.modules.taskReliability.service;
+package com.zt.life.modules.mainPart.taskReliability.service;
import com.zt.common.service.BaseService;
-import com.zt.life.modules.taskReliability.dao.ModelRbdDao;
-import com.zt.life.modules.taskReliability.model.ModelRbd;
+import com.zt.life.modules.mainPart.taskReliability.dao.ModelRbdDao;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
+
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskPhaseModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java
similarity index 76%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskPhaseModelService.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java
index abeca7a..b87bd88 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskPhaseModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java
@@ -1,11 +1,11 @@
-package com.zt.life.modules.taskReliability.service;
+package com.zt.life.modules.mainPart.taskReliability.service;
import com.zt.common.service.BaseService;
-import com.zt.life.modules.taskReliability.dao.TaskPhaseModelDao;
-import com.zt.life.modules.taskReliability.model.TaskPhaseModel;
+import com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseModelDao;
+import com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
+
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskPhaseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
similarity index 76%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskPhaseService.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
index 96622d2..08d899c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskPhaseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
@@ -1,11 +1,11 @@
-package com.zt.life.modules.taskReliability.service;
+package com.zt.life.modules.mainPart.taskReliability.service;
import com.zt.common.service.BaseService;
-import com.zt.life.modules.taskReliability.dao.TaskPhaseDao;
-import com.zt.life.modules.taskReliability.model.TaskPhase;
+import com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseDao;
+import com.zt.life.modules.mainPart.taskReliability.model.TaskPhase;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
+
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
similarity index 76%
rename from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskService.java
rename to modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
index 9279f67..3a796df 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
@@ -1,11 +1,11 @@
-package com.zt.life.modules.taskReliability.service;
+package com.zt.life.modules.mainPart.taskReliability.service;
import com.zt.common.service.BaseService;
-import com.zt.life.modules.taskReliability.dao.TaskDao;
-import com.zt.life.modules.taskReliability.model.Task;
+import com.zt.life.modules.mainPart.taskReliability.dao.TaskDao;
+import com.zt.life.modules.mainPart.taskReliability.model.Task;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
+
import java.util.List;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dto/ModelLinePair.java b/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dto/ModelLinePair.java
deleted file mode 100644
index ee6927d..0000000
--- a/modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dto/ModelLinePair.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zt.life.modules.taskReliability.dto;
-
-import com.zt.life.modules.taskReliability.model.ModelLine;
-import lombok.Data;
-
-@Data
-public class ModelLinePair {
- private ModelLine line1;
- private ModelLine line2;
-}
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 40c203e..2a83753 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -18,9 +18,7 @@
and ${whereSql}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY sort
</select>
<select id="getNo" resultType="java.lang.Integer">
SELECT COUNT(*)
@@ -34,7 +32,6 @@
and pid is null
</if>
</where>
- Group by product_type
</select>
<select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
select a.name, a.id
@@ -64,7 +61,8 @@
left join param_data p on p.product_id = a.id and p.page_code = 'expect'
left join sys_picture_base s on s.id = a.operat_img
WHERE a.is_delete = 0
- AND a.PID = ${productId}
+ AND ((a.PID = ${productId})
+ or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and a.product_type <> 10))
</select>
<select id="getTaskProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
diff --git a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/sysPictureBase/SysPictureBaseDao.xml
similarity index 83%
rename from modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/sysPictureBase/SysPictureBaseDao.xml
index cc8a20a..bf36c33 100644
--- a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/sysPictureBase/SysPictureBaseDao.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.sysPictureBase.dao.SysPictureBaseDao">
+<mapper namespace="com.zt.life.modules.mainPart.sysPictureBase.dao.SysPictureBaseDao">
<update id="updateByDefault">
update sys_picture_base
set is_default=2
@@ -20,7 +20,7 @@
and is_delete = 0
</update>
- <select id="getList" resultType="com.zt.life.modules.sysPictureBase.model.SysPictureBase">
+ <select id="getList" resultType="com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase">
select a.*
from sys_picture_base a
<where>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/AlgorithmDao.xml
similarity index 76%
rename from modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/AlgorithmDao.xml
index 27af26e..f33c2f5 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/AlgorithmDao.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.AlgorithmDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.AlgorithmDao">
<update id="deleteByModelId">
delete from algorithm where model_id=#{modelId}
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelLineDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelLineDao.xml
similarity index 75%
rename from modules/mainPart/src/main/resources/mapper/taskReliability/ModelLineDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelLineDao.xml
index 95eab9d..0e5a91d 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelLineDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelLineDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelLineDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelLineDao">
- <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelLine">
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelLine">
select a.*
from model_line a
<where>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeAlgorithmDao.xml
similarity index 74%
rename from modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeAlgorithmDao.xml
index 22f420e..594897a 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeAlgorithmDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelNodeAlgorithmDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelNodeAlgorithmDao">
- <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelNodeAlgorithm">
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNodeAlgorithm">
select a.*
from model_node_algorithm a
<where>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeDao.xml
similarity index 75%
rename from modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeDao.xml
index 26aedf0..235aedd 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelNodeDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelNodeDao">
- <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelNode">
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNode">
select a.*
from model_node a
<where>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelRbdDao.xml
similarity index 79%
rename from modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelRbdDao.xml
index bf1b63c..1225051 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelRbdDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelRbdDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelRbdDao">
- <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
select a.*,
CASE
WHEN b.end =1 THEN '宸插畬鎴�'
@@ -22,7 +22,7 @@
</if>
</where>
</select>
- <select id="getDiagram" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
+ <select id="getDiagram" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
select a.*
from model_rbd a
<where>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml
similarity index 73%
rename from modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml
index 801eec2..9dec2de 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.TaskDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.TaskDao">
- <select id="getList" resultType="com.zt.life.modules.taskReliability.model.Task">
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.Task">
select a.*
from task a
<where>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseDao.xml
similarity index 72%
rename from modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseDao.xml
index 0c9712c..091e73e 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.TaskPhaseDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseDao">
- <select id="getList" resultType="com.zt.life.modules.taskReliability.model.TaskPhase">
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskPhase">
select a.*
from task_phase a
<where>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseModelDao.xml
similarity index 76%
rename from modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
rename to modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseModelDao.xml
index f5176da..3078628 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseModelDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.taskReliability.dao.TaskPhaseModelDao">
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseModelDao">
- <select id="getList" resultType="com.zt.life.modules.taskReliability.model.TaskPhaseModel">
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel">
SELECT a.id as productId,
a.`NAME` as `system`,
c.model_name,
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index 44eb4a4..36dcfea 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -9,13 +9,22 @@
<el-col :span="19">
<div class="mod-basicInfo-paramData}">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/ParamData/page"
- delete-url="/basicInfo/ParamData"
+ delete-url="/basicInfo/ParamData/"
@dataLoaded="dataLoaded"
v-slot="{ table }"
:paging='false'>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
- <el-input v-model="dataForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable></el-input>
+ <zt-dict v-model="dataForm.basicJoinCompute" dict="is_or_not" placeholder="鏄惁鍙備笌璁＄畻" clearable></zt-dict>
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.repairable" dict="is_or_not" placeholder="鏄惁鍙淮淇�" clearable></zt-dict>
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.reliabDistribType" dict="ReliabDistribType" placeholder="璇烽�夋嫨鍙潬鎬у垎甯冪被鍨�" clearable></zt-dict>
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.repairDistribType" dict="RepairDistribType" placeholder="璇烽�夋嫨缁翠慨鍒嗗竷绫诲瀷" clearable></zt-dict>
</el-form-item>
<el-form-item>
<zt-button type="warning" @click="handleSaveRows">淇濆瓨</zt-button>
@@ -269,7 +278,11 @@
srcId: '',
name: '',
dataThreeList: null,
- nodeType: '5'
+ nodeType: '5',
+ basicJoinCompute:'',
+ repairable:'',
+ repairDistribType:'',
+ reliabDistribType:''
},
isOrNot: [{
value: 1,
diff --git a/web/src/views/modules/basicInfo/SelectTyModel.vue b/web/src/views/modules/basicInfo/SelectTyModel.vue
index 2b5c2d8..d12773f 100644
--- a/web/src/views/modules/basicInfo/SelectTyModel.vue
+++ b/web/src/views/modules/basicInfo/SelectTyModel.vue
@@ -13,7 +13,8 @@
@selection-change="changeRow">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="鍚嶇О"/>
- <zt-table-column-dict prop="nodeType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <zt-table-column-dict v-if="!pageCode" prop="nodeType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <zt-table-column-dict v-else prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
</el-table>
</zt-table-wraper>
</div>
diff --git a/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
index 8cd13a7..94e5a95 100644
--- a/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
@@ -38,6 +38,7 @@
import PictureSelect from "@/views/modules/basicInfo/SelectPicture";
export default {
+ name:'TyProductModel',
data() {
return {
fileId: '',
diff --git a/web/src/views/modules/basicInfo/TyProductModel.vue b/web/src/views/modules/basicInfo/TyProductModel.vue
index 3438ece..7615626 100644
--- a/web/src/views/modules/basicInfo/TyProductModel.vue
+++ b/web/src/views/modules/basicInfo/TyProductModel.vue
@@ -5,7 +5,7 @@
<zt-table-wraper query-url="/basicInfo/TyProductModel/tree" delete-url="/basicInfo/TyProductModel/" v-bind:paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
- <el-form-item>
+ <!--<el-form-item>
<zt-dict v-model="dataForm.nodeType" dict="product" placeholder="璇烽�夋嫨鑺傜偣绫诲瀷" clearable></zt-dict>
</el-form-item>
<el-form-item>
@@ -13,9 +13,9 @@
</el-form-item>
<el-form-item>
<zt-dict v-model="dataForm.repairDistrib" dict="RepairDistribType" placeholder="璇烽�夋嫨缁翠慨鍒嗗竷绫诲瀷" clearable></zt-dict>
- </el-form-item>
+ </el-form-item>-->
<el-form-item>
- <zt-button type="query" @click="table.query()"/>
+ <!--<zt-button type="query" @click="table.query()"/>-->
<zt-button type="add" @click="table.editHandle()"/>
<zt-button type="delete" @click="table.deleteHandle()"/>
</el-form-item>
diff --git a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
index cb15cbf..571d45b 100644
--- a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
@@ -50,19 +50,14 @@
},
methods: {
init(id,params) {
- if (params.type == 'tree') {
+ if (params.type === 'tree') {
this.isTree = true
this.isShow = false
this.getProductList()
} else {
this.dataForm.pid = params.pid
+ this.dataForm.productType = params.type
}
- },
- // 鑾峰彇绯荤粺鍒楄〃
- async getProductList() {
- let res = await this.$http.get('/basicInfo/XhProductModel/getProductList')
- this.productList = res.data
- console.log(this.productList, 'getProductList')
},
selectPicture() {
this.$refs.pictureSelect.$refs.dialog.init()
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index b1b8929..cada5bf 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -19,6 +19,7 @@
<el-form-item>
<zt-button type="query" @click="table.query()"/>
<zt-button type="add" @click="add()"/>
+ <zt-button v-if="productType==='3'" type="primary" @click="addCell()">鏂板铏氬崟鍏�</zt-button>
<zt-button type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
@@ -37,7 +38,7 @@
<zt-table-column-handle :table="table"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update @refreshDataList="table.query"/>
+ <add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
<select-ty-model @refreshDataList="table.query" ref="SelectTyModel"/>
</zt-table-wraper>
</div>
@@ -51,6 +52,7 @@
import SelectTyModel from './SelectTyModel'
import ProductModelTree from "./ProductModelTree";
import Cookies from "js-cookie";
+ import TyProductModel from "./TyProductModel-AddOrUpdate";
export default {
data() {
@@ -66,6 +68,7 @@
}
},
components: {
+ TyProductModel,
ProductModelTree,
AddOrUpdate,
SelectTyModel
@@ -88,14 +91,13 @@
}
this.$refs.SelectTyModel.$refs.dialog.init(null,{type:this.dataForm.type,id:this.dataForm.pid})
},
+ addCell(){
+ this.$refs.AddOrUpdate.$refs.dialog.init(null,{type:10,pid:this.dataForm.pid})
+ },
cellStyle({column}) {
if (column.label === '鍚嶇О') {
return 'text-align: left !important;'
}
- },
- getPath(id) {
- console.log(id, 'path')
- return `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${id}`
},
onProductSelected(data) {
console.log(data)
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index 60c5652..a800c0d 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -14,6 +14,12 @@
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
+ <el-input v-model="dataForm.modelName" placeholder="璇疯緭鍏ユā鍨嬪悕绉�" clearable></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-input v-model="dataForm.modelTag" placeholder="璇疯緭鍏ユā鍨嬫爣璇�" clearable></el-input>
+ </el-form-item>
+ <el-form-item>
<zt-button type="query" @click="table.query()"/>
<zt-button type="add" @click="add()"/>
<zt-button type="delete" @click="table.deleteHandle()"/>
@@ -60,6 +66,7 @@
modelName: '',
modelState:'',
productId: '',
+ modelTag: '',
}
}
},
--
Gitblit v1.9.1