From e7024b87c1af729f39982f0f93becbaaf29ffff1 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 18:06:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/virtualListDetails.vue | 6 +- .../projectManagement/components/TaskList.vue | 188 +++++++++++------- .../components/listOfRegulations.vue | 4 +- 5 files changed, 123 insertions(+), 81 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 167f675b5..b9dba09d0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -752,4 +752,7 @@ module.exports = { notEvaluated:'Not evaluated', cannotExceed:'cannot exceed', Characters:'Characters', + standardInformation:'standardInformation', + VirtualList:'VirtualList', + importTemplate:'import template', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index dda63194b..0f3b73146 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -580,6 +580,7 @@ module.exports = { selectDisplayList: '请选择是否列表展示', documentSplitDisplay: '文档拆分模块展示', VirtualListName: '虚拟清单名称', + VirtualList:'虚拟清单', listStatus: '清单状态', creater: '创建人', withdraw: '撤回', @@ -757,4 +758,6 @@ module.exports = { notEvaluated:'未评估', cannotExceed:'不能超出', Characters:'个字符', + standardInformation:'标准信息', + importTemplate:'导入模板', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index e703343cd..78812a1f0 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -138,7 +138,7 @@ {{$t('deleteLib')}} - {{text && text.length > 20 ? text.slice(0,19)+'...':text}} + {{text && text.length > 10 ? text.slice(0,9)+'...':text}} {{record.designDeliverableType_dictText}}
@@ -568,7 +568,7 @@ }, //模板下载 handleModule() { - downloadFile(this.url.exportTemplate, '模板下载.xls', {}) + downloadFile(this.url.exportTemplate, this.$t('VirtualList')+this.$t('importTemplate')+'.xls', {}) }, //导出 handleExport() { @@ -579,7 +579,7 @@ ids: selectedRowKeys.join(','), dummyInventoryBaseId: this.$route.query.id } - downloadFile(this.url.exportData, this.$route.query.name + '虚拟清单.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList')+'.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 6fe7f565c..786344d66 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -43,14 +43,57 @@
+
+
+ GB-7258-2017
+ 及东盟火车大师傅但是 +
+ +
+
+
+ 1212sdfdsf
+ 责任领土 +
+
+
+
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪 +
+
+
+
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪 +
+
+
+
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪 +
+
+
+ + 实验通过 + +
+
+
+
+
+
@@ -59,9 +102,10 @@ \ No newline at end of file +import { putAction,postAction,getAction,deleteAction } from '@/api/manage' +export default { + name: 'diolagArea', + components:{ + + }, + data(){ + return{ + title:this.$t('add'), + queryParams:{ + pageNo:1, + pageSize:10 + }, + total:0, + selectedRowKeys: [], + loading: false, + ipagination:true, + editId:'', + columns: [ + { + title: this.$t('zoneOfApplication'), + dataIndex: 'showArea', + key: 'showArea', + align: "center", + ellipsis: true, + }, + { + title: this.$t('parameterTemplate'), + align: "center", + dataIndex: 'enName', + ellipsis: true, + } + ], + newVisible:false, + labelCol: { + xs: { span: 24 }, + sm: { span: 7 }, + }, + wrapperCol: { + xs: { span: 24 }, + sm: { span: 14 }, + }, + form: { + isModel:'1', + showArea:'', + enName:'', + sort:'' + }, + rules: { + isModel:[ + { required: true, message: this.$t('PleaseSelectModule'), trigger: 'change' }, + + ], + enName:[ + { max: 100, message: this.$t('CannotExceed100characters'), trigger: 'blur' }, + + ], + showArea:[ + { required: true, message: this.$t('enterDisplayArea'), trigger: 'blur' }, + { min:1, max: 50, message: this.$t('charactersLength'), trigger: 'blur' }, + ], + sort:[ + { required: true, message: this.$t('enterSortingNumber'), trigger: 'change' }, + ] + }, + areaTable:[], + flag:false, //表单提交标识 + spinLoading:false, + } + }, + props:{ + // areaTable:Array + }, + mounted() { + this.loadData() + }, + methods:{ + loadData(){ + this.loading=true + let params={ + ...this.queryParams + } + postAction(`tag/onlCgformArea/page`,params).then(res=>{ + if(res.success){ + this.areaTable=[...res.result.records] + this.total=res.result.total + } + }).finally(()=>{ + this.loading=false + }) + }, + onSelectChange(selectedRowKeys) { + // console.log('selectedRowKeys changed: ', selectedRowKeys); + this.selectedRowKeys = selectedRowKeys; + }, + handleTableChange(){ + + }, + showModal() { + this.title=this.$t('add') + this.newVisible = true; + this.form={ + + } + }, + //新增 + hideModal() { + this.$refs.ruleForm.validate(valid => { + if (valid) { + this.flag=true + this.spinLoading=true + //编辑 + if(this.form.id){ + putAction(`tag/onlCgformArea/edit`,this.form).then((res)=>{ + if(res.success){ + this.$message.success(this.$t('OperationSuccessful')); + this.loadData() + this.form={ + isModel:'', + showArea:'', + enName:'', + sort:'' + } + }else{ + this.$message.warning(res.message) + this.form={ + isModel:'', + showArea:'', + enName:'', + sort:'' + } + } + }).finally(()=>{ + this.flag=false + this.spinLoading=false + this.newVisible = false; + this.form={ + isModel:'', + showArea:'', + enName:'', + sort:'' + } + }) + }else{ + //新增 + postAction(`/tag/onlCgformArea/add`,this.form).then(res=>{ + if(res.success){ + this.$message.success( this.$t('OperationSuccessful')); + this.loadData() + this.form={ + isModel:'', + showArea:'', + enName:'', + sort:'' + } + }else{ + // this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) + + } + } + ).finally(()=>{ + this.flag=false + this.spinLoading=false + this.newVisible = false; + }) + } + + } else { + // console.log('error submit!!'); + return false; + } + }); + + }, + cancelModel(){ + this.newVisible=false + this.$refs.ruleForm.resetFields(); + }, + //删除按钮 + deleteArea(val){ + this.$confirm({ + title: this.$t('confirmDeletion'), + content: '', + onOk: + async () => { + getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')); + if(this.areaTable.length==1&&this.queryParams.pageNo!=1){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } + this.loadData() + }else{ + // this.$message.warning(res.message) + if(res.message=='该展示区域有关联数据，无法删除！'){ + this.$message.warning(this.$t('noDelete')) + }else{ + this.$message.warning(this.$t('operationFailed')); + } + } + }) + } + }) + }, + //编辑按钮 + editArea(val){ + this.title=this.$t('edit') + this.newVisible = true; + let params={ + id:val + } + getAction(`tag/onlCgformArea/queryById`, params).then((res) => { + if(res.success){ + this.form={...res.result} + // this.$emit('updateOk',res.result) + + } + }) + }, + //点击页数 + onChangePage(page,pageSize){ + this.queryParams.pageNo = page + this.loadData() + }, + //一页显示条数 + SizeChange(page,pageSize){ + this.queryParams.pageSize = pageSize + this.queryParams.pageNo=1 + this.loadData() + }, + //正则替换小数点 + limitNumber(value) { + if (typeof value === 'string') { + return !isNaN(Number(value)) ? value.replace(/\./g, '') : 0 + } else if (typeof value === 'number') { + return !isNaN(value) ? String(value).replace(/\./g, '') : 0 + } else { + return 0 + } + } + } +} + + + + \ No newline at end of file From 7377e8ec27dee1d8682b6c8b9c4cf00df36062c3 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 18:53:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/TaskList.vue | 62 ++++++++++--------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 786344d66..02e2c0a3a 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -51,38 +51,30 @@ :columns="columns" >
-
- GB-7258-2017
- 及东盟火车大师傅但是 -
- + GB-7258-2017
+ 及东盟火车大师傅但是
-
- 1212sdfdsf
- 责任领土 -
+ 1212sdfdsf
+ 责任领土
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 + 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪 +
+
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 -
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 -
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪
@@ -247,21 +239,31 @@ } .box-left { - float: left; position: relative; - left: 50% } - .content { - float: left; - position: relative; - left: -50%; - text-align: left; + .content-box { + position: absolute; + width: calc(100% + 32px); + height: calc(100% + 32px); + top: -16px; + left: -16px; + border: 1px seagreen solid; + } + + .content-box-jiao { + position: absolute; + right: 0; + width: 0; + height: 0; + border-right: 30px solid red; + border-bottom: 30px solid transparent } .box-content { margin-bottom: 8px; display: inline-block; + text-align: left; } .box-content-color { From bb060a7f237b18249b46ff4de8ef99350f84ca76 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 5 May 2022 18:53:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=B8=85=E5=8D=95=E8=A1=A8-=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E3=80=81=E9=A1=B9=E7=9B=AE=E5=BA=93-?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95=E8=A1=A8-=E6=8F=90?= =?UTF-8?q?=E9=86=92=E5=8A=9E=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 1 + .../ProjectTaskInventoryEOController.java | 25 ++++ .../modules/project/enums/MsgTypeEnum.java | 3 + .../project/enums/OperatorTypeEnum.java | 1 + .../project/job/InventoryAffirmJob.java | 4 +- .../IProjectTaskInventoryEOService.java | 16 ++ .../ProjectTaskInventoryEOServiceImpl.java | 141 ++++++++++++++++-- .../project/util/SendMessageUtils.java | 99 ++++++++++++ 8 files changed, 276 insertions(+), 14 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 844252322..01933e2bc 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -140,6 +140,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/opensso/**", "anon"); //单点登录 filterChainDefinitionMap.put("/project/projectLawsInventoryEO/processCall", "anon"); // 项目库-法规清单 工作流处理数据接口排除 + filterChainDefinitionMap.put("/project/projectTaskInventoryEO/processCall", "anon"); // 项目库-任务清单 工作流处理数据接口排除 filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口 // 添加自己的过滤器并且取名为jwt diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java index 875529992..1cc62f664 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskInventoryEOController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.project.entity.ProjectTaskInventoryEO; @@ -167,4 +169,27 @@ public class ProjectTaskInventoryEOController extends JeroController processCall(@RequestBody JSONObject jsonObject){ + return this.projectTaskInventoryEOService.processCall(jsonObject); + } + + /** + * 提醒办理 + * @param jsonObject + * @return + */ + @AutoLog(value = "项目库-任务清单表-提醒办理") + @ApiOperation(value="项目库-任务清单表-提醒办理", notes="项目库-任务清单表-提醒办理") + @PostMapping(value = "/remindDispose") + public Result remindDispose(@RequestBody JSONObject jsonObject){ + return this.projectTaskInventoryEOService.remindDispose(jsonObject); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java index 7684c1f02..83b5b50d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java @@ -8,6 +8,9 @@ public enum MsgTypeEnum { TASK_AFFIRM_ISSUE_DRE_MSG("任务确认分配dre消息","taskAffirmIssueDreMsg"), TASK_AFFIRM_DRE_ACCEPTED("任务确认DRE通过消息","taskAffirmDreAccepted"), TASK_AFFIRM_DRE_REJECTED("任务确认DRE退回消息","taskAffirmDreRejected"), + + DESIGN_ISSUE_DRE_MSG("设计符合性确认分配dre消息","designIssueDreMsg"), + DESIGN_REMIND_MSG("设计符合性提醒办理","designRemindMsg"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index 7fb37f152..db22b91d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -18,6 +18,7 @@ public enum OperatorTypeEnum { TASK_AFFIRM_QUERY("任务确认流程，查询法规清单信息","taskAffirmQuery"), + ADD_TASK_INVENTORY_DETAIL("添加法规清单明细信息","addTaskInventoryDetail"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index c3a989e5c..cae7a657c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -130,9 +130,9 @@ public class InventoryAffirmJob implements Job { currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList()); /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/ - String msgContentEN = "The the regulation task confirmation of GB 7258 in " + String msgContentEN = "The the regulation list confirmation of " + projectNameInfoEO.getProjectName() - + "(projectname) is coming to an end today. Please check and deal with it intime"; + + "(project name) is coming to an end today. Please check and deal with it in time"; //发送消息 projectLawsInventoryEOService.sendMessage(msgContentEN,currentDaysUserIdList,projectLibraryBase.getId()); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java index 2cc6fbef1..b13e63b72 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryEOService.java @@ -1,5 +1,7 @@ package com.jero.modules.project.service; +import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; import com.jero.modules.project.entity.ProjectTaskInventoryEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -60,4 +62,18 @@ public interface IProjectTaskInventoryEOService extends IService queryList(ProjectTaskInventoryEO projectTaskInventoryEO, HttpServletRequest req); + + /** + * 项目库-任务清单表-流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); + + /** + * 项目库-任务清单表-提醒办理 + * @param jsonObject + * @return + */ + Result remindDispose(JSONObject jsonObject); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index c0abe9436..0af3ffb81 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -1,21 +1,18 @@ package com.jero.modules.project.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; -import com.jero.modules.project.entity.ProjectLawsInventoryEO; -import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; -import com.jero.modules.project.entity.ProjectTaskInventoryEO; -import com.jero.modules.project.enums.InventoryAffirmStatusEnum; -import com.jero.modules.project.enums.ProjectRoleEnum; -import com.jero.modules.project.enums.TaskAffirmStatusEnum; -import com.jero.modules.project.enums.TaskStatusEnum; -import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; -import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; -import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper; -import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper; +import com.jero.modules.project.entity.*; +import com.jero.modules.project.enums.*; +import com.jero.modules.project.mapper.*; import com.jero.modules.project.service.IProjectTaskInventoryEOService; +import com.jero.modules.project.util.SendMessageUtils; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.wkflow.enums.FlowTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -24,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Date; import java.util.stream.Collectors; @@ -50,6 +48,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + + if(StringUtils.equals(operatorType,OperatorTypeEnum.UPDATE_STATUS.getValue())){ + ProjectTaskInventoryEO projectTaskInventoryEO = JSONObject.parseObject(jsonObject.toString(), ProjectTaskInventoryEO.class); + this.baseMapper.updateById(projectTaskInventoryEO); + }else if(StringUtils.equals(operatorType,OperatorTypeEnum.SEND_MSG.getValue())){ + workFlowSendMsg(jsonObject); + }else if(StringUtils.equals(operatorType,OperatorTypeEnum.ADD_TASK_INVENTORY_DETAIL.getValue())){ + //添加法规清单明细数据。 + JSONArray taskInventoryDetailList = jsonObject.getJSONArray("taskInventoryDetailList"); + ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = null; + for (Object detail : taskInventoryDetailList) { + projectTaskInventoryDetailEO = JSONObject.parseObject(JSONObject.toJSONString(detail),ProjectTaskInventoryDetailEO.class); + projectTaskInventoryDetailEOMapper.insert(projectTaskInventoryDetailEO); + } + } + + return new Result<>().success("调用成功！"); + } + + /** + * 项目库-任务清单表-提醒办理 + * @param jsonObject + * @return + */ + @Override + public Result remindDispose(JSONObject jsonObject) { + + //发送消息类型 + String msgType = jsonObject.getString("msgType"); + + if(StringUtils.isEmpty(msgType)){ + throw new JeroBootException("发送消息类型不能为空，请检查！"); + } + String serialNumber = jsonObject.getString("serialNumber"); + //项目库id + String projectLibraryId = jsonObject.getString("projectLibraryId"); + + String msgContentEN = ""; + List userIdList = new ArrayList<>(); + + ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper() + .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + + QueryWrapper projectNameInfoEOQueryWrapper = new QueryWrapper<>(); + projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); + ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); + + if(StringUtils.equals(msgType,MsgTypeEnum.DESIGN_REMIND_MSG.getValue())){ + String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id + userIdList.addAll(Arrays.asList(dreUserIds.split(","))); + msgContentEN = "Please check and deal with the design compliance confirmation process of " + + serialNumber + " in "+ projectNameInfoEO.getProjectName() + " (project name) in time."; + } + + if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){ + //发送消息 + SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryId); + } + return new Result<>().success("提醒办理成功！"); + } + /** * 创建任务清单列表数据 * @param projectTaskInventoryEOList @@ -305,4 +383,43 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl() + .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + + QueryWrapper projectNameInfoEOQueryWrapper = new QueryWrapper<>(); + projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); + ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); + + SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper().lambda().eq(SysUser::getId, currentUserId)); + + String msgContentEN = ""; + List userIdList = new ArrayList<>(); + String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id + userIdList.addAll(Arrays.asList(dreUserIds.split(","))); + + if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) { + msgContentEN = sysUser.getUsername() + "has distributed the design compliance confirmation process of " + serialNumber + " in "+ projectNameInfoEO.getProjectName() + + " (project name) to you. Please check and handle it in time."; + } + + if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){ + //发送消息 + SendMessageUtils.sendMessage(msgContentEN,userIdList,id); + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java new file mode 100644 index 000000000..22e78ee15 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java @@ -0,0 +1,99 @@ +package com.jero.modules.project.util; + +import com.alibaba.fastjson.JSONObject; +import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.WebsocketConst; +import com.jero.common.constant.enums.MessageTypeEnum; +import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.message.websocket.WebSocket; +import com.jero.modules.system.entity.SysAnnouncement; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysAnnouncementService; +import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +@Component +public class SendMessageUtils { + private final static Logger logger= LoggerFactory.getLogger(SendMessageUtils.class); + + private static ISysUserService sysUserService; + @Autowired + public void setISysUserService(ISysUserService sysUserService){ + SendMessageUtils.sysUserService = sysUserService; + } + + private static ISysAnnouncementService sysAnnouncementService; + @Autowired + public void setISysAnnouncementService(ISysAnnouncementService sysAnnouncementService){ + SendMessageUtils.sysAnnouncementService = sysAnnouncementService; + } + + @Autowired + private static IFeishuService iFeishuService; + public void setIFeishuService(IFeishuService iFeishuService){ + SendMessageUtils.iFeishuService = iFeishuService; + } + + private static WebSocket webSocket; + @Autowired + public void setWebSocket(IFeishuService iFeishuService){ + SendMessageUtils.iFeishuService = iFeishuService; + } + + public static void sendMessage(String msgContent, List userIdList, String projectLibraryId) { + String idTemp = projectLibraryId; + + List sysUsers = sysUserService.listByIds(userIdList); + List thirdIdList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(sysUsers)){ + thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); + } + + //系统消息 + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgContent, ""); + sysAnnouncementService.saveAnnouncement(sysAnnouncement); + sendWebsocket(idTemp, idTemp); + + //飞书消息 + try { + iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), msgContent, MessageTypeEnum.PUSH.getName(), ""); + } catch (IOException e) { + logger.error("飞书消息推送失败"); + } + } + + @NotNull + private static SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo) { + SysAnnouncement sysAnnouncement = new SysAnnouncement(); + sysAnnouncement.setDelFlag("0"); + sysAnnouncement.setSendStatus("0"); + sysAnnouncement.setSendTime(new Date()); + sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型 + sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 + sysAnnouncement.setMsgContent(content); + sysAnnouncement.setMsgContentInfo(contentInfo); + sysAnnouncement.setUserIds(StringUtils.join(userIdList, ",")); + return sysAnnouncement; + } + + private static void sendWebsocket(String msgId, String msgTet) { + JSONObject obj = new JSONObject(); + obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); + obj.put(WebsocketConst.MSG_ID, msgId); + obj.put(WebsocketConst.MSG_TXT, msgTet); + webSocket.sendMessage(obj.toJSONString()); + } + +}