diff --git a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiModelServiceImpl.java b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiModelServiceImpl.java index 5cca72a8980c8f09ef4f1a958128e33d5a615fb2..bb90b13ce22d7dc216050f4d5b318b240ee074be 100644 --- a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiModelServiceImpl.java +++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiModelServiceImpl.java @@ -134,6 +134,9 @@ public class ActivitiModelServiceImpl implements ActivitiModelService{ @Autowired private DsFormPageDao dsFormPageDao; + + @Autowired + private DsFormPageSequenceDao dsFormPageSequenceDao; @Autowired public JedisClientService jedisClient; @@ -1790,7 +1793,7 @@ public class ActivitiModelServiceImpl implements ActivitiModelService{ dsFormPageDao.insertDsFormPageData(beans);//插入DsFormPageData表 Map entity = dsFormPageService.getDsFormPageSequence(userId, pageId, map.get("message").toString(), StringUtils.EMPTY); entity.put("sequenceId", sequenceId); - dsFormPageDao.insertDsFormPageSequence(Arrays.asList(entity)); + dsFormPageSequenceDao.insertDsFormPageSequence(Arrays.asList(entity)); }else{ outputObject.setreturnMessage(map.get("message").toString()); } diff --git a/skyeye-activiti/src/main/java/com/skyeye/eve/controller/PageSequenceController.java b/skyeye-activiti/src/main/java/com/skyeye/eve/controller/PageSequenceController.java index 546e9f38424e007ec830557e405214fdf628d53f..5360e52a6d4781ab33e5cd5320b5ee96e037038c 100644 --- a/skyeye-activiti/src/main/java/com/skyeye/eve/controller/PageSequenceController.java +++ b/skyeye-activiti/src/main/java/com/skyeye/eve/controller/PageSequenceController.java @@ -1,6 +1,7 @@ /******************************************************************************* * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ + package com.skyeye.eve.controller; import org.springframework.beans.factory.annotation.Autowired; diff --git a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActModleTypeDao.java b/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActModleTypeDao.java index f9c3cb2a2c56c1127f4d51dc6ced46c3c9c65270..5385d3ff79e4d1fd1e9bd4d1e802709ae4685300 100644 --- a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActModleTypeDao.java +++ b/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActModleTypeDao.java @@ -34,8 +34,6 @@ public interface ActModleTypeDao { public List> queryAllDsForm(Map map) throws Exception; - public List> queryDsFormMationToEdit( Map map) throws Exception; - public int editDsFormMationBySequenceId(Map m) throws Exception; public void editDsFormMationBySequenceIdAndProcessInstanceId(Map job) throws Exception; diff --git a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActModleTypeServiceImpl.java b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActModleTypeServiceImpl.java index ea401d956b4aee3a760963bafe3e3cc266e2d326..be51ddbfc005f66926e8f3667cf977020362479c 100644 --- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActModleTypeServiceImpl.java +++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActModleTypeServiceImpl.java @@ -14,6 +14,7 @@ import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.ActModelDao; import com.skyeye.eve.dao.ActModleTypeDao; +import com.skyeye.eve.dao.DsFormPageDao; import com.skyeye.eve.service.ActModleTypeService; import com.skyeye.jedis.JedisClientService; import org.activiti.engine.RepositoryService; @@ -26,6 +27,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -60,6 +62,9 @@ public class ActModleTypeServiceImpl implements ActModleTypeService { @Autowired private RuntimeService runtimeService; + @Autowired + private DsFormPageDao dsFormPageDao; + public static enum ActModelTypeState{ START_NEW(1, "新建"), START_UP(2, "上线"), @@ -574,7 +579,6 @@ public class ActModleTypeServiceImpl implements ActModleTypeService { * @return void 返回类型 * @throws */ - @SuppressWarnings("unchecked") @Override public void queryActModleUpStateByUpStateType(InputObject inputObject, OutputObject outputObject) throws Exception { Map map = inputObject.getParams(); @@ -626,7 +630,8 @@ public class ActModleTypeServiceImpl implements ActModleTypeService { @Override public void queryDsFormMationToEdit(InputObject inputObject, OutputObject outputObject) throws Exception { Map map = inputObject.getParams(); - List> beans = actModleTypeDao.queryDsFormMationToEdit(map); + String id = map.get("id").toString(); + List> beans = dsFormPageDao.queryDsFormPageDataListBySequenceId(Arrays.asList(id)); outputObject.setBeans(beans); outputObject.settotal(beans.size()); } @@ -641,7 +646,6 @@ public class ActModleTypeServiceImpl implements ActModleTypeService { * @return void 返回类型 * @throws */ - @SuppressWarnings("unchecked") @Override @Transactional(value="transactionManager") public void editDsFormMationBySequenceId(InputObject inputObject, OutputObject outputObject) throws Exception { diff --git a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java index da806542a1c4fe726df2d5d5701d1f511b1fa9f6..dad6931d858f2bb040bed42595bea9bc2f666633 100644 --- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java +++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java @@ -11,7 +11,7 @@ import com.skyeye.activiti.service.ActivitiModelService; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.ToolUtil; -import com.skyeye.eve.dao.PageSequenceDao; +import com.skyeye.eve.dao.DsFormPageSequenceDao; import com.skyeye.eve.service.DsFormPageService; import com.skyeye.eve.service.PageSequenceService; import com.skyeye.jedis.JedisClientService; @@ -37,7 +37,7 @@ import java.util.Map; public class PageSequenceServiceImpl implements PageSequenceService{ @Autowired - private PageSequenceDao pageSequenceDao; + private DsFormPageSequenceDao dsFormPageSequenceDao; @Autowired private ActivitiModelService activitiModelService; @@ -63,7 +63,7 @@ public class PageSequenceServiceImpl implements PageSequenceService{ Map map = inputObject.getParams(); map.put("userId", inputObject.getLogParams().get("id")); Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); - List> beans = pageSequenceDao.queryDsFormISDraftListByUser(map); + List> beans = dsFormPageSequenceDao.queryDsFormISDraftListByUser(map); outputObject.setBeans(beans); outputObject.settotal(pages.getTotal()); } @@ -83,12 +83,12 @@ public class PageSequenceServiceImpl implements PageSequenceService{ public void deleteDsFormISDraftByUser(InputObject inputObject, OutputObject outputObject) throws Exception { Map map = inputObject.getParams(); map.put("userId", inputObject.getLogParams().get("id")); - Map bean = pageSequenceDao.queryDsFormStateById(map); + Map bean = dsFormPageSequenceDao.queryDsFormStateById(map); if(bean != null && !bean.isEmpty()){ //删除表单提交序列表数据 - pageSequenceDao.deleteDsFormISDraftByUser(map); + dsFormPageSequenceDao.deleteDsFormISDraftByUser(map); //删除表单数据提交数据 - pageSequenceDao.deleteDsFormContentISDraftByUser(map); + dsFormPageSequenceDao.deleteDsFormContentISDraftByUser(map); }else{ outputObject.setreturnMessage("该数据状态已改变或不属于当前登录账号."); } @@ -107,7 +107,7 @@ public class PageSequenceServiceImpl implements PageSequenceService{ @Override public void queryDsFormISDraftToEditById(InputObject inputObject, OutputObject outputObject) throws Exception { Map map = inputObject.getParams(); - List> beans = pageSequenceDao.queryDsFormISDraftToEditById(map); + List> beans = dsFormPageSequenceDao.queryDsFormISDraftToEditById(map); outputObject.setBeans(beans); outputObject.settotal(beans.size()); } @@ -130,7 +130,7 @@ public class PageSequenceServiceImpl implements PageSequenceService{ List> json = JSONUtil.toList(str, null); for(int i = 0; i < json.size(); i++){ Map jObject = json.get(i);// 遍历 jsonarray 数组，把每一个对象转成 json 对象 - pageSequenceDao.editDsFormISDraftById(jObject); + dsFormPageSequenceDao.editDsFormISDraftById(jObject); } } } @@ -151,7 +151,7 @@ public class PageSequenceServiceImpl implements PageSequenceService{ Map user = inputObject.getLogParams(); map.put("userId", user.get("id")); //查询为草稿状态的提交项 - Map bean = pageSequenceDao.queryDsFormStateById(map); + Map bean = dsFormPageSequenceDao.queryDsFormStateById(map); if(bean != null && !bean.isEmpty()){ if(!bean.containsKey("actKey") || ToolUtil.isBlank(bean.get("actKey").toString())){ outputObject.setreturnMessage("该表单还未绑定工作流，请联系管理员."); @@ -161,7 +161,7 @@ public class PageSequenceServiceImpl implements PageSequenceService{ List> items = dsFormPageService.getDsFormPageContentByFormId(map.get("pageId").toString()); // 获取数据 Map subFormData = new HashMap<>(); - List> rows = pageSequenceDao.queryDsFormContentBySequenceId(map); + List> rows = dsFormPageSequenceDao.queryDsFormContentBySequenceId(map); for(Map row : rows){ for(Map item : items){ if(row.get("rowId").toString().equals(item.get("id").toString())){ @@ -178,7 +178,7 @@ public class PageSequenceServiceImpl implements PageSequenceService{ if("0".equals(map.get("code").toString())){ //请求成功 map.put("processInId", map.get("message")); - pageSequenceDao.editDsFormISDraftToSubApprovalById(map); + dsFormPageSequenceDao.editDsFormISDraftToSubApprovalById(map); }else{ outputObject.setreturnMessage(map.get("message").toString()); } @@ -200,7 +200,7 @@ public class PageSequenceServiceImpl implements PageSequenceService{ @Override public void queryDsFormISDraftDetailsById(InputObject inputObject, OutputObject outputObject) throws Exception { Map map = inputObject.getParams(); - List> rows = pageSequenceDao.queryDsFormISDraftDetailsById(map); + List> rows = dsFormPageSequenceDao.queryDsFormISDraftDetailsById(map); outputObject.setBeans(rows); outputObject.settotal(rows.size()); } diff --git a/skyeye-activiti/src/main/resources/mapper/activiti/ActModleTypeMapper.xml b/skyeye-activiti/src/main/resources/mapper/activiti/ActModleTypeMapper.xml index eb1dd5f6ca420d44f5764798c78afe2d1f6c5833..2b903590a6fe9af101cafcd2ddca2a1df5a0e664 100644 --- a/skyeye-activiti/src/main/resources/mapper/activiti/ActModleTypeMapper.xml +++ b/skyeye-activiti/src/main/resources/mapper/activiti/ActModleTypeMapper.xml @@ -125,33 +125,7 @@ FROM ds_form_page a - - - + UPDATE ds_form_page_data diff --git a/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormPageController.java b/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormPageController.java index 953f7138475879dac7f99aa544afd498b8ed18cc..01a27fcaa7bd964a8a76ee4ea6a5843ebd7a2f64 100644 --- a/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormPageController.java +++ b/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormPageController.java @@ -237,5 +237,17 @@ public class DsFormPageController { dsFormPageService.saveDsFormDataList(inputObject, outputObject); } - + /** + * 根据objectId获取动态表单信息 + * + * @param inputObject + * @param outputObject + * @throws Exception + */ + @RequestMapping("/post/DsFormPageController/queryDsFormDataListByObjectId") + @ResponseBody + public void queryDsFormDataListByObjectId(InputObject inputObject, OutputObject outputObject) throws Exception{ + dsFormPageService.queryDsFormDataListByObjectId(inputObject, outputObject); + } + } diff --git a/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageDao.java b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageDao.java index 7f6bc145093deca29ed0d20f6edff004619a764b..f6b8d589bbf4295a1f2dbeec4a4a421895e5c5b7 100644 --- a/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageDao.java +++ b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageDao.java @@ -51,8 +51,8 @@ public interface DsFormPageDao { public Map queryFromDsFormPageContent(@Param("pageContentId") String pageContentId) throws Exception; - public int insertDsFormPageSequence(List> pageSequence) throws Exception; - public int insertDsFormPageData(List> beans) throws Exception; + List> queryDsFormPageDataListBySequenceId(@Param("sequenceIds") List sequenceIds) throws Exception; + } diff --git a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/PageSequenceDao.java b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageSequenceDao.java similarity index 84% rename from skyeye-activiti/src/main/java/com/skyeye/eve/dao/PageSequenceDao.java rename to skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageSequenceDao.java index be5349aac82e68c22ff5768d4c86f11731b37d53..e47d9f143db819471182bdc382d81a84795eb366 100644 --- a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/PageSequenceDao.java +++ b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageSequenceDao.java @@ -4,6 +4,8 @@ package com.skyeye.eve.dao; +import org.apache.ibatis.annotations.Param; + import java.util.List; import java.util.Map; @@ -17,7 +19,7 @@ import java.util.Map; * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ -public interface PageSequenceDao { +public interface DsFormPageSequenceDao { public List> queryDsFormISDraftListByUser(Map map) throws Exception; @@ -37,4 +39,8 @@ public interface PageSequenceDao { public List> queryDsFormISDraftDetailsById(Map map) throws Exception; + int insertDsFormPageSequence(List> pageSequence) throws Exception; + + List> queryDsFormPageSequenceListByObjectId(@Param("objectId") String objectId) throws Exception; + } diff --git a/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormPageService.java b/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormPageService.java index 578434b61bb4de5ab333d0316eb6cdfbd15e325b..cb6a08b2f094d11bb3d66d7603d9ed0c12d3b507 100644 --- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormPageService.java +++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormPageService.java @@ -69,4 +69,5 @@ public interface DsFormPageService { Map getDsFormPageData(String pageContentId, String value, String text, String showType, String sequenceId, String userId) throws Exception; + void queryDsFormDataListByObjectId(InputObject inputObject, OutputObject outputObject) throws Exception; } diff --git a/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormPageServiceImpl.java b/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormPageServiceImpl.java index f94f08945f1a28d5426805ba18b25ce502d26f27..accc6c5f88f55090226bf908c84c0e734a3e5b4c 100644 --- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormPageServiceImpl.java +++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormPageServiceImpl.java @@ -16,6 +16,7 @@ import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.HttpClient; import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.DsFormPageDao; +import com.skyeye.eve.dao.DsFormPageSequenceDao; import com.skyeye.eve.service.DsFormPageService; import com.skyeye.jedis.JedisClientService; import org.apache.commons.lang3.StringUtils; @@ -25,10 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @@ -50,6 +48,9 @@ public class DsFormPageServiceImpl implements DsFormPageService { @Autowired public JedisClientService jedisClient; + + @Autowired + private DsFormPageSequenceDao dsFormPageSequenceDao; /** * @@ -348,7 +349,7 @@ public class DsFormPageServiceImpl implements DsFormPageService { } /** - * 根据code获取动添表单信息 + * 根据code获取动态表单信息 * * @param inputObject * @param outputObject @@ -403,7 +404,7 @@ public class DsFormPageServiceImpl implements DsFormPageService { } // 插入ds_form_page_sequence表 if(!pageSequence.isEmpty()){ - dsFormPageDao.insertDsFormPageSequence(pageSequence); + dsFormPageSequenceDao.insertDsFormPageSequence(pageSequence); } } @@ -417,6 +418,7 @@ public class DsFormPageServiceImpl implements DsFormPageService { * @return * @throws Exception */ + @Override public Map getDsFormPageSequence(String userId, String dsFormPageId, String processInstanceId, String objectId) { Map sequence = new HashMap<>(); sequence.put("sequenceId", ToolUtil.getSurFaceId()); @@ -443,4 +445,23 @@ public class DsFormPageServiceImpl implements DsFormPageService { return data; } + /** + * 根据objectId获取动态表单信息 + * + * @param inputObject + * @param outputObject + * @throws Exception + */ + @Override + public void queryDsFormDataListByObjectId(InputObject inputObject, OutputObject outputObject) throws Exception { + Map map = inputObject.getParams(); + String objectId = map.get("objectId").toString(); + List> dsFormList = dsFormPageSequenceDao.queryDsFormPageSequenceListByObjectId(objectId); + for(Map bean: dsFormList) { + bean.put("content", dsFormPageDao.queryDsFormPageDataListBySequenceId(Arrays.asList(bean.get("sequenceId").toString()))); + } + outputObject.setBeans(dsFormList); + outputObject.settotal(dsFormList.size()); + } + } diff --git a/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageMapper.xml b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageMapper.xml index 77ea32c7fcef5282c5317b59211f62e08ae43c39..d0fef6d038a6de1bc496858e271e7aa13626bac8 100644 --- a/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageMapper.xml +++ b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageMapper.xml @@ -244,15 +244,6 @@ AND b.id = a.form_content_id - - INSERT INTO ds_form_page_sequence - (id, page_id, process_instance_id, create_id, create_time, object_id) - VALUES - - (#{item.sequenceId}, #{item.pageId}, #{item.processInstanceId}, #{item.createId}, #{item.createTime}, #{item.objectId}) - - - INSERT INTO ds_form_page_data (id, content_id, sequence_id, page_id, title, placeholder, `require`, html_content, js_content, @@ -266,4 +257,38 @@ + + \ No newline at end of file diff --git a/skyeye-activiti/src/main/resources/mapper/activiti/PageSequenceMapper.xml b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageSequenceMapper.xml similarity index 80% rename from skyeye-activiti/src/main/resources/mapper/activiti/PageSequenceMapper.xml rename to skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageSequenceMapper.xml index c369f076dc1c15826355837246c08154314e6bd7..07cdf15521c8a2ca15e54e1c231384ce78fc665a 100644 --- a/skyeye-activiti/src/main/resources/mapper/activiti/PageSequenceMapper.xml +++ b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageSequenceMapper.xml @@ -1,6 +1,6 @@ - + + + + INSERT INTO ds_form_page_sequence + (id, page_id, process_instance_id, create_id, create_time, object_id) + VALUES + + (#{item.sequenceId}, #{item.pageId}, #{item.processInstanceId}, #{item.createId}, #{item.createTime}, #{item.objectId}) + + + + \ No newline at end of file diff --git a/skyeye-dsform/src/main/resources/reqmapping/mapping/reqdsform.xml b/skyeye-dsform/src/main/resources/reqmapping/mapping/reqdsform.xml index 53fa57dc12c8455a54a985d9a9d1f266986492c8..c3e578647a6086f5603c481f365f6b5c48d78c54 100644 --- a/skyeye-dsform/src/main/resources/reqmapping/mapping/reqdsform.xml +++ b/skyeye-dsform/src/main/resources/reqmapping/mapping/reqdsform.xml @@ -164,6 +164,9 @@ + + +