lawsDocumentSplitList = lawsDocumentSplitMapper.selectList(queryWrapper1);
- lawsDocumentSplitList.forEach(lawsDocumentSplit -> {
- String itemContent = lawsDocumentSplit.getItemContent();
- // 使用 jsoup 解析 HTML
- Document doc = Jsoup.parse(itemContent);
-
- // 选择所有的 元素
- Elements paragraphs = doc.select("p");
-
- // 存储提取的文本内容
- List textContents = new java.util.ArrayList<>();
-
- for (Element paragraph : paragraphs) {
- // 获取每个 元素的文本内容并添加到集合中
- String textContent = paragraph.text();
- textContents.add(textContent);
- }
-
- //List sarFileSplitItemsValEOList = new ArrayList<>();
- for (int i = 0; i < textContents.size(); i++) {
- SarFileSplitItemsValEO sarFileSplitItemsValEO = new SarFileSplitItemsValEO();
- sarFileSplitItemsValEO.setId(UUIDUtils.randomUUID20());
- sarFileSplitItemsValEO.setType("TEXT");
- sarFileSplitItemsValEO.setItemId(lawsDocumentSplit.getId());
- sarFileSplitItemsValEO.setItemContent(textContents.get(i));
- sarFileSplitItemsValEO.setDisplaySeq(i+1);
- sarFileSplitItemsValEO.setValidFlag(0);
- //sarFileSplitItemsValEOList.add(sarFileSplitItemsValEO);
- sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO);
- }
- //sarFileSplitItemsValEOService.insertForeach(sarFileSplitItemsValEOList);
- });
- });
- // 状态设置为已同步
- lawsAsmsOpenApi.setStatus("1");
- log.info("{}同步成功{}条数据", lawsAsmsOpenApi.getApiName(), sarFileSplitInfoEOList.size());
- }
- });
- // 同步接口的状态
- updateBatchById(lawsAsmsOpenApiList);
- }
-
- @Transactional
- public void upload(String url, String fileName, String fileType, String id, String code) {
- InputStream inputStream = asmsPostUtil.getFileByteArray(url);
- try {
- MinioUtil.upload(inputStream, filePath + url);
- } catch (Exception e) {
- e.printStackTrace();
- throw new JeroBootException("文件上传错误");
- }
- OSSFile ossFile = new OSSFile();
- ossFile.setFileName(fileName + "." + fileType);
- ossFile.setUrl(filePath + url);
- ossFile.setStandardId(id);
- ossFile.setStandardNo(code);
- ossFile.setStandardFileType("publish_of_original");
- ossFileService.save(ossFile);
- log.info("存储文件:{},url：{}", fileName, url);
- }
-
- private Date getSimpleDate(String dateStr) {
- if (StringUtils.isBlank(dateStr)) return null;
- try {
- return simpleDateFormat.parse(dateStr);
- } catch (ParseException e) {
- e.printStackTrace();
- throw new JeroBootException("时间格式转换错误");
- }
- }
-
- private Date getSimpleDate2(String dateStr) {
- if (StringUtils.isBlank(dateStr)) return null;
- try {
- return dateFormat.parse(dateStr);
- } catch (ParseException e) {
- e.printStackTrace();
- throw new JeroBootException("时间格式转换错误");
- }
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/23 15:57
- * @Description: 获取多日期字符串
- **/
- private String getManyDateString(String oldManyDateString) {
- if (StringUtils.isBlank(oldManyDateString)) return "";
- List oldValueList = Arrays.asList(oldManyDateString.split("、"));
- // 使用正则表达式提取日期部分
- Pattern pattern = Pattern.compile("\\d{4}年\\d{2}月\\d{2}日");
-
- List valueList = new java.util.ArrayList<>();
- oldValueList.forEach(value -> {
- Matcher matcher = pattern.matcher(value);
- String dateStr;
- if (matcher.find()) {
- dateStr = matcher.group(0);
- } else {
- return;
- }
- try {
- Date parse = oldDateFormat.parse(dateStr);
- String format = simpleDateFormat.format(parse);
- valueList.add(format);
- } catch (ParseException e) {
- e.printStackTrace();
- throw new JeroBootException("时间格式转换错误");
- }
- });
- if (valueList.size() == 1) {
- // 如果只有一个日期值，则复制成两个，用于查询和排序
- return valueList.get(0) + "," + valueList.get(0);
- }
- List dateList = valueList.stream()
- .map(LocalDate::parse) // 解析日期字符串为 LocalDate 对象
- .sorted() // 按照日期大小进行排序
- .collect(Collectors.toList());
-
- // 将排序后的 LocalDate 对象转换为字符串
- List sortedDateStrList = dateList.stream()
- .map(LocalDate::toString)
- .collect(Collectors.toList());
-
- return String.join(",", sortedDateStrList);
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/23 15:09
- * @Description: 获取字典值
- **/
- private String getItemValues(String itemTexts, String dictId, List sysDictItemList) {
- if (StringUtils.isBlank(itemTexts)) return "";
- List itemTextList = Arrays.asList(itemTexts.split(";"));
- List itemValues = sysDictItemList.stream()
- .filter(sysDictItem -> itemTextList.contains(sysDictItem.getItemText()) && dictId.equals(sysDictItem.getDictId()))
- .map(SysDictItem::getItemValue).collect(Collectors.toList());
- return StringUtils.join(itemValues, ",");
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/18 16:20
- * @Description: 批量删除原字典配置项
- **/
- @Override
- public void removeDictItemBatch(List idList) {
- List lawsAsmsOpenApiList = listByIds(idList);
- lawsAsmsOpenApiList = lawsAsmsOpenApiList.stream()
- .filter(e -> StringUtils.isNotBlank(e.getDictId())).collect(Collectors.toList());
- if (CollectionUtils.isNotEmpty(lawsAsmsOpenApiList)) {
- List dictIdList = lawsAsmsOpenApiList.stream()
- .map(LawsAsmsOpenApi::getDictId).collect(Collectors.toList());
- // 状态转为未同步
- lawsAsmsOpenApiList.forEach(e -> e.setStatus("0"));
- updateBatchById(lawsAsmsOpenApiList);
- // 物理删除字典配置项
- lawsAsmsOpenApiMapper.removeDictItemBatch(dictIdList);
- }
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
deleted file mode 100644
index 76f19a9..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
+++ /dev/null
@@ -1,634 +0,0 @@
-package com.jero.modules.docking.asms.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jero.common.exception.JeroBootException;
-import com.jero.common.util.MinioUtil;
-import com.jero.common.util.UUIDUtils;
-import com.jero.modules.docking.asms.entity.LawsAsmsDomestic;
-import com.jero.modules.docking.asms.mapper.LawsAsmsOpenApiMapper;
-import com.jero.modules.docking.asms.service.ILawsAsmsDomesticService;
-import com.jero.modules.docking.asms.util.AlphanumericComparator;
-import com.jero.modules.docking.asms.util.AsmsPostUtil;
-import com.jero.modules.laws.common.util.DateUtil;
-import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit;
-import com.jero.modules.laws.documenttool.mapper.LawsDocumentSplitMapper;
-import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
-import com.jero.modules.laws.home.common.LawsHomeSearchCommon;
-import com.jero.modules.laws.home.service.ILawsHomeSearchService;
-import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
-import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
-import com.jero.modules.laws.standard.service.ILawsReplacedStandardService;
-import com.jero.modules.laws.standardization.entity.LawsStandardization;
-import com.jero.modules.laws.standardization.service.ILawsStandardizationService;
-import com.jero.modules.oss.entity.OSSFile;
-import com.jero.modules.oss.service.IOSSFileService;
-import com.jero.modules.split.entity.SarFileSplitInfoEO;
-import com.jero.modules.split.entity.SarFileSplitItemsValEO;
-import com.jero.modules.split.entity.SarFileSplitMenuEO;
-import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper;
-import com.jero.modules.split.service.ISarFileSplitInfoService;
-import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
-import com.jero.modules.split.service.ISarFileSplitMenuEOService;
-import com.jero.modules.system.entity.SysDictItem;
-import com.jero.modules.system.service.ISysDictItemService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.io.InputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * @Author: liao
- * @Date: 2023/11/3 13:46
- * @Description: 定时同步asms
- */
-@Component
-@Slf4j
-public class SynchronizationAsmsService {
-
- @Autowired
- private AsmsPostUtil asmsPostUtil;
- @Autowired
- private ISysDictItemService sysDictItemService;
- @Autowired
- private ILawsAsmsDomesticService lawsAsmsDomesticService;
- @Autowired
- private LawsAsmsOpenApiMapper lawsAsmsOpenApiMapper;
- @Autowired
- private ILawsStandardizationService lawsStandardizationService;
- @Autowired
- private ILawsDomesticStandardService lawsDomesticStandardService;
- @Autowired
- private ISarFileSplitInfoService sarFileSplitInfoService;
- @Autowired
- private LawsDocumentSplitMapper lawsDocumentSplitMapper;
- @Autowired
- private ISarFileSplitMenuEOService sarFileSplitMenuEOService;
- @Autowired
- private SarFileSplitMenuEOMapper sarFileSplitMenuEOMapper;
- @Autowired
- private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService;
- @Autowired
- private ILawsReplacedStandardService lawsReplacedStandardService;
- @Resource
- private ILawsHomeSearchService lawsHomeSearchService;
- @Autowired
- private IOSSFileService ossFileService;
- @Autowired
- private IDocumentSplitService documentSplitService;
-
- private final static String filePath = "asms/";
- private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
- private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- private static SimpleDateFormat oldDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-
- /**
- * @Author: liao
- * @Date: 2023/11/3 13:48
- * @Description: 定时同步国内法规
- **/
- @Transactional
- public void syncDomestic() {
- log.info("=====================定时同步国内法规=====================");
- long start = System.currentTimeMillis();
-
- // 法规列表
- String url = "xiaobodata/openApi/domesticLaws/list";
- Map paramMap = new HashMap<>();
- paramMap.put("pageNo", "1");
- paramMap.put("pageSize", "2");
- Map totalMap = asmsPostUtil.sendGetReq2(url, paramMap);
- Integer total = (Integer) totalMap.get("total");
- paramMap.put("pageSize", total.toString());
-
- List> mapList = asmsPostUtil.sendGetReq(url, paramMap);
- if (Objects.isNull(mapList)) {
- log.info("=====================没有获取到ASMS系统数据，同步结束=====================");
- return;
- }
-
- LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.select(LawsDomesticStandard::getStandardNumber);
- List lawsDomesticStandards = lawsDomesticStandardService.list(queryWrapper);
- List dupCodeList;
- if (CollectionUtils.isNotEmpty(lawsDomesticStandards)) {
- dupCodeList = lawsDomesticStandards.stream().map(LawsDomesticStandard::getStandardNumber).collect(Collectors.toList());
- } else {
- dupCodeList = new ArrayList<>();
- }
-
- List lawsAsmsDomesticList = new ArrayList();
- mapList.forEach(eMap -> {
- String createTimeString = eMap.get("createTime");
- Date createTime = DateUtil.getDateSecond(createTimeString);
- Date yesterday = DateUtil.getDateAddDays(new Date(), -1);
- // 创建时间为昨天的数据
- if (createTime.after(DateUtil.getDayStart(yesterday)) && createTime.before(DateUtil.getDayEnd(yesterday))) {
- if (!dupCodeList.contains((String) eMap.get("code"))) {
- LawsAsmsDomestic lawsAsmsDomestic = JSONObject.parseObject(JSONObject.toJSONString(eMap), LawsAsmsDomestic.class);
- lawsAsmsDomestic.setCreateTimeString(createTimeString);
- lawsAsmsDomestic.setUpdateTimeString(eMap.get("updateTime"));
- lawsAsmsDomestic.setFocalPointName(eMap.get("focalPoint"));
- lawsAsmsDomesticList.add(lawsAsmsDomestic);
- }
- }
- });
- if (CollectionUtils.isEmpty(lawsAsmsDomesticList)) {
- log.info("=====================昨天新增法规0条，同步结束=====================");
- return;
- }
-
- // 法规详情
- String detailUrl = "xiaobodata/openApi/domesticLaws/getInfo";
- List detailList = new ArrayList();
- Map detailMap = new HashMap<>();
- lawsAsmsDomesticList.forEach(lawsAsmsDomestic -> {
- detailMap.put("lawCode", lawsAsmsDomestic.getCode());
- Map objectMap = asmsPostUtil.sendGetReq2(detailUrl, detailMap);
-
- LawsAsmsDomestic parseObject = JSONObject.parseObject(JSONObject.toJSONString(objectMap), LawsAsmsDomestic.class);
- parseObject.setCreateTimeString((String) objectMap.get("createTime"));
- parseObject.setUpdateTimeString((String) objectMap.get("updateTime"));
- parseObject.setFocalPointName((String) objectMap.get("focalPoint"));
- detailList.add(parseObject);
- });
-
- // 同步到数据库
- List sysDictItemList = sysDictItemService.list();
- List lawsStandardizationList = lawsStandardizationService.list();
- List insertDomesticList = new ArrayList<>();
- detailList.forEach(lawsAsmsDomestic -> {
- String[] parts = lawsAsmsDomestic.getCode().split("[-\\s]"); // 使用空格或破折号作为分隔符
- if (parts.length < 3) {
- parts = lawsAsmsDomestic.getCode().split("[—\\s]"); // 使用空格或破折号作为分隔符
- }
- // 封装实例
- LawsDomesticStandard lawsDomesticStandard = new LawsDomesticStandard();
- // 对接标识
- lawsDomesticStandard.setIsAsmsImport("1");
- // 标准编号
- lawsDomesticStandard.setStandardNumber(lawsAsmsDomestic.getCode());
- // 标准类别
- lawsDomesticStandard.setStandardClass(parts[0]);
- // 标准号
- lawsDomesticStandard.setStandardNumberTemp(parts[1]);
- // 年代号
- lawsDomesticStandard.setYearNumber(parts[2]);
- // 标准名称
- lawsDomesticStandard.setStandardName(lawsAsmsDomestic.getName());
- // 标准英文名称
- lawsDomesticStandard.setStandardEnglishName(lawsAsmsDomestic.getEnglishName());
- // 适用认证
- String itemValues = getItemValues(lawsAsmsDomestic.getApplicableCertificationListString(),
- "1696008107352854529", sysDictItemList);
- lawsDomesticStandard.setApplicableCertification(itemValues);
- // 适用车型
- itemValues = getItemValues(lawsAsmsDomestic.getApplicableModelsListString(),
- "1702518672924110850", sysDictItemList);
- lawsDomesticStandard.setApplicableVehicle(itemValues);
- // 采标程度
- itemValues = getItemValues(lawsAsmsDomestic.getDegreeAdoption(),
- "1696042735686049793", sysDictItemList);
- lawsDomesticStandard.setDegreeOfBidAcquisition(itemValues);
- // 实施日期
- lawsDomesticStandard.setImplementationDate(getSimpleDate(lawsAsmsDomestic.getImplementationDate()));
- // 采用国际标准号
- lawsDomesticStandard.setAdoptTheInternationalStandardNumber(lawsAsmsDomestic.getInternationalStandard());
- // 新车实施日期
- lawsDomesticStandard.setNewModelImplementationDate(getManyDateString(lawsAsmsDomestic.getNewCarImplementationDate()));
- // 动力类型
- itemValues = getItemValues(lawsAsmsDomestic.getPowerTypeListString(),
- "1702518671166697474", sysDictItemList);
- lawsDomesticStandard.setDynamicType(itemValues);
- // 在产车实施日期
- lawsDomesticStandard.setOnTheProductionDate(getManyDateString(lawsAsmsDomestic.getProductionCarImplementationDate()));
- // 发布日期
- lawsDomesticStandard.setReleaseDate(getSimpleDate(lawsAsmsDomestic.getPublishDate()));
- // 代替标准号
- lawsReplacedStandardService.addRelation(lawsAsmsDomestic.getReplaceCode(), lawsAsmsDomestic.getCode(), 1);
- // 标准性质
- /*itemValues = getItemValues(lawsAsmsDomestic.getStandardNature(),
- "1695010513489833985", sysDictItemList);*/
- lawsDomesticStandard.setStandardProperty("SN002");
- // 标准状态
- itemValues = getItemValues(lawsAsmsDomestic.getStandardStatus(),
- "1695991936599715842", sysDictItemList);
- lawsDomesticStandard.setStandardState(itemValues);
- // 分标委
- String subcommittee = lawsAsmsDomestic.getSubcommittee();
- if (StringUtils.isNotBlank(subcommittee)) {
- lawsDomesticStandard.setBiddingCommittee(lawsStandardizationList.stream()
- .filter(e -> subcommittee.equals(e.getName())).collect(Collectors.toList()).get(0).getId());
- }
- // 创建时间
- lawsDomesticStandard.setCreateTime(getSimpleDate2(lawsAsmsDomestic.getCreateTimeString()));
- // 更新时间
- lawsDomesticStandard.setUpdateTime(getSimpleDate2(lawsAsmsDomestic.getUpdateTimeString()));
-
- // 生成id
- lawsDomesticStandard.setId(UUIDUtils.randomUUID20());
-
- insertDomesticList.add(lawsDomesticStandard);
- });
- // 插入国内法规标准数据库
- lawsDomesticStandardService.saveBatch(insertDomesticList, insertDomesticList.size());
- // 同步es数据库
- insertDomesticList.forEach(e ->
- lawsHomeSearchService.updateEsData(LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD, e.getId(), LawsHomeSearchCommon.LAWS_ES_ADD));
- long time1 = System.currentTimeMillis();
- log.info("=====================同步国内法规标准数据：{}条，耗时：{}毫秒=====================", insertDomesticList.size(), time1 - start);
-
- // 同步国内法规相关文档
- String fileUrl = "xiaobodata/openApi/domesticLaws/getFile";
- insertDomesticList.forEach(lawsDomesticStandard -> {
- String id = lawsDomesticStandard.getId();
- String code = lawsDomesticStandard.getStandardNumber();
- Map fileParamMap = new HashMap<>();
- fileParamMap.put("lawCode", code);
- Map objectMap = asmsPostUtil.sendGetReq2(fileUrl, fileParamMap);
- if (!Objects.isNull(objectMap)) {
- Map standardTextPdf = (Map) objectMap.get("standardTextPdf");
- String fileName = standardTextPdf.get("fileName");
- String fileType = standardTextPdf.get("fileType");
- String uri = standardTextPdf.get("url");
- if (StringUtils.isNotBlank(uri)) {
- upload(uri, fileName, fileType, id, code);
- }
- Map standardTextWord = (Map) objectMap.get("standardTextWord");
- fileName = standardTextWord.get("fileName");
- fileType = standardTextWord.get("fileType");
- uri = standardTextWord.get("url");
- if (StringUtils.isNotBlank(uri)) {
- upload(uri, fileName, fileType, id, code);
- }
- }
- });
- long time2 = System.currentTimeMillis();
- log.info("=====================同步国内法规文件耗时：{}毫秒=====================", time2 - time1);
-
- long end = System.currentTimeMillis();
- log.info("=====================全部同步完成，耗时：{} 毫秒=====================", end - start);
- log.info("=====================定时任务同步结束=====================");
- }
-
- /**
- * @Author: liao
- * @Date: 2023/11/3 13:49
- * @Description: 同步文档拆分
- **/
- @Transactional
- public void syncSplit() {
- log.info("=====================定时同步文档拆分=====================");
- long start = System.currentTimeMillis();
-
- // 文档拆分
- String url = "xiaobodata/openApi/article/search";
- Map paramMap = new HashMap<>();
- paramMap.put("pageNo", "1");
- paramMap.put("pageSize", "2");
- Map totalMap = asmsPostUtil.sendGetReq2(url, paramMap);
- Integer total = (Integer) totalMap.get("total");
- paramMap.put("pageSize", total.toString());
-
- List> mapList = asmsPostUtil.sendGetReq(url, paramMap);
- if (Objects.isNull(mapList)) {
- log.info("=====================没有获取到ASMS系统数据，同步结束=====================");
- return;
- }
-
- List allSplitList = sarFileSplitInfoService.list();
- List codeList = allSplitList.stream().map(SarFileSplitInfoEO::getSerialNumber).collect(Collectors.toList());
-
- List insertSplitList = new ArrayList<>();
- mapList.forEach(eMap -> {
- String code = eMap.get("code");
- if (CollectionUtils.isEmpty(codeList) || !codeList.contains(code)) {
- LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(LawsDomesticStandard::getStandardNumber, code);
- LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getOne(queryWrapper);
-
- LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>();
- queryWrapper1.eq(OSSFile::getStandardId, lawsDomesticStandard.getId());
- queryWrapper1.eq(OSSFile::getStandardFileType, "publish_of_original");
- queryWrapper1.like(OSSFile::getFileName, ".docx");
- OSSFile ossFile = ossFileService.getOne(queryWrapper1);
-
- SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO();
- sarFileSplitInfoEO.setStandardId(lawsDomesticStandard.getId());
- sarFileSplitInfoEO.setSerialNumber(lawsDomesticStandard.getStandardNumber());
- sarFileSplitInfoEO.setTitle(lawsDomesticStandard.getStandardName());
- sarFileSplitInfoEO.setFileType("publish_of_original");
- sarFileSplitInfoEO.setFileId(ossFile.getId());
- sarFileSplitInfoEO.setFileName(ossFile.getFileName());
- sarFileSplitInfoEO.setSplitStatus("1");
- sarFileSplitInfoEO.setCreateTime(getSimpleDate2(eMap.get("createTime")));
- sarFileSplitInfoEO.setUpdateTime(getSimpleDate2(eMap.get("updateTime")));
- sarFileSplitInfoEO.setIsAsmsImport("1");
- sarFileSplitInfoEO.setAuthor("云平台");
- sarFileSplitInfoEO.setSplitResult("成功");
-
- sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20());
-
- insertSplitList.add(sarFileSplitInfoEO);
- }
- });
- if (CollectionUtils.isEmpty(insertSplitList)) {
- log.info("=====================昨天新增拆分0条，同步结束=====================");
- return;
- }
-
- sarFileSplitInfoService.saveBatch(insertSplitList, insertSplitList.size());
- long time1 = System.currentTimeMillis();
- log.info("=====================同步标准拆分数据：{}条，耗时：{}毫秒=====================", insertSplitList.size(), time1 - start);
-
- // 单条拆分的详情
- String splitUrl = "xiaobodata/openApi/article/details";
- List sysDictItemList = sysDictItemService.list();
- Map paramMap1 = new HashMap<>();
- Map paramMap2 = new HashMap<>();
- Map paramMap3 = new HashMap<>();
- Map> infoMap = new HashMap<>();
- int[] n = {0};
- insertSplitList.forEach(sarFileSplitInfoEO -> {
- paramMap.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
- paramMap1.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
- List> mapListAll = asmsPostUtil.sendGetReq(splitUrl, paramMap1);
- List insertDocumentList = new ArrayList<>();
- mapListAll.forEach(eMap -> {
- // 单个法规的条文解读详情
- paramMap2.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
- paramMap2.put("termsCode", eMap.get("termsNum"));
- Map objectMap = asmsPostUtil.sendGetReq2("xiaobodata/openApi/article/interpretation/details", paramMap2);
-
- // 单个法规的条文标签详情
- paramMap3.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
- paramMap3.put("termsCode", eMap.get("termsNum"));
- Map objectMap2 = asmsPostUtil.sendGetReq2("xiaobodata/openApi/article/label/details", paramMap3);
-
- LawsDocumentSplit lawsDocumentSplit = new LawsDocumentSplit();
- lawsDocumentSplit.setInfoId(sarFileSplitInfoEO.getId());
- lawsDocumentSplit.setItemNum(eMap.get("termsNum"));
- lawsDocumentSplit.setItemTitle(eMap.get("termsName"));
- lawsDocumentSplit.setItemContent(eMap.get("articleContent"));
- lawsDocumentSplit.setCreateTime(getSimpleDate2(eMap.get("createTime")));
- lawsDocumentSplit.setUpdateTime(getSimpleDate2(eMap.get("updateTime")));
-
- lawsDocumentSplit.setInterpretationArticles((String) objectMap.get("termsInterpretation"));
-
- lawsDocumentSplit.setFunctionClassification((String) objectMap2.get("functionClassification"));
- lawsDocumentSplit.setFunctionProfessional((String) objectMap2.get("functionProfession"));
- lawsDocumentSplit.setFunctionGroupCode((String) objectMap2.get("groupingNum"));
- lawsDocumentSplit.setFunctionGroupName((String) objectMap2.get("groupingNum"));
- lawsDocumentSplit.setCerImplementDate((String) objectMap2.get("implementDateCertified"));
- lawsDocumentSplit.setNewCerImplementDate((String) objectMap2.get("implementDateNewCer"));
- lawsDocumentSplit.setNewRegisterImplementDate((String) objectMap2.get("implementDateNewRegister"));
- lawsDocumentSplit.setLawsRequireType((String) objectMap2.get("lawsRequireType"));
- lawsDocumentSplit.setApplications((String) objectMap2.get("modelsType"));
- lawsDocumentSplit.setDynamicType((String) objectMap2.get("powerType"));
-
- lawsDocumentSplit.setId(UUIDUtils.randomUUID20());
-
- lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType(),
- "1702212236079886338", sysDictItemList)); // 法规要求类型
- lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification(),
- "1702212237296234497", sysDictItemList)); // 功能分类
- lawsDocumentSplit.setFunctionProfessional(getItemValues(lawsDocumentSplit.getFunctionProfessional(),
- "1702202280677044226", sysDictItemList)); // 功能专业
- lawsDocumentSplit.setApplications(getItemValues(lawsDocumentSplit.getApplications(),
- "1702518672924110850", sysDictItemList)); // 适用车型
- lawsDocumentSplit.setDynamicType(getItemValues(lawsDocumentSplit.getDynamicType(),
- "1702518671166697474", sysDictItemList)); // 动力类型
-
- insertDocumentList.add(lawsDocumentSplit);
- lawsDocumentSplitMapper.insert(lawsDocumentSplit);
- n[0]++;
- });
- infoMap.put(sarFileSplitInfoEO.getId(), insertDocumentList);
- });
- long time2 = System.currentTimeMillis();
- log.info("=====================同步DocumentSplit条文数据：{}条，耗时：{}毫秒=====================", n[0], time2 - time1);
-
- insertSplitList.forEach(sarFileSplitInfoEO -> {
- String infoId = sarFileSplitInfoEO.getId();
- List lawsDocumentSplitList = infoMap.get(infoId);
- List itemNumList = lawsDocumentSplitList.stream().map(LawsDocumentSplit::getItemNum).collect(Collectors.toList());
-
- // 对目录排序
- Collections.sort(itemNumList, new AlphanumericComparator());
- Map sortMap = new HashMap<>();
- for (int i = 0; i < itemNumList.size(); i++) {
- sortMap.put(itemNumList.get(i), i+2L);
- }
- List sarFileSplitMenuEOList = new java.util.ArrayList<>();
- // 根目录
- SarFileSplitMenuEO rootEO = new SarFileSplitMenuEO();
- String rootId = UUIDUtils.randomUUID20();
- rootEO.setId(rootId);
- rootEO.setInfoId(infoId);
- rootEO.setName("总目录");
- rootEO.setDisplaySeq(1L);
- rootEO.setValidFlag(0);
- sarFileSplitMenuEOMapper.insertSelective(rootEO);
-
- Map idMap = new HashMap<>();
- lawsDocumentSplitList.forEach(lawsDocumentSplit -> {
- SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
- String itemNum = lawsDocumentSplit.getItemNum();
- String id = UUIDUtils.randomUUID20();
- sarFileSplitMenuEO.setId(id);
- sarFileSplitMenuEO.setInfoId(infoId);
- sarFileSplitMenuEO.setName(itemNum);
- sarFileSplitMenuEO.setDisplaySeq(sortMap.get(itemNum));
- sarFileSplitMenuEO.setValidFlag(0);
- String itemTitle = lawsDocumentSplit.getItemTitle();
- sarFileSplitMenuEO.setItemName(itemTitle.substring(0, Math.min(10, itemTitle.length())));
- sarFileSplitMenuEOList.add(sarFileSplitMenuEO);
- idMap.put(itemNum, id);
-
- lawsDocumentSplit.setMenuId(id);
- lawsDocumentSplitMapper.updateById(lawsDocumentSplit);
- });
-
- // 设置父id
- sarFileSplitMenuEOList.forEach(sarFileSplitMenuEO -> {
- String itemNum = sarFileSplitMenuEO.getName();
- String[] split = itemNum.split("\\.");
- if (split.length == 1) {
- sarFileSplitMenuEO.setPId(rootId);
- } else {
- // 去除数组中的最后一个元素
- split = Arrays.copyOf(split, split.length - 1);
- String pid = idMap.get(StringUtils.join(split, "."));
- if (StringUtils.isBlank(pid)) {
- pid = rootId;
- }
- sarFileSplitMenuEO.setPId(pid);
- }
- });
- sarFileSplitMenuEOMapper.insertForeach(sarFileSplitMenuEOList);
- });
- long time3 = System.currentTimeMillis();
- log.info("=====================生成拆分详情左侧目录耗时：{}毫秒=====================", time3 - time2);
-
- insertSplitList.forEach(sarFileSplitInfoEO -> {
- String infoId = sarFileSplitInfoEO.getId();
- List lawsDocumentSplitList = infoMap.get(infoId);
- lawsDocumentSplitList.forEach(lawsDocumentSplit -> {
- String itemContent = lawsDocumentSplit.getItemContent();
- // 使用 jsoup 解析 HTML
- Document doc = Jsoup.parse(itemContent);
-
- // 选择所有的 元素
- Elements paragraphs = doc.select("p");
-
- // 存储提取的文本内容
- List textContents = new java.util.ArrayList<>();
-
- for (Element paragraph : paragraphs) {
- // 获取每个 元素的文本内容并添加到集合中
- String textContent = paragraph.text();
- textContents.add(textContent);
- }
-
- for (int i = 0; i < textContents.size(); i++) {
- SarFileSplitItemsValEO sarFileSplitItemsValEO = new SarFileSplitItemsValEO();
- sarFileSplitItemsValEO.setId(UUIDUtils.randomUUID20());
- sarFileSplitItemsValEO.setType("TEXT");
- sarFileSplitItemsValEO.setItemId(lawsDocumentSplit.getId());
- sarFileSplitItemsValEO.setItemContent(textContents.get(i));
- sarFileSplitItemsValEO.setDisplaySeq(i+1);
- sarFileSplitItemsValEO.setValidFlag(0);
- sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO);
- }
- });
- });
-
- for (SarFileSplitInfoEO sarFileSplitInfoEO : insertSplitList) {
- HashMap parameter = new HashMap<>();
- parameter.put("id", sarFileSplitInfoEO.getId());
- documentSplitService.publish(parameter);
- }
- long time4 = System.currentTimeMillis();
- log.info("=====================生成条文详情耗时：{}毫秒=====================", time4 - time3);
-
- long end = System.currentTimeMillis();
- log.info("=====================全部同步完成，耗时：{} 毫秒=====================", end - start);
- log.info("=====================定时任务同步结束=====================");
- }
-
- @Transactional
- public void upload(String url, String fileName, String fileType, String id, String code) {
- InputStream inputStream = asmsPostUtil.getFileByteArray(url);
- try {
- MinioUtil.upload(inputStream, filePath + url);
- } catch (Exception e) {
- e.printStackTrace();
- throw new JeroBootException("文件上传错误");
- }
- OSSFile ossFile = new OSSFile();
- ossFile.setFileName(fileName + "." + fileType);
- ossFile.setUrl(filePath + url);
- ossFile.setStandardId(id);
- ossFile.setStandardNo(code);
- ossFile.setStandardFileType("publish_of_original");
- ossFileService.save(ossFile);
- }
-
- private Date getSimpleDate(String dateStr) {
- if (StringUtils.isBlank(dateStr)) return null;
- try {
- return simpleDateFormat.parse(dateStr);
- } catch (ParseException e) {
- e.printStackTrace();
- throw new JeroBootException("时间格式转换错误");
- }
- }
-
- private Date getSimpleDate2(String dateStr) {
- if (StringUtils.isBlank(dateStr)) return null;
- try {
- return dateFormat.parse(dateStr);
- } catch (ParseException e) {
- e.printStackTrace();
- throw new JeroBootException("时间格式转换错误");
- }
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/23 15:57
- * @Description: 获取多日期字符串
- **/
- private String getManyDateString(String oldManyDateString) {
- if (StringUtils.isBlank(oldManyDateString)) return "";
- List oldValueList = Arrays.asList(oldManyDateString.split("、"));
- // 使用正则表达式提取日期部分
- Pattern pattern = Pattern.compile("\\d{4}年\\d{2}月\\d{2}日");
-
- List valueList = new java.util.ArrayList<>();
- oldValueList.forEach(value -> {
- Matcher matcher = pattern.matcher(value);
- String dateStr;
- if (matcher.find()) {
- dateStr = matcher.group(0);
- } else {
- return;
- }
- try {
- Date parse = oldDateFormat.parse(dateStr);
- String format = simpleDateFormat.format(parse);
- valueList.add(format);
- } catch (ParseException e) {
- e.printStackTrace();
- throw new JeroBootException("时间格式转换错误");
- }
- });
- if (valueList.size() == 1) {
- // 如果只有一个日期值，则复制成两个，用于查询和排序
- return valueList.get(0) + "," + valueList.get(0);
- }
- List dateList = valueList.stream()
- .map(LocalDate::parse) // 解析日期字符串为 LocalDate 对象
- .sorted() // 按照日期大小进行排序
- .collect(Collectors.toList());
-
- // 将排序后的 LocalDate 对象转换为字符串
- List sortedDateStrList = dateList.stream()
- .map(LocalDate::toString)
- .collect(Collectors.toList());
-
- return String.join(",", sortedDateStrList);
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/23 15:09
- * @Description: 获取字典值
- **/
- private String getItemValues(String itemTexts, String dictId, List sysDictItemList) {
- if (StringUtils.isBlank(itemTexts)) return "";
- List itemTextList = Arrays.asList(itemTexts.split(";"));
- List itemValues = sysDictItemList.stream()
- .filter(sysDictItem -> itemTextList.contains(sysDictItem.getItemText()) && dictId.equals(sysDictItem.getDictId()))
- .map(SysDictItem::getItemValue).collect(Collectors.toList());
- return StringUtils.join(itemValues, ",");
- }
-
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AlphanumericComparator.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AlphanumericComparator.java
deleted file mode 100644
index 3dfdb80..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AlphanumericComparator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.jero.modules.docking.asms.util;
-
-import java.util.Comparator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @Author: liao
- * @Date: 2023/10/25 9:33
- * @Description: 目录顺序排序
- */
-public class AlphanumericComparator implements Comparator {
- private Pattern pattern = Pattern.compile("(\\d+|\\D+)");
-
- @Override
- public int compare(String s1, String s2) {
- Matcher matcher1 = pattern.matcher(s1);
- Matcher matcher2 = pattern.matcher(s2);
-
- while (matcher1.find() && matcher2.find()) {
- String group1 = matcher1.group();
- String group2 = matcher2.group();
-
- int result;
- if (isInteger(group1) && isInteger(group2)) {
- result = Integer.compare(Integer.parseInt(group1), Integer.parseInt(group2));
- } else {
- result = group1.compareTo(group2);
- }
-
- if (result != 0) {
- return result;
- }
- }
-
- return 0;
- }
-
- private boolean isInteger(String s) {
- try {
- Integer.parseInt(s);
- return true;
- } catch (NumberFormatException e) {
- return false;
- }
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AsmsPostUtil.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AsmsPostUtil.java
deleted file mode 100644
index c32a777..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AsmsPostUtil.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.jero.modules.docking.asms.util;
-
-import com.jero.common.api.vo.Result;
-import com.jero.common.exception.JeroBootException;
-import com.jero.common.util.RedisUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.*;
-
-/**
- * @Author: liao
- * @Date: 2023/10/17 15:12
- * @Description: 远程调用
- */
-@Component
-@Slf4j
-public class AsmsPostUtil {
-
- @Autowired
- private RestTemplate restTemplate;
- @Autowired
- private RedisUtil redisUtil;
- @Value("${asms.host}")
- private String host;
- @Value("${asms.username}")
- private String username;
- @Value("${asms.password}")
- private String password;
- @Value("${asms.expire}")
- private Long expire;
- // 汽车标准数字化平台ASMS权限验证token
- private final static String ASMS_SYSTEM_AUTH_TOKEN = "ASMS_SYSTEM_AUTH_TOKEN";
-
- /**
- * @Author: liao
- * @Date: 2023/10/17 15:43
- * @Description: 获取token字符串
- **/
- private String getToken() {
- // 从redis中获取token
- String token = (String) redisUtil.get(ASMS_SYSTEM_AUTH_TOKEN);
- // 如果token为空则重新获取
- if (StringUtils.isBlank(token)) {
- Map map = new HashMap<>();
- map.put("username", username);
- map.put("password", password);
- ResponseEntity responseEntity = restTemplate.postForEntity(host + "xiaobodata/openApi/login", map, Result.class);
- if (!responseEntity.getBody().isSuccess()) {
- System.out.println("汽车标准数字化平台:token获取失败" + responseEntity.getBody().toString());
- throw new JeroBootException("汽车标准数字化平台:token获取失败" + responseEntity.getBody().toString());
- }
- Map resultMap = (Map) responseEntity.getBody().getResult();
- token = resultMap.get("token");
- // 将新获取的token存入redis
- redisUtil.set(ASMS_SYSTEM_AUTH_TOKEN, token, expire * 60 * 60);
- log.info("new token is creating: {}", token);
- }
- return token;
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/17 16:33
- * @Description: 发送get请求
- * uri：接口地址
- * map：参数map
- **/
- public List> sendGetReq(String uri, Map map) {
- ResponseEntity responseEntity = getSendGetReq(uri, map);
- Map resultMap = (Map) responseEntity.getBody().getResult();
- if (Objects.isNull(resultMap)) {
- throw new JeroBootException("返回数据为空");
- }
- List> mapList = (List>) resultMap.get("records");
- if (CollectionUtils.isEmpty(mapList)) {
- mapList = new ArrayList<>();
- Map result = (Map) responseEntity.getBody().getResult();
- if (result.containsKey("records")) {
- return new ArrayList<>();
- }
- mapList.add(result);
- }
- log.info("返回{}条数据", mapList.size());
- return mapList;
- }
-
- public Map sendGetReq2(String uri, Map map) {
- ResponseEntity responseEntity = getSendGetReq(uri, map);
- return (Map) responseEntity.getBody().getResult();
- }
-
- private ResponseEntity getSendGetReq(String uri, Map map) {
- // 准备请求头
- String token = getToken();
- HttpHeaders headers = new HttpHeaders();
- headers.set("Content-Type", "application/x-www-form-urlencoded");
- headers.set("X-Access-Token", token);
-
- if (StringUtils.isBlank(uri)) {
- throw new JeroBootException("url不能为空");
- }
- // 准备url
- String url = host + uri;
- if (!Objects.isNull(map)) {
- StringBuilder sb = new StringBuilder();
- map.forEach((k, v) -> sb.append("&" + k + "=" + v));
- String s = sb.toString();
- url += "?" + s.substring(1);
- }
-
- ResponseEntity responseEntity;
- try {
- log.info("request url : {}", url);
- responseEntity = restTemplate.exchange(url.toString(),
- HttpMethod.GET, new HttpEntity<>(null, headers), Result.class);
- } catch (Exception e) {
- log.info("old token is deleting: {}", token);
- redisUtil.del(ASMS_SYSTEM_AUTH_TOKEN);
- e.printStackTrace();
- throw new JeroBootException("操作失败，请稍后重试");
- }
-
- if (!responseEntity.getBody().isSuccess()) {
- System.out.println("汽车标准数字化平台:请求发送失败" + responseEntity.getBody().toString());
- throw new JeroBootException("汽车标准数字化平台:请求发送失败" + responseEntity.getBody().toString());
- }
- return responseEntity;
- }
-
- public InputStream getFileByteArray(String fileUrl) {
- // 执行GET请求
- ResponseEntity response = restTemplate.getForEntity(host + fileUrl, byte[].class);
- byte[] bytes = response.getBody();
- return new ByteArrayInputStream(bytes);
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/config/DownloadInterceptor.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/config/DownloadInterceptor.java
deleted file mode 100644
index d5a300c..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/config/DownloadInterceptor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.jero.modules.docking.download.config;
-
-import com.jero.modules.docking.download.service.DownloadDecryptFileService;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author lqt
- * @version 1.0
- * @date 2023/11/23 18:20
- */
-@Component
-public class DownloadInterceptor implements HandlerInterceptor{
-
- @Resource
- private DownloadDecryptFileService downloadDecryptFileService;
-
- public DownloadInterceptor(DownloadDecryptFileService downloadDecryptFileService) {
- this.downloadDecryptFileService = downloadDecryptFileService;
- }
-
- /**
- * 预处理回调方法，实现处理器的预处理（如检查登陆），第三个参数为响应的处理器
- * 返回值：true表示继续流程（如调用下一个拦截器或处理器）；false表示流程中断（如登录检查失败），不会继续调用其他的拦截器或处理器，此时我们需要通过response来产生响应
- * @throws Exception
- */
- @Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- return true;
- }
-
- /**
- * 后处理回调方法，实现处理器的后处理（但在渲染视图之前），此时我们可以通过modelAndView（模型和视图对象）对模型数据进行处理或对视图进行处理，modelAndView也可能为null
- */
- @Override
- public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable ModelAndView modelAndView) throws Exception {
- downloadDecryptFileService.downloadDecryptFile(request,response,handler,"1");
- }
-
- /**
- *整个请求处理完毕回调方法，即在视图渲染完毕时回调，如性能监控中我们可以在此记录结束时间并输出消耗时间，还可以进行一些资源清理，类似于try-catch-finally中的finally，但仅调用处理器执行链中
- */
- @Override
- public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex) throws Exception {
- downloadDecryptFileService.downloadDecryptFile(request,response,handler,null);
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/config/InterceptorConfig.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/config/InterceptorConfig.java
deleted file mode 100644
index 74cf99b..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/config/InterceptorConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.jero.modules.docking.download.config;
-
-import com.jero.modules.docking.download.service.DownloadDecryptFileService;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.annotation.Resource;
-
-/**
- * @author lqt
- * @version 1.0
- * @date 2023/11/23 18:21
- */
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
- @Resource
- private DownloadDecryptFileService downloadDecryptFileService;
-
- @Override
- public void addInterceptors(InterceptorRegistry registry) {
- registry.addInterceptor(new DownloadInterceptor(downloadDecryptFileService)).addPathPatterns("/**");
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/controller/SearchController.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/controller/SearchController.java
deleted file mode 100644
index c48a61e..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/controller/SearchController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.jero.modules.docking.download.controller;
-
-import com.jero.modules.docking.utils.IntekeyUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author lqt
- * @version 1.0
- * @date 2023/11/27 17:41
- */
-@RestController
-@RequestMapping("/home/search")
-public class SearchController {
-
-
- @PostMapping(value = "/download")
- public void downloadAndView(@RequestParam("file") MultipartFile file,
- @RequestParam("url") String url,
- @RequestParam("appCode") String appCode,
- @RequestParam("secretKey") String secretKey,
- @RequestParam("scope") Integer scope,
- HttpServletResponse response) {
- try (InputStream inputStream = IntekeyUtils.DecryptFile(url, appCode, secretKey, scope, file);
- OutputStream outputStream = response.getOutputStream()
- ) {
- byte[] buf = new byte[1024];
- int len;
- while ((len = inputStream.read(buf)) > 0) {
- outputStream.write(buf, 0, len);
- }
- response.flushBuffer();
- } catch (Exception e) {
- response.setStatus(404);
- e.printStackTrace();
- }
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/service/DownloadDecryptFileService.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/service/DownloadDecryptFileService.java
deleted file mode 100644
index 65d4d17..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/service/DownloadDecryptFileService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.jero.modules.docking.download.service;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author lqt
- * @version 1.0
- * @date 2023/11/24 9:04
- */
-public interface DownloadDecryptFileService {
-
- /**
- *
- * @author LQT
- * @date 2023/11/24 9:06
- * @param request
- * @param response
- * @param handler
- * @param type 1 为直接返回文件流，其他为modelandview
- * @return void
- */
- void downloadDecryptFile(HttpServletRequest request, HttpServletResponse response, Object handler,String type);
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/service/impl/DownloadDecryptFileServiceImpl.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/service/impl/DownloadDecryptFileServiceImpl.java
deleted file mode 100644
index b9ed334..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/download/service/impl/DownloadDecryptFileServiceImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package com.jero.modules.docking.download.service.impl;
-
-import com.jero.common.api.vo.ResultCommon;
-import com.jero.common.exception.JeroBootException;
-import com.jero.common.system.vo.LoginUser;
-import com.jero.modules.docking.download.service.DownloadDecryptFileService;
-import com.jero.modules.docking.utils.IntekeyUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.entity.ContentType;
-import org.apache.shiro.SecurityUtils;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.stereotype.Service;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.util.ContentCachingResponseWrapper;
-import org.springframework.web.util.WebUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-
-/**
- * @author lqt
- * @version 1.0
- * @date 2023/11/24 9:04
- */
-@Slf4j
-@Service
-public class DownloadDecryptFileServiceImpl implements DownloadDecryptFileService {
-
- @Value("#{'${download.download_url}'.split(',')}")
- private List downloadUrl;
-
- @Value("#{'${download.view_url}'.split(',')}")
- private List viewUrl;
-
- @Value("#{'${download.enable}'}")
- private boolean enable;
-
- /**
- * 管理员角色
- */
- @Value("#{'${download.admin_role_code}'.split(',')}")
- private List adminRoleCode;
-
- /**
- * 加密
- */
- @Value("#{'${download.encrypt.url}'}")
- private String encryptUrl;
- @Value("#{'${download.encrypt.app_code}'}")
- private String encryptAppCode;
- @Value("#{'${download.encrypt.secret_key}'}")
- private String encryptSecretKey;
-
- /**
- * 解密
- */
- @Value("#{'${download.decrypt.url}'}")
- private String decryptUrl;
- @Value("#{'${download.decrypt.app_code}'}")
- private String decryptAppCode;
- @Value("#{'${download.decrypt.secret_key}'}")
- private String decryptSecretKey;
-
- /**
- * 研发域
- */
- @Value("#{'${download.scope_dev}'}")
- private int scopeDev;
- /**
- * 办公域
- */
- @Value("#{'${download.scope_work}'}")
- private int scopeWork;
-
-
- @Override
- public void downloadDecryptFile(HttpServletRequest request, HttpServletResponse response, Object handler,String type) {
- if(!enable){
- return;
- }
- // 判断返回值是否为文件流，否则其他接口返回值会变更成字符串，导致前端无法解析
- HandlerMethod handlerMethod = (HandlerMethod) handler;
- InputStream responseBody = null;
- try {
- String returnType = handlerMethod.getMethod().getReturnType().getName();
- if(!Objects.equals(returnType,"void") && !Objects.equals(returnType,"org.springframework.web.servlet.ModelAndView")){
- return;
- }
- if(Objects.equals(returnType,"void") && !Objects.equals(type,"1")){
- return;
- }
- ContentCachingResponseWrapper wrapper = WebUtils.getNativeResponse(response, ContentCachingResponseWrapper.class);
- if (wrapper != null) {
- responseBody = wrapper.getContentInputStream();
- }
- } catch (Exception e) {
- e.printStackTrace();
- response.setStatus(404);
- }
-
- String contentType = response.getContentType();
- String fileName = getFileName(response);
-
- MultipartFile file = getMultipartFile(response,responseBody, contentType, fileName);
- // 访问路径
- String str = request.getRequestURI();
-
- boolean b = isBoolean(str, viewUrl);
-
- boolean b1 = isBoolean(str, downloadUrl);
-
- if(b){
- // 预览，进行解密
- decryptFile(response, file, null);
- }else if(b1){
- // 下载文件 先解密，判断组织域，加密
- try (InputStream is = IntekeyUtils.DecryptFile(decryptUrl, decryptAppCode, decryptSecretKey, null, file)) {
- MultipartFile fileDecrypt = getMultipartFile(response,is, contentType, fileName);
- int scope = getScope();
- // 加密
- encryptFile(response, fileDecrypt, scope);
- } catch (Exception e) {
- response.setStatus(404);
- }
-
- }else{
- // excel 判断组织域，加密
- int scope = getScope();
- // 加密
- encryptFile(response, file, scope);
- }
- }
-
- @NotNull
- private String getFileName(HttpServletResponse response) {
- String fileName = "";
- String headerField = response.getHeader("Content-Disposition");
-
- if (!StringUtils.isBlank(headerField) || headerField.contains("fileName=") || headerField.contains("filename=")){
- String name = "";
- if(headerField.contains("fileName=")){
- name = "fileName";
- }else{
- name = "filename";
- }
- fileName = headerField.substring(headerField.lastIndexOf(name + "=") + 9);
- }else {
- fileName = UUID.randomUUID().toString();
- }
- return fileName;
- }
-
- private void decryptFile(HttpServletResponse response, MultipartFile file, Integer scope) {
- try (InputStream is = IntekeyUtils.DecryptFile(decryptUrl, decryptAppCode, decryptSecretKey, scope, file)) {
- writeResponse(response, is);
- } catch (Exception e) {
- response.setStatus(404);
- }
- }
-
- private void encryptFile(HttpServletResponse response, MultipartFile file, Integer scope) {
- try (InputStream is = IntekeyUtils.DecryptFile(encryptUrl, encryptAppCode, encryptSecretKey, scope, file)) {
- writeResponse(response, is);
- } catch (Exception e) {
- response.setStatus(404);
- }
- }
-
- @NotNull
- private MultipartFile getMultipartFile(HttpServletResponse response,InputStream responseBody,String contentType,String fileName) {
- MultipartFile file = null;
- try {
- file = new MockMultipartFile(ContentType.APPLICATION_OCTET_STREAM.toString(),fileName,contentType, responseBody);
- } catch (IOException e) {
- e.printStackTrace();
- response.setStatus(404);
- }
- return file;
- }
-
- private boolean isBoolean(String str, List viewUrl) {
- boolean b = false;
- for (String s : viewUrl) {
- if (str.contains(s)) {
- b = true;
- break;
- }
- }
- return b;
- }
-
- private int getScope() {
-// 角色信息中存在 【系统管理员】或者 【标准管理员】即加为研发密，其他情况都是OA密
-// 研发密比较高级（加密需要传参）
-// 研发域 scope = 51
-// 办公密 scope = 52
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- List listRoleCode = Arrays.asList(sysUser.getRoleIds().split(","));
- if(CollectionUtils.isEmpty(listRoleCode)){
- throw new JeroBootException(ResultCommon.ERROR);
- }
- int scope = scopeWork;
- long l = listRoleCode.stream().filter(o->adminRoleCode.contains(o)).count();
- if(l > 0){
- scope = scopeDev;
- }
- return scope;
- }
-
- private void writeResponse(HttpServletResponse response,InputStream is) {
- response.resetBuffer();
- try (OutputStream outputStream = response.getOutputStream()) {
- byte[] buf = new byte[1024];
- int len;
- while ((len = is.read(buf)) > 0) {
- outputStream.write(buf, 0, len);
- }
- response.flushBuffer();
- }catch (Exception e){
- log.error(e.getMessage());
- response.setStatus(404);
- e.printStackTrace();
- }
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkDingDingMsg.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkDingDingMsg.java
deleted file mode 100644
index 9c38c40..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkDingDingMsg.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.jero.modules.docking.hiwork.entity;
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Author: liao
- * @Date: 2023/10/13 17:49
- * @Description: 统一消息集成-钉钉消息
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="统一消息集成-钉钉消息", description="统一消息集成-钉钉消息")
-public class HiworkDingDingMsg {
- @ApiModelProperty(value = "异构系统标识")
- private String sysCode;
- @ApiModelProperty(value = "服务号")
- private String noticeServiceCode;
- @ApiModelProperty(value = "发送人员Id")
- private String useridList;
- @ApiModelProperty(value = "发送部门id")
- private String deptIdList;
- @ApiModelProperty(value = "agentId")
- private String agentId;
- @ApiModelProperty(value = "标题")
- private String title;
- @ApiModelProperty(value = "消息体")
- private JSONObject msg;
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkResult.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkResult.java
deleted file mode 100644
index 5c63224..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkResult.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jero.modules.docking.hiwork.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Author: liao
- * @Date: 2023/10/13 14:39
- * @Description: 统一待办集成返回
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="统一待办集成返回", description="统一待办集成返回")
-public class HiworkResult {
- @ApiModelProperty(value = "成功true，失败false")
- private Boolean success;
- @ApiModelProperty(value = "成功1，失败0")
- private Integer code;
- @ApiModelProperty(value = "消息")
- private String msg;
- @ApiModelProperty(value = "成功null，失败null")
- private Object data;
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkSystemMsg.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkSystemMsg.java
deleted file mode 100644
index 04bfece..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkSystemMsg.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.jero.modules.docking.hiwork.entity;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Author: liao
- * @Date: 2023/10/13 17:49
- * @Description: 统一消息集成-系统消息
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="统一消息集成-系统消息", description="统一消息集成-系统消息")
-public class HiworkSystemMsg {
- @ApiModelProperty(value = "异构系统标识")
- private String sysCode;
- @ApiModelProperty(value = "发送人员编号")
- private String sendCode;
- @ApiModelProperty(value = "发送人员姓名")
- private String sendName;
- @ApiModelProperty(value = "消息类型 字典")
- private String messageType;
- @ApiModelProperty(value = "消息标题")
- private String title;
- @ApiModelProperty(value = "消息接收人 集合")
- private JSONArray receiverList;
- @ApiModelProperty(value = "消息体")
- private JSONObject msg;
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java
deleted file mode 100644
index 892c59d..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.jero.modules.docking.hiwork.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.time.Instant;
-
-/**
- * @Author: liao
- * @Date: 2023/10/13 14:22
- * @Description: 待办
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="统一待办集成", description="统一待办集成")
-public class HiworkTodo {
- @ApiModelProperty(value = "异构系统标识")
- private String sysCode;
- @ApiModelProperty(value = "标题")
- private String noticeTitle;
- @ApiModelProperty(value = "描述")
- private String noticeDescription;
- @ApiModelProperty(value = "流程编号")
- private String busiDefCode;
- @ApiModelProperty(value = "流程实例id")
- private String processId;
- @ApiModelProperty(value = "流程实例名称")
- private String processName;
- @ApiModelProperty(value = "流程类型，字典")
- private String processType;
- @ApiModelProperty(value = "任务id")
- private String taskId;
- @ApiModelProperty(value = "节点名称")
- private String taskName;
- @ApiModelProperty(value = "是否会签")
- private Integer multiInstance;
- @ApiModelProperty(value = "节点编号")
- private String nodeBusiCode;
- @ApiModelProperty(value = "跳转链接")
- private String businessLink;
- @ApiModelProperty(value = "APP跳转链接")
- private String appBusinessLink;
- @ApiModelProperty(value = "创建人code")
- private String createUserCode;
- @ApiModelProperty(value = "创建人姓名")
- private String createUserName;
- @ApiModelProperty(value = "接收人id")
- private String userId;
- @ApiModelProperty(value = "接收人code")
- private String userCode;
- @ApiModelProperty(value = "接收人姓名")
- private String userName;
- @ApiModelProperty(value = "参与者id")
- private String participantId;
- @ApiModelProperty(value = "参与者编号")
- private String participantCode;
- @ApiModelProperty(value = "接收时间")
- private Instant receiveTime;
- @ApiModelProperty(value = "截止时间")
- private Long dueTime;
- @ApiModelProperty(value = "业务主键")
- private String bid;
- @ApiModelProperty(value = "待办、已办")
- private String isTodo;
- @ApiModelProperty(value = "是否展示在列表中")
- private String isShow;
- @ApiModelProperty(value = "优先级")
- private String priority;
- @ApiModelProperty(value = "是否通知消息")
- private String notifyConfig;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodoAdd.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodoAdd.java
deleted file mode 100644
index 0c1c4a5..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodoAdd.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.jero.modules.docking.hiwork.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Author: liao
- * @Date: 2023/10/16 17:23
- * @Description: 统一待办集成-添加
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="统一待办集成-添加", description="统一待办集成-添加")
-public class HiworkTodoAdd {
- @ApiModelProperty(value = "标题")
- private String title;
- @ApiModelProperty(value = "任务id")
- private String taskId;
- @ApiModelProperty(value = "流程类型，字典")
- private String processType;
- @ApiModelProperty(value = "是否会签")
- private Integer isCounterSignature;
- @ApiModelProperty(value = "节点编号")
- private String nodeNumber;
- @ApiModelProperty(value = "跳转链接")
- private String jumpLink;
- @ApiModelProperty(value = "APP跳转链接")
- private String appJumpLink;
- @ApiModelProperty(value = "创建人id")
- private String creatorId;
- @ApiModelProperty(value = "接收人id")
- private String recipientId;
- @ApiModelProperty(value = "截止时间")
- private Long endTime;
- @ApiModelProperty(value = "业务主键")
- private String businessId;
- @ApiModelProperty(value = "待办、已办（1、待办 2已办 3结束 6 删除）")
- private String isTodo;
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/enums/IsTodoEnum.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/enums/IsTodoEnum.java
deleted file mode 100644
index e90dc76..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/enums/IsTodoEnum.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.jero.modules.docking.hiwork.enums;
-
-/**
- * @Author: liao
- * @Date: 2023/10/13 15:05
- * @Description: 待办、已办
- */
-public enum IsTodoEnum {
- TODO( "待办", "1"),
- DONE("已办", "2"),
- FINISH("结束", "3"),
- DEL("删除", "6")
- ;
-
- String name;
- String value;
-
- IsTodoEnum(String name, String value) {
- this.name = name;
- this.value = value;
- }
-
- public String getName() {return name;}
- public String getValue() {return value;}
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/handle/DingDingSendMsgHandle.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/handle/DingDingSendMsgHandle.java
deleted file mode 100644
index 297ff3d..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/handle/DingDingSendMsgHandle.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.jero.modules.docking.hiwork.handle;
-
-import com.jero.common.util.SpringContextUtils;
-import com.jero.modules.docking.hiwork.service.IHiworkMsgService;
-import com.jero.modules.message.handle.ISendMsgHandle;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @Author: liao
- * @Date: 2023/10/17 14:29
- * @Description: Hiwork钉钉消息
- **/
-@Slf4j
-public class DingDingSendMsgHandle implements ISendMsgHandle {
-
- /**
- * @Author: liao
- * @Date: 2023/10/17 14:29
- * @Description: Hiwork钉钉消息
- **/
- @Override
- public void SendMsg(String esReceiver, String esTitle, String esContent) {
- IHiworkMsgService hiworkMsgService = SpringContextUtils.getBean(IHiworkMsgService.class);
- hiworkMsgService.sendDingDingMsg(Arrays.asList(esReceiver.split(",")), esTitle, esContent);
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/handle/SystemSendMsgHandle.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/handle/SystemSendMsgHandle.java
deleted file mode 100644
index 07154e0..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/handle/SystemSendMsgHandle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jero.modules.docking.hiwork.handle;
-
-import com.jero.common.util.SpringContextUtils;
-import com.jero.modules.docking.hiwork.service.IHiworkMsgService;
-import com.jero.modules.message.handle.ISendMsgHandle;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Arrays;
-
-@Slf4j
-public class SystemSendMsgHandle implements ISendMsgHandle {
-
- @Override
- public void SendMsg(String esReceiver, String esTitle, String esContent) {
- IHiworkMsgService hiworkMsgService = SpringContextUtils.getBean(IHiworkMsgService.class);
- // TODO 先写死 01 消息类型（暂未确定）
- String messageType = "01";
- hiworkMsgService.sendSystemMsg(Arrays.asList(esReceiver.split(",")), messageType, esTitle, esContent);
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/IHiworkMsgService.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/IHiworkMsgService.java
deleted file mode 100644
index a21fbca..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/IHiworkMsgService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.jero.modules.docking.hiwork.service;
-
-import java.util.List;
-
-/**
- * @Author: liao
- * @Date: 2023/10/16 15:18
- * @Description: 统一消息集成
- */
-public interface IHiworkMsgService {
-
- /**
- * @Author: liao
- * @Date: 2023/10/16 15:32
- * @Description: 发送钉钉消息
- * senderIdList：发送人员id集合
- * title：消息标题
- * content：文本内容
- **/
- void sendDingDingMsg(List senderIdList, String title, String content);
-
- /**
- * @Author: liao
- * @Date: 2023/10/16 16:11
- * @Description: 发送系统消息
- * senderId：发送人员id
- * receiverIdList：消息接收人id集合
- * messageType：消息类型 字典
- * title：消息标题
- * content：消息内容
- **/
- void sendSystemMsg(List receiverIdList, String messageType, String title, String content);
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/IHiworkTodoService.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/IHiworkTodoService.java
deleted file mode 100644
index 3907db3..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/IHiworkTodoService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jero.modules.docking.hiwork.service;
-
-import com.jero.modules.docking.hiwork.entity.HiworkTodoAdd;
-
-import java.util.List;
-
-/**
- * @Author: liao
- * @Date: 2023/10/13 14:23
- * @Description: 待办
- */
-public interface IHiworkTodoService {
-
- /**
- * @Author: liao
- * @Date: 2023/10/13 15:12
- * @Description: 统一待办集成
- **/
- void sendTodoTask(List hiworkTodoAddList);
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java
deleted file mode 100644
index 08f2e12..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.jero.modules.docking.hiwork.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.jero.common.exception.JeroBootException;
-import com.jero.common.system.vo.LoginUser;
-import com.jero.modules.docking.hiwork.entity.HiworkDingDingMsg;
-import com.jero.modules.docking.hiwork.entity.HiworkSystemMsg;
-import com.jero.modules.docking.hiwork.service.IHiworkMsgService;
-import com.jero.modules.docking.hiwork.util.HiworkPostUtil;
-import com.jero.common.api.vo.ResultCommon;
-import com.jero.modules.system.entity.SysUser;
-import com.jero.modules.system.service.ISysUserService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Author: liao
- * @Date: 2023/10/16 15:18
- * @Description: 统一消息集成
- */
-@Service
-@Slf4j
-public class HiworkMsgServiceImpl implements IHiworkMsgService {
-
- @Autowired
- private HiworkPostUtil hiworkPostUtil;
- @Autowired
- private ISysUserService sysUserService;
-
- private final static String TEXT = "text"; // 消息类型-文本
- private final static String MSG_TYPE = "msgtype"; // 消息类型
- private final static String CONTENT = "content"; // 消息内容
-
- /**
- * @Author: liao
- * @Date: 2023/10/16 15:32
- * @Description: 发送钉钉消息
- * senderIdList：发送人员id集合
- * content：文本内容
- **/
- @Override
- public void sendDingDingMsg(List senderIdList, String title, String content) {
- HiworkDingDingMsg hiworkDingDingMsg = new HiworkDingDingMsg();
- // 异步系统标识
- hiworkDingDingMsg.setSysCode(HiworkPostUtil.getSysCode());
-
- if (CollectionUtils.isEmpty(senderIdList)) {
- throw new JeroBootException(ResultCommon.EMPTY_COMMON, "senderIdList");
- }
- List senderUserList = sysUserService.listByIds(senderIdList);
- List usernameList = senderUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
- // 发送人员id（工号以英文逗号分隔）
- hiworkDingDingMsg.setUseridList(StringUtils.join(usernameList, ","));
- // 标题
- hiworkDingDingMsg.setTitle(title);
-
- // 消息体
- JSONObject msgJsonObject = new JSONObject();
- msgJsonObject.put(MSG_TYPE, TEXT);
- JSONObject textJsonObject = new JSONObject();
- textJsonObject.put(CONTENT, content);
- msgJsonObject.put(TEXT, textJsonObject);
- hiworkDingDingMsg.setMsg(msgJsonObject);
-
- log.info("发送Hiwork钉钉消息: {}", JSONObject.toJSONString(hiworkDingDingMsg));
-
- hiworkPostUtil.postDingDingMsg(hiworkDingDingMsg);
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/16 16:12
- * @Description: 发送系统消息
- * senderId：发送人员id
- * receiverIdList：消息接收人id集合
- * messageType：消息类型 字典
- * title：消息标题
- * content：消息内容
- **/
- @Override
- public void sendSystemMsg(List receiverIdList, String messageType, String title, String content) {
- HiworkSystemMsg hiworkSystemMsg = new HiworkSystemMsg();
-
- // 异步系统标识
- hiworkSystemMsg.setSysCode(HiworkPostUtil.getSysCode());
-
- LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- // 发送人员编号
- hiworkSystemMsg.setSendCode(loginUser.getUsername());
- // 发送人员姓名
- hiworkSystemMsg.setSendName(loginUser.getRealname());
- // 消息类型
- hiworkSystemMsg.setMessageType(messageType);
- // 消息标题
- hiworkSystemMsg.setTitle(title);
-
- if (CollectionUtils.isEmpty(receiverIdList)) {
- throw new JeroBootException(ResultCommon.EMPTY_COMMON, "receiverIdList");
- }
- List receiverUserList = sysUserService.listByIds(receiverIdList);
- JSONArray jsonArray = new JSONArray();
- receiverUserList.forEach(receiverUser -> {
- Map receiverMap = new HashMap<>();
- // 人员编号
- receiverMap.put("employeeNo", receiverUser.getUsername());
- // 人员名称
- receiverMap.put("userName", receiverUser.getRealname());
- jsonArray.add(receiverMap);
- });
- // 消息接收人 集合
- hiworkSystemMsg.setReceiverList(jsonArray);
-
- // 消息体
- JSONObject msgJsonObject = new JSONObject();
- msgJsonObject.put(MSG_TYPE, TEXT);
- JSONObject textJsonObject = new JSONObject();
- textJsonObject.put(CONTENT, content);
- msgJsonObject.put(TEXT, textJsonObject);
- hiworkSystemMsg.setMsg(msgJsonObject);
-
- log.info("发送Hiwork系统消息: {}", JSONObject.toJSONString(hiworkSystemMsg));
-
- hiworkPostUtil.postSystemMsg(hiworkSystemMsg);
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
deleted file mode 100644
index 85c3f79..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.jero.modules.docking.hiwork.service.impl;
-
-import com.jero.common.exception.JeroBootException;
-import com.jero.modules.docking.hiwork.entity.HiworkTodoAdd;
-import com.jero.modules.docking.hiwork.service.IHiworkTodoService;
-import com.jero.modules.docking.hiwork.util.HiworkPostUtil;
-import com.jero.modules.docking.hiwork.entity.HiworkTodo;
-import com.jero.common.api.vo.ResultCommon;
-import com.jero.modules.system.entity.SysUser;
-import com.jero.modules.system.service.ISysUserService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.task.Task;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author: liao
- * @Date: 2023/10/13 14:23
- * @Description: 待办
- */
-@Service
-public class HiworkTodoServiceImpl implements IHiworkTodoService {
-
- @Autowired
- private ISysUserService sysUserService;
- @Autowired
- private TaskService taskService;
- @Autowired
- private RuntimeService runtimeService;
- @Autowired
- private HiworkPostUtil hiworkPostUtil;
-
- /**
- * @Author: liao
- * @Date: 2023/10/13 15:12
- * @Description: 统一待办集成
- **/
- @Override
- public void sendTodoTask(List hiworkTodoAddList) {
- if (CollectionUtils.isEmpty(hiworkTodoAddList)) {
- throw new JeroBootException(ResultCommon.EMPTY_COMMON, "hiworkTodoAddList");
- }
-
- List hiworkTodoList = new ArrayList<>();
- hiworkTodoAddList.forEach(hiworkTodoAdd -> {
- HiworkTodo hiworkTodo = new HiworkTodo();
- // 异步系统标识
- hiworkTodo.setSysCode(HiworkPostUtil.getSysCode());
- // 标题
- hiworkTodo.setNoticeTitle(hiworkTodoAdd.getTitle());
-
- if (StringUtils.isBlank(hiworkTodoAdd.getTaskId())) {
- throw new JeroBootException(ResultCommon.EMPTY_COMMON, "taskId");
- }
- Task task = taskService.createTaskQuery().taskId(hiworkTodoAdd.getTaskId()).singleResult();
- ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
- .processInstanceId(task.getProcessInstanceId()).singleResult();
-
- // 流程实例id
- hiworkTodo.setProcessId(processInstance.getId());
- // 流程实例名称
- hiworkTodo.setProcessName(processInstance.getName());
- // 流程类型，字典
- hiworkTodo.setProcessType(hiworkTodoAdd.getProcessType());
- // 任务id
- hiworkTodo.setTaskId(hiworkTodoAdd.getTaskId());
- // 节点名称
- hiworkTodo.setTaskName(task.getName());
- // 是否会签
- hiworkTodo.setMultiInstance(hiworkTodoAdd.getIsCounterSignature());
- // 节点编号
- hiworkTodo.setNodeBusiCode(hiworkTodoAdd.getNodeNumber());
- // 跳转链接
- hiworkTodo.setBusinessLink(hiworkTodoAdd.getJumpLink());
- // APP跳转链接
- hiworkTodo.setAppBusinessLink(hiworkTodoAdd.getAppJumpLink());
-
- if (StringUtils.isBlank(hiworkTodoAdd.getCreatorId())) {
- throw new JeroBootException(ResultCommon.EMPTY_COMMON, "creatorId");
- }
- SysUser creatorUser = sysUserService.getById(hiworkTodoAdd.getCreatorId());
- // 创建人code
- hiworkTodo.setCreateUserCode(creatorUser.getUsername());
- // 创建人姓名
- hiworkTodo.setCreateUserName(creatorUser.getRealname());
-
- if (StringUtils.isBlank(hiworkTodoAdd.getRecipientId())) {
- throw new JeroBootException(ResultCommon.EMPTY_COMMON, "recipientId");
- }
- SysUser recipientUser = sysUserService.getById(hiworkTodoAdd.getRecipientId());
- // 接收人id
- hiworkTodo.setUserId(recipientUser.getId());
- // 接收人code
- hiworkTodo.setUserCode(recipientUser.getUsername());
- // 接收人姓名
- hiworkTodo.setUserName(recipientUser.getRealname());
-
- // 截止时间
- hiworkTodo.setDueTime(hiworkTodoAdd.getEndTime());
- // 业务主键
- hiworkTodo.setBid(hiworkTodoAdd.getBusinessId());
- // 待办、已办
- hiworkTodo.setIsTodo(hiworkTodoAdd.getIsTodo());
-
- hiworkTodoList.add(hiworkTodo);
- });
-
- // 远程调用
- hiworkPostUtil.postTodo(hiworkTodoList);
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
deleted file mode 100644
index 6ccb259..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.jero.modules.docking.hiwork.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jero.common.api.dto.message.SendMessageDTO;
-import com.jero.common.api.vo.SendMessageAPI;
-import com.jero.common.exception.JeroBootException;
-import com.jero.modules.docking.hiwork.handle.DingDingSendMsgHandle;
-import com.jero.modules.docking.hiwork.handle.SystemSendMsgHandle;
-import com.jero.modules.message.entity.SysMessageTemplate;
-import com.jero.modules.message.handle.ISendMsgHandle;
-import com.jero.modules.message.handle.impl.SmsSendMsgHandle;
-import com.jero.modules.message.service.ISysMessageTemplateService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @Author: liao
- * @Date: 2023/10/17 11:23
- * @Description: 发送消息
- */
-@Slf4j
-@Service
-public class SendMessageServiceImpl implements SendMessageAPI {
-
- @Resource
- private ISysMessageTemplateService sysMessageTemplateService;
- @Value("${hiwork.isSend}")
- private Boolean isSend;
-
- /**
- * @Author: liao
- * @Date: 2023/10/17 11:25
- * @Description: 根据模板发送消息
- **/
- @Override
- public void sendMessage(SendMessageDTO sendMessageDTO) {
- if(StringUtils.isEmpty(sendMessageDTO.getToUserId())){
- throw new JeroBootException("消息接收人id不能为空");
- }
- if(StringUtils.isEmpty(sendMessageDTO.getTemplateCode())){
- throw new JeroBootException("消息模板编码不能为空!");
- }
-
- LambdaQueryWrapper query = new LambdaQueryWrapper<>();
- query.eq(SysMessageTemplate::getTemplateCode,sendMessageDTO.getTemplateCode());
- List sysSmsTemplates = sysMessageTemplateService.list(query);
- if(CollectionUtils.isEmpty(sysSmsTemplates)){
- throw new JeroBootException("消息模板不存在");
- }
- SysMessageTemplate sysMessageTemplate = sysSmsTemplates.get(0);
-
- try {
- // 替换模板内容
- if(!Objects.isNull(sendMessageDTO.getMap())){
- Map map = sendMessageDTO.getMap();
- map.forEach((k,v)-> sysMessageTemplate.setTemplateContent(
- sysMessageTemplate.getTemplateContent().replace("${" + k + "}", v)));
- }
-
- List typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(","));
- typeList.forEach(type -> {
- log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(),sysMessageTemplate.getTemplateContent(), type);
- ISendMsgHandle sendMsgHandle;
- if ("5".equals(type)) {
- // Hiwork钉钉消息
- sendMsgHandle = new DingDingSendMsgHandle();
- } else if ("6".equals(type)) {
- // Hiwork系统消息
- sendMsgHandle = new SystemSendMsgHandle();
- } else if ("4".equals(type)) {
- // 普通系统消息
- sendMsgHandle = new SmsSendMsgHandle();
- if (!isSend) {
- sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent());
- }
- } else {
- return;
- }
- if (isSend) {
- sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent());
- }
- });
- } catch (Exception e){
- log.error("发送消息异常",e);
- throw new JeroBootException("发送消息异常");
- }
-
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/util/HiworkPostUtil.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/util/HiworkPostUtil.java
deleted file mode 100644
index c1cd8b2..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/util/HiworkPostUtil.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.jero.modules.docking.hiwork.util;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jero.common.exception.JeroBootException;
-import com.jero.modules.docking.hiwork.entity.HiworkResult;
-import com.jero.modules.docking.hiwork.entity.HiworkTodo;
-import com.jero.modules.docking.hiwork.entity.HiworkDingDingMsg;
-import com.jero.modules.docking.hiwork.entity.HiworkSystemMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.List;
-
-/**
- * @Author: liao
- * @Date: 2023/10/13 16:55
- * @Description: Hiwork集成
- */
-@Component
-public class HiworkPostUtil {
- @Autowired
- private RestTemplate restTemplate;
- @Value("${hiwork.ip}")
- private String ip;
- @Value("${hiwork.todoUrl}")
- private String todoUrl;
- @Value("${hiwork.messageUrl}")
- private String messageUrl;
-
- // 异构系统标识
- private static String sysCode;
-
- @Value("${hiwork.sysCode}")
- public void setSysCode(String sysCode) {
- HiworkPostUtil.sysCode = sysCode;
- }
-
- public static String getSysCode() {
- return sysCode;
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/13 17:45
- * @Description: 远程调用Hiwork
- **/
- private void postHiwork(String jsonString, String url) {
- // 设置请求头
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_JSON);
-
- HttpEntity requestEntity = new HttpEntity<>(jsonString, headers);
-
- // 发送 POST 请求并获取响应
- ResponseEntity response = restTemplate.postForEntity(url, requestEntity, HiworkResult.class);
-
- // 处理响应数据
- if (response.getStatusCode().is2xxSuccessful()) {
- HiworkResult hiworkResult = response.getBody();
- if (!hiworkResult.getSuccess()) {
- throw new JeroBootException("Hiwork:" + hiworkResult.getMsg());
- }
- } else {
- throw new JeroBootException("Hiwork: request failed with status code: " + response.getStatusCode());
- }
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/13 17:45
- * @Description: 统一待办集成远程调用
- **/
- public void postTodo(List hiworkTodoList) {
- ObjectMapper objectMapper = new ObjectMapper();
- String jsonString;
- try {
- jsonString = objectMapper.writeValueAsString(hiworkTodoList);
- } catch (JsonProcessingException e) {
- throw new JeroBootException("JSON string format conversion error");
- }
- postHiwork(jsonString, ip + todoUrl);
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/13 17:45
- * @Description: 统一消息集成远程调用-钉钉消息
- **/
- public void postDingDingMsg(HiworkDingDingMsg hiworkDingDingMsg) {
- ObjectMapper objectMapper = new ObjectMapper();
- String jsonString;
- try {
- jsonString = objectMapper.writeValueAsString(hiworkDingDingMsg);
- } catch (JsonProcessingException e) {
- throw new JeroBootException("JSON string format conversion error");
- }
- postHiwork(jsonString, ip + messageUrl);
- }
-
- /**
- * @Author: liao
- * @Date: 2023/10/13 17:45
- * @Description: 统一消息集成远程调用-系统消息
- **/
- public void postSystemMsg(HiworkSystemMsg hiworkSystemMsg) {
- ObjectMapper objectMapper = new ObjectMapper();
- String jsonString;
- try {
- jsonString = objectMapper.writeValueAsString(hiworkSystemMsg);
- } catch (JsonProcessingException e) {
- throw new JeroBootException("JSON string format conversion error");
- }
- postHiwork(jsonString, ip + messageUrl);
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/annotation/IamProperty.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/annotation/IamProperty.java
deleted file mode 100644
index 66d17bc..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/annotation/IamProperty.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.jero.modules.docking.iam.annotation;
-
-import java.lang.annotation.*;
-
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface IamProperty {
-
-// /**
-// * 字段属性名
-// * @return
-// */
-// String name() default "";
-//
-// /**
-// *
-// * @return
-// */
-// String type() default "";
-
- /**
- * 定义对象的属性字段在创建时是否为必填字段
- * @return
- */
- boolean required() default true;
-
- /**
- * 定义对象的属性字段是否为多值
- * @return
- */
- boolean multivalued() default false;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java
deleted file mode 100644
index c6676aa..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java
+++ /dev/null
@@ -1,322 +0,0 @@
-package com.jero.modules.docking.iam.client;
-
-import cn.hutool.http.HttpUtil;
-import com.bamboocloud.codec.BamboocloudFacade;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jero.common.util.DateUtils;
-import com.jero.common.util.UUIDGenerator;
-import com.jero.common.util.UUIDUtils;
-import com.jero.modules.docking.iam.dto.IamCommonAcceptDto;
-import com.jero.modules.docking.iam.dto.IamOrgAcceptDto;
-import com.jero.modules.docking.iam.dto.IamUserAcceptDto;
-import com.jero.modules.docking.iam.po.encrypt.AcceptEncryptPo;
-import com.jero.modules.docking.iam.po.MessageHeader;
-import com.jero.modules.docking.iam.po.encrypt.MessageEncryptTabels;
-import com.jero.modules.docking.iam.po.encrypt.MessageEncryptTabelsHeader;
-import com.jero.modules.docking.iam.po.encrypt.SendPoEncryptPo;
-import com.jero.modules.docking.utils.BamboocloudUtils;
-import com.jero.modules.docking.utils.DockingConstant;
-
-import java.util.Date;
-
-/**
- * 测试接口是否正确的客户端，mock IAM发送请求
- */
-public class TestClient {
-
- public static void main(String[] args) throws JsonProcessingException {
- TestClient testClient = new TestClient();
-// testClient.sendSchemaService(); // 字段映射接口测试
-// for (int i = 0; i < 1; i++) {
-// System.out.println(i);
-// testClient.sendUserCreate(i);
-// }
- // 创建用户接口测试
-// testClient.sendUserUpdate(); // 更新用户接口测试
-// testClient.sendOrgCreate(); // 组织创建接口测试
-// testClient.sendQueryAllUserIdsService(); // 查询所有用户ID接口测试
-// testClient.sendQueryAllOrgIdsService(); // 查询所有组织ID接口测试
-// testClient.sendQueryOrgByIdService(); // 查询指定id的组织数据测试
-// testClient.sendQueryUserByIdService(); // 查询指定id的用户数据测试
- testClient.decryptSting("8rAKWPUwkEZ3yYLy/1TuGGkIGCYtc+MD56pShLi97OmMttoFooo5GXZ/lY4NrQ5DiWmVUX23zqDwyQqufXLZNDU+KuJO/9UonpqUlZxM91w=");
- }
-
- private void decryptSting(String encryptString) {
- String decrypt = BamboocloudUtils.getPlaintext(encryptString, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
- System.out.println("解密后数据：" + decrypt);
- }
-
- // 对数据解密
- private void decryptData(String encryptData) throws JsonProcessingException {
- ObjectMapper objectMapper = new ObjectMapper();
- SendPoEncryptPo sendPoEncryptPo = objectMapper.readValue(encryptData, SendPoEncryptPo.class);
- String decrypt = BamboocloudUtils.getPlaintext(sendPoEncryptPo.getReturns().getData(), DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- System.out.println("解密后数据：" + decrypt);
- }
-
- /**
- * 封装统一发送的PO层
- * @param encryptData
- * @return
- */
- private AcceptEncryptPo handlerPoPackage(String encryptData) {
- MessageHeader messageHeader = new MessageHeader();
- messageHeader.setInterfaceID("SRMSUSERCREATE");
- messageHeader.setUUID(UUIDGenerator.generate());
- messageHeader.setMessageId(UUIDGenerator.generate());
- messageHeader.setSender(DockingConstant.IAM_SYSTEM_NAME);
- messageHeader.setReceiver(DockingConstant.SYSTEM_NAME);
-
- Date curDate = new Date();
- messageHeader.setSendDate(DateUtils.formatDate(curDate, "YYYYMMDD"));
- messageHeader.setSendTime(DateUtils.formatDate(curDate, "HHmmss"));
-
- MessageEncryptTabelsHeader messageEncryptTabelsHeader = new MessageEncryptTabelsHeader();
- messageEncryptTabelsHeader.setData(encryptData);
-
- MessageEncryptTabels messageEncryptTabels = new MessageEncryptTabels();
- messageEncryptTabels.setHeader(messageEncryptTabelsHeader);
-
- AcceptEncryptPo acceptEncryptPo = new AcceptEncryptPo();
- acceptEncryptPo.setMessageHeader(messageHeader);
- acceptEncryptPo.setMessageEncryptTabels(messageEncryptTabels);
-
- return acceptEncryptPo;
- }
-
- /**
- * Schema映射获取
- */
- private void sendSchemaService() throws JsonProcessingException {
- String url = "http://localhost:8184/laws-sinotruk/sync/iam/UserCreateService";
-
- IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto();
- iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
- iamCommonAcceptDto.setBimRemoteUser("srmsIam");
- iamCommonAcceptDto.setBimRemotePwd("srmsIam2023");
-
- // 加密数据
- ObjectMapper objectMapper = new ObjectMapper();
- String sendData = objectMapper.writeValueAsString(iamCommonAcceptDto);
- String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
- String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
-
- String response = HttpUtil.post(url, sendPoDataJson);
- System.out.println("映射接口响应：" + response);
- }
-
- /**
- * 用户创建测试
- */
- private void sendUserCreate(int i) throws JsonProcessingException {
- // 封装 IamUserAcceptDto 为用户数据层
- IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto();
- iamUserAcceptDto.setSrmsCompanyCode("123");
- iamUserAcceptDto.setSrmsOrgCode("123/321");
- iamUserAcceptDto.setSrmsTypeId("001");
- iamUserAcceptDto.setSrmsUsername((108088 + i) +"");
- iamUserAcceptDto.setSrmsRealname("测试" + i);
- iamUserAcceptDto.setSrmsPassword("1qaz@WSX");
- iamUserAcceptDto.setSrmsSex("1"); // 男
- iamUserAcceptDto.setSrmsPost("主任");
- iamUserAcceptDto.setSrmsDutyLevelId("4"); // 主管级，srms不解析，直接存
- iamUserAcceptDto.setSrmsDirectLeadership("1706939999105900545"); // 直接上级，不清楚应该存什么，暂时存为id（fcc-test）
- iamUserAcceptDto.setSrmsPostStatus("1"); // 在岗，srms不解析，直接存
- iamUserAcceptDto.setSrmsStatus("1"); // 1在册，0离职
- iamUserAcceptDto.setSrmsOfficePhone("022-87648762");
- iamUserAcceptDto.setSrmsPhone("13811112232");
- iamUserAcceptDto.setSrmsEmail("test@sinotruk.com");
- iamUserAcceptDto.setSrmsCreateTime("2023-10-15 10:35:20");
-
- iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
- iamUserAcceptDto.setBimRemoteUser("srmsIam");
- iamUserAcceptDto.setBimRemotePwd("srmsIam2023");
-
- // 加密数据
- ObjectMapper objectMapper = new ObjectMapper();
- String sendData = objectMapper.writeValueAsString(iamUserAcceptDto);
- String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- // 封装 AcceptPoSystemPo 为PO层套壳
- AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
- String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
-
- // 发送数据
- String url = "http://localhost:8184/laws-sinotruk/sync/iam/UserCreateService";
-// String url = "laws-test.sinotruk.com/laws-sinotruk/sync/iam/UserCreateService";
- String response = HttpUtil.post(url, sendPoDataJson);
- System.out.println("用户创建接口响应：" + response);
- }
-
- /**
- * 用户更新测试
- */
- private void sendUserUpdate() throws JsonProcessingException {
- // 封装 IamUserAcceptDto 为用户数据层
- IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto();
- iamUserAcceptDto.setBimUid("1709786346053017601"); // 数据库中取到的ID
- iamUserAcceptDto.setSrmsPost("科长");
- iamUserAcceptDto.setSrmsUpdateTime("2023-10-15 10:35:20"); // 测试不发送UpdateTime的情况
-
- iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
- iamUserAcceptDto.setBimRemoteUser("srmsIam");
- iamUserAcceptDto.setBimRemotePwd("srmsIam2023");
-
- // 加密数据
- ObjectMapper objectMapper = new ObjectMapper();
- String sendData = objectMapper.writeValueAsString(iamUserAcceptDto);
- String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- // 封装 AcceptPoSystemPo 为PO层套壳
- AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
- String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
-
- // 发送数据
- String url = "http://localhost:8184/laws-sinotruk/sync/iam/UserUpdateService";
- String response = HttpUtil.post(url, sendPoDataJson);
- System.out.println("用户更新接口响应：" + response);
- }
-
- /**
- * 用户创建测试
- */
- private void sendOrgCreate() throws JsonProcessingException {
- // 封装 IamUserAcceptDto 为用户数据层
- IamOrgAcceptDto iamOrgAcceptDto = new IamOrgAcceptDto();
-
- iamOrgAcceptDto.setSrmsOrgCode("IA00102");
- iamOrgAcceptDto.setSrmsDepartName("测试IAM部门");
- iamOrgAcceptDto.setSrmsParentCode("");
- iamOrgAcceptDto.setSrmsCompany("测试公司");
- iamOrgAcceptDto.setSrmsStatus("1");
- iamOrgAcceptDto.setSrmsCreateTime("2023-10-12 10:35:20");
- iamOrgAcceptDto.setSrmsType("002");
- iamOrgAcceptDto.setSrmsOrgCategory("2");
-
- iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
- iamOrgAcceptDto.setBimRemoteUser("srmsIam");
- iamOrgAcceptDto.setBimRemotePwd("srmsIam2023");
-
- // 加密数据
- ObjectMapper objectMapper = new ObjectMapper();
- String sendData = objectMapper.writeValueAsString(iamOrgAcceptDto);
- String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- // 封装 AcceptPoSystemPo 为PO层套壳
- AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
- String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
-
- // 发送数据
- String url = "http://localhost:8184/laws-sinotruk/sync/iam/OrgCreateService";
- String response = HttpUtil.post(url, sendPoDataJson);
- System.out.println("组织创建接口响应：" + response);
- }
-
- /**
- * 获取全部用户id
- */
- private void sendQueryAllUserIdsService() throws JsonProcessingException {
- String url = "http://localhost:8184/laws-sinotruk/sync/iam/QueryAllUserIdsService";
-
- IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto();
- iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
- iamCommonAcceptDto.setBimRemoteUser("srmsIam");
- iamCommonAcceptDto.setBimRemotePwd("srmsIam2023");
-
- // 加密数据
- ObjectMapper objectMapper = new ObjectMapper();
- String sendData = objectMapper.writeValueAsString(iamCommonAcceptDto);
- String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
- String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
- String response = HttpUtil.post(url, sendPoDataJson);
- System.out.println("查询全部用户id接口响应：" + response);
-
- this.decryptData(response);
- }
-
- /**
- * 获取全部组织id
- */
- private void sendQueryAllOrgIdsService() throws JsonProcessingException {
- String url = "http://localhost:8184/laws-sinotruk/sync/iam/QueryAllOrgIdsService";
-
- IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto();
- iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
- iamCommonAcceptDto.setBimRemoteUser("srmsIam");
- iamCommonAcceptDto.setBimRemotePwd("srmsIam2023");
-
- // 加密数据
- ObjectMapper objectMapper = new ObjectMapper();
- String sendData = objectMapper.writeValueAsString(iamCommonAcceptDto);
- String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
- String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
-
- String response = HttpUtil.post(url, sendPoDataJson);
- System.out.println("查询全部组织id接口响应：" + response);
-
- this.decryptData(response);
- }
-
- /**
- * 用户查询接口测试
- */
- private void sendQueryUserByIdService() throws JsonProcessingException {
- // 封装 IamUserAcceptDto 为用户数据层
- IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto();
- iamUserAcceptDto.setBimUid("1709786346053017601"); // 数据库中取到的ID
- iamUserAcceptDto.setBimRemoteUser("srmsIam");
- iamUserAcceptDto.setBimRemotePwd("srmsIam2023");
-
- // 加密数据
- ObjectMapper objectMapper = new ObjectMapper();
- String sendData = objectMapper.writeValueAsString(iamUserAcceptDto);
- String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- // 封装 AcceptPoSystemPo 为PO层套壳
- AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
- String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
-
- // 发送数据
- String url = "http://localhost:8184/laws-sinotruk/sync/iam/QueryUserByIdService";
- String response = HttpUtil.post(url, sendPoDataJson);
- System.out.println("用户查询接口响应：" + response);
-
- this.decryptData(response);
- }
-
- /**
- * 组织查询接口测试
- */
- private void sendQueryOrgByIdService() throws JsonProcessingException {
- // 封装 IamUserAcceptDto 为用户数据层
- IamOrgAcceptDto iamOrgAcceptDto = new IamOrgAcceptDto();
- iamOrgAcceptDto.setBimOrgId("IA00102"); // 数据库中取到的ID
- iamOrgAcceptDto.setBimRemoteUser("srmsIam");
- iamOrgAcceptDto.setBimRemotePwd("srmsIam2023");
-
- // 加密数据
- ObjectMapper objectMapper = new ObjectMapper();
- String sendData = objectMapper.writeValueAsString(iamOrgAcceptDto);
- String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- // 封装 AcceptPoSystemPo 为PO层套壳
- AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
- String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
-
- // 发送数据
- String url = "http://localhost:8184/laws-sinotruk/sync/iam/QueryOrgByIdService";
- String response = HttpUtil.post(url, sendPoDataJson);
- System.out.println("组织查询接口响应：" + response);
-
- this.decryptData(response);
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/IamLoginController.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/IamLoginController.java
deleted file mode 100644
index 0953662..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/IamLoginController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.jero.modules.docking.iam.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.jero.common.api.vo.Result;
-import com.jero.modules.system.entity.Oauth;
-import com.jero.modules.system.service.ILoginService;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Author: yjz
- * @Date: 2023/10/17/10:09
- * @Description:
- */
-@RestController
-@RequestMapping("/iam")
-@Slf4j
-public class IamLoginController {
- private final ILoginService loginService;
-
- public IamLoginController(ILoginService loginService) {
- this.loginService = loginService;
- }
-
- @ApiOperation("单点登录")
- @PostMapping("/loginByOauth2")
- public Result loginByOauth2(@Validated @RequestBody Oauth oauth){
- return loginService.loginByOauth2(oauth);
- }
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java
deleted file mode 100644
index 7dd4778..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java
+++ /dev/null
@@ -1,598 +0,0 @@
-package com.jero.modules.docking.iam.controller;
-
-import cn.hutool.core.text.CharSequenceUtil;
-import com.alibaba.fastjson.JSON;
-import com.aliyun.oss.ServiceException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jero.common.constant.CacheConstant;
-import com.jero.modules.base.service.BaseCommonService;
-import com.jero.modules.docking.iam.dto.IamCommonAcceptDto;
-import com.jero.modules.docking.iam.dto.IamOrgAcceptDto;
-import com.jero.modules.docking.iam.dto.IamUserAcceptDto;
-import com.jero.modules.docking.iam.dto.bpmc.*;
-import com.jero.modules.docking.iam.dto.response.*;
-import com.jero.modules.docking.iam.exception.IamGlobalException;
-import com.jero.modules.docking.iam.po.MessageHeader;
-import com.jero.modules.docking.iam.po.decrypt.AcceptDecryptPo;
-import com.jero.modules.docking.iam.po.encrypt.AcceptEncryptPo;
-import com.jero.modules.docking.iam.po.encrypt.SendPoEncryptPo;
-import com.jero.modules.docking.iam.service.SyncIamService;
-import com.jero.modules.docking.utils.BamboocloudUtils;
-import com.jero.modules.docking.utils.DockingConstant;
-import com.jero.modules.docking.utils.SHA256Util;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * IAM同步的控制器，提供用户、组织、菜单和权限的同步
- */
-@RestController
-@RequestMapping("/sync/iam")
-@Slf4j
-public class SyncIamController {
-
- @Value("${iam.bpmcAppkey}")
- private String bpmcAppkey;
-
- @Resource
- private SyncIamService syncIamService;
-
- public final String paramNotGetError = "参数传递错误，未收到参数";
-
- @Resource
- private BaseCommonService baseCommonService;
-
- @PostMapping({"/SchemaService"})
- public SendPoEncryptPo schemaService(@RequestBody AcceptEncryptPo iamCommon) throws JsonProcessingException {
- if (iamCommon == null
- || iamCommon.getMessageEncryptTabels() == null
- || iamCommon.getMessageEncryptTabels().getHeader() == null
- || iamCommon.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, this.paramNotGetError);
- }
-
- // 对核心数据解密
- String bodyParam = iamCommon.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamCommonAcceptDto commonAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamCommonAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(commonAcceptDto);
-
- // 处理业务逻辑，封装字段
- IamSchemaResponse iamSchemaResponse = this.syncIamService.getSchemaInfo(commonAcceptDto);
-
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamCommon.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamSchemaResponse);
-
- return sendPoEncryptPo;
- }
-
- @PostMapping({"/UserCreateService"})
- public SendPoEncryptPo userCreateService(@RequestBody AcceptEncryptPo iamUserInfo) throws JsonProcessingException {
- log.info("进入账号创建");
- IamUserAcceptDto userAcceptDto = null;
- IamUserCreateResponse iamUserCreateResponse = new IamUserCreateResponse();
- SendPoEncryptPo sendPoEncryptPo = new SendPoEncryptPo();
- try {
- if (iamUserInfo == null
- || iamUserInfo.getMessageEncryptTabels() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- // 对核心数据解密
- String bodyParam = iamUserInfo.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- userAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamUserAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(userAcceptDto);
- iamUserCreateResponse.setBimRequestId(userAcceptDto.getBimRequestId());
- // 处理业务逻辑，存储用户，返回用户id
- iamUserCreateResponse = this.syncIamService.userCreateService(userAcceptDto);
- } catch (ServiceException e) {
- iamUserCreateResponse.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- String message = e.getErrorMessage();
- iamUserCreateResponse.setMessage(message);
- log.error(iamUserCreateResponse.getMessage());
- }catch (Exception e){
- iamUserCreateResponse.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- iamUserCreateResponse.setMessage("操作失败" + e.getMessage());
- log.error(iamUserCreateResponse.getMessage());
- }
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamUserInfo.getMessageHeader();
- sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamUserCreateResponse);
- return sendPoEncryptPo;
- }
-
- @PostMapping({"/UserUpdateService"})
- public SendPoEncryptPo userUpdateService(@RequestBody AcceptEncryptPo iamUserInfo) throws JsonProcessingException {
- IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
- try {
- if (iamUserInfo == null
- || iamUserInfo.getMessageEncryptTabels() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- // 对核心数据解密
- String bodyParam = iamUserInfo.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamUserAcceptDto userAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamUserAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(userAcceptDto);
-
- // 处理业务逻辑，存储用户，返回用户id
- iamCommonResponseDto = this.syncIamService.userUpdateService(userAcceptDto);
- iamCommonResponseDto.setBimRequestId(userAcceptDto.getBimRequestId());
- }catch (IamGlobalException e){
- iamCommonResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- String message = e.getMessage();
- iamCommonResponseDto.setMessage(message);
- log.error(iamCommonResponseDto.getMessage());
- }catch (Exception e){
- iamCommonResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- iamCommonResponseDto.setMessage("操作失败" + e.getMessage());
- log.error(iamCommonResponseDto.getMessage());
- }
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamUserInfo.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamCommonResponseDto);
- return sendPoEncryptPo;
- }
-
- @PostMapping({"/UserDeleteService"})
- public SendPoEncryptPo userDeleteService(@RequestBody AcceptEncryptPo iamUserInfo) throws JsonProcessingException {
- IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
- try {
- if (iamUserInfo == null
- || iamUserInfo.getMessageEncryptTabels() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- // 对核心数据解密
- String bodyParam = iamUserInfo.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamUserAcceptDto userAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamUserAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(userAcceptDto);
-
- // 处理业务逻辑，存储用户，返回用户id
- iamCommonResponseDto = this.syncIamService.userDeleteService(userAcceptDto);
- iamCommonResponseDto.setBimRequestId(userAcceptDto.getBimRequestId());
- }catch (IamGlobalException e){
- iamCommonResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- String message = e.getMessage();
- iamCommonResponseDto.setMessage(message);
- log.error(iamCommonResponseDto.getMessage());
- }catch (Exception e){
- iamCommonResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- iamCommonResponseDto.setMessage("操作失败" + e.getMessage());
- log.error(iamCommonResponseDto.getMessage());
- }
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamUserInfo.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamCommonResponseDto);
- return sendPoEncryptPo;
- }
-
- /**
- * 组织创建和更新移除缓存
- * @param iamOrgInfo
- * @return
- * @throws JsonProcessingException
- */
- @PostMapping({"/OrgCreateService"})
- @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
- public SendPoEncryptPo orgCreateService(@RequestBody AcceptEncryptPo iamOrgInfo) throws JsonProcessingException {
- IamOrgAcceptDto orgAcceptDto = null;
- try {
- if (iamOrgInfo == null
- || iamOrgInfo.getMessageEncryptTabels() == null
- || iamOrgInfo.getMessageEncryptTabels().getHeader() == null
- || iamOrgInfo.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- // 对核心数据解密
- String bodyParam = iamOrgInfo.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- orgAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamOrgAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(orgAcceptDto);
-
- // 处理业务逻辑，存储组织，返回组织id
- IamOrgCreateResponse iamOrgCreateResponse = this.syncIamService.orgCreateService(orgAcceptDto);
-
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamOrgInfo.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamOrgCreateResponse);
- return sendPoEncryptPo;
- } catch (DuplicateKeyException duplicateKeyException) {
- log.error("数据库值重复：{}", duplicateKeyException.getMessage());
- if (orgAcceptDto != null) {
- throw new IamGlobalException(orgAcceptDto.getBimRequestId(), "数据库值重复，请检查组织编号【" + orgAcceptDto.getSrmsOrgCode() + "】是否异常");
- } else {
- throw new IamGlobalException(null, "未知异常，请联系管理员");
- }
- }
- }
-
- /**
- * 组织创建和更新移除缓存
- * @param iamOrgInfo
- * @return
- * @throws JsonProcessingException
- */
- @PostMapping({"/OrgUpdateService"})
- @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
- public SendPoEncryptPo orgUpdateService(@RequestBody AcceptEncryptPo iamOrgInfo) throws JsonProcessingException {
- if (iamOrgInfo == null
- || iamOrgInfo.getMessageEncryptTabels() == null
- || iamOrgInfo.getMessageEncryptTabels().getHeader() == null
- || iamOrgInfo.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- // 对核心数据解密
- String bodyParam = iamOrgInfo.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamOrgAcceptDto orgAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamOrgAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(orgAcceptDto);
-
- // 处理业务逻辑，更新组织
- IamCommonResponseDto iamCommonResponseDto = this.syncIamService.orgUpdateService(orgAcceptDto);
-
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamOrgInfo.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamCommonResponseDto);
-
- return sendPoEncryptPo;
- }
-
- @PostMapping({"/OrgDeleteService"})
- public SendPoEncryptPo orgDeleteService(@RequestBody AcceptEncryptPo iamOrgInfo) throws JsonProcessingException {
- if (iamOrgInfo == null
- || iamOrgInfo.getMessageEncryptTabels() == null
- || iamOrgInfo.getMessageEncryptTabels().getHeader() == null
- || iamOrgInfo.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- // 对核心数据解密
- String bodyParam = iamOrgInfo.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamOrgAcceptDto orgAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamOrgAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(orgAcceptDto);
-
- // 处理业务逻辑，更新组织
- IamCommonResponseDto iamCommonResponseDto = this.syncIamService.orgDeleteService(orgAcceptDto);
-
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamOrgInfo.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamCommonResponseDto);
-
- return sendPoEncryptPo;
- }
-
- /**
- * 对接统一权限服务平台。
- * 该接口包含角色创建、菜单创建、角色菜单关联、用户角色关联等4个接口
- * 通过type字段来区分
- */
- @PostMapping({"/bpmcCreate"})
- public SendPoEncryptPo bpmcCreate(@RequestBody AcceptDecryptPo acceptDecryptPo) throws JsonProcessingException {
- if (acceptDecryptPo == null
- || acceptDecryptPo.getMessageDecryptTabels() == null
- || acceptDecryptPo.getMessageDecryptTabels().getHeader() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- log.info("统一权限服务平台请求数据:{}", acceptDecryptPo.toString());
- ObjectMapper objectMapper = new ObjectMapper();
- BpmcAcceptDto bpmcAcceptDto = objectMapper.readValue(acceptDecryptPo.getMessageDecryptTabels().getHeader().getData(), BpmcAcceptDto.class);
-
- MessageHeader messageHeader = acceptDecryptPo.getMessageHeader();
- BpmcResponseDto bpmcResponseDto = BpmcResponseDto.success();
- SendPoEncryptPo sendPoEncryptPo = new SendPoEncryptPo();
-
- if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getType())){
- bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- bpmcResponseDto.setMessage("接口类型（type）未传参，请检查");
- log.error(bpmcResponseDto.getMessage());
- sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
- sendPoEncryptPo.getReturns().setData(JSON.toJSONString(bpmcResponseDto));
- return sendPoEncryptPo;
- }
-
- if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getEntity())){
- bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- bpmcResponseDto.setMessage("数据实体（entity）未传参，请检查");
- log.error(bpmcResponseDto.getMessage());
- sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
- sendPoEncryptPo.getReturns().setData(JSON.toJSONString(bpmcResponseDto));
- return sendPoEncryptPo;
- }
-
- if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getAction())){
- bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- bpmcResponseDto.setMessage("操作方式（action）未传参，请检查");
- log.error(bpmcResponseDto.getMessage());
- sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
- sendPoEncryptPo.getReturns().setData(JSON.toJSONString(bpmcResponseDto));
- return sendPoEncryptPo;
- }
-
- if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getSignature())){
- bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- bpmcResponseDto.setMessage("签名（signature）未传参，请检查");
- log.error(bpmcResponseDto.getMessage());
- sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
- sendPoEncryptPo.getReturns().setData(JSON.toJSONString(bpmcResponseDto));
- return sendPoEncryptPo;
- }
-
- // 验证签名
- String validateSign = SHA256Util.getSHA256StrJava(bpmcAcceptDto.getEntity() + bpmcAppkey + bpmcAcceptDto.getTimestamp());
- if (!bpmcAcceptDto.getSignature().equals(validateSign)){
- bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
- bpmcResponseDto.setMessage("签名校验不通过，请检查");
- log.error(bpmcResponseDto.getMessage());
- sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
- sendPoEncryptPo.getReturns().setData(JSON.toJSONString(bpmcResponseDto));
- return sendPoEncryptPo;
- }
-
- try {
- switch (bpmcAcceptDto.getType()){
- // 角色
- case DockingConstant.BPMC_TYPE_ROLE:
- bpmcResponseDto = bpmcTypeRole(objectMapper, bpmcAcceptDto, bpmcResponseDto);
- break;
-
- // 菜单
- case DockingConstant.BPMC_TYPE_RESOURCE:
- bpmcResponseDto = bpmcTypeResource(objectMapper, bpmcAcceptDto, bpmcResponseDto);
- break;
-
- // 用户角色关联
- case DockingConstant.BPMC_TYPE_USER_ROLE:
- bpmcResponseDto = bpmcTypeUserRole(objectMapper, bpmcAcceptDto, bpmcResponseDto);
- break;
-
- // 角色菜单关联
- case DockingConstant.BPMC_TYPE_ROLE_RESOURCE:
- bpmcResponseDto = bpmcTypeRoleResource(objectMapper, bpmcAcceptDto, bpmcResponseDto);
- break;
-
- default:
- bpmcResponseDto = BpmcResponseDto.error("接口类型（type）未找到，请检查");
- break;
- }
- }catch (Exception e){
- e.printStackTrace();
- log.error(e.getMessage());
- bpmcResponseDto = BpmcResponseDto.error(e.getMessage());
- }
- log.info(bpmcResponseDto.getMessage());
- sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
- sendPoEncryptPo.getReturns().setData(JSON.toJSONString(bpmcResponseDto));
- return sendPoEncryptPo;
- }
- private BpmcResponseDto bpmcTypeRoleResource(ObjectMapper objectMapper, BpmcAcceptDto bpmcAcceptDto, BpmcResponseDto bpmcResponseDto) throws JsonProcessingException {
- List roleResourceDtoList = objectMapper.readValue(bpmcAcceptDto.getEntity(), new TypeReference>() {});
- // 根据新增/删除调用不同的业务处理代码
- if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_ADD)){
- bpmcResponseDto = this.syncIamService.roleResourceCreateService(roleResourceDtoList);
- } else if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_DELETE)) {
- bpmcResponseDto = this.syncIamService.roleResourceDeleteService(roleResourceDtoList);
- }
- return bpmcResponseDto;
- }
-
- private BpmcResponseDto bpmcTypeUserRole(ObjectMapper objectMapper, BpmcAcceptDto bpmcAcceptDto, BpmcResponseDto bpmcResponseDto) throws JsonProcessingException {
- List userRoleDtoList = objectMapper.readValue(bpmcAcceptDto.getEntity(), new TypeReference>() {});
- // 根据新增/删除调用不同的业务处理代码
- if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_ADD)){
- bpmcResponseDto = this.syncIamService.userRoleCreateService(userRoleDtoList);
- } else if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_DELETE)) {
- bpmcResponseDto = this.syncIamService.userRoleDeleteService(userRoleDtoList);
- }
- return bpmcResponseDto;
- }
-
- private BpmcResponseDto bpmcTypeResource(ObjectMapper objectMapper, BpmcAcceptDto bpmcAcceptDto, BpmcResponseDto bpmcResponseDto) throws JsonProcessingException {
- ResourceDto resourceDto = objectMapper.readValue(bpmcAcceptDto.getEntity(), ResourceDto.class);
- // 根据新增/编辑/删除调用不同的业务处理代码
- if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_ADD)){
- bpmcResponseDto = this.syncIamService.resourceCreateService(resourceDto);
- } else if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_UPDATE)) {
- bpmcResponseDto = this.syncIamService.resourceUpdateService(resourceDto);
- } else if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_DELETE)) {
- bpmcResponseDto = this.syncIamService.resourceDeleteService(resourceDto);
- }
- return bpmcResponseDto;
- }
-
- private BpmcResponseDto bpmcTypeRole(ObjectMapper objectMapper, BpmcAcceptDto bpmcAcceptDto, BpmcResponseDto bpmcResponseDto) throws JsonProcessingException {
- RoleDto roleDto = objectMapper.readValue(bpmcAcceptDto.getEntity(), RoleDto.class);
- // 根据新增/编辑/删除调用不同的业务处理代码
- if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_ADD)){
- bpmcResponseDto = this.syncIamService.roleCreateService(roleDto);
- } else if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_UPDATE)) {
- bpmcResponseDto = this.syncIamService.roleUpdateService(roleDto);
- } else if (bpmcAcceptDto.getAction().equals(DockingConstant.BPMC_ACTION_DELETE)) {
- bpmcResponseDto = this.syncIamService.roleDeleteService(roleDto);
- }
- return bpmcResponseDto;
- }
-
- /**
- * 查询全部用户id
- * @param iamCommon
- * @return
- * @throws JsonProcessingException
- */
- @PostMapping({"/QueryAllUserIdsService"})
- public SendPoEncryptPo QueryAllUserIdsService(@RequestBody AcceptEncryptPo iamCommon) throws JsonProcessingException {
- if (iamCommon == null
- || iamCommon.getMessageEncryptTabels() == null
- || iamCommon.getMessageEncryptTabels().getHeader() == null
- || iamCommon.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, this.paramNotGetError);
- }
-
- // 对核心数据解密
- String bodyParam = iamCommon.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamCommonAcceptDto commonAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamCommonAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(commonAcceptDto);
-
- // 处理业务逻辑，封装字段
- IamUserIdListResponse userIdListResponse = this.syncIamService.getAllUserIds(commonAcceptDto);
-
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamCommon.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, userIdListResponse);
-
- return sendPoEncryptPo;
- }
-
- /**
- * 查询全部组织id
- * @param iamCommon
- * @return
- * @throws JsonProcessingException
- */
- @PostMapping({"/QueryAllOrgIdsService"})
- public SendPoEncryptPo QueryAllOrgIdsService(@RequestBody AcceptEncryptPo iamCommon) throws JsonProcessingException {
- if (iamCommon == null
- || iamCommon.getMessageEncryptTabels() == null
- || iamCommon.getMessageEncryptTabels().getHeader() == null
- || iamCommon.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, this.paramNotGetError);
- }
-
- // 对核心数据解密
- String bodyParam = iamCommon.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamCommonAcceptDto commonAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamCommonAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(commonAcceptDto);
-
- // 处理业务逻辑，封装字段
- IamOrgIdListResponse orgIdListResponse = this.syncIamService.getAllOrgIds(commonAcceptDto);
-
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamCommon.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, orgIdListResponse);
-
- return sendPoEncryptPo;
- }
-
- @PostMapping({"/QueryUserByIdService"})
- public SendPoEncryptPo QueryUserByIdService(@RequestBody AcceptEncryptPo iamUserInfo) throws JsonProcessingException {
- if (iamUserInfo == null
- || iamUserInfo.getMessageEncryptTabels() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- // 对核心数据解密
- String bodyParam = iamUserInfo.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamUserAcceptDto userAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamUserAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(userAcceptDto);
-
- // 处理业务逻辑，存储用户，返回用户id
- IamUserInfoResponse iamUserInfoResponse = this.syncIamService.getUserInfoById(userAcceptDto);
-
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamUserInfo.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamUserInfoResponse);
-
- return sendPoEncryptPo;
- }
-
- @PostMapping({"/QueryOrgByIdService"})
- public SendPoEncryptPo QueryOrgByIdService(@RequestBody AcceptEncryptPo iamUserInfo) throws JsonProcessingException {
- if (iamUserInfo == null
- || iamUserInfo.getMessageEncryptTabels() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader() == null
- || iamUserInfo.getMessageEncryptTabels().getHeader().getData() == null){
- throw new IamGlobalException(null, "参数传递错误，未收到参数");
- }
-
- // 对核心数据解密
- String bodyParam = iamUserInfo.getMessageEncryptTabels().getHeader().getData();
- String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- ObjectMapper objectMapper = new ObjectMapper();
- IamOrgAcceptDto orgAcceptDto = objectMapper.readValue(bodyParamDecrypt, IamOrgAcceptDto.class);
-
- // 校验身份认证，确保接口正确 必须调用！
- this.syncIamService.validateUserAndPwd(orgAcceptDto);
-
- // 处理业务逻辑，存储用户，返回用户id
- IamOrgInfoResponse iamOrgInfoResponse = this.syncIamService.getOrgInfoById(orgAcceptDto);
-
- // 处理统一响应PO层，并加密业务字段
- MessageHeader acceptMessageHeader = iamUserInfo.getMessageHeader();
- SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(acceptMessageHeader, iamOrgInfoResponse);
-
- return sendPoEncryptPo;
- }
-
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamCommonAcceptDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamCommonAcceptDto.java
deleted file mode 100644
index a318a0c..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamCommonAcceptDto.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.jero.modules.docking.iam.dto;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
-import lombok.ToString;
-
-/**
- * IAM的通用Dto，存放IAM接口的非业务通用属性。接口呗请求时会带着该参数
- */
-@Data
-@ToString
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class IamCommonAcceptDto {
-
- /**
- * BIM每次调用生成的随机ID，应用系统每次响应返回此ID
- */
- private String bimRequestId;
-
- /**
- *BIM调用三方应用接口的授权账号，由应用分配给BIM系统
- */
- private String bimRemoteUser ;
-
-
- /**
- * BIM调用三方应用接口的密码，由应用分配给BIM系统
- */
- private String bimRemotePwd;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java
deleted file mode 100644
index 233fa56..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.jero.modules.docking.iam.dto;
-
-import com.jero.modules.docking.iam.annotation.IamProperty;
-import lombok.Data;
-import lombok.ToString;
-
-/**
- * IAM的组织实体，接收IAM传递的组织数据
- */
-@Data
-@ToString
-public class IamOrgAcceptDto extends IamCommonAcceptDto {
-
- /**
- * 组织的id，在删除或编辑的接口会传递
- */
- private String bimOrgId;
-
- /**
- * 机构编码.全集团唯一，不可重复，撤销后不可重新启用
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsOrgCode;
-
- /**
- * 组织名称
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsDepartName;
-
- /**
- * 父级机构编码.当前组织所属的父节点code
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsParentCode;
-
- /**
- * 所属单位,10位HR机构编号
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsCompany;
-
- /**
- * 机构状态
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsStatus;
-
- /**
- * 机构类型。001内部机构 002 外部机构 003 虚拟机构
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsType;
-
- /**
- * 组织类型。1.单位 2.部门。单位下可以有单位，但是部门下不能有单位
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsOrgCategory;
-
- /**
- * 创建时间
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsCreateTime;
-
- /**
- * 更新时间
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsUpdateTime;
-
- /**
- * 部门负责人
- */
- @IamProperty(required = false, multivalued = false)
- private String srmsHeadOfDepartment;
-
- /**
- * 分管领导
- */
- @IamProperty(required = false, multivalued = false)
- private String srmsLeadersInCharge;
-
- /**
- * 副职领导
- */
- @IamProperty(required = false, multivalued = false)
- private String srmsDeputyLeader;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java
deleted file mode 100644
index 844aa9d..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.jero.modules.docking.iam.dto;
-
-import com.jero.modules.docking.iam.annotation.IamProperty;
-import lombok.Data;
-import lombok.ToString;
-
-/**
- * IAM的用户实体，接收IAM传递的用户数据
- */
-@Data
-@ToString
-public class IamUserAcceptDto extends IamCommonAcceptDto {
-
- /**
- * 用户的id，在删除或编辑的接口会传递
- */
- private String bimUid;
-
- /**
- * 单位编码
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsCompanyCode;
-
- /**
- * 部门编码，用于做人员和组织的关联
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsOrgCode;
-
- /**
- * 人员类型
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsTypeId;
-
- /**
- * 工号
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsUsername;
-
- /**
- * 姓名
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsRealname;
-
- /**
- * 密码
- */
- @IamProperty(required = false, multivalued = false)
- private String srmsPassword;
-
- /**
- * 性别
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsSex;
-
- /**
- * 岗位
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsPost;
-
- /**
- * 职务级别
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsDutyLevelId;
-
- /**
- * 直接上级
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsDirectLeadership;
-
- /**
- * 岗位状态
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsPostStatus;
-
- /**
- * 是否在册
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsStatus;
-
- /**
- * 办公电话
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsOfficePhone;
-
- /**
- * 移动电话
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsPhone;
-
- /**
- * 电子邮件
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsEmail;
-
- /**
- * 创建时间
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsCreateTime;
-
- /**
- * 更新时间
- */
- @IamProperty(required = true, multivalued = false)
- private String srmsUpdateTime;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/BpmcAcceptDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/BpmcAcceptDto.java
deleted file mode 100644
index 6123379..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/BpmcAcceptDto.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.jero.modules.docking.iam.dto.bpmc;
-
-import lombok.Data;
-import lombok.ToString;
-
-/**
- * 和竹云统一权限服务平台对接的实体
- */
-@Data
-@ToString
-public class BpmcAcceptDto {
-
- /**
- * 角色：D_AR (本系统对接)
- * 功能权限：D_AM (本系统对接)
- * 账号与应用角色关系： R_USER_AR (本系统对接)
- * 应用角色与应用功能权限关系：R_AR_AM (本系统对接)
- * 账号与功能权限关系：R_USER_AM
- * 群组与应用角色关系：R_ACCSET_AR
- * 群组与功能权限关系：R_ACCSET_AM
- * 机构/岗位与应用角色关系：R_USERSET_AR
- * 机构/岗位与功能权限关系：R_USERSET_AM
- */
- private String type;
-
- /**
- * 后续基础数据接口、权限关系接口章节中对应操作的entity JSON格式数据字符串
- */
- private String entity;
-
- /**
- * 操作方式
- * 基础数据接口：（add：新增；delete：删除；update：更新）
- * 关系数据接口：
- * （add：新增；delete：删除；）
- */
- private String action;
-
- /**
- * 请求签名，计算方式
- * SHA256 (entity+appKey+timestamp)
- */
- private String signature;
-
- /**
- * 时间戳
- */
- private long timestamp;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/ResourceDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/ResourceDto.java
deleted file mode 100644
index c29f444..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/ResourceDto.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.jero.modules.docking.iam.dto.bpmc;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 统一权限服务平台的菜单实体
- */
-@Data
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ResourceDto {
-
- private String id;
-
- /**
- * 功能编码
- */
- private String code;
-
- /**
- * 父级id
- */
- private String parentId;
-
- /**
- * 功能名称
- */
- private String name;
-
- /**
- * 对应前端组件
- */
- private String component;
-
- /**
- * 描述
- */
- private String description;
-
- /**
- * 一级菜单跳转地址
- */
- private String redirect;
-
- /**
- * 路径
- */
- private String url;
-
- /**
- * 类型(0:一级菜单; 1:子菜单:2:按钮权限)
- */
- private int menu_type;
-
- /**
- * 排序号
- */
- private Integer sort;
-
- /**
- * 菜单英文
- */
- private String menu_en;
-
- /**
- * 菜单是否为路径菜单（默认值为1）
- */
- private Integer is_route;
-
- /**
- * 打开外部链接菜单的方式（默认值为0）
- */
- private Integer internal_or_external;
-
- /**
- * 菜单是否隐藏（默认值为0）
- */
- private Integer hidden;
-
- /**
- * 菜单是否需要缓存（默认值为0）
- */
- private Integer keep_alive;
-
- /**
- * 创建时间
- */
- private Date createTime;
-
- /**
- * 创建人
- */
- private String createBy;
-
- /**
- * 修改时间
- */
- private Date modifyTime;
-
- /**
- * 最近修改人
- */
- private String modifyBy;
-
- /**
- * 应用id
- */
- private String appId;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleDto.java
deleted file mode 100644
index 1a4284e..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleDto.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.jero.modules.docking.iam.dto.bpmc;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 统一权限服务平台的角色实体
- */
-@Data
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class RoleDto {
-
- private String id;
-
- /**
- * 角色编码
- */
- private String code;
-
- /**
- * 角色名称
- */
- private String name;
-
- /**
- * 描述
- */
- private String description;
-
- /**
- * 排序号
- */
- private int sort;
-
- /**
- * 创建时间
- */
- private Date createTime;
-
- /**
- * 创建人
- */
- private String createBy;
-
- /**
- * 修改时间
- */
- private Date modifyTime;
-
- /**
- * 最近修改人
- */
- private String modifyBy;
-
- /**
- * 应用id
- */
- private String appId;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleResourceDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleResourceDto.java
deleted file mode 100644
index 30a798f..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleResourceDto.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.jero.modules.docking.iam.dto.bpmc;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
-
-/**
- * 统一权限服务平台的 角色-菜单关联 实体
- */
-@Data
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class RoleResourceDto {
-
- /**
- * 角色id
- */
- private String arId;
-
- /**
- * 角色名称
- */
- private String arName;
-
- /**
- * 角色编码
- */
- private String arCode;
-
- /**
- * 菜单id
- */
- private String amId;
-
- /**
- * 菜单名称
- */
- private String amName;
-
- /**
- * 菜单编码
- */
- private String amCode;
-
- /**
- * 菜单类型（0 菜单 、1行为）
- */
- private int amType;
-
- /**
- * 菜单code绝对路径
- */
- private String codePath;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/UserRoleDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/UserRoleDto.java
deleted file mode 100644
index 82cb8d5..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/UserRoleDto.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.jero.modules.docking.iam.dto.bpmc;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
-
-/**
- * 统一权限服务平台的 用户-角色关联 实体
- */
-@Data
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class UserRoleDto {
-
- /**
- * 用户ID
- */
- private String userId;
-
- /**
- * 账号名
- */
- private String accountCode;
-
- /**
- * 账号id
- */
- private String accountId;
-
- /**
- * 姓名
- */
- private String fullName;
-
- /**
- * 角色id
- */
- private String arId;
-
- /**
- * 角色编码
- */
- private String arCode;
-
- /**
- * 角色名称
- */
- private String arName;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java
deleted file mode 100644
index b99cf01..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import lombok.Data;
-
-@Data
-public class BpmcResponseDto {
-
- private String returnCode;
-
- @Override
- public String toString() {
- return "{" +
- "returnCode:'" + returnCode + '\'' +
- ", message:'" + message + '\'' +
- '}';
- }
-
- private String message;
- public static BpmcResponseDto success(){
- BpmcResponseDto bpmcResponseDto = new BpmcResponseDto();
- bpmcResponseDto.returnCode = "200"; // 成功时固定为200
- bpmcResponseDto.message = "操作成功";
-
- return bpmcResponseDto;
- }
-
- public static BpmcResponseDto error(String message){
- BpmcResponseDto bpmcResponseDto = new BpmcResponseDto();
- bpmcResponseDto.returnCode = "500"; // 失败时固定为500
- bpmcResponseDto.message = message;
-
- return bpmcResponseDto;
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamCommonResponseDto.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamCommonResponseDto.java
deleted file mode 100644
index 0574a1a..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamCommonResponseDto.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import lombok.Data;
-
-/**
- * IAM出SchemaService外的成功响应 或 失败响应 通用报文
- */
-@Data
-public class IamCommonResponseDto {
-
- /**
- * 请求id，收到什么就返回什么
- */
- private String bimRequestId;
-
- /**
- * 相应码，0位正常
- */
- private String resultCode;
-
- /**
- * 消息
- */
- private String message;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgCreateResponse.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgCreateResponse.java
deleted file mode 100644
index be5c641..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgCreateResponse.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import lombok.Data;
-
-/**
- * 组织机构创建的响应体
- */
-@Data
-public class IamOrgCreateResponse extends IamCommonResponseDto{
-
- /**
- * 用户创建后生成的id
- */
- private String orgId;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgIdListResponse.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgIdListResponse.java
deleted file mode 100644
index 9fb1ce3..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgIdListResponse.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 组织机构创建的响应体
- */
-@Data
-public class IamOrgIdListResponse extends IamCommonResponseDto{
-
- /**
- * 用户创建后生成的id
- */
- private List orgIdList;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgInfoResponse.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgInfoResponse.java
deleted file mode 100644
index 0e631a5..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamOrgInfoResponse.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import com.jero.modules.docking.iam.dto.IamOrgAcceptDto;
-import com.jero.modules.docking.iam.dto.IamUserAcceptDto;
-import lombok.Data;
-
-/**
- * 组织机构创建的响应体
- */
-@Data
-public class IamOrgInfoResponse extends IamCommonResponseDto{
-
- private IamOrgAcceptDto organization;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamSchemaResponse.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamSchemaResponse.java
deleted file mode 100644
index e8e95a4..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamSchemaResponse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Schema映射的响应体
- */
-@Data
-public class IamSchemaResponse {
-
- /**
- * 请求id，收到什么就返回什么
- */
- private String bimRequestId;
-
- /**
- * 用户账号的具体内容响应实体
- */
- private List account;
-
- /**
- * 组织机构的具体内容响应实体
- */
- private List organization;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserCreateResponse.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserCreateResponse.java
deleted file mode 100644
index 21bab74..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserCreateResponse.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import lombok.Data;
-
-/**
- * 用户创建的响应体
- */
-@Data
-public class IamUserCreateResponse extends IamCommonResponseDto{
-
- /**
- * 用户创建后生成的id
- */
- private String uid;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserIdListResponse.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserIdListResponse.java
deleted file mode 100644
index b8065fa..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserIdListResponse.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 组织机构创建的响应体
- */
-@Data
-public class IamUserIdListResponse extends IamCommonResponseDto{
-
- /**
- * 用户创建后生成的id
- */
- private List userIdList;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserInfoResponse.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserInfoResponse.java
deleted file mode 100644
index 7a6a8e2..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/IamUserInfoResponse.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import com.jero.modules.docking.iam.dto.IamUserAcceptDto;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 组织机构创建的响应体
- */
-@Data
-public class IamUserInfoResponse extends IamCommonResponseDto{
-
- private IamUserAcceptDto account;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/SchemaResponseInner.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/SchemaResponseInner.java
deleted file mode 100644
index 5fbb503..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/SchemaResponseInner.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.jero.modules.docking.iam.dto.response;
-
-import lombok.Data;
-
-/**
- * Schema的核心内容
- */
-@Data
-public class SchemaResponseInner {
-
- /**
- * 定义对象的属性字段名称
- */
- private String name;
-
- /**
- * 定义对象的属性字段类型，可选值为String、int、double、float、long、byte、boolean
- */
- private String type;
-
- /**
- * 定义对象的属性字段在创建时是否为必填字段。可选值true或者false
- */
- private boolean required;
-
- /**
- * 定义对象的属性字段是否为多值。可选值true或者false。字段为boolean类型
- */
- private boolean multivalued;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/exception/IamGlobalException.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/exception/IamGlobalException.java
deleted file mode 100644
index 38f2785..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/exception/IamGlobalException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jero.modules.docking.iam.exception;
-
-import com.jero.common.util.MessageUtils;
-
-public class IamGlobalException extends RuntimeException {
-
- private String bimRequestId;
- private String message;
-
- private static final long serialVersionUID = 3634632351214L;
-
- public IamGlobalException(String bimRequestId, String message){
- super(message);
- this.bimRequestId = bimRequestId;
- this.message = message;
- }
-
- public String getBimRequestId() {
- return bimRequestId;
- }
-
- @Override
- public String getMessage() {
- return message;
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/exception/IamGlobalExceptionHandler.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/exception/IamGlobalExceptionHandler.java
deleted file mode 100644
index 0b5b51d..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/exception/IamGlobalExceptionHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.jero.modules.docking.iam.exception;
-
-import com.jero.common.api.vo.Result;
-import com.jero.common.exception.JeroBootException;
-import com.jero.modules.docking.iam.dto.response.IamCommonResponseDto;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
-import org.apache.shiro.authz.AuthorizationException;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.data.redis.connection.PoolException;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.multipart.MaxUploadSizeExceededException;
-import org.springframework.web.servlet.NoHandlerFoundException;
-
-/**
- * IAM对接全局异常处理器
- */
-@RestControllerAdvice
-@Slf4j
-public class IamGlobalExceptionHandler {
-
- /**
- * 处理自定义异常
- */
- @ExceptionHandler(IamGlobalException.class)
- public IamCommonResponseDto handleJeroBootException(IamGlobalException e){
- IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
- iamCommonResponseDto.setBimRequestId(e.getBimRequestId());
- iamCommonResponseDto.setResultCode("-1"); // 错误码统一为-1
- iamCommonResponseDto.setMessage(e.getMessage());
-
- return iamCommonResponseDto;
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/MessageHeader.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/MessageHeader.java
deleted file mode 100644
index 4f569f6..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/MessageHeader.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.jero.modules.docking.iam.po;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * PO系统交互必须的实体，包含接口传递的基本信息头
- */
-@Data
-public class MessageHeader {
-
- /**
- * 接口ID
- */
- @JsonProperty("Interface_ID")
- private String interfaceID;
-
- /**
- * UUID
- */
- @JsonProperty("UUID")
- private String UUID;
-
- /**
- * 消息Id
- */
- @JsonProperty("MessageId")
- private String messageId;
-
- /**
- * 发送系统
- */
- @JsonProperty("Sender")
- private String sender;
-
- /**
- * 接收系统
- */
- @JsonProperty("Receiver")
- private String receiver;
-
- /**
- * 发送日期
- */
- @JsonProperty("SendDate")
- private String sendDate;
-
- /**
- * 发送时间
- */
- @JsonProperty("SendTime")
- private String sendTime;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/AcceptDecryptPo.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/AcceptDecryptPo.java
deleted file mode 100644
index 891d291..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/AcceptDecryptPo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.jero.modules.docking.iam.po.decrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jero.modules.docking.iam.po.MessageHeader;
-import lombok.Data;
-
-/**
- * 和PO系统做数据交互的最外层壳，做数据接收用
- */
-@Data
-public class AcceptDecryptPo {
-
- @JsonProperty("MessageHeader")
- private MessageHeader messageHeader;
-
- @JsonProperty("Tables")
- private MessageDecryptTabels messageDecryptTabels;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageDecryptTabels.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageDecryptTabels.java
deleted file mode 100644
index 8be046d..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageDecryptTabels.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.jero.modules.docking.iam.po.decrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * PO系统交互必须的实体，包含接口传递的正式数据（仅为套的一层壳）
- */
-@Data
-public class MessageDecryptTabels {
-
- @JsonProperty("Header")
- private MessageTablesData header;
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageTablesData.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageTablesData.java
deleted file mode 100644
index 5790867..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageTablesData.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.jero.modules.docking.iam.po.decrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * @ClassName: MessageTablesData
- * @Description:
- * @Author: yjz
- * @Date: 2023-11-07 14:21
- * @Version: 1.0
- **/
-@Data
-public class MessageTablesData {
- @JsonProperty("data")
- private String data;
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/SendPoDecryptPo.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/SendPoDecryptPo.java
deleted file mode 100644
index 39f1c96..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/SendPoDecryptPo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jero.modules.docking.iam.po.decrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jero.modules.docking.iam.po.MessageHeader;
-import lombok.Data;
-
-/**
- * 和PO系统做数据交互的最外层壳，做数据发送用
- */
-@Data
-public class SendPoDecryptPo {
-
- @JsonProperty("MessageHeader")
- private MessageHeader messageHeader;
-
- @JsonProperty("Returns")
- private T returns;
-
- public SendPoDecryptPo response(MessageHeader messageHeader, T t){
- SendPoDecryptPo sendPoDecryptPo = new SendPoDecryptPo<>();
- sendPoDecryptPo.setMessageHeader(messageHeader);
- sendPoDecryptPo.setReturns(t);
-
- return sendPoDecryptPo;
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/AcceptEncryptPo.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/AcceptEncryptPo.java
deleted file mode 100644
index 0b15350..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/AcceptEncryptPo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.jero.modules.docking.iam.po.encrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jero.modules.docking.iam.po.MessageHeader;
-import lombok.Data;
-
-/**
- * 和PO系统做数据交互的最外层壳，做数据接收用
- */
-@Data
-public class AcceptEncryptPo {
-
- @JsonProperty("MessageHeader")
- private MessageHeader messageHeader;
-
- @JsonProperty("Tables")
- private MessageEncryptTabels messageEncryptTabels;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/MessageEncryptTabels.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/MessageEncryptTabels.java
deleted file mode 100644
index 20a0498..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/MessageEncryptTabels.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.jero.modules.docking.iam.po.encrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * PO系统交互必须的实体，包含接口传递的正式数据（仅为套的一层壳）
- */
-@Data
-public class MessageEncryptTabels {
-
- @JsonProperty("Header")
- private MessageEncryptTabelsHeader header;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/MessageEncryptTabelsHeader.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/MessageEncryptTabelsHeader.java
deleted file mode 100644
index 608f891..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/MessageEncryptTabelsHeader.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.jero.modules.docking.iam.po.encrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 接受数据的tables中的header层
- */
-@Data
-public class MessageEncryptTabelsHeader {
-
- @JsonProperty("data")
- private String data;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/SendEncryptReturnsPo.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/SendEncryptReturnsPo.java
deleted file mode 100644
index f016635..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/SendEncryptReturnsPo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jero.modules.docking.iam.po.encrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 返回数据的Return层
- */
-@Data
-@NoArgsConstructor
-public class SendEncryptReturnsPo {
-
- @JsonProperty("data")
- private String data;
-
- public SendEncryptReturnsPo(String data){
- this.data = data;
- }
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/SendPoEncryptPo.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/SendPoEncryptPo.java
deleted file mode 100644
index af01464..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/encrypt/SendPoEncryptPo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.jero.modules.docking.iam.po.encrypt;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jero.modules.docking.iam.po.MessageHeader;
-import lombok.Data;
-
-/**
- * 和PO系统做数据交互的最外层壳，做数据发送用
- */
-@Data
-public class SendPoEncryptPo {
-
- @JsonProperty("MessageHeader")
- private MessageHeader messageHeader;
-
- @JsonProperty("Returns")
- private SendEncryptReturnsPo returns;
-
-}
diff --git a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java b/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
deleted file mode 100644
index 7c30224..0000000
--- a/byd-structuredplugins-serve/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
+++ /dev/null
@@ -1,1037 +0,0 @@
-package com.jero.modules.docking.iam.service;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.NumberUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.bamboocloud.codec.BamboocloudFacade;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jero.common.constant.CommonConstant;
-import com.jero.common.constant.FillRuleConstant;
-import com.jero.common.system.api.ISysBaseAPI;
-import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.*;
-import com.jero.modules.docking.iam.annotation.IamProperty;
-import com.jero.modules.docking.iam.dto.IamCommonAcceptDto;
-import com.jero.modules.docking.iam.dto.IamOrgAcceptDto;
-import com.jero.modules.docking.iam.dto.IamUserAcceptDto;
-import com.jero.modules.docking.iam.dto.bpmc.ResourceDto;
-import com.jero.modules.docking.iam.dto.bpmc.RoleDto;
-import com.jero.modules.docking.iam.dto.bpmc.RoleResourceDto;
-import com.jero.modules.docking.iam.dto.bpmc.UserRoleDto;
-import com.jero.modules.docking.iam.dto.response.*;
-import com.jero.modules.docking.iam.exception.IamGlobalException;
-import com.jero.modules.docking.iam.po.MessageHeader;
-import com.jero.modules.docking.iam.po.encrypt.SendEncryptReturnsPo;
-import com.jero.modules.docking.iam.po.encrypt.SendPoEncryptPo;
-import com.jero.modules.docking.utils.DockingConstant;
-import com.jero.modules.system.entity.*;
-import com.jero.modules.system.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * IAM对接业务处理类
- */
-@Slf4j
-@Service
-@Transactional
-public class SyncIamService {
-
- @Value("${iam.bimRemoteUser}")
- private String bimRemoteUser;
-
- @Value("${iam.bimRemotePwd}")
- private String bimRemotePwd;
-
- @Value("${iam.defaultRoleIds}")
- private String defaultRoleIds;
-
- @Resource
- private ISysUserService sysUserService;
-
- @Resource
- private ISysDepartService sysDepartService;
-
- @Resource
- private ISysRoleService sysRoleService;
-
- @Resource
- private ISysPermissionService sysPermissionService;
-
- @Resource
- private ISysUserRoleService sysUserRoleService;
-
- @Resource
- private ISysRolePermissionService sysRolePermissionService;
-
- @Resource
- private ISysBaseAPI sysBaseAPI;
-
- private String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
-
- /**
- * 校验IAM调用时的账号密码是否正确
- * 校验通过了正常走后续，不通过直接返回
- * @return
- */
- public void validateUserAndPwd(IamCommonAcceptDto commonAcceptDto) {
- if (!bimRemoteUser.equals(commonAcceptDto.getBimRemoteUser())
- || !bimRemotePwd.equals(commonAcceptDto.getBimRemotePwd())){
- throw new IamGlobalException(commonAcceptDto.getBimRequestId(), "用户名或密码不对，无法调用接口");
- }
- }
-
- /**
- * 生成Schema的信息
- * @return
- */
- public IamSchemaResponse getSchemaInfo(IamCommonAcceptDto commonAcceptDto){
- // 获取用户同步的字段
- List accountFiledList = new ArrayList<>();
- Field[] userFields = IamUserAcceptDto.class.getDeclaredFields();
- this.extractedFieldProperty(accountFiledList, userFields);
-
- // 获取组织机构同步的字段
- List orgFiledList = new ArrayList<>();
- Field[] orgFields = IamOrgAcceptDto.class.getDeclaredFields();
- this.extractedFieldProperty(orgFiledList, orgFields);
-
- IamSchemaResponse iamSchemaResponse = new IamSchemaResponse();
- iamSchemaResponse.setAccount(accountFiledList);
- iamSchemaResponse.setOrganization(orgFiledList);
- iamSchemaResponse.setBimRequestId(commonAcceptDto.getBimRequestId());
-
-
- return iamSchemaResponse;
- }
-
- /**
- * 抽取含有IamProperty注解的字段元属性
- * @param filedList
- * @param fields
- */
- private void extractedFieldProperty(List filedList, Field[] fields) {
- for (Field field : fields) {
- if (field.isAnnotationPresent(IamProperty.class)) {
- SchemaResponseInner schemaInfo = new SchemaResponseInner();
-
- //获取Annotation对象
- IamProperty iamProperty = field.getAnnotation(IamProperty.class);
- //提取注解对象元数据
- boolean required = iamProperty.required();
- boolean multivalued = iamProperty.multivalued();
- String name = field.getName();
- String type = field.getType().getSimpleName();
-
- schemaInfo.setName(name);
- schemaInfo.setType(type);
- schemaInfo.setRequired(required);
- schemaInfo.setMultivalued(multivalued);
-
- filedList.add(schemaInfo);
- }
- }
- }
-
- /**
- * 转换Iam传来的用户数据，进行转换后存储
- * @param userAcceptDto
- * @return
- */
- public IamUserCreateResponse userCreateService(IamUserAcceptDto userAcceptDto){
- log.info("用户创建收到的解密后数据:{}", userAcceptDto.toString());
-
- IamUserCreateResponse iamUserCreateResponse = new IamUserCreateResponse();
- iamUserCreateResponse.setBimRequestId(userAcceptDto.getBimRequestId());
- iamUserCreateResponse.setResultCode(DockingConstant.IAM_SUCCESS_RESULT_CODE);
- iamUserCreateResponse.setMessage(DockingConstant.IAM_SUCCESS_MESSAGE);
- // 将iam的数据转换成sysUser数据存入数据库
- SysUser sysUser = new SysUser();
- sysUser.setUsername(userAcceptDto.getSrmsUsername());
- sysUser.setRealname(userAcceptDto.getSrmsRealname());
-
- sysUser.setPassword(CommonConstant.DEFAULT_PASSWORD);
- String salt = UUIDUtils.randomUUID(8);
- System.out.println(salt);
- sysUser.setSalt(salt);
- String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), sysUser.getPassword(), salt);
- sysUser.setPassword(passwordEncode);
- if (NumberUtil.isInteger(userAcceptDto.getSrmsSex())){
- sysUser.setSex(Integer.valueOf(userAcceptDto.getSrmsSex()));
- }
-
- sysUser.setEmail(userAcceptDto.getSrmsEmail());
- sysUser.setPhone(userAcceptDto.getSrmsPhone());
-
- if ("1".equals(userAcceptDto.getSrmsStatus())){
- sysUser.setStatus(CommonConstant.USER_UNFREEZE);
- sysUser.setDelFlag(CommonConstant.DEL_FLAG_0);
- } else {
- sysUser.setStatus(CommonConstant.USER_FREEZE);
- sysUser.setDelFlag(CommonConstant.DEL_FLAG_1);
- }
-
- sysUser.setTelephone(userAcceptDto.getSrmsOfficePhone());
- sysUser.setCreateBy(DockingConstant.IAM_SYSTEM_NAME);
- sysUser.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsCreateTime())){
- Date createTime = DateUtils.str2Date(userAcceptDto.getSrmsCreateTime(), new SimpleDateFormat(DATE_FORMAT));
- sysUser.setCreateTime(createTime);
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsUpdateTime())){
- Date updateTime = DateUtils.str2Date(userAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat(DATE_FORMAT));
- sysUser.setCreateTime(updateTime);
- }
-
- sysUser.setActivitiSync(0);
- sysUser.setUserIdentity(0);
-
- sysUser.setTypeId(userAcceptDto.getSrmsTypeId());
- sysUser.setPost(userAcceptDto.getSrmsPost());
- sysUser.setDutyLevelId(userAcceptDto.getSrmsDutyLevelId());
- sysUser.setDirectLeadership(userAcceptDto.getSrmsDirectLeadership());
- sysUser.setPostStatus(userAcceptDto.getSrmsPostStatus());
-
- // 获取组织机构(多个逗号分隔)
- String orgCode = userAcceptDto.getSrmsOrgCode();
- String selectedDeparts = orgCode;
-
- // 获取角色(多个逗号分隔)，针对大部分角用户默认写死一般用户
- // （TODO 需要根据实际情况再沟通一遍角色怎么自动赋予），需要和角色接口那边沟通，确认具体情况
- String selectedRoles = defaultRoleIds; // 一般用户的角色ID
- // 存储到用户表中
- this.sysUserService.saveUser(sysUser, selectedRoles, selectedDeparts);
- iamUserCreateResponse.setUid(sysUser.getId());
- return iamUserCreateResponse;
- }
-
- /**
- *根据传过来看的bimUid标识用户的唯一id，取出后修改新传递的字符串
- * @param userAcceptDto
- * @return
- */
- public IamCommonResponseDto userUpdateService(IamUserAcceptDto userAcceptDto){
- log.info("用户更新收到的解密后数据:{}", userAcceptDto.toString());
-
- if (userAcceptDto == null || CharSequenceUtil.isEmpty(userAcceptDto.getBimUid())){
- throw new IamGlobalException(userAcceptDto.getBimRequestId(), "用户id（bimUid）为空，无法进行用户信息更新");
- }
-
- // 取出对应的SysUser数据，将iam的数据全部抓取进行判空赋值后存入
- SysUser sysUser = this.sysUserService.getById(userAcceptDto.getBimUid());
- if (sysUser == null){
- throw new IamGlobalException(userAcceptDto.getBimRequestId(), "未查询到id为（" + userAcceptDto.getBimUid() + "）用户，无法更新");
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsUsername())){
- sysUser.setUsername(userAcceptDto.getSrmsUsername());
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsRealname())){
- sysUser.setRealname(userAcceptDto.getSrmsRealname());
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsSex()) && NumberUtil.isInteger(userAcceptDto.getSrmsSex())){
- sysUser.setSex(Integer.valueOf(userAcceptDto.getSrmsSex()));
- }
-
-
- // 手机号 和 邮箱有加密，需要单独处理
- sysUser.setEmail(userAcceptDto.getSrmsEmail());
- sysUser.setPhone(userAcceptDto.getSrmsPhone());
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsStatus())){
- if ("1".equals(userAcceptDto.getSrmsStatus())){
- sysUser.setStatus(CommonConstant.USER_UNFREEZE);
- sysUser.setDelFlag(CommonConstant.DEL_FLAG_0);
- } else {
- sysUser.setStatus(CommonConstant.USER_FREEZE);
- sysUser.setDelFlag(CommonConstant.DEL_FLAG_1);
- }
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsOfficePhone())){
- sysUser.setTelephone(userAcceptDto.getSrmsOfficePhone());
- }
-
- sysUser.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsUpdateTime())){
- Date updateTime = DateUtils.str2Date(userAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat(DATE_FORMAT));
- sysUser.setCreateTime(updateTime);
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsTypeId())){
- sysUser.setTypeId(userAcceptDto.getSrmsTypeId());
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsPost())){
- sysUser.setPost(userAcceptDto.getSrmsPost());
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsDutyLevelId())){
- sysUser.setDutyLevelId(userAcceptDto.getSrmsDutyLevelId());
- }
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsDirectLeadership())){
- sysUser.setDirectLeadership(userAcceptDto.getSrmsDirectLeadership());
- }
-
-
- if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsPostStatus())){
- sysUser.setPostStatus(userAcceptDto.getSrmsPostStatus());
- }
-
- // 获取组织机构(多个逗号分隔)
- String orgCode = userAcceptDto.getSrmsOrgCode();
-
- String selectedDeparts = null;
- if (CharSequenceUtil.isNotEmpty(orgCode)){
- selectedDeparts = orgCode;
- }
-
- // 编辑存储到用户表中，角色是系统自己处理的，更新不会影响角色，所以不传
- this.sysUserService.editUser(sysUser, null, selectedDeparts);
-
- IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
- iamCommonResponseDto.setBimRequestId(userAcceptDto.getBimRequestId());
- iamCommonResponseDto.setResultCode(DockingConstant.IAM_SUCCESS_RESULT_CODE);
- iamCommonResponseDto.setMessage(DockingConstant.IAM_SUCCESS_MESSAGE);
-
- return iamCommonResponseDto;
- }
-
- /**
- * 删除用户
- * @param userAcceptDto
- * @return
- */
- public IamCommonResponseDto userDeleteService(IamUserAcceptDto userAcceptDto){
- if (userAcceptDto == null || CharSequenceUtil.isEmpty(userAcceptDto.getBimUid())){
- String bimRequestId = null;
- if (userAcceptDto != null) {
- bimRequestId = userAcceptDto.getBimRequestId();
- }
-
- throw new IamGlobalException(bimRequestId, "用户id（bimUid）为空，无法进行用户删除");
- }
-
- log.info("用户删除收到的解密后数据:{}", userAcceptDto.toString());
-
- this.sysUserService.deleteUser(userAcceptDto.getBimUid());
-
- IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
- iamCommonResponseDto.setBimRequestId(userAcceptDto.getBimRequestId());
- iamCommonResponseDto.setResultCode(DockingConstant.IAM_SUCCESS_RESULT_CODE);
- iamCommonResponseDto.setMessage(DockingConstant.IAM_SUCCESS_MESSAGE);
-
- return iamCommonResponseDto;
- }
-
- /**
- * 转换Iam传来的组织数据，进行转换后存储
- * @param orgAcceptDto
- * @return
- */
- public IamOrgCreateResponse orgCreateService(IamOrgAcceptDto orgAcceptDto){
- if (orgAcceptDto == null || CharSequenceUtil.isEmpty(orgAcceptDto.getSrmsOrgCode())){
- String bimRequestId = null;
- if (orgAcceptDto != null) {
- bimRequestId = orgAcceptDto.getBimRequestId();
- }
-
- throw new IamGlobalException(bimRequestId, "机构编码为空，无法进行数据存储");
- }
-
- log.info("组织创建收到的解密后数据:{}", orgAcceptDto.toString());
-
- IamOrgCreateResponse iamOrgCreateResponse = new IamOrgCreateResponse();
- iamOrgCreateResponse.setBimRequestId(orgAcceptDto.getBimRequestId());
- iamOrgCreateResponse.setResultCode(DockingConstant.IAM_SUCCESS_RESULT_CODE);
- iamOrgCreateResponse.setMessage(DockingConstant.IAM_SUCCESS_MESSAGE);
-
- // 将iam的数据转换成sysDepart数据存入数据库
- SysDepart sysDepart = new SysDepart();
- sysDepart.setId(orgAcceptDto.getSrmsOrgCode());
- sysDepart.setParentId(orgAcceptDto.getSrmsParentCode());
- // 生成orgCode
- JSONObject formData = new JSONObject();
- formData.put("parentId", orgAcceptDto.getSrmsParentCode());
- String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.DEPART, formData);
- sysDepart.setOrgCode(codeArray[0]);
- sysDepart.setDepartName(orgAcceptDto.getSrmsDepartName());
- sysDepart.setDepartOrder(100); // 接入数据无排序，都设置为100
-
- // 1为单位，2为部门，转映射到 本系统内的数据 1公司，2组织机构，映射关系一致。如下代码是为了后续修改方便
- if ("1".equals(orgAcceptDto.getSrmsOrgCategory())){
- sysDepart.setOrgCategory("1");
- } else {
- sysDepart.setOrgCategory("2");
- }
-
- sysDepart.setOrgType(orgAcceptDto.getSrmsType());
- sysDepart.setOrgCode(orgAcceptDto.getSrmsOrgCode());
-
- if ("1".equals(orgAcceptDto.getSrmsStatus())){
- sysDepart.setStatus(CommonConstant.STATUS_1);
- sysDepart.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
- } else {
- sysDepart.setStatus(CommonConstant.STATUS_0);
- sysDepart.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_1));
- }
-
- sysDepart.setCreateBy(DockingConstant.IAM_SYSTEM_NAME);
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsCreateTime())){
- Date createTime = DateUtils.str2Date(orgAcceptDto.getSrmsCreateTime(), new SimpleDateFormat(DATE_FORMAT));
- sysDepart.setCreateTime(createTime);
- }
-
- sysDepart.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsUpdateTime())){
- Date updateTime = DateUtils.str2Date(orgAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat(DATE_FORMAT));
- sysDepart.setCreateTime(updateTime);
- }
-
- sysDepart.setCompany(orgAcceptDto.getSrmsCompany());
- sysDepart.setHeadOfDepartment(orgAcceptDto.getSrmsHeadOfDepartment());
- sysDepart.setLeadersInCharge(orgAcceptDto.getSrmsLeadersInCharge());
- sysDepart.setDeputyLeader(orgAcceptDto.getSrmsDeputyLeader());
-
- // 存储到组织机构表中
- this.sysDepartService.save(sysDepart);
-
- iamOrgCreateResponse.setOrgId(sysDepart.getId());
-
- return iamOrgCreateResponse;
- }
-
- /**
- * 更新组织机构
- * @param orgAcceptDto
- * @return
- */
- public IamCommonResponseDto orgUpdateService(IamOrgAcceptDto orgAcceptDto){
- log.info("组织更新收到的解密后数据:{}", orgAcceptDto.toString());
-
- if (orgAcceptDto == null || CharSequenceUtil.isEmpty(orgAcceptDto.getBimOrgId())){
- throw new IamGlobalException(orgAcceptDto.getBimRequestId(), "机构id为空，无法进行组织信息更新");
- }
-
- IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
- iamCommonResponseDto.setBimRequestId(orgAcceptDto.getBimRequestId());
- iamCommonResponseDto.setResultCode(DockingConstant.IAM_SUCCESS_RESULT_CODE);
- iamCommonResponseDto.setMessage(DockingConstant.IAM_SUCCESS_MESSAGE);
-
- // 将iam的数据转换成sysDepart数据存入数据库
- SysDepart sysDepart = this.sysDepartService.getById(orgAcceptDto.getBimOrgId());
- if (sysDepart == null){
- throw new IamGlobalException(orgAcceptDto.getBimRequestId(), "未查询到id为（" + orgAcceptDto.getBimOrgId() + "）组织，无法更新");
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsParentCode())){
- sysDepart.setParentId(orgAcceptDto.getSrmsParentCode());
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsDepartName())){
- sysDepart.setDepartName(orgAcceptDto.getSrmsDepartName());
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsOrgCategory())){
- // 1为单位，2为部门，转映射到 本系统内的数据 1公司，2组织机构，映射关系一致。如下代码是为了后续修改方便
- if ("1".equals(orgAcceptDto.getSrmsOrgCategory())){
- sysDepart.setOrgCategory("1");
- } else {
- sysDepart.setOrgCategory("2");
- }
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsType())){
- sysDepart.setOrgType(orgAcceptDto.getSrmsType());
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsOrgCode())){
- sysDepart.setOrgCode(orgAcceptDto.getSrmsOrgCode());
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsStatus())){
- if ("1".equals(orgAcceptDto.getSrmsStatus())){
- sysDepart.setStatus(CommonConstant.STATUS_1);
- sysDepart.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
- } else {
- sysDepart.setStatus(CommonConstant.STATUS_0);
- sysDepart.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_1));
- }
- }
-
- sysDepart.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsUpdateTime())){
- Date updateTime = DateUtils.str2Date(orgAcceptDto.getSrmsUpdateTime(), new SimpleDateFormat(DATE_FORMAT));
- sysDepart.setCreateTime(updateTime);
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsCompany())){
- sysDepart.setCompany(orgAcceptDto.getSrmsCompany());
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsHeadOfDepartment())){
- sysDepart.setHeadOfDepartment(orgAcceptDto.getSrmsHeadOfDepartment());
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsLeadersInCharge())){
- sysDepart.setLeadersInCharge(orgAcceptDto.getSrmsLeadersInCharge());
- }
-
- if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsDeputyLeader())){
- sysDepart.setDeputyLeader(orgAcceptDto.getSrmsDeputyLeader());
- }
-
- // 存储到组织机构表中
- this.sysDepartService.updateById(sysDepart);
-
- return iamCommonResponseDto;
- }
-
- /**
- * 删除组织机构
- * @param orgAcceptDto
- * @return
- */
- public IamCommonResponseDto orgDeleteService(IamOrgAcceptDto orgAcceptDto){
- if (orgAcceptDto == null || CharSequenceUtil.isEmpty(orgAcceptDto.getBimOrgId())){
- String bimRequestId = null;
- if (orgAcceptDto != null) {
- bimRequestId = orgAcceptDto.getBimRequestId();
- }
-
- throw new IamGlobalException(bimRequestId, "用户id（bimUid）为空，无法进行组织删除");
- }
-
- log.info("组织删除收到的解密后数据:{}", orgAcceptDto.toString());
-
- this.sysDepartService.delete(orgAcceptDto.getBimOrgId());
-
- IamCommonResponseDto iamCommonResponseDto = new IamCommonResponseDto();
- iamCommonResponseDto.setBimRequestId(orgAcceptDto.getBimRequestId());
- iamCommonResponseDto.setResultCode(DockingConstant.IAM_SUCCESS_RESULT_CODE);
- iamCommonResponseDto.setMessage(DockingConstant.IAM_SUCCESS_MESSAGE);
-
- return iamCommonResponseDto;
- }
-
- /**
- * 处理统一响应PO层，并加密业务字段
- * @param acceptMessageHeader
- * @param object
- * @return
- * @throws JsonProcessingException
- */
- public SendPoEncryptPo handlerGloablEncryptResponse(MessageHeader acceptMessageHeader, Object object) throws JsonProcessingException {
- SendPoEncryptPo sendPoEncryptPo = new SendPoEncryptPo();
-
- MessageHeader sendMessageHeader = generatorReturnMessageHeader(acceptMessageHeader);
-
- ObjectMapper objectMapper = new ObjectMapper();
- String returnData = objectMapper.writeValueAsString(object);
- // 加密PO层外的业务数据
- String encryptData = BamboocloudFacade.encrypt(returnData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
-
- sendPoEncryptPo.setMessageHeader(sendMessageHeader);
- sendPoEncryptPo.setReturns(new SendEncryptReturnsPo(encryptData));
-
- return sendPoEncryptPo;
- }
-
-
- /**
- * @param acceptMessageHeader
- * @return
- */
- @NotNull
- public MessageHeader generatorReturnMessageHeader(MessageHeader acceptMessageHeader) {
- MessageHeader sendMessageHeader = new MessageHeader();
- sendMessageHeader.setInterfaceID(acceptMessageHeader.getInterfaceID());
- sendMessageHeader.setUUID(UUIDGenerator.generate());
- sendMessageHeader.setMessageId(UUIDGenerator.generate());
- sendMessageHeader.setSender(DockingConstant.SYSTEM_NAME); // 固定值，即本系统
- sendMessageHeader.setReceiver(DockingConstant.IAM_SYSTEM_NAME);
-
- Date curDate = new Date();
- sendMessageHeader.setSendDate(DateUtils.formatDate(curDate, "YYYYMMDD"));
- sendMessageHeader.setSendTime(DateUtils.formatDate(curDate, "HHmmss"));
- return sendMessageHeader;
- }
-
- /**
- * 角色创建
- */
- public BpmcResponseDto roleCreateService(RoleDto roleDto){
- SysRole sysRole = new SysRole();
- sysRole.setId(roleDto.getId());
- sysRole.setRoleName(roleDto.getName());
- sysRole.setRoleCode(roleDto.getCode());
- sysRole.setDescription(roleDto.getDescription());
- sysRole.setCreateBy(DockingConstant.IAM_SYSTEM_NAME);
- sysRole.setCreateTime(roleDto.getCreateTime());
- sysRole.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
- sysRole.setUpdateTime(roleDto.getModifyTime());
- sysRole.setAppId(roleDto.getAppId());
-
- sysRoleService.save(sysRole);
- return BpmcResponseDto.success();
- }
-
- /**
- * 角色更新
- */
- public BpmcResponseDto roleUpdateService(RoleDto roleDto){
- if (CharSequenceUtil.isEmpty(roleDto.getId())){
- return BpmcResponseDto.error("角色id为空，无法更新");
- }
-
- SysRole sysRole = sysRoleService.getById(roleDto.getId());
-
- if (sysRole == null){
- return BpmcResponseDto.error("未找到对应id角色，无法更新");
- }else {
- sysRole.setId(roleDto.getId());
- }
-
- if (CharSequenceUtil.isNotEmpty(roleDto.getName())){
- sysRole.setRoleName(roleDto.getName());
- }
-
- if (CharSequenceUtil.isNotEmpty(roleDto.getCode())){
- sysRole.setRoleCode(roleDto.getCode());
- }
-
- if (CharSequenceUtil.isNotEmpty(roleDto.getDescription())){
- sysRole.setDescription(roleDto.getDescription());
- }
-
- if (CharSequenceUtil.isNotEmpty(roleDto.getAppId())){
- sysRole.setAppId(roleDto.getAppId());
- }
-
- sysRole.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
-
- if (roleDto.getModifyTime() != null){
- sysRole.setUpdateTime(roleDto.getModifyTime());
- }
-
- sysRoleService.updateById(sysRole);
-
- return BpmcResponseDto.success();
- }
-
- /**
- * 角色删除
- */
- public BpmcResponseDto roleDeleteService(RoleDto roleDto){
- if (CharSequenceUtil.isEmpty(roleDto.getId())){
- return BpmcResponseDto.error("角色id为空，无法删除");
- }
-
- sysRoleService.deleteRole(roleDto.getId());
-
- return BpmcResponseDto.success();
- }
-
- /**
- * 菜单创建
- */
- public BpmcResponseDto resourceCreateService(ResourceDto resourceDto){
- SysPermission sysPermission = new SysPermission();
- sysPermission.setId(resourceDto.getId());
- if (StringUtils.isNotBlank(resourceDto.getParentId())){
- sysPermission.setParentId(resourceDto.getParentId());
- }
- sysPermission.setName(resourceDto.getName());
- sysPermission.setPermsType("1"); // 1显示2禁用，固定为1
- sysPermission.setIcon("copy"); //IAM 没有icon字段，设定为固定值
- if (StringUtils.isNotBlank(resourceDto.getCode())){
- sysPermission.setPerms(resourceDto.getCode());
- }
- sysPermission.setComponent(resourceDto.getComponent()); // 组件的路径
- if (CharSequenceUtil.isNotEmpty(resourceDto.getRedirect())){
- sysPermission.setRedirect(resourceDto.getRedirect()); // 地址栏显示的路径
- }
- if (CharSequenceUtil.isNotEmpty(resourceDto.getUrl())){
- sysPermission.setUrl(resourceDto.getUrl()); // 路径
- }
- sysPermission.setAppId(resourceDto.getAppId()); // appId
- if (!Objects.isNull(resourceDto.getSort())){
- sysPermission.setSortNo(Double.valueOf(resourceDto.getSort()));
- }else {
- sysPermission.setSortNo(1D);
- }
-
-
- // TODO 菜单英文名数据库中没有，需要确认
-
- // sysPermission的 menuType （0：一级菜单；1：子菜单 ；2：按钮权限）
- if (DockingConstant.BPMC_RESOURCE_TYPE_MENU == resourceDto.getMenu_type()){
- if (CharSequenceUtil.isEmpty(resourceDto.getParentId())){
- sysPermission.setMenuType(0);
- } else {
- sysPermission.setMenuType(1);
- }
- } else {
- sysPermission.setMenuType(2);
- }
-
- sysPermission.setCreateTime(new Date());
- sysPermission.setCreateBy(DockingConstant.IAM_SYSTEM_NAME);
- if (!Objects.isNull(resourceDto.getModifyTime())){
- sysPermission.setUpdateTime(resourceDto.getModifyTime());
- }
- sysPermission.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
-
- if (StringUtils.isNotBlank(resourceDto.getDescription())){
- sysPermission.setDescription(resourceDto.getDescription());
- }
-
- // 以下为IAM没有的属性，设置默认值
- sysPermission.setRoute(resourceDto.getIs_route() == 0 ? false : true); // 是否路由，设固定值
- sysPermission.setKeepAlive(resourceDto.getKeep_alive() == 0 ? false : true); // 是否缓存，设固定值
- sysPermission.setDelFlag(CommonConstant.DEL_FLAG_0);
- sysPermission.setRuleFlag(0); // 是否配置菜单的数据权限 1是0否 默认0
- sysPermission.setHidden(resourceDto.getHidden() == 0 ? false : true); // 是否配置菜单的数据权限 1是0否 默认0
- sysPermission.setStatus("1"); // 按钮权限状态(0无效1有效)
- sysPermission.setAlwaysShow(false);
- sysPermission.setInternalOrExternal(resourceDto.getInternal_or_external() == 0 ? false : true);
-
- sysPermissionService.addPermission(sysPermission);
-
- return BpmcResponseDto.success();
- }
-
- /**
- * 菜单更新
- */
- public BpmcResponseDto resourceUpdateService(ResourceDto resourceDto){
- if (CharSequenceUtil.isEmpty(resourceDto.getId())){
- return BpmcResponseDto.error("菜单id为空，无法更新");
- }
-
- SysPermission sysPermission = sysPermissionService.getById(resourceDto.getId());
-
- if (sysPermission == null){
- return BpmcResponseDto.error("未找到对应id功能权限，无法更新");
- }else {
- sysPermission.setId(resourceDto.getId());
- }
-
- if (CharSequenceUtil.isNotEmpty(resourceDto.getParentId())){
- sysPermission.setParentId(resourceDto.getParentId());
- }
-
- if (CharSequenceUtil.isNotEmpty(resourceDto.getName())){
- sysPermission.setName(resourceDto.getName());
- }
-
- if (CharSequenceUtil.isNotEmpty(resourceDto.getCode())){
- sysPermission.setPerms(resourceDto.getCode());
- }
-
- if (CharSequenceUtil.isNotEmpty(resourceDto.getComponent())){
- sysPermission.setComponent(resourceDto.getComponent()); // 组件的路径
- }
-
- if (CharSequenceUtil.isNotEmpty(resourceDto.getRedirect())){
- sysPermission.setRedirect(resourceDto.getRedirect()); // 地址栏显示的路径
- }
-
- if (CharSequenceUtil.isNotEmpty(resourceDto.getUrl())){
- sysPermission.setUrl(resourceDto.getUrl()); // 路径
- }
-
- if (resourceDto.getSort() != null){
- sysPermission.setSortNo(Double.valueOf(resourceDto.getSort()));
- }
-
- if (CharSequenceUtil.isNotEmpty(resourceDto.getAppId())){
- sysPermission.setAppId(resourceDto.getAppId());
- }
-
- // sysPermission的 menuType （0：一级菜单；1：子菜单 ；2：按钮权限）
- if (DockingConstant.BPMC_RESOURCE_TYPE_MENU == resourceDto.getMenu_type()){
- if (CharSequenceUtil.isEmpty(resourceDto.getParentId())){
- sysPermission.setMenuType(0);
- } else {
- sysPermission.setMenuType(1);
- }
- } else {
- sysPermission.setMenuType(2);
- }
- if (!Objects.isNull(resourceDto.getModifyTime())){
- sysPermission.setUpdateTime(resourceDto.getModifyTime());
- }
- sysPermission.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
- if (StringUtils.isNotBlank(resourceDto.getDescription())){
- sysPermission.setDescription(resourceDto.getDescription());
- }
-
- if (resourceDto.getIs_route() != null){
- sysPermission.setRoute(resourceDto.getIs_route() == 0 ? false : true);
- }
-
- if (resourceDto.getKeep_alive() != null){
- sysPermission.setKeepAlive(resourceDto.getKeep_alive() == 0 ? false : true);
- }
-
- if (resourceDto.getHidden() != null){
- sysPermission.setHidden(resourceDto.getKeep_alive() == 0 ? false : true);
- }
-
- if (resourceDto.getInternal_or_external() != null){
- sysPermission.setInternalOrExternal(resourceDto.getInternal_or_external() == 0 ? false : true);
- }
-
- sysPermissionService.editPermission(sysPermission);
- return BpmcResponseDto.success();
- }
-
- /**
- * 菜单删除(真实删除)
- */
- public BpmcResponseDto resourceDeleteService(ResourceDto resourceDto){
- if (CharSequenceUtil.isEmpty(resourceDto.getId())){
- return BpmcResponseDto.error("菜单id为空，无法删除");
- }
- sysPermissionService.deletePermission(resourceDto.getId());
- return BpmcResponseDto.success();
- }
-
- /**
- * 用户角色关联 创建（批量）
- */
- public BpmcResponseDto userRoleCreateService(List userRoleDtoList){
- List userRoleList = new ArrayList<>();
-
- for (UserRoleDto userRoleDto : userRoleDtoList){
- if (CharSequenceUtil.isNotEmpty(userRoleDto.getAccountCode())){
- SysUserRole sysUserRole = new SysUserRole();
- // 根据 accountCode 字段（即用户名username） 从数据库里查出来用户id，在给到sysUserRole
- LoginUser userInfo = sysBaseAPI.getUserByName(userRoleDto.getAccountCode());
-
- if (userInfo == null){
- continue;
- }
-
- sysUserRole.setUserId(userInfo.getId());
- sysUserRole.setRoleId(userRoleDto.getArId());
-
- // 角色重复性校验
- int count = sysUserRoleService.count(new LambdaQueryWrapper()
- .eq(SysUserRole::getUserId, sysUserRole.getUserId())
- .eq(SysUserRole::getRoleId, sysUserRole.getRoleId()));
- if (count > 0){
- continue;
- }
-
- userRoleList.add(sysUserRole);
- }
- }
- this.sysUserRoleService.saveBatch(userRoleList);
-
- return BpmcResponseDto.success();
- }
-
- /**
- * 用户角色关联 刪除（批量）
- */
- public BpmcResponseDto userRoleDeleteService(List userRoleDtoList){
- for (UserRoleDto userRoleDto : userRoleDtoList){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- // 根据 accountCode 字段（即用户名username） 从数据库里查出来用户id，在给到sysUserRole
- LoginUser userInfo = sysBaseAPI.getUserByName(userRoleDto.getAccountCode());
- if (userInfo == null){
- continue;
- }
-
- queryWrapper.eq("user_id", userInfo.getId());
- queryWrapper.eq("role_id", userRoleDto.getArId());
-
- this.sysUserRoleService.remove(queryWrapper);
- }
- return BpmcResponseDto.success();
- }
-
- /**
- * 角色菜单关联 创建（批量）
- */
- public BpmcResponseDto roleResourceCreateService(List roleResourceDtoList){
- List sysRolePermissionList = new ArrayList<>();
-
- for (RoleResourceDto roleResourceDto : roleResourceDtoList){
- SysRolePermission sysRolePermission = new SysRolePermission();
- sysRolePermission.setPermissionId(roleResourceDto.getAmId());
- sysRolePermission.setRoleId(roleResourceDto.getArId());
- // 重复性校验
- int count = sysRolePermissionService.count(new LambdaQueryWrapper()
- .eq(SysRolePermission::getRoleId, sysRolePermission.getRoleId())
- .eq(SysRolePermission::getPermissionId, sysRolePermission.getPermissionId()));
- if (count > 0){
- continue;
- }
- sysRolePermissionList.add(sysRolePermission);
- }
- this.sysRolePermissionService.saveBatch(sysRolePermissionList);
- return BpmcResponseDto.success();
- }
-
- /**
- * 用户角色关联 刪除（批量）
- */
- public BpmcResponseDto roleResourceDeleteService(List