DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改] 流程监听器的名称

Browse Source
This commit is contained in:
bupengxiang
2023-05-04 18:00:32 +08:00
parent d5214158fa
commit 0de7012353
16 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java
+3 -2
View File
@@ -120,6 +120,9 @@ public class ShiroFilterConfiguration {
filterChainDefinitionMap.put(restPath + "/updateUserInfo", ANON);
filterChainDefinitionMap.put(restPath + "/updatePassword", ANON);
filterChainDefinitionMap.put(restPath + "/user/supplierRegistry/*", ANON);
/* 流程需要 */
filterChainDefinitionMap.put(restPath + "/service/model/**", ANON);
filterChainDefinitionMap.put(restPath + "/service/editor/stencilset", ANON);
filterChainDefinitionMap.put(restPath + "/**", AUTHC);
@@ -132,8 +135,6 @@ public class ShiroFilterConfiguration {
filterChainDefinitionMap.put(adminPath + "/logout", "logout");
// filterChainDefinitionMap.put(restPath + "/**", "logout");
filterChainDefinitionMap.put("/swagger-ui.html", ANON);
/* 流程需要 */
filterChainDefinitionMap.put(restPath + "/service/model/**", ANON);
// filterChainDefinitionMap.put("/swagger-ui.html", "jwtFilter");
/* 全api一般需要登录才能使用 */
adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java
+2
View File
@@ -49,5 +49,7 @@ public interface PowerApplyActDao extends BaseMapper<PowerApplyAct> {
List<PowerApplyActPageVO> selectListBydataIdNodel(@Param("dataId")String dataId);
List<PowerApplyAct> selectActListBydataId(@Param("dataId")String dataId);
int batchDel(@Param("ids") List<String> ids);
}
adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java
+3
View File
@@ -1,6 +1,7 @@
package com.adc.da.report.dao.mysql;
import com.adc.da.report.eo.ReportEntity;
import com.adc.da.report.eo.TtReportManageAct;
import com.adc.da.report.vo.ReportQueryVo;
import com.adc.da.report.vo.ReportVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -59,4 +60,6 @@ public interface ReportDao extends BaseMapper<ReportEntity> {
List<String> isAct(@Param("Vo") ReportQueryVo vo);
long selectByidAndName(@Param("Vo")ReportEntity entity);
void saveReportAct(@Param("Vo") TtReportManageAct ttReportManageAct);
}
adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java
+2
View File
@@ -18,4 +18,6 @@ public interface ITtReportManageActService {
void saveOrUpdateSingle(TtReportManageAct ttReportManageAct);
void deleteById(DeleteParamRequestVO deleteParamVO);
void saveReport(TtReportManageAct ttReportManageAct);
}
adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
+19
View File
@@ -1,7 +1,10 @@
package com.adc.da.report.service.impl;
import com.adc.da.report.dao.mysql.PowerApplyDao;
import com.adc.da.report.dao.mysql.ReportDao;
import com.adc.da.report.dao.mysql.TtReportManageActDao;
import com.adc.da.report.eo.PowerApplyAct;
import com.adc.da.report.eo.TtReportManageAct;
import com.adc.da.report.service.ITtReportManageActService;
import com.adc.da.report.vo.DeleteParamRequestVO;
@@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -27,6 +31,12 @@ import java.util.List;
@Service
public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageActDao, TtReportManageAct> implements ITtReportManageActService {
@Autowired
ReportDao reportDao;
@Autowired
PowerApplyDao powerApplyDao;
/**
* @param ttReportManageActPageVO
* @return <com.adc.da.report.entity.TtReportManageAct>
@@ -108,4 +118,13 @@ public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageAct
ttReportManageAct.setDelFlag(1);
baseMapper.update(ttReportManageAct,wrapper);
}
@Override
public void saveReport(TtReportManageAct ttReportManageAct) {
//保存报告
reportDao.saveReportAct(ttReportManageAct);
//保存报告权限数据
List<PowerApplyAct> powerList = ttReportManageAct.getPowerList();
powerApplyDao.saveBatch(powerList);
}
}
adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml
+5
View File
@@ -113,4 +113,9 @@
left join TT_REPORT_MANAGE rep on a.report_id = rep.id
where a.data_id = #{dataId}
</select>
<select id="selectActListBydataId" resultType="com.adc.da.report.eo.PowerApplyAct">
select a.*
from <include refid="TableName"/> a
where a.data_id = #{dataId} and a.del_flag = 0
</select>
</mapper>
adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+19
View File
@@ -2,6 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.report.dao.mysql.ReportDao">
<!-- 通用查询结果列 -->
<sql id="BaseColumnList">
id,
data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
</sql>
<sql id="BaseColumnValue">
#{Vo.id},
#{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId},
#{Vo.confidentialLevel},#{Vo.privacyLevel},
#{Vo.createUserId},
#{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}
</sql>
<insert id="saveReportAct">
insert into TT_REPORT_MANAGE (<include refid="BaseColumnList"/>)
value (<include refid="BaseColumnValue"/>)
</insert>
<select id="getReportDateList" parameterType="string" resultType="string">
select distinct year from TT_REPORT_MANAGE t1
left join TR_REPORT_USER t2 on t1.id=t2.reportId
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+7
View File
@@ -444,6 +444,13 @@ public class TodoTaskController {
String string = JSONArray.toJSONString(powerApplyActs);
//去对应的 数据表查数据
busProcessNewVO.setDataJson(string);
}else if ("2".equals(prcType)){
TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId);
List<PowerApplyActPageVO> powerApplyActs = powerApplyActDao.selectListBydataId(dataId);
ttReportManageActPageVO.setPowerList(powerApplyActs);
String string = JSONArray.toJSONString(ttReportManageActPageVO);
//去对应的 数据表查数据
busProcessNewVO.setDataJson(string);
}
return busProcessNewVO;
}
report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid2.java → report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.List;
/**
* 上传报告 发起流程
*/
public class aid2 implements TaskListener {
public class oneApplyAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid4.java → report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.List;
/**
* 上传报告 发起流程
*/
public class aid4 implements TaskListener {
public class reEditAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid1.java → report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.List;
/**
* 上传报告 发起流程
*/
public class aid1 implements TaskListener {
public class startAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid3.java → report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java
+12 -3
View File
@@ -1,8 +1,11 @@
package com.adc.da.wkflow.listener.SCBG;
import com.adc.da.login.util.UserUtils;
import com.adc.da.report.dao.mysql.PowerApplyActDao;
import com.adc.da.report.dao.mysql.TtReportManageActDao;
import com.adc.da.report.eo.PowerApplyAct;
import com.adc.da.report.eo.TtReportManageAct;
import com.adc.da.report.service.ITtReportManageActService;
import com.adc.da.wkflow.business_main.entity.BusProcessApprove;
import com.adc.da.wkflow.business_main.entity.BusProcessNew;
import com.adc.da.wkflow.business_main.service.IBusProcessApproveService;
@@ -19,11 +22,13 @@ import java.util.List;
/**
* 上传报告 发起流程
*/
public class aid3 implements TaskListener {
public class twoApplyAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class);
TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class);
ITtReportManageActService ttReportManageActService = SpringContextUtil.getBean(ITtReportManageActService.class);
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
//查询task任务
@@ -33,6 +38,11 @@ public class aid3 implements TaskListener {
TtReportManageAct ttReportManageAct = new TtReportManageAct();
if (ttReportManageActs.size()>0){
ttReportManageAct = ttReportManageActs.get(0);
List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectActListBydataId(ttReportManageAct.getCreateUserId());
for (PowerApplyAct powerApplyAct : powerApplyActs) {
powerApplyAct.setReportId(ttReportManageAct.getId());
}
ttReportManageAct.setPowerList(powerApplyActs);
}
//构建工作流代办
BusProcessNew busProcessNew = new BusProcessNew();
@@ -53,8 +63,7 @@ public class aid3 implements TaskListener {
// 1: 同意 2：退回
delegateTask.setVariable("flag",s);
if ("1".equals(s)){
//todo
// ttReportManageActDao.saveBatch(powerApplyActs);
ttReportManageActService.saveReport(ttReportManageAct);
}
}
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid2.java → report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.List;
/**
* 权限申请流程 发起流程
*/
public class aid2 implements TaskListener {
public class oneApplyAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid3.java → report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java
+1 -1
View File
@@ -20,7 +20,7 @@ import java.util.List;
/**
* 权限申请流程 发起流程
*/
public class aid3 implements TaskListener {
public class reEditAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid1.java → report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.List;
/**
* 权限申请流程 发起流程
*/
public class aid1 implements TaskListener {
public class startAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid4.java → report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.List;
/**
* 权限申请流程 发起流程
*/
public class aid4 implements TaskListener {
public class twoApplyAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {