From 7f17f41351482818661741b44d261f9482362f50 Mon Sep 17 00:00:00 2001 From: xiaowenyu Date: Mon, 22 Aug 2022 12:35:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index e31b0a1fc..f52e1d14e 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -928,7 +928,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Responsible Fi UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Filled by' WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Eng. Interface' WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b'; --- 国家国旗表 增加旗帜 2022-08-16 +-- 国家国旗表 增加旗帜 2022-08-16 已同步生产环境 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('14', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '/jero-boot/nationalFlag/GCC.png'); INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('15', NULL, NULL, NULL, NULL, NULL, '巴西', 'Brazil', NULL, '/jero-boot/nationalFlag/Brazil.png'); INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('16', NULL, NULL, NULL, NULL, NULL, '德国', 'Germany', NULL, '/jero-boot/nationalFlag/Germany.png'); @@ -946,15 +946,15 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti -- 删除之前的3中国香港 和8海湾地区 delete from country_national_flag where id in ('3','8'); --- 法规流程历史表增加字段 审批意见 2022-08-16 +-- 法规流程历史表增加字段 审批意见 2022-08-16 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_process_history` ADD COLUMN `approval_opinion` varchar(2000) NULL COMMENT '审批意见' AFTER `flow_type`; ---- 用户表 删除工号唯一索引 2022-08-18 +--- 用户表 删除工号唯一索引 2022-08-18 已同步生产环境 ALTER TABLE `laws_weilai`.`sys_user` DROP INDEX `uniq_sys_user_work_no`; --- 工作流 流程表增加流程名称 英文字段 2022-08-19 +-- 工作流 流程表增加流程名称 英文字段 2022-08-19 已同步生产环境 ALTER TABLE `laws_weilai_wkflow`.`bus_process_name` ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称（英文）' AFTER `PROJECT_LAWS_INVENTORY_ID`; From 55c235efa0e4fc8e9ffa7d78f0c6c0b349d84d5f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 22 Aug 2022 14:40:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E4=BA=A4=E4=BA=92-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=90=8D=E7=89=87?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FeishuServiceImpl.java | 133 ++++++++++++------ 1 file changed, 88 insertions(+), 45 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 0f51306b6..b3367fda2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -21,6 +21,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.HttpRequestUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -565,69 +566,111 @@ public class FeishuServiceImpl implements IFeishuService { headerMap.put("Authorization", "Bearer " + token); headerMap.put("Content-Type", "application/json; charset=utf-8"); - String sendJson = " {\n" + - " \"config\": {\n" + - " \"wide_screen_mode\": true\n" + - " },\n" + + //参考：https://open.feishu.cn/tool/cardbuilder?from=openplantform_mcb_entrance + /*String sendJson = "{\n" + " \"header\": {\n" + + " \"template\": \"green\",\n" + " \"title\": {\n" + - " \"tag\": \"plain_text\",\n" + - " \"content\": \"点击下方的分类查看常见问题\"\n" + - " },\n" + - " \"template\": \"green\"\n" + + " \"content\": \"知识库分类负责人\",\n" + + " \"tag\": \"plain_text\"\n" + + " }\n" + + " },\n" + + " \"elements\": [\n" + + " {\n" + + " \"fields\": [\n" + + " {\n" + + " \"is_short\": true,\n" + + " \"text\": {\n" + + " \"content\": \"**\uD83D\uDC64 提交人：**\\n\",\n" + + " \"tag\": \"lark_md\"\n" + + " }\n" + + " }\n" + + " ],\n" + + " \"tag\": \"div\"\n" + + " }\n" + + " ]\n" + + "}";*/ + + String sendJson = "{\n" + + " \"header\": {\n" + + " \"template\": \"green\",\n" + + " \"title\": {\n" + + " \"content\": \"知识库分类负责人\",\n" + + " \"tag\": \"plain_text\"\n" + + " }\n" + " }\n" + "}"; JSONObject jsonObject = JSONObject.parseObject(sendJson); JSONArray elements = new JSONArray(); JSONObject element = new JSONObject(); - element.put("tag","action"); - element.put("layout","bisected"); + JSONArray fields = new JSONArray(); //获取分类 List problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(); this.problemKnowledgeBaseClassifyEOService.disposeData(problemKnowledgeBaseClassifyEOList); - JSONArray actions = new JSONArray(); - - //组装推送过去的点击按钮 + //获取所有分类下的负责人信息 + List chargePersonUserIdList = new ArrayList<>(); for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { - JSONObject buttonObject = new JSONObject(); - JSONObject text = new JSONObject(); - JSONObject value = new JSONObject(); - buttonObject.put("tag","button"); - - text.put("tag","plain_text"); - text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel() + " [" + problemKnowledgeBaseClassifyEO.getChargePersonIdName() + "]"); - value.put("chosen",problemKnowledgeBaseClassifyEO.getChargePersonId()); - - buttonObject.put("text",text); - buttonObject.put("type","primary"); - buttonObject.put("value",value); - actions.add(buttonObject); + if(StringUtils.isNotEmpty(problemKnowledgeBaseClassifyEO.getChargePersonId())){ + String chargePersonId = problemKnowledgeBaseClassifyEO.getChargePersonId(); + for (String chargePerson : chargePersonId.split(",")) { + chargePersonUserIdList.add(chargePerson); + } + } } - element.put("actions",actions); + if(CollectionUtils.isNotEmpty(chargePersonUserIdList)){ + List chargePersonUserList = this.sysUserService.querySysUserListByIdList(chargePersonUserIdList); + //组装推送过去的知识库负责人信息 + for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { + JSONObject field = new JSONObject(); + JSONObject text = new JSONObject(); + StringBuilder atUserSb = new StringBuilder(); - elements.add(element); - jsonObject.put("elements",elements); - // 设置请求参数 - JSONObject paramsMap = new JSONObject(); - paramsMap.put("user_ids", userIds); - paramsMap.put("msg_type", "interactive"); - paramsMap.put("card", jsonObject); + if(StringUtils.isNotEmpty(problemKnowledgeBaseClassifyEO.getChargePersonId())){ + for (String chargePersonId : problemKnowledgeBaseClassifyEO.getChargePersonId().split(",")) { + for (SysUser sysUser : chargePersonUserList) { + if(StringUtils.equals(chargePersonId,sysUser.getId())){ + String thirdId = sysUser.getThirdId(); + atUserSb.append(""); + atUserSb.append(" "); + } + } + } + } - // 发送请求给飞书 - String response = null; - try { - response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); - } catch (IOException e) { - e.printStackTrace(); - } - // 获取返回结果 - JSONObject tokenJson = JSONObject.parseObject(response); - if(!tokenJson.get("code").toString().equals("0")) { - log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + text.put("content","问题标签：" + problemKnowledgeBaseClassifyEO.getProblemLabel() + "\n" + "责任人：" + atUserSb.toString()); + text.put("tag","lark_md"); + + field.put("is_short",true); + field.put("text",text); + fields.add(field); + } + + element.put("tag","div"); + element.put("fields",fields); + elements.add(element); + jsonObject.put("elements",elements); + // 设置请求参数 + JSONObject paramsMap = new JSONObject(); + paramsMap.put("user_ids", userIds); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", jsonObject); + + // 发送请求给飞书 + String response = null; + try { + response = HttpRequestUtil.getResponseOfPOST(batchSendMessageUrl, headerMap, paramsMap.toJSONString()); + } catch (IOException e) { + e.printStackTrace(); + } + // 获取返回结果 + JSONObject tokenJson = JSONObject.parseObject(response); + if(!tokenJson.get("code").toString().equals("0")) { + log.error("请求出现异常：" + tokenJson.get("msg") + " " + tokenJson); + } } } From 8fc2f8a22af8d45a011caae7a3b260cbd60cd184 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 22 Aug 2022 16:14:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E4=BF=AE=E6=94=B9=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 844f7bebe..f65bef370 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -772,6 +772,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); String dbFieldName = onlCgformField.getDbFieldName(); + if ("nioNumber".equals(dbFieldName) || "paramsName".equals(dbFieldName)) { + map.put("click3", true); + } if ("description".equals(dbFieldName)) { indexOfDescription = i; map.put("click2", true);