修改控件校验数据迁移,添加接口根据新模板同步已发布的参数清单
This commit is contained in:
+1
@@ -166,6 +166,7 @@ public class ShiroConfig {
|
|||||||
filterChainDefinitionMap.put("/project/projectTaskInventoryConditionAssessmentEO/initConditionAssessment", "anon"); // 初始化项目当前状态数据接口
|
filterChainDefinitionMap.put("/project/projectTaskInventoryConditionAssessmentEO/initConditionAssessment", "anon"); // 初始化项目当前状态数据接口
|
||||||
filterChainDefinitionMap.put("/todoCenter/projectProcess/initHistoryData", "anon"); // 待办中心-初始化历史数据接口排除
|
filterChainDefinitionMap.put("/todoCenter/projectProcess/initHistoryData", "anon"); // 待办中心-初始化历史数据接口排除
|
||||||
filterChainDefinitionMap.put("/project/projectTaskInventoryEO/disposeHistoryData", "anon"); // 项目库-任务清单 处理历史数据接口
|
filterChainDefinitionMap.put("/project/projectTaskInventoryEO/disposeHistoryData", "anon"); // 项目库-任务清单 处理历史数据接口
|
||||||
|
filterChainDefinitionMap.put("/params/manifest/updateModel", "anon"); // 项目库-任务清单 处理历史数据接口
|
||||||
|
|
||||||
// 添加自己的过滤器并且取名为jwt
|
// 添加自己的过滤器并且取名为jwt
|
||||||
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
|
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
|
||||||
|
|||||||
+11
@@ -161,6 +161,17 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "参数清单-更新模板更新参数", notes = "参数清单-更新模板更新参数")
|
||||||
|
@PostMapping(value = "/updateModel")
|
||||||
|
public Result<?> updateModel(String mid, String version,String cid) {
|
||||||
|
boolean isSuccess = paramsManifestEOService.updateModel(mid,version, cid);
|
||||||
|
if (isSuccess) {
|
||||||
|
return Result.OK("更新成功!");
|
||||||
|
} else {
|
||||||
|
return Result.error("更新失败!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 编辑
|
* 编辑
|
||||||
*
|
*
|
||||||
|
|||||||
+2
@@ -97,4 +97,6 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
|
|||||||
|
|
||||||
// 参数模板删除时,记录参数模板名称到清单
|
// 参数模板删除时,记录参数模板名称到清单
|
||||||
boolean setTemplateName(List<String> paramsTemplateIds);
|
boolean setTemplateName(List<String> paramsTemplateIds);
|
||||||
|
|
||||||
|
boolean updateModel(String mid,String version, String cid);
|
||||||
}
|
}
|
||||||
|
|||||||
+56
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.common.constant.enums.CutEnum;
|
import com.jero.common.constant.enums.CutEnum;
|
||||||
import com.jero.common.exception.JeroBootException;
|
import com.jero.common.exception.JeroBootException;
|
||||||
import com.jero.common.system.vo.DictModel;
|
import com.jero.common.system.vo.DictModel;
|
||||||
@@ -195,6 +196,59 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
|
|||||||
return save(paramsManifestEO);
|
return save(paramsManifestEO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateModel(String mid, String version, String cid) {
|
||||||
|
try{
|
||||||
|
LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, cid);
|
||||||
|
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
|
||||||
|
// 根据参数模板id发布版本查询对应参数项集合
|
||||||
|
List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(mid, Integer.parseInt(version));
|
||||||
|
|
||||||
|
// 复制参数项
|
||||||
|
for (ParamsInfoPublishEO source : paramsInfoPublishEOList) {
|
||||||
|
boolean isHave = false;
|
||||||
|
for (ParamsCollectManifestEO target : paramsCollectManifestEOList) {
|
||||||
|
if (target.getNioNumber().equals(source.getNioNumber())) {
|
||||||
|
isHave = true;
|
||||||
|
//复制模版信息
|
||||||
|
target.setIsMust(source.getIsMust());
|
||||||
|
target.setParamsName(source.getParamsName());
|
||||||
|
target.setParamsBatch(source.getParamsBatch());
|
||||||
|
target.setDutyTerritory(source.getDutyTerritory());
|
||||||
|
target.setControlType(source.getControlType());
|
||||||
|
target.setControlValues(source.getControlValues());
|
||||||
|
target.setControlVerify(source.getControlVerify());
|
||||||
|
target.setFileTemplateConnectId(source.getFileTemplateConnectId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(!isHave){
|
||||||
|
//新增
|
||||||
|
ParamsCollectManifestEO target = new ParamsCollectManifestEO();
|
||||||
|
BeanUtils.copyProperties(source, target);
|
||||||
|
target.setId(UUID.randomUUID().toString().replace("-", ""));
|
||||||
|
target.setParamsManifestId(cid);
|
||||||
|
target.setState(CollectManifestStateEnum.WAIT_FILL.getValue());
|
||||||
|
target.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 设置删除标识
|
||||||
|
target.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 设置添加标识
|
||||||
|
target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
|
||||||
|
target.setVersion(1); // 设置参数项初始版本为 1
|
||||||
|
|
||||||
|
if (!ControlTypeEnum.Title.getValue().equals(source.getControlType())) {
|
||||||
|
target.setSdt("song.gao2.o");
|
||||||
|
target.setDre("song.gao2.o");
|
||||||
|
}
|
||||||
|
paramsCollectManifestEOList.add(target);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
paramsCollectManifestEOService.saveOrUpdateBatch(paramsCollectManifestEOList);
|
||||||
|
}catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新 只对标题进行编辑
|
* 更新 只对标题进行编辑
|
||||||
*
|
*
|
||||||
@@ -418,6 +472,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
|
|||||||
* 变更扩展
|
* 变更扩展
|
||||||
* 仅能选择一条进行变更扩展
|
* 仅能选择一条进行变更扩展
|
||||||
* 状态为已完成的清单可进行变更扩展
|
* 状态为已完成的清单可进行变更扩展
|
||||||
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@@ -973,6 +1028,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 计算百分比
|
* 计算百分比
|
||||||
|
*
|
||||||
* @param d1
|
* @param d1
|
||||||
* @param d2
|
* @param d2
|
||||||
* @return
|
* @return
|
||||||
|
|||||||
Reference in New Issue
Block a user