bug fixed active
This commit is contained in:
Timer
@ -63,6 +63,7 @@ import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* 流程模型控制器
|
||||
*
|
||||
@ -92,94 +93,97 @@ public class ModelController {
|
||||
protected TaskService taskService;
|
||||
|
||||
@RequestMapping("/showModelList.do")
|
||||
public String showModelList(HttpServletRequest request,Model model) {
|
||||
public String showModelList(HttpServletRequest request, Model model) {
|
||||
return "/activiti/modelList";
|
||||
}
|
||||
|
||||
@RequestMapping("/showProcessTechnicsList.do")
|
||||
public String showProcessTechnicsList(HttpServletRequest request,Model model) {
|
||||
public String showProcessTechnicsList(HttpServletRequest request, Model model) {
|
||||
return "/activiti/processTechnicsList";
|
||||
}
|
||||
|
||||
/*
|
||||
* 模型副本
|
||||
* */
|
||||
@RequestMapping(value = "copycreat.do")
|
||||
public ModelAndView copycreat(HttpServletRequest request,
|
||||
HttpServletResponse response,Model model
|
||||
HttpServletResponse response, Model model
|
||||
) throws IOException {
|
||||
int result =0;
|
||||
User cu = (User)request.getSession().getAttribute("cu");
|
||||
int result = 0;
|
||||
User cu = (User) request.getSession().getAttribute("cu");
|
||||
String modelid = request.getParameter("id");
|
||||
org.activiti.engine.repository.Model modelData = repositoryService.getModel(modelid);
|
||||
ObjectNode modelNode = (ObjectNode) new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelData.getId()));
|
||||
byte[] bpmnBytes = null;
|
||||
try {
|
||||
|
||||
bpmnBytes=modelNode.toString().getBytes("utf-8");
|
||||
bpmnBytes = modelNode.toString().getBytes("utf-8");
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
org.activiti.engine.repository.Model modelData_new = repositoryService.newModel();
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
ObjectNode modelObjectNode = objectMapper.createObjectNode();
|
||||
modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME,modelData.getName()+"(副本)" );
|
||||
modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, modelData.getName() + "(副本)");
|
||||
modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, 1);
|
||||
modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, modelData.getName()+"(副本)");
|
||||
modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, modelData.getName() + "(副本)");
|
||||
modelData_new.setMetaInfo(modelObjectNode.toString());
|
||||
modelData_new.setName(modelData.getName()+"(副本)");
|
||||
modelData_new.setName(modelData.getName() + "(副本)");
|
||||
modelData_new.setKey(modelData.getKey());
|
||||
|
||||
repositoryService.saveModel(modelData_new);
|
||||
repositoryService.addModelEditorSource(modelData_new.getId(),bpmnBytes );
|
||||
repositoryService.addModelEditorSource(modelData_new.getId(), bpmnBytes);
|
||||
|
||||
result =1;
|
||||
model.addAttribute("result",result);
|
||||
result = 1;
|
||||
model.addAttribute("result", result);
|
||||
return new ModelAndView("result");
|
||||
}
|
||||
|
||||
@RequestMapping("/doimportExcel.do")
|
||||
public String doimportTechnics(HttpServletRequest request,Model model){
|
||||
public String doimportTechnics(HttpServletRequest request, Model model) {
|
||||
return "/activiti/importExcel4Model";
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping(value = "saveImportModel.do")
|
||||
public ModelAndView saveImportActiviti(@RequestParam MultipartFile[] file, HttpServletRequest request,
|
||||
HttpServletResponse response,Model model) throws IOException {
|
||||
int result=0;
|
||||
User cu = (User)request.getSession().getAttribute("cu");
|
||||
HttpServletResponse response, Model model) throws IOException {
|
||||
int result = 0;
|
||||
User cu = (User) request.getSession().getAttribute("cu");
|
||||
//要存入的实际地址
|
||||
String realPath = request.getSession().getServletContext().getRealPath("/");
|
||||
String pjName = request.getContextPath().substring(1, request.getContextPath().length());
|
||||
realPath = realPath.replace(pjName,"Temp");
|
||||
realPath = realPath.replace(pjName, "Temp");
|
||||
//String technicsname="";
|
||||
List<TaskModel> taskModels= new ArrayList<>();//(technicsname,ptList);
|
||||
List<TaskModel> taskModels = new ArrayList<>();//(technicsname,ptList);
|
||||
|
||||
String modelid =processModelService.autoImport(taskModels);
|
||||
String modelid = processModelService.autoImport(taskModels);
|
||||
|
||||
List<String> unmainProcedure =new ArrayList<>();//存储未匹配预设工序的工序名
|
||||
if(modelid!=null && !modelid.isEmpty()){
|
||||
try{
|
||||
List<String> unmainProcedure = new ArrayList<>();//存储未匹配预设工序的工序名
|
||||
if (modelid != null && !modelid.isEmpty()) {
|
||||
try {
|
||||
SimpleDateFormat dateFormat = new SimpleDateFormat(
|
||||
"yyyy-MM-dd HH:mm:ss.SSS", Locale.SIMPLIFIED_CHINESE);
|
||||
result=1;
|
||||
}catch(Exception e){
|
||||
result = 1;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
repositoryService.deleteModel(modelid);//管控信息保存失败时，删除模型
|
||||
}
|
||||
|
||||
}
|
||||
String res_str="";
|
||||
String res_str = "";
|
||||
for (String str : unmainProcedure) {
|
||||
if(!res_str.isEmpty()){
|
||||
res_str+=",";
|
||||
if (!res_str.isEmpty()) {
|
||||
res_str += ",";
|
||||
}
|
||||
str=str.replace(" ", "").replace("\n", "");
|
||||
res_str+=str;
|
||||
str = str.replace(" ", "").replace("\n", "");
|
||||
res_str += str;
|
||||
}
|
||||
model.addAttribute("result","{\"res\":\""+result+"\",\"unmatch\":\""+res_str+"\"}");
|
||||
model.addAttribute("result", "{\"res\":\"" + result + "\",\"unmatch\":\"" + res_str + "\"}");
|
||||
return new ModelAndView("result");
|
||||
}
|
||||
|
||||
/* //导入文档最后一个sheet
|
||||
/* //导入文档最后一个sheet
|
||||
public String importByExcel(String realPath, MultipartFile[] file,List<ProcessTechnics> ptList) throws IOException {
|
||||
String technicsname="";
|
||||
//上传文件的原名(即上传前的文件名字)
|
||||
@ -240,16 +244,16 @@ public class ModelController {
|
||||
|
||||
return technicsname;
|
||||
}
|
||||
*/ //根据导入excel获取工艺名称，即产品编号
|
||||
private String getTechnicsName(Sheet sheet ,int row_NO){
|
||||
String res="";
|
||||
*/ //根据导入excel获取工艺名称，即产品编号
|
||||
private String getTechnicsName(Sheet sheet, int row_NO) {
|
||||
String res = "";
|
||||
Row row = sheet.getRow(row_NO);
|
||||
for(int i=0;i<row.getLastCellNum();i++){
|
||||
String cellcontent=getMergedRegionValue(sheet,row_NO,i);
|
||||
if(cellcontent!=null && cellcontent.equals(CommString.Flag_Technics_Name)){
|
||||
for (int i = 0; i < row.getLastCellNum(); i++) {
|
||||
String cellcontent = getMergedRegionValue(sheet, row_NO, i);
|
||||
if (cellcontent != null && cellcontent.equals(CommString.Flag_Technics_Name)) {
|
||||
continue;
|
||||
}else{
|
||||
res=cellcontent;
|
||||
} else {
|
||||
res = cellcontent;
|
||||
break;
|
||||
|
||||
}
|
||||
@ -418,60 +422,64 @@ public class ModelController {
|
||||
/*
|
||||
* 获取主工序code
|
||||
* */
|
||||
|
||||
/**
|
||||
* 获取合并单元格的值
|
||||
*
|
||||
* @param sheet
|
||||
* @param row
|
||||
* @param column
|
||||
* @return
|
||||
*/
|
||||
public String getMergedRegionValue(Sheet sheet ,int row , int column){
|
||||
public String getMergedRegionValue(Sheet sheet, int row, int column) {
|
||||
int sheetMergeCount = sheet.getNumMergedRegions();
|
||||
|
||||
for(int i = 0 ; i < sheetMergeCount ; i++){
|
||||
for (int i = 0; i < sheetMergeCount; i++) {
|
||||
CellRangeAddress ca = sheet.getMergedRegion(i);
|
||||
int firstColumn = ca.getFirstColumn();
|
||||
int lastColumn = ca.getLastColumn();
|
||||
int firstRow = ca.getFirstRow();
|
||||
int lastRow = ca.getLastRow();
|
||||
|
||||
if(row >= firstRow && row <= lastRow){
|
||||
if (row >= firstRow && row <= lastRow) {
|
||||
|
||||
if(column >= firstColumn && column <= lastColumn){
|
||||
if (column >= firstColumn && column <= lastColumn) {
|
||||
Row fRow = sheet.getRow(firstRow);
|
||||
Cell fCell = fRow.getCell(firstColumn);
|
||||
|
||||
return getCellValue(fCell) ;
|
||||
return getCellValue(fCell);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null ;
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单元格的值
|
||||
*
|
||||
* @param cell
|
||||
* @return
|
||||
*/
|
||||
public String getCellValue(Cell cell){
|
||||
public String getCellValue(Cell cell) {
|
||||
|
||||
if(cell == null) {
|
||||
if (cell == null) {
|
||||
return "";
|
||||
}
|
||||
|
||||
if(cell.getCellType() == CellType.STRING){
|
||||
if (cell.getCellType() == CellType.STRING) {
|
||||
|
||||
return cell.getStringCellValue();
|
||||
|
||||
}else if(cell.getCellType() == CellType.BOOLEAN){
|
||||
} else if (cell.getCellType() == CellType.BOOLEAN) {
|
||||
|
||||
return String.valueOf(cell.getBooleanCellValue());
|
||||
|
||||
}else if(cell.getCellType() == CellType.FORMULA){
|
||||
} else if (cell.getCellType() == CellType.FORMULA) {
|
||||
|
||||
return cell.getCellFormula() ;
|
||||
return cell.getCellFormula();
|
||||
|
||||
}else if(cell.getCellType() == CellType.NUMERIC){
|
||||
} else if (cell.getCellType() == CellType.NUMERIC) {
|
||||
|
||||
return String.valueOf(cell.getNumericCellValue());
|
||||
|
||||
@ -479,6 +487,7 @@ public class ModelController {
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
/*
|
||||
* 将存在的值赋给目标变量
|
||||
* */
|
||||
@ -504,44 +513,45 @@ public class ModelController {
|
||||
throw new Exception("属性复制失败:" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 流程定义列表
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getModelList.do")
|
||||
public ModelAndView getModelList(HttpServletRequest request,Model model,
|
||||
public ModelAndView getModelList(HttpServletRequest request, Model model,
|
||||
@RequestParam(value = "page") Integer page,
|
||||
@RequestParam(value = "rows") Integer rows,
|
||||
@RequestParam(value = "sort", required=false) String sort,
|
||||
@RequestParam(value = "order", required=false) String order) {
|
||||
User cu= (User)request.getSession().getAttribute("cu");
|
||||
@RequestParam(value = "sort", required = false) String sort,
|
||||
@RequestParam(value = "order", required = false) String order) {
|
||||
User cu = (User) request.getSession().getAttribute("cu");
|
||||
|
||||
int startNum=0;
|
||||
if(rows==null || rows==0){
|
||||
int startNum = 0;
|
||||
if (rows == null || rows == 0) {
|
||||
rows = 50;
|
||||
}
|
||||
if(page!=null && page>0){
|
||||
startNum =(page-1)*rows;
|
||||
if (page != null && page > 0) {
|
||||
startNum = (page - 1) * rows;
|
||||
}
|
||||
String wherestr = " where 1=1 ";
|
||||
if(request.getParameter("search_name")!=null && !request.getParameter("search_name").isEmpty()){
|
||||
wherestr += " and NAME_ like '%"+request.getParameter("search_name")+"%' ";
|
||||
if (request.getParameter("search_name") != null && !request.getParameter("search_name").isEmpty()) {
|
||||
wherestr += " and NAME_ like '%" + request.getParameter("search_name") + "%' ";
|
||||
}
|
||||
if(request.getParameter("search_code")!=null && !request.getParameter("search_code").isEmpty()){
|
||||
wherestr += " and KEY_ like '%"+request.getParameter("search_code")+"%' ";
|
||||
}else{
|
||||
if(!cu.getId().equals(CommString.ID_Admin)){
|
||||
if (request.getParameter("search_code") != null && !request.getParameter("search_code").isEmpty()) {
|
||||
wherestr += " and KEY_ like '%" + request.getParameter("search_code") + "%' ";
|
||||
} else {
|
||||
if (!cu.getId().equals(CommString.ID_Admin)) {
|
||||
List<Company> companies = unitService.getCompaniesByUserId(cu.getId());
|
||||
if(companies!=null && companies.size()>0){
|
||||
for(int i=0;i<companies.size();i++){
|
||||
wherestr += " and KEY_ like '%"+companies.get(0).getId()+"%' ";
|
||||
if (companies != null && companies.size() > 0) {
|
||||
for (int i = 0; i < companies.size(); i++) {
|
||||
wherestr += " and KEY_ like '%" + companies.get(0).getId() + "%' ";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
String sql = "select * from [ACT_RE_MODEL]"+wherestr;
|
||||
String sql = "select * from [ACT_RE_MODEL]" + wherestr;
|
||||
//page = 2;
|
||||
// List<org.activiti.engine.repository.Model> list = repositoryService.createModelQuery().orderByCreateTime().desc().listPage(startNum, rows);
|
||||
List<org.activiti.engine.repository.Model> list = repositoryService.createNativeModelQuery().sql(sql).list();
|
||||
@ -565,98 +575,103 @@ public class ModelController {
|
||||
}
|
||||
}*/
|
||||
PageInfo<org.activiti.engine.repository.Model> pi = new PageInfo<org.activiti.engine.repository.Model>(list);
|
||||
JSONArray json=JSONArray.fromObject(list);
|
||||
String result="{\"total\":"+list.size()+",\"rows\":"+json+"}";
|
||||
model.addAttribute("result",result);
|
||||
JSONArray json = JSONArray.fromObject(list);
|
||||
String result = "{\"total\":" + list.size() + ",\"rows\":" + json + "}";
|
||||
model.addAttribute("result", result);
|
||||
|
||||
return new ModelAndView("result");
|
||||
|
||||
|
||||
|
||||
// page.setTotalCount(processDefinitionQuery.count());
|
||||
// page.setResult(objects);
|
||||
// mav.addObject("page", page);
|
||||
//
|
||||
// return mav;
|
||||
}
|
||||
|
||||
/**
|
||||
* 流程定义列表
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/getModelAll.do")
|
||||
public ModelAndView getModelAll(HttpServletRequest request,Model model) {
|
||||
User cu=(User)request.getSession().getAttribute("cu");
|
||||
public ModelAndView getModelAll(HttpServletRequest request, Model model) {
|
||||
User cu = (User) request.getSession().getAttribute("cu");
|
||||
String userId = cu.getId();
|
||||
String wherestr = " where 1=1 ";
|
||||
if(request.getParameter("bizid")!=null && !request.getParameter("bizid").isEmpty()){
|
||||
wherestr += " and KEY_ like '%"+request.getParameter("bizid")+"%' ";
|
||||
if (request.getParameter("bizid") != null && !request.getParameter("bizid").isEmpty()) {
|
||||
wherestr += " and KEY_ like '%" + request.getParameter("bizid") + "%' ";
|
||||
}
|
||||
String sql = "select * from [ACT_RE_MODEL]"+wherestr;
|
||||
String sql = "select * from [ACT_RE_MODEL]" + wherestr;
|
||||
List<org.activiti.engine.repository.Model> list = repositoryService.createNativeModelQuery().sql(sql).list();
|
||||
JSONArray json=JSONArray.fromObject(list);
|
||||
JSONArray json = JSONArray.fromObject(list);
|
||||
JSONArray rows = new JSONArray();
|
||||
if(json!=null && json.size()>0){
|
||||
for(int i=0;i<json.size();i++){
|
||||
if (json != null && json.size() > 0) {
|
||||
for (int i = 0; i < json.size(); i++) {
|
||||
JSONObject job = json.getJSONObject(i);
|
||||
TaskQuery taskQuery = taskService.createTaskQuery().taskCandidateOrAssigned(userId).processDefinitionKey(job.get("key").toString());
|
||||
List<Task> taskList = taskQuery.list();
|
||||
int taskNum = taskList.size();
|
||||
job.put("taskNum",taskNum);
|
||||
job.put("taskNum", taskNum);
|
||||
rows.add(job);
|
||||
}
|
||||
}
|
||||
String result="{\"total\":"+list.size()+",\"rows\":"+rows+"}";
|
||||
model.addAttribute("result",result);
|
||||
String result = "{\"total\":" + list.size() + ",\"rows\":" + rows + "}";
|
||||
model.addAttribute("result", result);
|
||||
|
||||
return new ModelAndView("result");
|
||||
}
|
||||
|
||||
@RequestMapping("/addModel.do")
|
||||
public String addModel(HttpServletRequest request,Model model) {
|
||||
public String addModel(HttpServletRequest request, Model model) {
|
||||
Company company = this.unitService.getCompById(request.getParameter("companyId"));
|
||||
request.setAttribute("company", company);
|
||||
return "/activiti/modelAdd";
|
||||
}
|
||||
|
||||
@RequestMapping("/editModel.do")
|
||||
public String editModel(HttpServletRequest request,Model model) {
|
||||
public String editModel(HttpServletRequest request, Model model) {
|
||||
String modelId = request.getParameter("modelid");
|
||||
org.activiti.engine.repository.Model modelData = repositoryService.getModel(modelId);
|
||||
model.addAttribute("model", modelData);
|
||||
String metainfo = modelData.getMetaInfo();
|
||||
JSONObject modelObjectNode = JSONObject.fromObject(metainfo) ;
|
||||
JSONObject modelObjectNode = JSONObject.fromObject(metainfo);
|
||||
String description = modelObjectNode.getString(ModelDataJsonConstants.MODEL_DESCRIPTION);
|
||||
String[] str =modelData.getKey().split("-");
|
||||
String[] str = modelData.getKey().split("-");
|
||||
model.addAttribute("processTypeId", str[0]);
|
||||
String companyId = str[1];
|
||||
Company company = this.unitService.getCompById(companyId);
|
||||
request.setAttribute("company", company);
|
||||
model.addAttribute("description", description);
|
||||
if (str.length>2) {
|
||||
if (str.length > 2) {
|
||||
String maintenanceType = str[2];
|
||||
model.addAttribute("maintenanceType", maintenanceType);
|
||||
}
|
||||
return "/activiti/modelEdit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑流程图
|
||||
* @author wuping
|
||||
*
|
||||
* @return
|
||||
* @author wuping
|
||||
*/
|
||||
@RequestMapping("/editFlow.do")
|
||||
public String editFlow(HttpServletRequest request,Model model) {
|
||||
public String editFlow(HttpServletRequest request, Model model) {
|
||||
return "/activiti/modelFlowEdit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑流程节点添加业务
|
||||
* @author wuping
|
||||
*
|
||||
* @return
|
||||
* @author wuping
|
||||
*/
|
||||
@RequestMapping("/editNode.do")
|
||||
public String editNode(HttpServletRequest request,Model model) {
|
||||
public String editNode(HttpServletRequest request, Model model) {
|
||||
//String prString= request.getParameter("processTypeId");
|
||||
String modelid = request.getParameter("modelid");
|
||||
int index=0;
|
||||
int index = 0;
|
||||
String resourceId = request.getParameter("resourceId");
|
||||
String bizId = request.getParameter("bizId");
|
||||
Company company = this.unitService.getCompById(bizId);
|
||||
@ -667,22 +682,22 @@ public class ModelController {
|
||||
Object businessid = "";
|
||||
try {
|
||||
modelNode = (ObjectNode) new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelid));
|
||||
for(int i=0;i<modelNode.get("childShapes").size();i++){
|
||||
if(modelNode.get("childShapes").path(i).get("resourceId").asText().equals(resourceId)){
|
||||
for (int i = 0; i < modelNode.get("childShapes").size(); i++) {
|
||||
if (modelNode.get("childShapes").path(i).get("resourceId").asText().equals(resourceId)) {
|
||||
index = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
JsonNode json =modelNode.get("childShapes").path(index);
|
||||
JsonNode json = modelNode.get("childShapes").path(index);
|
||||
JsonNode properties = json.get("properties");
|
||||
System.out.println(properties);
|
||||
name =properties.get("name").asText();
|
||||
name = properties.get("name").asText();
|
||||
JsonNode stencil = json.get("stencil");
|
||||
nodetype =stencil.get("id").asText();
|
||||
businessid =properties.get("documentation");
|
||||
if(businessid != null){
|
||||
businessid =properties.get("documentation").asText();
|
||||
}else{
|
||||
nodetype = stencil.get("id").asText();
|
||||
businessid = properties.get("documentation");
|
||||
if (businessid != null) {
|
||||
businessid = properties.get("documentation").asText();
|
||||
} else {
|
||||
businessid = "";
|
||||
}
|
||||
|
||||
@ -709,45 +724,50 @@ public class ModelController {
|
||||
|
||||
/**
|
||||
* 流程节点列表
|
||||
* @author wuping
|
||||
*
|
||||
* @return
|
||||
* @author wuping
|
||||
*/
|
||||
@RequestMapping("modelNode.do")
|
||||
public ModelAndView modelNode(HttpServletRequest request,Model model) {
|
||||
public ModelAndView modelNode(HttpServletRequest request, Model model) {
|
||||
String modelId = request.getParameter("modelid");
|
||||
org.activiti.engine.repository.Model modelData = repositoryService.getModel(modelId);
|
||||
model.addAttribute("model", modelData);
|
||||
JSONArray jsonArray =new JSONArray();
|
||||
JSONArray jsonArray = new JSONArray();
|
||||
|
||||
Map map;
|
||||
try {
|
||||
ObjectNode modelNode = (ObjectNode) new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelData.getId()));
|
||||
JsonNode childShapes =modelNode.get("childShapes");
|
||||
if(childShapes!= null && childShapes.size()>0){
|
||||
for(int i=0;i<childShapes.size();i++){
|
||||
JsonNode childShapes = modelNode.get("childShapes");
|
||||
if (childShapes != null && childShapes.size() > 0) {
|
||||
for (int i = 0; i < childShapes.size(); i++) {
|
||||
JsonNode stencil = childShapes.path(i).get("stencil");
|
||||
if(stencil.get("id").asText().toString().equals("UserTask")){
|
||||
if (stencil.get("id").asText().toString().equals("UserTask")) {
|
||||
JSONObject json = JSONObject.fromObject(childShapes.path(i).toString());
|
||||
JSONObject properties = JSONObject.fromObject(json.get("properties").toString());
|
||||
String documentation = properties.get("documentation").toString();
|
||||
|
||||
String documentation = "";
|
||||
Object documentation1 = properties.get("documentation");
|
||||
if (documentation1 != null) {
|
||||
documentation = documentation1.toString();
|
||||
json.put("businessunit", businessUnitService.selectById(documentation));
|
||||
}
|
||||
// 获取节点名称
|
||||
String nodeName = "";
|
||||
if(properties.has("name") && properties.get("name") != null) {
|
||||
if (properties.has("name") && properties.get("name") != null) {
|
||||
nodeName = properties.get("name").toString();
|
||||
}else if(properties.has("namename") && properties.get("namename") != null) {
|
||||
nodeName = properties.get("namename").toString();
|
||||
}
|
||||
// 添加节点名称字段，方便前端显示
|
||||
json.put("nodeName", nodeName);
|
||||
|
||||
json.put("businessunit", businessUnitService.selectById(documentation));
|
||||
String resourceId = json.get("resourceId").toString();
|
||||
List<ModelNodeJob> list = this.jobService.selectModelNodeJobListByWhere(" where resource_id='"+resourceId+"' and model_id ='"+modelData.getId()+"' ");
|
||||
StringBuilder jobNames= new StringBuilder();
|
||||
StringBuilder jobIds= new StringBuilder();
|
||||
if(list != null && !list.isEmpty()){
|
||||
for(int j=0;j<list.size();j++){
|
||||
if(list.get(j)!=null){
|
||||
if(list.get(j).getName() != null && list.get(j).getName() !="" && list.get(j).getName() != "null"){
|
||||
List<ModelNodeJob> list = this.jobService.selectModelNodeJobListByWhere(" where resource_id='" + resourceId + "' and model_id ='" + modelData.getId() + "' ");
|
||||
StringBuilder jobNames = new StringBuilder();
|
||||
StringBuilder jobIds = new StringBuilder();
|
||||
if (list != null && !list.isEmpty()) {
|
||||
for (int j = 0; j < list.size(); j++) {
|
||||
if (list.get(j) != null) {
|
||||
if (list.get(j).getName() != null && list.get(j).getName() != "" && list.get(j).getName() != "null") {
|
||||
jobNames.append(list.get(j).getName()).append(",");
|
||||
jobIds.append(list.get(j).getJobId()).append(",");
|
||||
}
|
||||
@ -756,7 +776,7 @@ public class ModelController {
|
||||
|
||||
}
|
||||
}
|
||||
if(!jobNames.toString().isEmpty()){
|
||||
if (!jobNames.toString().isEmpty()) {
|
||||
json.put("jobNames", jobNames.toString());
|
||||
json.put("jobIds", jobIds.toString());
|
||||
|
||||
@ -768,7 +788,7 @@ public class ModelController {
|
||||
}
|
||||
}
|
||||
String result = "{\"total\":" + jsonArray.size() + ",\"rows\":" + jsonArray + "}";
|
||||
model.addAttribute("result",result);
|
||||
model.addAttribute("result", result);
|
||||
|
||||
|
||||
} catch (JsonProcessingException e) {
|
||||
@ -782,32 +802,33 @@ public class ModelController {
|
||||
return new ModelAndView("result");
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新模型
|
||||
*/
|
||||
@RequestMapping(value = "update", method = RequestMethod.POST)
|
||||
public String update(HttpServletRequest request,Model model,
|
||||
@RequestParam(value ="id") String id,
|
||||
@RequestParam(value ="name") String name,
|
||||
@RequestParam(value ="description", required=false) String description,
|
||||
@RequestParam(value ="companyid") String companyid,
|
||||
@RequestParam(value ="processType") String processType,HttpServletResponse response){
|
||||
User cu= (User)request.getSession().getAttribute("cu");
|
||||
public String update(HttpServletRequest request, Model model,
|
||||
@RequestParam(value = "id") String id,
|
||||
@RequestParam(value = "name") String name,
|
||||
@RequestParam(value = "description", required = false) String description,
|
||||
@RequestParam(value = "companyid") String companyid,
|
||||
@RequestParam(value = "processType") String processType, HttpServletResponse response) {
|
||||
User cu = (User) request.getSession().getAttribute("cu");
|
||||
|
||||
String result="";
|
||||
String result = "";
|
||||
try {
|
||||
|
||||
org.activiti.engine.repository.Model modelData = repositoryService.getModel(id);
|
||||
modelData.setName(name);
|
||||
String modelKey=processType+"-"+companyid;
|
||||
String maintenanceType=request.getParameter("maintenanceType");
|
||||
String modelKey = processType + "-" + companyid;
|
||||
String maintenanceType = request.getParameter("maintenanceType");
|
||||
if (ProcessType.B_Maintenance.getId().equals(processType)) {
|
||||
modelKey+="-"+maintenanceType;
|
||||
modelKey += "-" + maintenanceType;
|
||||
}
|
||||
modelData.setKey(modelKey);//模型key
|
||||
description = StringUtils.defaultString(description);
|
||||
String metainfo = modelData.getMetaInfo();
|
||||
JSONObject modelObjectNode = JSONObject.fromObject(metainfo) ;
|
||||
JSONObject modelObjectNode = JSONObject.fromObject(metainfo);
|
||||
modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
|
||||
modelData.setMetaInfo(modelObjectNode.toString());
|
||||
repositoryService.saveModel(modelData);
|
||||
@ -819,7 +840,7 @@ public class ModelController {
|
||||
propertiesNode.put("name", modelData.getName());
|
||||
modelNode.put("properties", propertiesNode);
|
||||
repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
|
||||
result=modelData.getId();
|
||||
result = modelData.getId();
|
||||
} catch (Exception e) {
|
||||
logger.error("创建模型失败：", e);
|
||||
}
|
||||
@ -827,17 +848,18 @@ public class ModelController {
|
||||
model.addAttribute("result", result);
|
||||
return "result";
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建模型
|
||||
*/
|
||||
@RequestMapping(value = "create", method = RequestMethod.POST)
|
||||
public String create(HttpServletRequest request,Model model,
|
||||
@RequestParam(value ="name") String name,
|
||||
@RequestParam(value ="description", required=false) String description,
|
||||
@RequestParam(value ="companyid") String companyid,
|
||||
@RequestParam(value ="processType") String processType,
|
||||
public String create(HttpServletRequest request, Model model,
|
||||
@RequestParam(value = "name") String name,
|
||||
@RequestParam(value = "description", required = false) String description,
|
||||
@RequestParam(value = "companyid") String companyid,
|
||||
@RequestParam(value = "processType") String processType,
|
||||
HttpServletResponse response) {
|
||||
String result="";
|
||||
String result = "";
|
||||
try {
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
ObjectNode editorNode = objectMapper.createObjectNode();
|
||||
@ -854,10 +876,10 @@ public class ModelController {
|
||||
modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
|
||||
modelData.setMetaInfo(modelObjectNode.toString());
|
||||
modelData.setName(name);
|
||||
String maintenanceType=request.getParameter("maintenanceType");
|
||||
String modelKey=processType+"-"+companyid;
|
||||
String maintenanceType = request.getParameter("maintenanceType");
|
||||
String modelKey = processType + "-" + companyid;
|
||||
if (ProcessType.B_Maintenance.getId().equals(processType)) {
|
||||
modelKey+="-"+maintenanceType;
|
||||
modelKey += "-" + maintenanceType;
|
||||
}
|
||||
modelData.setKey(modelKey);//模型key
|
||||
|
||||
@ -869,37 +891,39 @@ public class ModelController {
|
||||
|
||||
repositoryService.saveModel(modelData);
|
||||
repositoryService.addModelEditorSource(modelData.getId(), editorNode.toString().getBytes("utf-8"));
|
||||
result=modelData.getId();
|
||||
result = modelData.getId();
|
||||
} catch (Exception e) {
|
||||
logger.error("创建模型失败：", e);
|
||||
}
|
||||
model.addAttribute("result",result );
|
||||
model.addAttribute("result", result);
|
||||
return "result";
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新业务流程节点
|
||||
* @author wuping
|
||||
*
|
||||
* @return
|
||||
* @author wuping
|
||||
*/
|
||||
@RequestMapping("/saveNode.do")
|
||||
public String saveNode(HttpServletRequest request,Model model,
|
||||
@RequestParam(value ="businessid") String businessid,
|
||||
@RequestParam(value ="nodename") String nodename,
|
||||
@RequestParam(value ="modelid") String modelid,
|
||||
@RequestParam(value ="index") String index,
|
||||
@RequestParam(value = "countersign",required = false,defaultValue = "false") boolean countersign,
|
||||
public String saveNode(HttpServletRequest request, Model model,
|
||||
@RequestParam(value = "businessid") String businessid,
|
||||
@RequestParam(value = "nodename") String nodename,
|
||||
@RequestParam(value = "modelid") String modelid,
|
||||
@RequestParam(value = "index") String index,
|
||||
@RequestParam(value = "countersign", required = false, defaultValue = "false") boolean countersign,
|
||||
HttpServletResponse response) {
|
||||
String result="";
|
||||
String result = "";
|
||||
JsonNode modelNode;
|
||||
JSONObject modelobject;
|
||||
BpmnModel bpmnModel ;
|
||||
BpmnModel bpmnModel;
|
||||
BpmnJsonConverter bpmnJsonConverter;
|
||||
try {
|
||||
int i = Integer.valueOf(index);
|
||||
modelNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelid));
|
||||
modelobject = JSONObject.fromObject(new ObjectMapper().writeValueAsString(modelNode));
|
||||
JSONObject json= modelobject.getJSONArray("childShapes").getJSONObject(i);
|
||||
JSONObject properties =json.getJSONObject("properties");
|
||||
JSONObject json = modelobject.getJSONArray("childShapes").getJSONObject(i);
|
||||
JSONObject properties = json.getJSONObject("properties");
|
||||
properties.put("documentation", businessid);
|
||||
properties.put("name", nodename);
|
||||
properties.put("nodename", nodename);
|
||||
@ -944,7 +968,7 @@ public class ModelController {
|
||||
} catch (Exception e) {
|
||||
logger.error("创建模型失败：", e);
|
||||
}
|
||||
model.addAttribute("result",result );
|
||||
model.addAttribute("result", result);
|
||||
return "result";
|
||||
}
|
||||
|
||||
@ -952,64 +976,64 @@ public class ModelController {
|
||||
* 根据Model部署流程
|
||||
*/
|
||||
@RequestMapping(value = "deploy", method = RequestMethod.POST)
|
||||
public String deploy(HttpServletRequest request,Model model,
|
||||
@RequestParam(value ="modelId") String modelId) {
|
||||
public String deploy(HttpServletRequest request, Model model,
|
||||
@RequestParam(value = "modelId") String modelId) {
|
||||
/*String result=processModelService.deploy(modelId);
|
||||
model.addAttribute("result",result);
|
||||
return "result";*/
|
||||
|
||||
|
||||
String result="";
|
||||
String result = "";
|
||||
JsonNode modelNode;
|
||||
JSONObject modelobject;
|
||||
JSONArray childShapes;
|
||||
try {
|
||||
modelNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelId));
|
||||
modelobject = JSONObject.fromObject(new ObjectMapper().writeValueAsString(modelNode));
|
||||
if(modelobject.get("childShapes")!=null){
|
||||
childShapes= modelobject.getJSONArray("childShapes");
|
||||
for(int i=0;i<childShapes.size();i++){
|
||||
JSONObject json= childShapes.getJSONObject(i);
|
||||
JSONObject properties =json.getJSONObject("properties");
|
||||
JSONObject stencil =json.getJSONObject("stencil");
|
||||
if(!stencil.get("id").toString().equals("StartNoneEvent")&&!stencil.get("id").toString().equals("UserTask")&&!stencil.get("id").toString().equals("SequenceFlow")&&!stencil.get("id").toString().equals("EndNoneEvent")
|
||||
&&!stencil.get("id").toString().equals("ExclusiveGateway")){
|
||||
model.addAttribute("result","{\"res\":\"0\",\"restr\":\"部署失败，请勿添加除任务、单一选择的网关、开始、结束以外的流程图元素！\"}" );
|
||||
if (modelobject.get("childShapes") != null) {
|
||||
childShapes = modelobject.getJSONArray("childShapes");
|
||||
for (int i = 0; i < childShapes.size(); i++) {
|
||||
JSONObject json = childShapes.getJSONObject(i);
|
||||
JSONObject properties = json.getJSONObject("properties");
|
||||
JSONObject stencil = json.getJSONObject("stencil");
|
||||
if (!stencil.get("id").toString().equals("StartNoneEvent") && !stencil.get("id").toString().equals("UserTask") && !stencil.get("id").toString().equals("SequenceFlow") && !stencil.get("id").toString().equals("EndNoneEvent")
|
||||
&& !stencil.get("id").toString().equals("ExclusiveGateway")) {
|
||||
model.addAttribute("result", "{\"res\":\"0\",\"restr\":\"部署失败，请勿添加除任务、单一选择的网关、开始、结束以外的流程图元素！\"}");
|
||||
return "result";
|
||||
}
|
||||
if(stencil.get("id").toString().equals("UserTask")){
|
||||
if(properties.get("documentation").toString().equals("")||properties.get("documentation").toString()== null){
|
||||
model.addAttribute("result","{\"res\":\"0\",\"restr\":\"部署失败，请为节点添加业务！\"}" );
|
||||
if (stencil.get("id").toString().equals("UserTask")) {
|
||||
if (properties.get("documentation").toString().equals("") || properties.get("documentation").toString() == null) {
|
||||
model.addAttribute("result", "{\"res\":\"0\",\"restr\":\"部署失败，请为节点添加业务！\"}");
|
||||
return "result";
|
||||
}
|
||||
}
|
||||
//properties.put("documentation", businessid);
|
||||
//properties.put("usertaskassignment", "{\"assignment\":{\"candidateUsers\":[{\"value\":\"#{userIds}\",\"$$hashKey\":\"0BQ\"}],\"assignee\":\"${applicantId}\"}}");
|
||||
if(stencil.get("id").toString().indexOf("SequenceFlow")!=-1){
|
||||
String regEx="[^0-9]";
|
||||
if (stencil.get("id").toString().indexOf("SequenceFlow") != -1) {
|
||||
String regEx = "[^0-9]";
|
||||
Pattern p = Pattern.compile(regEx);
|
||||
Matcher m = p.matcher(properties.get("name").toString());
|
||||
String numstr = m.replaceAll("").trim();
|
||||
numstr=numstr.isEmpty()?"0":numstr;
|
||||
numstr = numstr.isEmpty() ? "0" : numstr;
|
||||
int num = Integer.valueOf(numstr);
|
||||
if(properties.get("name").toString().startsWith("通过")){
|
||||
if(num>0){
|
||||
properties.put("conditionsequenceflow", "${pass && route=="+num+"}");
|
||||
}else{
|
||||
if (properties.get("name").toString().startsWith("通过")) {
|
||||
if (num > 0) {
|
||||
properties.put("conditionsequenceflow", "${pass && route==" + num + "}");
|
||||
} else {
|
||||
properties.put("conditionsequenceflow", "${pass}");
|
||||
}
|
||||
}
|
||||
if(properties.get("name").toString().startsWith("不通过")){
|
||||
if(num>0){
|
||||
properties.put("conditionsequenceflow", "${!pass && route=="+num+"}");
|
||||
}else{
|
||||
if (properties.get("name").toString().startsWith("不通过")) {
|
||||
if (num > 0) {
|
||||
properties.put("conditionsequenceflow", "${!pass && route==" + num + "}");
|
||||
} else {
|
||||
properties.put("conditionsequenceflow", "${!pass}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
model.addAttribute("result","{\"res\":\"0\",\"restr\":\"部署失败,请编辑流程图！\"}" );
|
||||
} else {
|
||||
model.addAttribute("result", "{\"res\":\"0\",\"restr\":\"部署失败,请编辑流程图！\"}");
|
||||
return "result";
|
||||
}
|
||||
|
||||
@ -1018,12 +1042,12 @@ public class ModelController {
|
||||
//JSON ----> JsonNode
|
||||
JsonNode editorNode = mapper.readTree(modelobject.toString());
|
||||
repositoryService.addModelEditorSource(modelId, editorNode.toString().getBytes("utf-8"));
|
||||
result=processModelService.deploy(modelId);
|
||||
model.addAttribute("result",result );
|
||||
result = processModelService.deploy(modelId);
|
||||
model.addAttribute("result", result);
|
||||
return "result";
|
||||
} catch (Exception e) {
|
||||
logger.error("创建模型失败：", e);
|
||||
model.addAttribute("result","{\"res\":\"0\",\"restr\":\"部署失败！\"}" );
|
||||
model.addAttribute("result", "{\"res\":\"0\",\"restr\":\"部署失败！\"}");
|
||||
return "result";
|
||||
}
|
||||
|
||||
@ -1053,8 +1077,8 @@ public class ModelController {
|
||||
}
|
||||
|
||||
@RequestMapping("/delete.do")
|
||||
public String dodel(HttpServletRequest request,Model model,
|
||||
@RequestParam(value="id") String id){
|
||||
public String dodel(HttpServletRequest request, Model model,
|
||||
@RequestParam(value = "id") String id) {
|
||||
repositoryService.deleteModel(id);
|
||||
model.addAttribute("result", 1);
|
||||
return "result";
|
||||
@ -1094,7 +1118,7 @@ public class ModelController {
|
||||
|
||||
// 构建模型Key
|
||||
String modelKey = null;
|
||||
User cu = (User)request.getSession().getAttribute("cu");
|
||||
User cu = (User) request.getSession().getAttribute("cu");
|
||||
if (companyId != null && !companyId.isEmpty()) {
|
||||
modelKey = "imported-" + companyId;
|
||||
} else if (cu != null && !cu.getId().equals(CommString.ID_Admin)) {
|
||||
@ -1145,7 +1169,7 @@ public class ModelController {
|
||||
|
||||
try {
|
||||
// 获取当前用户和公司信息
|
||||
User cu = (User)request.getSession().getAttribute("cu");
|
||||
User cu = (User) request.getSession().getAttribute("cu");
|
||||
String processTypeId = request.getParameter("processTypeId");
|
||||
String companyId = request.getParameter("companyId");
|
||||
String maintenanceType = request.getParameter("maintenanceType");
|
||||
|
||||
Reference in New Issue
Block a user