From 0cc7c4bafbfa030133f60118b153e0dd7cbd7c71 Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Wed, 5 Jun 2024 11:41:59 +0800 Subject: [PATCH 01/44] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BE=BE=E6=A2=A6?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ReportManageServiceImpl.java | 507 +++++++++--------- 1 file changed, 249 insertions(+), 258 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java b/service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java index 044dcd40..eccc4f7a 100644 --- a/service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java @@ -3,21 +3,15 @@ package com.hzya.frame.report.reportManage.service.impl; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.report.reportManage.dao.IReportManageDao; import com.hzya.frame.report.reportManage.entity.JimuReportEntity; import com.hzya.frame.report.reportManage.entity.ReportManageEntity; -import com.hzya.frame.report.reportManage.dao.IReportManageDao; import com.hzya.frame.report.reportManage.service.IReportManageService; -import com.hzya.frame.sysnew.user.entity.SysUserEntity; -import com.hzya.frame.sysnew.userCompany.entity.SysUserCompanyEntity; -import com.hzya.frame.sysnew.userRoles.entity.SysUserRolesEntity; -import com.hzya.frame.util.AESUtil; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import dm.jdbc.d.U; -import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; -import com.hzya.frame.basedao.service.impl.BaseService; +import org.springframework.stereotype.Service; import java.util.List; @@ -29,272 +23,269 @@ import java.util.List; */ @Service(value = "reportManageService") public class ReportManageServiceImpl extends BaseService implements IReportManageService { - + private IReportManageDao reportManageDao; - + @Autowired - public void setReportManageDao(IReportManageDao dao) { - this.reportManageDao = dao; - this.dao = dao; - } + public void setReportManageDao(IReportManageDao dao) { + this.reportManageDao = dao; + this.dao = dao; + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询报表列表分页 - * @Date 11:52 上午 2024/3/27 - **/ - @Override - public JsonResultEntity queryEntityPage(JSONObject jsonObject) { - ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); - //判断分页 - if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { - return BaseResult.getFailureMessageEntity("分页查询参数不存在"); - } - PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); - List list = reportManageDao.queryByLikeClassify(entity); - PageInfo pageInfo = new PageInfo(list); - return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntityPage(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = reportManageDao.queryByLikeClassify(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询报表列表 - * @Date 11:52 上午 2024/3/27 - **/ - @Override - public JsonResultEntity queryEntity(JSONObject jsonObject) { - ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); - if (entity == null) { - entity = new ReportManageEntity(); - } - List list = reportManageDao.queryByLike(entity); - return BaseResult.getSuccessMessageEntity("查询数据成功", list); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表列表 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + entity = new ReportManageEntity(); + } + List list = reportManageDao.queryByLike(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", list); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 保存报表 - * @Date 2:36 下午 2024/3/27 - **/ - @Override - public JsonResultEntity saveEntity(JSONObject jsonObject) { - ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getReportId() == null || "".equals(entity.getReportId())) { - return BaseResult.getFailureMessageEntity("请先选择报表"); - } - if (entity.getReportName() == null || "".equals(entity.getReportName())) { - return BaseResult.getFailureMessageEntity("请先输入报表名称"); - } - if (entity.getClassifyId() == null || "".equals(entity.getClassifyId())) { - return BaseResult.getFailureMessageEntity("请先选择分类"); - } - if (entity.getPreviewAddress() == null || "".equals(entity.getPreviewAddress())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity.setState("0"); - if (!checkIsUse(entity)) { - return BaseResult.getFailureMessageEntity("当前报表已经配置，请勿重复配置"); - } - entity.setCreate(); - //保存 - reportManageDao.save(entity); - return BaseResult.getSuccessMessageEntity("保存报表成功", entity); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存报表 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity saveEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getReportId() == null || "".equals(entity.getReportId())) { + return BaseResult.getFailureMessageEntity("请先选择报表"); + } + if (entity.getReportName() == null || "".equals(entity.getReportName())) { + return BaseResult.getFailureMessageEntity("请先输入报表名称"); + } + if (entity.getClassifyId() == null || "".equals(entity.getClassifyId())) { + return BaseResult.getFailureMessageEntity("请先选择分类"); + } + if (entity.getPreviewAddress() == null || "".equals(entity.getPreviewAddress())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setState("0"); + if (!checkIsUse(entity)) { + return BaseResult.getFailureMessageEntity("当前报表已经配置，请勿重复配置"); + } + entity.setCreate(); + //保存 + reportManageDao.save(entity); + return BaseResult.getSuccessMessageEntity("保存报表成功", entity); + } + private boolean checkIsUse(ReportManageEntity entity) { + ReportManageEntity checkUse = new ReportManageEntity(); + checkUse.setReportId(entity.getReportId()); + return reportManageDao.getCount(checkUse) <= 0; + } - private boolean checkIsUse(ReportManageEntity entity) { - ReportManageEntity checkUse = new ReportManageEntity(); - checkUse.setReportId(entity.getReportId()); - if (reportManageDao.getCount(checkUse) > 0) { - return false; - } - return true; - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取报表 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity getEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = reportManageDao.get(entity.getId()); + if (entity == null) { + return BaseResult.getFailureMessageEntity("获取报表失败"); + } + return BaseResult.getSuccessMessageEntity("获取报表成功", entity); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 获取报表 - * @Date 2:36 下午 2024/3/27 - **/ - @Override - public JsonResultEntity getEntity(JSONObject jsonObject) { - ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity = reportManageDao.get(entity.getId()); - if (entity == null) { - return BaseResult.getFailureMessageEntity("获取报表失败"); - } - return BaseResult.getSuccessMessageEntity("获取报表成功", entity); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改报表 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity updateEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getReportId() == null || "".equals(entity.getReportId())) { + return BaseResult.getFailureMessageEntity("请先选择报表"); + } + if (entity.getReportName() == null || "".equals(entity.getReportName())) { + return BaseResult.getFailureMessageEntity("请先输入报表名称"); + } + if (entity.getClassifyId() == null || "".equals(entity.getClassifyId())) { + return BaseResult.getFailureMessageEntity("请先选择分类"); + } + if (entity.getPreviewAddress() == null || "".equals(entity.getPreviewAddress())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + //保存 + reportManageDao.update(entity); + return BaseResult.getSuccessMessageEntity("修改报表成功"); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 修改报表 - * @Date 2:37 下午 2024/3/27 - **/ - @Override - public JsonResultEntity updateEntity(JSONObject jsonObject) { - ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - if (entity.getReportId() == null || "".equals(entity.getReportId())) { - return BaseResult.getFailureMessageEntity("请先选择报表"); - } - if (entity.getReportName() == null || "".equals(entity.getReportName())) { - return BaseResult.getFailureMessageEntity("请先输入报表名称"); - } - if (entity.getClassifyId() == null || "".equals(entity.getClassifyId())) { - return BaseResult.getFailureMessageEntity("请先选择分类"); - } - if (entity.getPreviewAddress() == null || "".equals(entity.getPreviewAddress())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity.setUpdate(); - //保存 - reportManageDao.update(entity); - return BaseResult.getSuccessMessageEntity("修改报表成功"); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除报表 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity deleteEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + reportManageDao.logicRemove(entity); + return BaseResult.getSuccessMessageEntity("删除报表成功"); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 删除报表 - * @Date 2:37 下午 2024/3/27 - **/ - @Override - public JsonResultEntity deleteEntity(JSONObject jsonObject) { - ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity.setUpdate(); - reportManageDao.logicRemove(entity); - return BaseResult.getSuccessMessageEntity("删除报表成功"); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用报表 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity enableDisableEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getState() == null || "".equals(entity.getState())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + reportManageDao.update(entity); + //0启用 1 停用 + if ("0".equals(entity.getState())) { + return BaseResult.getSuccessMessageEntity("启用用户成功"); + } else { + return BaseResult.getSuccessMessageEntity("停用用户成功"); + } + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 启用停用报表 - * @Date 2:37 下午 2024/3/27 - **/ - @Override - public JsonResultEntity enableDisableEntity(JSONObject jsonObject) { - ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - if (entity.getState() == null || "".equals(entity.getState())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity.setUpdate(); - reportManageDao.update(entity); - //0启用 1 停用 - if ("0".equals(entity.getState())) { - return BaseResult.getSuccessMessageEntity("启用用户成功"); - } else { - return BaseResult.getSuccessMessageEntity("停用用户成功"); - } - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity queryReport(JSONObject jsonObject) { + JimuReportEntity entity = getData("jsonStr", jsonObject, JimuReportEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = reportManageDao.queryReportNotUse(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询报表 - * @Date 2:36 下午 2024/3/27 - **/ - @Override - public JsonResultEntity queryReport(JSONObject jsonObject) { - JimuReportEntity entity = getData("jsonStr", jsonObject, JimuReportEntity.class); - //判断分页 - if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { - return BaseResult.getFailureMessageEntity("分页查询参数不存在"); - } - PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); - List list = reportManageDao.queryReportNotUse(entity); - PageInfo pageInfo = new PageInfo(list); - return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); - } + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity queryReportEntity(JSONObject jsonObject) { + JimuReportEntity entity = getData("jsonStr", jsonObject, JimuReportEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = reportManageDao.queryReportEntity(entity); + if (entity == null) { + return BaseResult.getFailureMessageEntity("获取报表失败"); + } + return BaseResult.getSuccessMessageEntity("获取报表成功", entity); - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 查询报表 - * @Date 2:36 下午 2024/3/27 - **/ - @Override - public JsonResultEntity queryReportEntity(JSONObject jsonObject) { - JimuReportEntity entity = getData("jsonStr", jsonObject, JimuReportEntity.class); - if (entity == null) { - return BaseResult.getFailureMessageEntity("参数不允许为空"); - } - if (entity.getId() == null || "".equals(entity.getId())) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - entity = reportManageDao.queryReportEntity(entity); - if (entity == null) { - return BaseResult.getFailureMessageEntity("获取报表失败"); - } - return BaseResult.getSuccessMessageEntity("获取报表成功", entity); + } - } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 权限查询 - * @Date 2:37 下午 2024/3/27 - **/ - @Override - public JsonResultEntity jurisdiction(JSONObject jsonObject) { + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 权限查询 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity jurisdiction(JSONObject jsonObject) { - return null; - } + return null; + } - /** - * @param jsonObject - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 保存权限查询 - * @Date 2:37 下午 2024/3/27 - **/ - @Override - public JsonResultEntity saveJurisdiction(JSONObject jsonObject) { + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存权限查询 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity saveJurisdiction(JSONObject jsonObject) { - return null; - } + return null; + } } From a18e5e5179616bf6bde749f1796f00dad02918ac Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Thu, 6 Jun 2024 14:13:44 +0800 Subject: [PATCH 02/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AAu8c?= =?UTF-8?q?=E5=A0=86=E6=A0=88=E4=BF=A1=E6=81=AF=E6=89=93=E5=8D=B0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/u8c/ax/service/impl/AxServiceImpl.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java b/service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java index f126e010..e9ef121d 100644 --- a/service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java @@ -1,16 +1,10 @@ package com.hzya.frame.u8c.ax.service.impl; -import cn.hutool.http.HttpRequest; -import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.u8c.ax.dao.IAxDao; -import com.hzya.frame.u8c.ax.entity.ArchivesEntity; -import com.hzya.frame.u8c.ax.entity.Ass; -import com.hzya.frame.u8c.ax.entity.Voucher; -import com.hzya.frame.u8c.ax.entity.VoucherDetails; -import com.hzya.frame.u8c.ax.entity.VoucherRoot; +import com.hzya.frame.u8c.ax.entity.*; import com.hzya.frame.u8c.ax.service.IAxService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; @@ -22,14 +16,11 @@ import org.apache.http.entity.ByteArrayEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; -import org.checkerframework.checker.units.qual.A; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import com.hzya.frame.basedao.service.impl.BaseService; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -218,6 +209,7 @@ public class AxServiceImpl extends BaseService implement post.setHeader("publicKey", publicKey); post.setHeader("secretKey", secretKey); post.setHeader("appId", appId); + post.setHeader("needStackTrace", jsonObject.getString("needStackTrace")); switch (jsonObject.getString("voucherType")){ case "add"://新增 post.setHeader("apiCode", pzApiCodexz); From 54332d5fc25e04011e3b751309d6425f6741cb5a Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Tue, 11 Jun 2024 10:00:36 +0800 Subject: [PATCH 03/44] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A7=AF=E6=9C=A8?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index fa54a84e..383d109f 100644 --- a/pom.xml +++ b/pom.xml @@ -244,12 +244,12 @@ - - - com.dameng - Dm8JdbcDriver18 - 8.1.1.49 - + + + + + + @@ -338,21 +338,7 @@ org.springframework.boot spring-boot-starter-cache - - - - org.jeecgframework.jimureport - jimureport-spring-boot-starter - ${jimureport.version} - - - - io.minio - minio - ${minio.version} - true - - + org.postgresql postgresql From 1b98e96aa5c8b7f1a5f1a82ad3d25505837cc692 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 7 May 2024 09:04:40 +0800 Subject: [PATCH 04/44] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildpackage/src/main/resources/application-hclocal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildpackage/src/main/resources/application-hclocal.yml b/buildpackage/src/main/resources/application-hclocal.yml index 5d960999..0e91791f 100644 --- a/buildpackage/src/main/resources/application-hclocal.yml +++ b/buildpackage/src/main/resources/application-hclocal.yml @@ -6,7 +6,7 @@ logging: encodings: UTF-8 file: # 日志保存路径 - path: /Users/apple/Desktop/log/local + path: D:\yongansystem\kangarooDataCenter\v3\logs spring: datasource: dynamic: @@ -18,6 +18,6 @@ spring: driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 savefile: # 文件保存路径 - path: /Users/apple/Desktop/log/local + path: D:\yongansystem\kangarooDataCenter\v3\logs ax: url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file From 5aea5a5fd636d2c0f8073eca1f873838ab69c189 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Mon, 27 May 2024 10:46:36 +0800 Subject: [PATCH 05/44] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-hclocal.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/buildpackage/src/main/resources/application-hclocal.yml b/buildpackage/src/main/resources/application-hclocal.yml index 0e91791f..995c4368 100644 --- a/buildpackage/src/main/resources/application-hclocal.yml +++ b/buildpackage/src/main/resources/application-hclocal.yml @@ -12,10 +12,14 @@ spring: dynamic: datasource: master: - url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true - username: root - password: bd993088e8a7c3dc5f44441617f9b4bf - driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +# url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true +# username: root +# password: bd993088e8a7c3dc5f44441617f9b4bf +# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 + url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: hzya@1314 + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 savefile: # 文件保存路径 path: D:\yongansystem\kangarooDataCenter\v3\logs From fcc4b15b2a1d8fb808f6432ed03c86ac4cc116aa Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Mon, 27 May 2024 11:21:21 +0800 Subject: [PATCH 06/44] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AF=B9=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sysnew/comparison/dao/IComparisonDao.java | 71 ++ .../comparison/dao/IComparisonDetailsDao.java | 50 ++ .../dao/impl/ComparisonDaoImpl.java | 54 ++ .../dao/impl/ComparisonDetailsDaoImpl.java | 45 ++ .../entity/ComparisonDetailsEntity.java | 323 ++++++++++ .../entity/ComparisonDetailsEntity.xml | 89 +++ .../comparison/entity/ComparisonEntity.java | 607 ++++++++++++++++++ .../comparison/entity/ComparisonEntity.xml | 158 +++++ .../service/IComparisonDetailsService.java | 7 + .../service/IComparisonService.java | 49 ++ .../impl/ComparisonDetailsServiceImpl.java | 10 + .../service/impl/ComparisonServiceImpl.java | 334 ++++++++++ 12 files changed, 1797 insertions(+) create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonDetailsService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonDetailsServiceImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java new file mode 100644 index 00000000..b11a112a --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java @@ -0,0 +1,71 @@ +package com.hzya.frame.sysnew.comparison.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; + +import java.util.List; + +public interface IComparisonDao extends IBaseDao { + + /** + * + * @content 根据主数据编码查询表名，字段名等信息 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 16:05 + * **/ + List queryComparison(ComparisonEntity comparison); + + /** + * + * @content 分页查询数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 15:11 + * **/ + List queryComparisonPage(ComparisonEntity comparison); + + /** + * + * @content 保存档案对照数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 16:56 + * **/ + ComparisonEntity saveComparison(ComparisonEntity comparison); + + /** + * + * @content 生成单据规则 如：CK-yyyyMMdd-0001 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 9:42 + * **/ + ComparisonEntity queryComparisonRule(ComparisonEntity comparison); + + /** + * + * @content 更新档案对照数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 10:32 + * **/ + Integer updateComparisonByType(ComparisonEntity comparison); + + /** + * + * @content 删除档案对照数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 14:09 + * **/ + Integer deleteComparison(ComparisonEntity comparison); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java new file mode 100644 index 00000000..731109c9 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java @@ -0,0 +1,50 @@ +package com.hzya.frame.sysnew.comparison.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; + +import java.util.List; + +public interface IComparisonDetailsDao extends IBaseDao { + + /** + * + * @content 保存档案对照子表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 10:41 + * **/ + ComparisonDetailsEntity saveComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity); + + /** + * + * @content 更新档案对照子表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 10:41 + * **/ + Integer updateComparisonDetailsByType(ComparisonDetailsEntity comparisonDetailsEntity); + + /** + * + * @content 删除档案对照子表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 14:11 + * **/ + Integer deleteComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity); + + /** + * + * @content 分页查询子表数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 15:34 + * **/ + List queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java new file mode 100644 index 00000000..695c3683 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java @@ -0,0 +1,54 @@ +package com.hzya.frame.sysnew.comparison.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository(value = "comparisonDaoImpl") +public class ComparisonDaoImpl extends MybatisGenericDao implements IComparisonDao { + //根据主数据编码查询表名，字段名等信息 + @Override + public List queryComparison(ComparisonEntity comparison) { + List query = super.query(getSqlIdPrifx() + "queryComparison", comparison); + return query; + } + + //分页查询 + @Override + public List queryComparisonPage(ComparisonEntity comparison) { + List query = super.query(getSqlIdPrifx() + "queryComparisonPage", comparison); + return query; + } + + //保存数据 + @Override + public ComparisonEntity saveComparison(ComparisonEntity comparison) { + ComparisonEntity comparisonEntity = super.save(getSqlIdPrifx() + "saveComparison", comparison); + return comparisonEntity; + } + + //生成单据规则 + @Override + public ComparisonEntity queryComparisonRule(ComparisonEntity comparison) { + List comparisonEntities = super.query(getSqlIdPrifx() + "queryComparisonRule", comparison); + return comparisonEntities.get(0); + } + + //更新档案对照数据 + @Override + public Integer updateComparisonByType(ComparisonEntity comparison) { + int update = super.update(getSqlIdPrifx() + "updateComparisonByType", comparison); + return update; + } + + //删除档案对照数据 + @Override + public Integer deleteComparison(ComparisonEntity comparison) { + int delete = super.delete(getSqlIdPrifx() + "deleteComparison", comparison); + return delete; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java new file mode 100644 index 00000000..bafc78fe --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java @@ -0,0 +1,45 @@ +package com.hzya.frame.sysnew.comparison.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDao; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDetailsDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository(value = "comparisonDetailsDaoImpl") +public class ComparisonDetailsDaoImpl extends MybatisGenericDao implements IComparisonDetailsDao { + + //保存档案对照子表数据 + @Override + public ComparisonDetailsEntity saveComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity) { + ComparisonDetailsEntity detailsEntity = super.save(getSqlIdPrifx() + "saveComparisonDetails", comparisonDetailsEntity); + return detailsEntity; + } + + //更新档案对照子表数据 + @Override + public Integer updateComparisonDetailsByType(ComparisonDetailsEntity comparisonDetailsEntity) { + int update = super.update(getSqlIdPrifx()+"updateComparisonDetailsByType", comparisonDetailsEntity); + return update; + } + + //删除档案对照子表的数据 + @Override + public Integer deleteComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity) { + int delete = super.delete(getSqlIdPrifx() + "deleteComparisonDetails", comparisonDetailsEntity); + return delete; + } + + //分页查询子表数据 + @Override + public List queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity) { + List query = super.query(getSqlIdPrifx() + "queryComparisonDetailsPage", comparisonDetailsEntity); + return query; + } + + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java new file mode 100644 index 00000000..11ce420d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java @@ -0,0 +1,323 @@ +package com.hzya.frame.sysnew.comparison.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzya.frame.web.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.Map; + +/** + * + * @content 档案对照明细实体类 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 15:50 + * **/ +public class ComparisonDetailsEntity extends BaseEntity { + + private String contrastType;//对照类型 + private String documentRule;//单据规则 + private Long documentRuleNum;//单据规则流水号 + private String sszz;//所属组织 + private String bz;//备注 + private String formmainId;//上级id + private String taskLinvingId;//集成任务-实例_id + private String result;//返回结果 + private String queryCondition;//原始查询条件 + private String rootAppPk;//源系统主键 + private String rootAppBill;//原系统单据 + private String rootAppNewData;//最新源系统数据详情 + private String newTransmitInfo;//最新传输信息 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date newPushDate;//最新推送时间 + private String repairPust;//是否补推(Y是N不是) + private String senceId;//场景id + private String newState;//最新推送状态 + private String businessDate;//单据业务日期 + private String pluginId;//插件id + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date processingTime;//处理时间 + private String processingRemarks;//处理备注 + private String processorName;//处理⼈名称 + private String processor;//处理⼈ + private String newSystemNumber;//下游系统单号 + private String newSystemPrimary;//下游系统主键 + + private String mdmName;//主数据名称 + private String mdmCode;//主数据编码 + private String dbName;//表名 + private String dbType;//类型 1、主表 2、明细 + private String enName;//字段名 英文 + private String chName;// 字段名 中文 + private String filedType;//字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME + + private Map mapDetails; + + public String getMdmName() { + return mdmName; + } + + public void setMdmName(String mdmName) { + this.mdmName = mdmName; + } + + public String getMdmCode() { + return mdmCode; + } + + public void setMdmCode(String mdmCode) { + this.mdmCode = mdmCode; + } + + public String getDbName() { + return dbName; + } + + public void setDbName(String dbName) { + this.dbName = dbName; + } + + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getChName() { + return chName; + } + + public void setChName(String chName) { + this.chName = chName; + } + + public String getFiledType() { + return filedType; + } + + public void setFiledType(String filedType) { + this.filedType = filedType; + } + + public Map getMapDetails() { + return mapDetails; + } + + public void setMapDetails(Map mapDetails) { + this.mapDetails = mapDetails; + } + + public String getContrastType() { + return contrastType; + } + + public void setContrastType(String contrastType) { + this.contrastType = contrastType; + } + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getSszz() { + return sszz; + } + + public void setSszz(String sszz) { + this.sszz = sszz; + } + + public String getBz() { + return bz; + } + + public void setBz(String bz) { + this.bz = bz; + } + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + public String getTaskLinvingId() { + return taskLinvingId; + } + + public void setTaskLinvingId(String taskLinvingId) { + this.taskLinvingId = taskLinvingId; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getQueryCondition() { + return queryCondition; + } + + public void setQueryCondition(String queryCondition) { + this.queryCondition = queryCondition; + } + + public String getRootAppPk() { + return rootAppPk; + } + + public void setRootAppPk(String rootAppPk) { + this.rootAppPk = rootAppPk; + } + + public String getRootAppBill() { + return rootAppBill; + } + + public void setRootAppBill(String rootAppBill) { + this.rootAppBill = rootAppBill; + } + + public String getRootAppNewData() { + return rootAppNewData; + } + + public void setRootAppNewData(String rootAppNewData) { + this.rootAppNewData = rootAppNewData; + } + + public String getNewTransmitInfo() { + return newTransmitInfo; + } + + public void setNewTransmitInfo(String newTransmitInfo) { + this.newTransmitInfo = newTransmitInfo; + } + + public Date getNewPushDate() { + return newPushDate; + } + + public void setNewPushDate(Date newPushDate) { + this.newPushDate = newPushDate; + } + + public String getRepairPust() { + return repairPust; + } + + public void setRepairPust(String repairPust) { + this.repairPust = repairPust; + } + + public String getSenceId() { + return senceId; + } + + public void setSenceId(String senceId) { + this.senceId = senceId; + } + + public String getNewState() { + return newState; + } + + public void setNewState(String newState) { + this.newState = newState; + } + + public String getBusinessDate() { + return businessDate; + } + + public void setBusinessDate(String businessDate) { + this.businessDate = businessDate; + } + + public String getPluginId() { + return pluginId; + } + + public void setPluginId(String pluginId) { + this.pluginId = pluginId; + } + + public Date getProcessingTime() { + return processingTime; + } + + public void setProcessingTime(Date processingTime) { + this.processingTime = processingTime; + } + + public String getProcessingRemarks() { + return processingRemarks; + } + + public void setProcessingRemarks(String processingRemarks) { + this.processingRemarks = processingRemarks; + } + + public String getProcessorName() { + return processorName; + } + + public void setProcessorName(String processorName) { + this.processorName = processorName; + } + + public String getProcessor() { + return processor; + } + + public void setProcessor(String processor) { + this.processor = processor; + } + + public String getNewSystemNumber() { + return newSystemNumber; + } + + public void setNewSystemNumber(String newSystemNumber) { + this.newSystemNumber = newSystemNumber; + } + + public String getNewSystemPrimary() { + return newSystemPrimary; + } + + public void setNewSystemPrimary(String newSystemPrimary) { + this.newSystemPrimary = newSystemPrimary; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml new file mode 100644 index 00000000..dfd07457 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into ${dbName} + + + ${column}, + + + values + + + #{value}, + + + + + + + update ${dbName} + + + ${key} =#{value} + + + where formmain_id=#{formmainId} and sts='Y' + + + + + update + ${dbName} + set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + + + and formmain_id=#{formmainId} and sts='Y' + + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java new file mode 100644 index 00000000..6f96d23f --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java @@ -0,0 +1,607 @@ +package com.hzya.frame.sysnew.comparison.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzya.frame.web.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * + * @content 档案对照实体类 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 15:50 + * **/ +public class ComparisonEntity extends BaseEntity { + private String contrastType;//对照类型 + private String documentRule;//单据规则 + private Long documentRuleNum;//单据规则流水号 + private String ckbm;//仓库编码 + private String ckmc;//仓库名称 + private String cklx;//仓库类型 + private String ckdz;//仓库地址 + private String fzr;//负责人 + private String dh;//电话 + private String ssdd;//所属地点 + private String bz;//备注 + private String ssck;//所属仓库 + private String hwbm;//货位编码 + + private String hwmc;//货位名称 + private String hwrj;//货位容积 + private String dd;//地点 + private String sjzz;//上级组织 + private String zzbm;//组织编码 + private String zzmc;//组织名称 + private String fr;//法人 + private String dz;//地址 + private String taskCode;//任务编码 + private String taskName;//任务名称 + private String taskClasses;//任务分类 + private String taskCron;//任务策略 + private String taskTag;//任务标识 + private String funInfo;//功能介绍/任务描述' + private String senceId;//场景id + private String remark;//备注 + private String taskStatus;//任务状态 + private String serverName;//服务名称 + private String plug;//插件 + private String plugId;//插件id + + private String taskLinvingId;//集成任务-实例_id + private String result;//返回结果 + private String queryCondition;//原始查询条件 + private String rootAppPk;//源系统主键 + private String rootAppBill;//原系统单据 + private String rootAppNewData;//最新源系统数据详情 + private String newTransmitInfo;//最新传输信息 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date newPushDate;//最新推送时间 + private String repairPust;//是否补推(Y是N不是) + private String newState;//最新推送状态 + private String businessDate;//单据业务日期 + private String pluginId;//插件id + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date processingTime;//处理时间 + private String processingRemarks;//处理备注 + private String processorName;//处理⼈名称 + private String processor;//处理⼈ + private String newSystemNumber;//下游系统单号 + private String newSystemPrimary;//下游系统主键 + + private String mdmName;//主数据名称 + private String mdmCode;//主数据编码 + private String dbName;//表名 + private String dbType;//类型 1、主表 2、明细 + private String enName;//字段名 英文 + private String chName;// 字段名 中文 + private String filedType;//字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME + + private Map map; + private ComparisonDetailsEntity comparisonDetailsEntity; + private String sszz;//所属组织 + private String formmainId;//上级id + + private String rulePrefix;//规则前缀 CK-yyyyMMdd-0001中的CK + + private List comparisonDetailsEntityList; + + public List getComparisonDetailsEntityList() { + return comparisonDetailsEntityList; + } + + public void setComparisonDetailsEntityList(List comparisonDetailsEntityList) { + this.comparisonDetailsEntityList = comparisonDetailsEntityList; + } + + public String getRulePrefix() { + return rulePrefix; + } + + public void setRulePrefix(String rulePrefix) { + this.rulePrefix = rulePrefix; + } + + public String getSszz() { + return sszz; + } + + public void setSszz(String sszz) { + this.sszz = sszz; + } + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + public ComparisonDetailsEntity getComparisonDetailsEntity() { + return comparisonDetailsEntity; + } + + public void setComparisonDetailsEntity(ComparisonDetailsEntity comparisonDetailsEntity) { + this.comparisonDetailsEntity = comparisonDetailsEntity; + } + + public Map getMap() { + return map; + } + + public void setMap(Map map) { + this.map = map; + } + + + public String getMdmName() { + return mdmName; + } + + public void setMdmName(String mdmName) { + this.mdmName = mdmName; + } + + public String getMdmCode() { + return mdmCode; + } + + public void setMdmCode(String mdmCode) { + this.mdmCode = mdmCode; + } + + public String getDbName() { + return dbName; + } + + public void setDbName(String dbName) { + this.dbName = dbName; + } + + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getChName() { + return chName; + } + + public void setChName(String chName) { + this.chName = chName; + } + + public String getFiledType() { + return filedType; + } + + public void setFiledType(String filedType) { + this.filedType = filedType; + } + + public String getTaskLinvingId() { + return taskLinvingId; + } + + public void setTaskLinvingId(String taskLinvingId) { + this.taskLinvingId = taskLinvingId; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getQueryCondition() { + return queryCondition; + } + + public void setQueryCondition(String queryCondition) { + this.queryCondition = queryCondition; + } + + public String getRootAppPk() { + return rootAppPk; + } + + public void setRootAppPk(String rootAppPk) { + this.rootAppPk = rootAppPk; + } + + public String getRootAppBill() { + return rootAppBill; + } + + public void setRootAppBill(String rootAppBill) { + this.rootAppBill = rootAppBill; + } + + public String getRootAppNewData() { + return rootAppNewData; + } + + public void setRootAppNewData(String rootAppNewData) { + this.rootAppNewData = rootAppNewData; + } + + public String getNewTransmitInfo() { + return newTransmitInfo; + } + + public void setNewTransmitInfo(String newTransmitInfo) { + this.newTransmitInfo = newTransmitInfo; + } + + public Date getNewPushDate() { + return newPushDate; + } + + public void setNewPushDate(Date newPushDate) { + this.newPushDate = newPushDate; + } + + public String getRepairPust() { + return repairPust; + } + + public void setRepairPust(String repairPust) { + this.repairPust = repairPust; + } + + public String getNewState() { + return newState; + } + + public void setNewState(String newState) { + this.newState = newState; + } + + public String getBusinessDate() { + return businessDate; + } + + public void setBusinessDate(String businessDate) { + this.businessDate = businessDate; + } + + public String getPluginId() { + return pluginId; + } + + public void setPluginId(String pluginId) { + this.pluginId = pluginId; + } + + public Date getProcessingTime() { + return processingTime; + } + + public void setProcessingTime(Date processingTime) { + this.processingTime = processingTime; + } + + public String getProcessingRemarks() { + return processingRemarks; + } + + public void setProcessingRemarks(String processingRemarks) { + this.processingRemarks = processingRemarks; + } + + public String getProcessorName() { + return processorName; + } + + public void setProcessorName(String processorName) { + this.processorName = processorName; + } + + public String getProcessor() { + return processor; + } + + public void setProcessor(String processor) { + this.processor = processor; + } + + public String getNewSystemNumber() { + return newSystemNumber; + } + + public void setNewSystemNumber(String newSystemNumber) { + this.newSystemNumber = newSystemNumber; + } + + public String getNewSystemPrimary() { + return newSystemPrimary; + } + + public void setNewSystemPrimary(String newSystemPrimary) { + this.newSystemPrimary = newSystemPrimary; + } + + public String getContrastType() { + return contrastType; + } + + public void setContrastType(String contrastType) { + this.contrastType = contrastType; + } + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getCkbm() { + return ckbm; + } + + public void setCkbm(String ckbm) { + this.ckbm = ckbm; + } + + public String getCkmc() { + return ckmc; + } + + public void setCkmc(String ckmc) { + this.ckmc = ckmc; + } + + public String getCklx() { + return cklx; + } + + public void setCklx(String cklx) { + this.cklx = cklx; + } + + public String getCkdz() { + return ckdz; + } + + public void setCkdz(String ckdz) { + this.ckdz = ckdz; + } + + public String getFzr() { + return fzr; + } + + public void setFzr(String fzr) { + this.fzr = fzr; + } + + public String getDh() { + return dh; + } + + public void setDh(String dh) { + this.dh = dh; + } + + public String getSsdd() { + return ssdd; + } + + public void setSsdd(String ssdd) { + this.ssdd = ssdd; + } + + public String getBz() { + return bz; + } + + public void setBz(String bz) { + this.bz = bz; + } + + public String getSsck() { + return ssck; + } + + public void setSsck(String ssck) { + this.ssck = ssck; + } + + public String getHwbm() { + return hwbm; + } + + public void setHwbm(String hwbm) { + this.hwbm = hwbm; + } + + public String getHwmc() { + return hwmc; + } + + public void setHwmc(String hwmc) { + this.hwmc = hwmc; + } + + public String getHwrj() { + return hwrj; + } + + public void setHwrj(String hwrj) { + this.hwrj = hwrj; + } + + public String getDd() { + return dd; + } + + public void setDd(String dd) { + this.dd = dd; + } + + public String getSjzz() { + return sjzz; + } + + public void setSjzz(String sjzz) { + this.sjzz = sjzz; + } + + public String getZzbm() { + return zzbm; + } + + public void setZzbm(String zzbm) { + this.zzbm = zzbm; + } + + public String getZzmc() { + return zzmc; + } + + public void setZzmc(String zzmc) { + this.zzmc = zzmc; + } + + public String getFr() { + return fr; + } + + public void setFr(String fr) { + this.fr = fr; + } + + public String getDz() { + return dz; + } + + public void setDz(String dz) { + this.dz = dz; + } + + public String getTaskCode() { + return taskCode; + } + + public void setTaskCode(String taskCode) { + this.taskCode = taskCode; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getTaskClasses() { + return taskClasses; + } + + public void setTaskClasses(String taskClasses) { + this.taskClasses = taskClasses; + } + + public String getTaskCron() { + return taskCron; + } + + public void setTaskCron(String taskCron) { + this.taskCron = taskCron; + } + + public String getTaskTag() { + return taskTag; + } + + public void setTaskTag(String taskTag) { + this.taskTag = taskTag; + } + + public String getFunInfo() { + return funInfo; + } + + public void setFunInfo(String funInfo) { + this.funInfo = funInfo; + } + + public String getSenceId() { + return senceId; + } + + public void setSenceId(String senceId) { + this.senceId = senceId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String taskStatus) { + this.taskStatus = taskStatus; + } + + public String getServerName() { + return serverName; + } + + public void setServerName(String serverName) { + this.serverName = serverName; + } + + public String getPlug() { + return plug; + } + + public void setPlug(String plug) { + this.plug = plug; + } + + public String getPlugId() { + return plugId; + } + + public void setPlugId(String plugId) { + this.plugId = plugId; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml new file mode 100644 index 00000000..ff5c6469 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into ${dbName} + + + ${column}, + + + values + + + #{value}, + + + + + + + update ${dbName} + + + ${key} =#{value} + + + where id=#{id} and sts='Y' + + + + + + update + ${dbName} + set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + + + and ${key} =#{value} + + and id=#{id} and sts='Y' + + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonDetailsService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonDetailsService.java new file mode 100644 index 00000000..ac5db9c0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonDetailsService.java @@ -0,0 +1,7 @@ +package com.hzya.frame.sysnew.comparison.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; + +public interface IComparisonDetailsService extends IBaseService { +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java new file mode 100644 index 00000000..60375cfb --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java @@ -0,0 +1,49 @@ +package com.hzya.frame.sysnew.comparison.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface IComparisonService extends IBaseService { + + /** + * + * @content 分页查询档案对照数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 15:55 + * **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + /** + * + * @content 新增档案对照数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/7 16:52 + * **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * + * @content 编辑档案对照数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 10:19 + * **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * + * @content 删除档案对照数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/9 13:59 + * **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonDetailsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonDetailsServiceImpl.java new file mode 100644 index 00000000..64b6bfd9 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonDetailsServiceImpl.java @@ -0,0 +1,10 @@ +package com.hzya.frame.sysnew.comparison.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; +import com.hzya.frame.sysnew.comparison.service.IComparisonDetailsService; +import org.springframework.stereotype.Service; + +@Service(value = "comparisonDetailsServiceImpl") +public class ComparisonDetailsServiceImpl extends BaseService implements IComparisonDetailsService { +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java new file mode 100644 index 00000000..e449e22d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java @@ -0,0 +1,334 @@ +package com.hzya.frame.sysnew.comparison.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDao; +import com.hzya.frame.sysnew.comparison.dao.IComparisonDetailsDao; +import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.sysnew.comparison.service.IComparisonService; +import com.hzya.frame.sysnew.generalData.dao.IGeneralDataDao; +import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import sun.java2d.pipe.AAShapePipe; + +import java.util.*; + +@Service(value = "comparisonServiceImpl") +public class ComparisonServiceImpl extends BaseService implements IComparisonService { + + private IComparisonDao comparisonDao; + + @Autowired + private IComparisonDetailsDao comparisonDetailsDao; + + @Autowired + public void setGeneralDataDao(IComparisonDao dao) { + this.comparisonDao = dao; + this.dao = dao; + } + + //分页查询档案对照数据 + @Override + public JsonResultEntity queryEntityPage(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if (jsonObject == null) { + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if (!checkStr(jsonObject.getString("mdmCode"))) { + return BaseResult.getFailureMessageEntity("主数据编码为空"); + } + ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); + List comparisonEntities=new ArrayList<>(); + try { + //根据主数据编码查询表名称，字段名称等信息 10001 + comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + }catch (Exception e){ + logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("查询失败",e.getMessage()); + } + Map map = new HashMap<>();//将主表数据存到map中 + if (comparisonEntities != null && comparisonEntities.size() > 0) { + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObject.keySet()) { + if (entity.getDbType().equals("1")) { + comparisonEntity.setDbName(entity.getDbName()); + if(!"mdmCode".equals(key)){ + map.put(key, jsonObject.getString(key)); + } + } + } + } + comparisonEntity.setMap(map); + try { + List comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity); + PageInfo pageInfo = new PageInfo(comparisonEntitiePages); + return BaseResult.getSuccessMessageEntity("查询成功", pageInfo); + } catch (Exception e) { + logger.info("查询档案对照错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("查询失败", e.getMessage()); + } + } + return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); + } + + //新增档案对照数据 + @Override + public JsonResultEntity saveEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if (jsonObject == null) { + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if (!checkStr(jsonObject.getString("mdmCode"))) { + return BaseResult.getFailureMessageEntity("主数据编码为空"); + } + if (!checkStr(jsonObject.getString("rulePrefix"))) { + return BaseResult.getFailureMessageEntity("规则为空"); + } + ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); + ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); + List comparisonEntities=new ArrayList<>(); + try { + //根据主数据编码查询表名称，字段名称等信息 10001 + comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + }catch (Exception e){ + logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败",e.getMessage()); + } + String main = jsonObject.getString("main");//获取主表数据 + JSONArray jsonArray = jsonObject.getJSONArray("details");//获取子表数据 + JSONObject jsonObjectMain = JSONObject.parseObject(main); + if(jsonObjectMain != null ) { + Map map = new HashMap<>();//将主表数据存到map中 + Map mapDetails = new HashMap<>();//将子表数据存到map中 + if (comparisonEntities != null && comparisonEntities.size() > 0) { + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectMain.keySet()) { + if (entity.getDbType().equals("1")) { + comparisonEntity.setDbName(entity.getDbName()); + map.put(key, jsonObjectMain.getString(key)); + } + } + } + if (jsonArray != null && jsonArray.size() > 0) { + for (Object object : jsonArray) { + JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object); + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectDetails.keySet()) { + if (entity.getDbType().equals("2")) { + comparisonDetailsEntity.setDbName(entity.getDbName()); + mapDetails.put(key, jsonObjectDetails.getString(key)); + } + } + } + } + } + String uuid = UUIDUtils.getUUID(); + map.put("id", uuid); + map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("org_id", "0"); + map.put("create_time", new Date()); + map.put("modify_time", new Date()); + map.put("sts", "Y"); + comparisonEntity.setMap(map); + //生成单据规则 + comparisonEntity.setRulePrefix(jsonObject.getString("rulePrefix")); + try { + ComparisonEntity comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); + map.put("document_rule", comparisonEntityRule.getDocumentRule());//单据规则 + map.put("document_rule_num", comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 + } catch (Exception e) { + logger.info("保存档案对照时候生成单据规则错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败", e.getMessage()); + } + try { + //保存主表数据 + ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntity); + //保存子表数据 + if (mapDetails != null && mapDetails.size() > 0) { + mapDetails.put("id", UUIDUtils.getUUID()); + mapDetails.put("formmain_id", uuid); + mapDetails.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + mapDetails.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + mapDetails.put("org_id", "0"); + mapDetails.put("create_time", new Date()); + mapDetails.put("modify_time", new Date()); + mapDetails.put("sts", "Y"); + comparisonDetailsEntity.setMapDetails(mapDetails); + ComparisonDetailsEntity comparisonDetailsEntityOne = comparisonDetailsDao.saveComparisonDetails(comparisonDetailsEntity); + comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); + } + return BaseResult.getSuccessMessageEntity("保存成功", comparisonEntityOne); + } catch (Exception e) { + logger.info("保存档案对照时候错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败", e.getMessage()); + } + } + } + return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); + } + + //更新档案对照数据 + @Override + public JsonResultEntity updateEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if (jsonObject == null) { + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if (!checkStr(jsonObject.getString("mdmCode"))) { + return BaseResult.getFailureMessageEntity("主数据编码为空"); + } + ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); + ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); + JSONObject jsonObjectMain=jsonObject.getJSONObject("main");//获取主表数据 + JSONArray jsonArray = jsonObject.getJSONArray("details");//获取子表数据 + if(!checkStr(jsonObjectMain.getString("id"))){ + return BaseResult.getFailureMessageEntity("更新时候主表id不能为空"); + } + List comparisonEntities=new ArrayList<>(); + //根据主数据编码查询表名称，字段名称等信息 10001 + try { + comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + }catch (Exception e){ + logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("更新失败",e.getMessage()); + } + Map map=new HashMap<>();//将主表数据存到map中 + Map mapDetails=new HashMap<>();//将子表数据存到map中 + if(comparisonEntities !=null && comparisonEntities.size()>0) { + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectMain.keySet()) { + if (entity.getDbType().equals("1")) { + comparisonEntity.setDbName(entity.getDbName()); + map.put(key, jsonObjectMain.getString(key)); + } + } + } + if (jsonArray != null && jsonArray.size() > 0) { + for (Object object : jsonArray) { + JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object); + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectDetails.keySet()) { + if (entity.getDbType().equals("2")) { + comparisonDetailsEntity.setDbName(entity.getDbName()); + mapDetails.put(key, jsonObjectDetails.getString(key)); + } + } + } + } + } + map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + map.put("org_id", "0"); + map.put("modify_time", new Date()); + map.put("sts", "Y"); + comparisonEntity.setMap(map); + comparisonEntity.setId(jsonObjectMain.getString("id")); + /*//生成单据规则 + comparisonEntity.setRulePrefix(jsonObject.getString("rulePrefix")); + try { + ComparisonEntity comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); + map.put("document_rule",comparisonEntityRule.getDocumentRule());//单据规则 + map.put("document_rule_num",comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 + }catch (Exception e){ + logger.info("更新档案对照时候生成单据规则错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("更新失败",e.getMessage()); + }*/ + try { + //保存主表数据 + Integer integer = comparisonDao.updateComparisonByType(comparisonEntity); + if (integer > 0) { + //保存子表数据 + if (mapDetails != null && mapDetails.size() > 0) { + mapDetails.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + mapDetails.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); + mapDetails.put("org_id", "0"); + mapDetails.put("modify_time", new Date()); + mapDetails.put("sts", "Y"); + comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); + comparisonDetailsEntity.setMapDetails(mapDetails); + comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); + return BaseResult.getSuccessMessageEntity("更新成功", integer); + } + }else{ + return BaseResult.getFailureMessageEntity("更新失败", "请查看id是否在表中存在"); + } + } catch (Exception e) { + logger.info("更新档案对照时候错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("更新失败", e.getMessage()); + } + } + return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); + } + + //删除当初对照数据 + @Override + public JsonResultEntity deleteEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if (jsonObject == null) { + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if (!checkStr(jsonObject.getString("mdmCode"))) { + return BaseResult.getFailureMessageEntity("主数据编码为空"); + } + ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); + ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); + JSONObject jsonObjectMain=jsonObject.getJSONObject("main");//获取主表数据 + if(!checkStr(jsonObjectMain.getString("id"))){ + return BaseResult.getFailureMessageEntity("删除时候主表id不能为空"); + } + List comparisonEntities=new ArrayList<>(); + //根据主数据编码查询表名称，字段名称等信息 10001 + try { + comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + }catch (Exception e){ + logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("删除失败",e.getMessage()); + } + Map map=new HashMap<>(); + if(comparisonEntities !=null && comparisonEntities.size()>0) { + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectMain.keySet()) { + if (entity.getDbType().equals("1")) { + comparisonEntity.setDbName(entity.getDbName()); + map.put(key, jsonObjectMain.getString(key)); + } + if(entity.getDbType().equals("2")){ + comparisonDetailsEntity.setDbName(entity.getDbName()); + } + } + } + comparisonEntity.setId(jsonObjectMain.getString("id")); + comparisonEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); + comparisonEntity.setMap(map); + try { + Integer integer = comparisonDao.deleteComparison(comparisonEntity); + if(integer>0){ + comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); + comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); + comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); + return BaseResult.getSuccessMessageEntity("删除成功",integer); + }else{ + return BaseResult.getFailureMessageEntity("删除失败","请查看id是否在表中存在"); + } + }catch (Exception e){ + logger.info("删除档案对照数据错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("删除失败",e.getMessage()); + } + } + return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); + } +} From 53db9d524b90b2558a4c8ac16e420e65dabd739f Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Mon, 27 May 2024 11:22:38 +0800 Subject: [PATCH 07/44] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generalData/dao/IGeneralDataDao.java | 49 ++++ .../dao/impl/GeneralDataDaoImpl.java | 40 +++ .../generalData/entity/GeneralDataEntity.java | 169 ++++++++++++ .../generalData/entity/GeneralDataEntity.xml | 258 ++++++++++++++++++ .../service/IGeneralDataService.java | 59 ++++ .../service/impl/GeneralDataServiceImpl.java | 241 ++++++++++++++++ 6 files changed, 816 insertions(+) create mode 100644 service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java new file mode 100644 index 00000000..ec391b3a --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java @@ -0,0 +1,49 @@ +package com.hzya.frame.sysnew.generalData.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.generalData.entity.GeneralDataEntity; + +import java.util.List; + +public interface IGeneralDataDao extends IBaseDao { + + /** + * + * @content 新增通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 16:49 + * **/ + GeneralDataEntity saveGeneralDataByType(GeneralDataEntity generalDataEntity); + + /** + * + * @content 查询通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 16:51 + * **/ + List queryGeneralData(GeneralDataEntity generalDataEntity); + + /** + * + * @content 编辑通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:17 + * **/ + Integer updateGeneralDataByType(GeneralDataEntity generalDataEntity); + + /** + * + * @content 删除通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:20 + * **/ + Integer deleteGeneralDataByType(GeneralDataEntity generalDataEntity); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java new file mode 100644 index 00000000..b94f80c0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java @@ -0,0 +1,40 @@ +package com.hzya.frame.sysnew.generalData.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.generalData.dao.IGeneralDataDao; +import com.hzya.frame.sysnew.generalData.entity.GeneralDataEntity; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository(value = "generalDataDaoImpl") +public class GeneralDataDaoImpl extends MybatisGenericDao implements IGeneralDataDao { + //新增通用数据 + @Override + public GeneralDataEntity saveGeneralDataByType(GeneralDataEntity generalDataEntity) { + generalDataEntity = super.save(getSqlIdPrifx() + "saveGeneralDataByType", generalDataEntity); + return generalDataEntity; + } + + //查询通用数据 + @Override + public List queryGeneralData(GeneralDataEntity generalDataEntity) { + List query = super.query(getSqlIdPrifx() + "queryGeneralData", generalDataEntity); + return query; + } + + //编辑通用数据 + @Override + public Integer updateGeneralDataByType(GeneralDataEntity generalDataEntity) { + int update = super.update(getSqlIdPrifx() + "updateGeneralDataByType", generalDataEntity); + return update; + } + + //删除通用数据 + @Override + public Integer deleteGeneralDataByType(GeneralDataEntity generalDataEntity) { + int update = super.update(getSqlIdPrifx() + "deleteGeneralDataByType", generalDataEntity); + return update; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java new file mode 100644 index 00000000..5aef2e9f --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java @@ -0,0 +1,169 @@ +package com.hzya.frame.sysnew.generalData.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * + * @content 通用数据接口实体类 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 16:21 + * **/ +public class GeneralDataEntity extends BaseEntity { + private String archivesType;//类型 + private String leftCode;//左编码 + private String rightCode;//右编码 + + private String leftAppId;//左应用id + private String leftAppCode;//左应用编码 + private String leftAppName;//左应用名称 + private String leftApiId;//左接口ID + private String leftId;//左id + private String leftName;//左名称 + private String rightAppId;//右应用id + private String rightAppCode;//右应用编码 + private String rightAppName;//右应用名称 + private String rightApiId;//右接口ID + private String rightId;//右id + private String rightName;//右名称 + + private String leftOrg;//左公司 + private String rightOrg;//右公司 + + public String getLeftOrg() { + return leftOrg; + } + + public void setLeftOrg(String leftOrg) { + this.leftOrg = leftOrg; + } + + public String getRightOrg() { + return rightOrg; + } + + public void setRightOrg(String rightOrg) { + this.rightOrg = rightOrg; + } + + public String getArchivesType() { + return archivesType; + } + + public void setArchivesType(String archivesType) { + this.archivesType = archivesType; + } + + public String getLeftCode() { + return leftCode; + } + + public void setLeftCode(String leftCode) { + this.leftCode = leftCode; + } + + public String getRightCode() { + return rightCode; + } + + public void setRightCode(String rightCode) { + this.rightCode = rightCode; + } + + public String getLeftAppId() { + return leftAppId; + } + + public void setLeftAppId(String leftAppId) { + this.leftAppId = leftAppId; + } + + public String getLeftAppCode() { + return leftAppCode; + } + + public void setLeftAppCode(String leftAppCode) { + this.leftAppCode = leftAppCode; + } + + public String getLeftAppName() { + return leftAppName; + } + + public void setLeftAppName(String leftAppName) { + this.leftAppName = leftAppName; + } + + public String getLeftApiId() { + return leftApiId; + } + + public void setLeftApiId(String leftApiId) { + this.leftApiId = leftApiId; + } + + public String getLeftId() { + return leftId; + } + + public void setLeftId(String leftId) { + this.leftId = leftId; + } + + public String getLeftName() { + return leftName; + } + + public void setLeftName(String leftName) { + this.leftName = leftName; + } + + public String getRightAppId() { + return rightAppId; + } + + public void setRightAppId(String rightAppId) { + this.rightAppId = rightAppId; + } + + public String getRightAppCode() { + return rightAppCode; + } + + public void setRightAppCode(String rightAppCode) { + this.rightAppCode = rightAppCode; + } + + public String getRightAppName() { + return rightAppName; + } + + public void setRightAppName(String rightAppName) { + this.rightAppName = rightAppName; + } + + public String getRightApiId() { + return rightApiId; + } + + public void setRightApiId(String rightApiId) { + this.rightApiId = rightApiId; + } + + public String getRightId() { + return rightId; + } + + public void setRightId(String rightId) { + this.rightId = rightId; + } + + public String getRightName() { + return rightName; + } + + public void setRightName(String rightName) { + this.rightName = rightName; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.xml new file mode 100644 index 00000000..50065a16 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into + + sys_personnel_control + sys_org_control + sys_stock_control + sys_merchant_control + sys_taxrate_control + sys_project_control + sys_bank_control + sys_bankaccount_control + sys_assets_control + + ( + + id , + left_app_id , + left_app_code , + left_app_name , + left_api_id , + left_id , + left_code , + left_name , + right_app_id , + right_app_code , + right_app_name , + right_api_id , + right_id , + right_code , + right_name , + left_org , + right_org , + sorts , + create_user_id , + modify_user_id , + org_id , + company_id , + create_time, + modify_time, + sts + + )values( + + #{id} , + #{leftAppId} , + #{leftAppCode} , + #{leftAppName} , + #{leftApiId} , + #{leftId} , + #{leftCode} , + #{leftName} , + #{rightAppId} , + #{rightAppCode} , + #{rightAppName} , + #{rightApiId} , + #{rightId} , + #{rightCode} , + #{rightName} , + #{leftOrg} , + #{rightOrg} , + #{sorts} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from + + sys_personnel_control + sys_org_control + sys_stock_control + sys_merchant_control + sys_taxrate_control + sys_project_control + sys_bank_control + sys_bankaccount_control + sys_assets_control + + a WHERE a.sts = 'Y' ), + #{create_user_id} , + #{modify_user_id} , + #{org_id} , + #{companyId} , + #{create_time} , + now() , + #{modify_time} , + now() , + #{sts} , + 'Y' + + ) + + + + + update + + sys_personnel_control + sys_org_control + sys_stock_control + sys_merchant_control + sys_taxrate_control + sys_project_control + sys_bank_control + sys_bankaccount_control + sys_assets_control + + set + + left_app_id = #{leftAppId}, + left_app_code = #{leftAppCode}, + left_app_name = #{leftAppName}, + left_api_id = #{leftApiId}, + left_id = #{leftId}, + left_code = #{leftCode}, + left_name = #{leftName}, + right_app_id = #{rightAppId}, + right_app_code = #{rightAppCode}, + right_app_name = #{rightAppName}, + right_api_id = #{rightApiId}, + right_id = #{rightId}, + right_code = #{rightCode}, + right_name = #{rightName}, + left_org = #{leftOrg} , + right_org = #{rightOrg} , + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + modify_time = now(), + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId} + + where id = #{id} + + + + + update + + sys_personnel_control + sys_org_control + sys_stock_control + sys_merchant_control + sys_taxrate_control + sys_project_control + sys_bank_control + sys_bankaccount_control + sys_assets_control + + set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + + and left_app_id = #{leftAppId} + and left_app_code = #{leftAppCode} + and left_app_name = #{leftAppName} + and left_api_id = #{leftApiId} + and left_id = #{leftId} + and left_code = #{leftCode} + and left_name = #{leftName} + and right_app_id = #{rightAppId} + and right_app_code = #{rightAppCode} + and right_app_name = #{rightAppName} + and right_api_id = #{rightApiId} + and right_id = #{rightId} + and right_code = #{rightCode} + and right_name = #{rightName} + left_org = #{leftOrg} , + right_org = #{rightOrg} , + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and id=#{id} and sts='Y' + + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java new file mode 100644 index 00000000..df8dbd47 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java @@ -0,0 +1,59 @@ +package com.hzya.frame.sysnew.generalData.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.generalData.entity.GeneralDataEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface IGeneralDataService extends IBaseService { + + /** + * + * @content 新增通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 16:23 + * **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * + * @content 查询通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:00 + * **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + /** + * + * @content 编辑通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:16 + * **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * + * @content 删除通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:23 + * **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); + + /** + * + * @content 查询单个通用数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/6 17:26 + * **/ + JsonResultEntity getEntity(JSONObject jsonObject); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java new file mode 100644 index 00000000..72a1778a --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/impl/GeneralDataServiceImpl.java @@ -0,0 +1,241 @@ +package com.hzya.frame.sysnew.generalData.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.generalData.dao.IGeneralDataDao; +import com.hzya.frame.sysnew.generalData.entity.GeneralDataEntity; +import com.hzya.frame.sysnew.generalData.service.IGeneralDataService; +import com.hzya.frame.sysnew.homeComponent.dao.ISysHomeComponentDao; +import com.hzya.frame.uuid.UUIDLong; +import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +@Service(value = "generalDataServiceImpl") +public class GeneralDataServiceImpl extends BaseService implements IGeneralDataService { + private IGeneralDataDao generalDataDao; + + @Autowired + public void setGeneralDataDao(IGeneralDataDao dao) { + this.generalDataDao = dao; + this.dao = dao; + } + + //新增通用数据 + @Override + public JsonResultEntity saveEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("通用数据类型为空"); + } + if(!checkStr(jsonObject.getString("leftCode"))){ + return BaseResult.getFailureMessageEntity("左编码为空"); + } + if(!checkStr(jsonObject.getString("rightCode"))){ + return BaseResult.getFailureMessageEntity("右编码为空"); + } + if(!checkStr(jsonObject.getString("leftAppCode"))){ + return BaseResult.getFailureMessageEntity("左应用编码为空"); + } + if(!checkStr(jsonObject.getString("rightAppCode"))){ + return BaseResult.getFailureMessageEntity("右应用编码为空"); + } + List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"}); + if(!fzhs.contains(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案类型错误，请联系管理员"); + } + /* switch (jsonObject.getString("archivesType")){ + case "1"://人员对照 + GeneralDataEntity generalDataEntityPersonnel = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityPersonnel); + break; + case "2"://部门档案 + GeneralDataEntity generalDataEntityOrg = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityOrg); + break; + case "6"://存货对照 + GeneralDataEntity generalDataEntityStock = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityStock); + break; + case "73"://客商辅助核算 + GeneralDataEntity generalDataEntityMerchant = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityMerchant); + break; + case "D01"://税率 + GeneralDataEntity generalDataEntityTaxrate = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityTaxrate); + break; + case "jobass"://项目辅助核算 + GeneralDataEntity generalDataEntityProject = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityProject); + break; + case "93"://银行类别 + GeneralDataEntity generalDataEntityBank = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityBank); + break; + case "96"://银行账户 + GeneralDataEntity generalDataEntityBankaccount = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityBankaccount); + break; + case "22"://资产类别 + GeneralDataEntity generalDataEntityAssets = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataDao.saveGeneralDataByType(generalDataEntityAssets); + break; + default: + break; + }*/ + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + generalDataEntity.setId(UUIDUtils.getUUID()); + generalDataEntity.setCreate_user_id("1"); + generalDataEntity.setModify_user_id("1"); + generalDataEntity.setOrg_id("0"); + generalDataEntity.setCompanyId("0"); + try { + GeneralDataEntity generalDataEntitySave = generalDataDao.saveGeneralDataByType(generalDataEntity); + return BaseResult.getSuccessMessageEntity("新增成功",generalDataEntitySave); + }catch (Exception e){ + logger.info("通用数据新增错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("新增失败",e.getMessage()); + } + } + + //查询通用数据 + @Override + public JsonResultEntity queryEntityPage(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("通用数据类型为空"); + } + /*if(!checkStr(jsonObject.getString("leftCode"))){ + return BaseResult.getFailureMessageEntity("左编码为空"); + } + if(!checkStr(jsonObject.getString("rightCode"))){ + return BaseResult.getFailureMessageEntity("右编码为空"); + }*/ + List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"}); + if(!fzhs.contains(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案类型错误，请联系管理员"); + } + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + try { + List generalDataEntities = generalDataDao.queryGeneralData(generalDataEntity); + PageInfo pageInfo=new PageInfo(generalDataEntities); + return BaseResult.getSuccessMessageEntity("查询成功",pageInfo); + }catch (Exception e){ + logger.info("通用数据查询错误：{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("查询失败",e.getMessage()); + } + } + + //编辑通用数据 + @Override + public JsonResultEntity updateEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("id"))){ + return BaseResult.getFailureMessageEntity("id为空"); + } + if(!checkStr(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("通用数据类型为空"); + } + /*if(!checkStr(jsonObject.getString("leftCode"))){ + return BaseResult.getFailureMessageEntity("左编码为空"); + } + if(!checkStr(jsonObject.getString("rightCode"))){ + return BaseResult.getFailureMessageEntity("右编码为空"); + } + if(!checkStr(jsonObject.getString("leftAppCode"))){ + return BaseResult.getFailureMessageEntity("左应用编码为空"); + } + if(!checkStr(jsonObject.getString("rightAppCode"))){ + return BaseResult.getFailureMessageEntity("右应用编码为空"); + }*/ + List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"}); + if(!fzhs.contains(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案类型错误，请联系管理员"); + } + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + try { + generalDataDao.updateGeneralDataByType(generalDataEntity); + return BaseResult.getSuccessMessageEntity("编辑成功"); + }catch (Exception e){ + logger.info("通用数据编辑失败:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("编辑失败",e.getMessage()); + } + } + + //删除通用数据 + @Override + public JsonResultEntity deleteEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("id"))){ + return BaseResult.getFailureMessageEntity("id为空"); + } + if(!checkStr(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("通用数据类型为空"); + } + /*if(!checkStr(jsonObject.getString("leftCode"))){ + return BaseResult.getFailureMessageEntity("左编码为空"); + } + if(!checkStr(jsonObject.getString("rightCode"))){ + return BaseResult.getFailureMessageEntity("右编码为空"); + } + if(!checkStr(jsonObject.getString("leftAppCode"))){ + return BaseResult.getFailureMessageEntity("左应用编码为空"); + } + if(!checkStr(jsonObject.getString("rightAppCode"))){ + return BaseResult.getFailureMessageEntity("右应用编码为空"); + }*/ + List fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"}); + if(!fzhs.contains(jsonObject.getString("archivesType"))){ + return BaseResult.getFailureMessageEntity("档案类型错误，请联系管理员"); + } + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + try { + generalDataEntity.setCreate_user_id("1"); + generalDataEntity.setModify_user_id("1"); + generalDataDao.deleteGeneralDataByType(generalDataEntity); + return BaseResult.getSuccessMessageEntity("删除成功"); + }catch (Exception e){ + logger.info("通用数据删除失败:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("删除失败",e.getMessage()); + } + } + + //查询单个通用数据对象 + @Override + public JsonResultEntity getEntity(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + if(jsonObject == null ){ + return BaseResult.getFailureMessageEntity("数据为空，请先传递数据"); + } + if(!checkStr(jsonObject.getString("id"))){ + return BaseResult.getFailureMessageEntity("id为空"); + } + GeneralDataEntity generalDataEntity = jsonObject.toJavaObject(GeneralDataEntity.class); + try { + GeneralDataEntity generalDataEntityOne = generalDataDao.queryOne(generalDataEntity); + return BaseResult.getSuccessMessageEntity("查询单个成功",generalDataEntityOne); + }catch (Exception e){ + logger.info("查询单个通用数据错误:{}",e.getMessage()); + return BaseResult.getSuccessMessageEntity("查询单个失败",e.getMessage()); + } + } +} From 2aa03eda606ae1b82ccfffebfe7794bf7f46c24e Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 29 May 2024 17:20:12 +0800 Subject: [PATCH 08/44] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildpackage/src/main/resources/application-hclocal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpackage/src/main/resources/application-hclocal.yml b/buildpackage/src/main/resources/application-hclocal.yml index 995c4368..b88db817 100644 --- a/buildpackage/src/main/resources/application-hclocal.yml +++ b/buildpackage/src/main/resources/application-hclocal.yml @@ -18,7 +18,7 @@ spring: # driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true username: root - password: hzya@1314 + password: 62e4295b615a30dbf3b8ee96f41c820b driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 savefile: # 文件保存路径 From 7a6c3dab90b172729c8081205a51bb4f4bb3b796 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 29 May 2024 17:21:14 +0800 Subject: [PATCH 09/44] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sysnew/comparison/dao/IComparisonDao.java | 19 +- .../comparison/dao/IComparisonDetailsDao.java | 9 +- .../dao/impl/ComparisonDaoImpl.java | 16 +- .../dao/impl/ComparisonDetailsDaoImpl.java | 11 +- .../entity/ComparisonDetailsEntity.java | 262 ++------- .../entity/ComparisonDetailsEntity.xml | 23 +- .../comparison/entity/ComparisonEntity.java | 546 +++--------------- .../comparison/entity/ComparisonEntity.xml | 125 ++-- .../service/IComparisonService.java | 8 +- .../service/impl/ComparisonServiceImpl.java | 131 +++-- 10 files changed, 286 insertions(+), 864 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java index b11a112a..d33044c7 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java @@ -6,6 +6,7 @@ import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; import java.util.List; +import java.util.Map; public interface IComparisonDao extends IBaseDao { @@ -27,11 +28,11 @@ public interface IComparisonDao extends IBaseDao { * @Author hecan * @Date 2024/5/9 15:11 * **/ - List queryComparisonPage(ComparisonEntity comparison); + List> queryComparisonPage(ComparisonEntity comparison); /** * - * @content 保存档案对照数据 + * @content 保存通用数据数据 * @Param * @Return * @Author hecan @@ -51,7 +52,7 @@ public interface IComparisonDao extends IBaseDao { /** * - * @content 更新档案对照数据 + * @content 更新通用数据数据 * @Param * @Return * @Author hecan @@ -61,11 +62,21 @@ public interface IComparisonDao extends IBaseDao { /** * - * @content 删除档案对照数据 + * @content 删除通用数据 * @Param * @Return * @Author hecan * @Date 2024/5/9 14:09 * **/ Integer deleteComparison(ComparisonEntity comparison); + + /** + * + * @content 查询单据规则 + * @Param + * @Return + * @Author hecan + * @Date 2024/5/28 14:39 + * **/ + ComparisonEntity queryComparisonById(ComparisonEntity comparison); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java index 731109c9..36c66021 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java @@ -5,12 +5,13 @@ import com.hzya.frame.basedao.dao.IBaseDao; import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; import java.util.List; +import java.util.Map; public interface IComparisonDetailsDao extends IBaseDao { /** * - * @content 保存档案对照子表数据 + * @content 保存通用数据子表数据 * @Param * @Return * @Author hecan @@ -20,7 +21,7 @@ public interface IComparisonDetailsDao extends IBaseDao queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity); + List> queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java index 695c3683..63281c12 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java @@ -7,6 +7,7 @@ import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Map; @Repository(value = "comparisonDaoImpl") public class ComparisonDaoImpl extends MybatisGenericDao implements IComparisonDao { @@ -19,8 +20,8 @@ public class ComparisonDaoImpl extends MybatisGenericDao queryComparisonPage(ComparisonEntity comparison) { - List query = super.query(getSqlIdPrifx() + "queryComparisonPage", comparison); + public List> queryComparisonPage(ComparisonEntity comparison) { + List> query =(List>) super.selectList(getSqlIdPrifx() + "queryComparisonPage", comparison); return query; } @@ -38,17 +39,24 @@ public class ComparisonDaoImpl extends MybatisGenericDao comparisonEntities = super.query(getSqlIdPrifx() + "queryComparisonById", comparison); + return comparisonEntities.get(0); + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java index bafc78fe..cab43d0d 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java @@ -9,25 +9,26 @@ import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Map; @Repository(value = "comparisonDetailsDaoImpl") public class ComparisonDetailsDaoImpl extends MybatisGenericDao implements IComparisonDetailsDao { - //保存档案对照子表数据 + //保存通用数据子表数据 @Override public ComparisonDetailsEntity saveComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity) { ComparisonDetailsEntity detailsEntity = super.save(getSqlIdPrifx() + "saveComparisonDetails", comparisonDetailsEntity); return detailsEntity; } - //更新档案对照子表数据 + //更新通用数据子表数据 @Override public Integer updateComparisonDetailsByType(ComparisonDetailsEntity comparisonDetailsEntity) { int update = super.update(getSqlIdPrifx()+"updateComparisonDetailsByType", comparisonDetailsEntity); return update; } - //删除档案对照子表的数据 + //删除通用数据子表的数据 @Override public Integer deleteComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity) { int delete = super.delete(getSqlIdPrifx() + "deleteComparisonDetails", comparisonDetailsEntity); @@ -36,8 +37,8 @@ public class ComparisonDetailsDaoImpl extends MybatisGenericDao queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity) { - List query = super.query(getSqlIdPrifx() + "queryComparisonDetailsPage", comparisonDetailsEntity); + public List> queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity) { + List> query =(List>) super.selectList(getSqlIdPrifx() + "queryComparisonDetailsPage", comparisonDetailsEntity); return query; } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java index 11ce420d..5766ec65 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java @@ -9,7 +9,7 @@ import java.util.Map; /** * - * @content 档案对照明细实体类 + * @content 通用数据明细实体类 * @Param * @Return * @Author hecan @@ -20,32 +20,7 @@ public class ComparisonDetailsEntity extends BaseEntity { private String contrastType;//对照类型 private String documentRule;//单据规则 private Long documentRuleNum;//单据规则流水号 - private String sszz;//所属组织 - private String bz;//备注 - private String formmainId;//上级id - private String taskLinvingId;//集成任务-实例_id - private String result;//返回结果 - private String queryCondition;//原始查询条件 - private String rootAppPk;//源系统主键 - private String rootAppBill;//原系统单据 - private String rootAppNewData;//最新源系统数据详情 - private String newTransmitInfo;//最新传输信息 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date newPushDate;//最新推送时间 - private String repairPust;//是否补推(Y是N不是) - private String senceId;//场景id - private String newState;//最新推送状态 - private String businessDate;//单据业务日期 - private String pluginId;//插件id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date processingTime;//处理时间 - private String processingRemarks;//处理备注 - private String processorName;//处理⼈名称 - private String processor;//处理⼈ - private String newSystemNumber;//下游系统单号 - private String newSystemPrimary;//下游系统主键 + private String mdmName;//主数据名称 private String mdmCode;//主数据编码 @@ -54,9 +29,42 @@ public class ComparisonDetailsEntity extends BaseEntity { private String enName;//字段名 英文 private String chName;// 字段名 中文 private String filedType;//字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME + private String formmainId;//上级id + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } private Map mapDetails; + public String getContrastType() { + return contrastType; + } + + public void setContrastType(String contrastType) { + this.contrastType = contrastType; + } + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + public String getMdmName() { return mdmName; } @@ -120,204 +128,4 @@ public class ComparisonDetailsEntity extends BaseEntity { public void setMapDetails(Map mapDetails) { this.mapDetails = mapDetails; } - - public String getContrastType() { - return contrastType; - } - - public void setContrastType(String contrastType) { - this.contrastType = contrastType; - } - - public String getDocumentRule() { - return documentRule; - } - - public void setDocumentRule(String documentRule) { - this.documentRule = documentRule; - } - - public Long getDocumentRuleNum() { - return documentRuleNum; - } - - public void setDocumentRuleNum(Long documentRuleNum) { - this.documentRuleNum = documentRuleNum; - } - - public String getSszz() { - return sszz; - } - - public void setSszz(String sszz) { - this.sszz = sszz; - } - - public String getBz() { - return bz; - } - - public void setBz(String bz) { - this.bz = bz; - } - - public String getFormmainId() { - return formmainId; - } - - public void setFormmainId(String formmainId) { - this.formmainId = formmainId; - } - - public String getTaskLinvingId() { - return taskLinvingId; - } - - public void setTaskLinvingId(String taskLinvingId) { - this.taskLinvingId = taskLinvingId; - } - - public String getResult() { - return result; - } - - public void setResult(String result) { - this.result = result; - } - - public String getQueryCondition() { - return queryCondition; - } - - public void setQueryCondition(String queryCondition) { - this.queryCondition = queryCondition; - } - - public String getRootAppPk() { - return rootAppPk; - } - - public void setRootAppPk(String rootAppPk) { - this.rootAppPk = rootAppPk; - } - - public String getRootAppBill() { - return rootAppBill; - } - - public void setRootAppBill(String rootAppBill) { - this.rootAppBill = rootAppBill; - } - - public String getRootAppNewData() { - return rootAppNewData; - } - - public void setRootAppNewData(String rootAppNewData) { - this.rootAppNewData = rootAppNewData; - } - - public String getNewTransmitInfo() { - return newTransmitInfo; - } - - public void setNewTransmitInfo(String newTransmitInfo) { - this.newTransmitInfo = newTransmitInfo; - } - - public Date getNewPushDate() { - return newPushDate; - } - - public void setNewPushDate(Date newPushDate) { - this.newPushDate = newPushDate; - } - - public String getRepairPust() { - return repairPust; - } - - public void setRepairPust(String repairPust) { - this.repairPust = repairPust; - } - - public String getSenceId() { - return senceId; - } - - public void setSenceId(String senceId) { - this.senceId = senceId; - } - - public String getNewState() { - return newState; - } - - public void setNewState(String newState) { - this.newState = newState; - } - - public String getBusinessDate() { - return businessDate; - } - - public void setBusinessDate(String businessDate) { - this.businessDate = businessDate; - } - - public String getPluginId() { - return pluginId; - } - - public void setPluginId(String pluginId) { - this.pluginId = pluginId; - } - - public Date getProcessingTime() { - return processingTime; - } - - public void setProcessingTime(Date processingTime) { - this.processingTime = processingTime; - } - - public String getProcessingRemarks() { - return processingRemarks; - } - - public void setProcessingRemarks(String processingRemarks) { - this.processingRemarks = processingRemarks; - } - - public String getProcessorName() { - return processorName; - } - - public void setProcessorName(String processorName) { - this.processorName = processorName; - } - - public String getProcessor() { - return processor; - } - - public void setProcessor(String processor) { - this.processor = processor; - } - - public String getNewSystemNumber() { - return newSystemNumber; - } - - public void setNewSystemNumber(String newSystemNumber) { - this.newSystemNumber = newSystemNumber; - } - - public String getNewSystemPrimary() { - return newSystemPrimary; - } - - public void setNewSystemPrimary(String newSystemPrimary) { - this.newSystemPrimary = newSystemPrimary; - } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml index dfd07457..8ca17330 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml @@ -5,28 +5,7 @@ - - - - - - - - - - - - - - - - - - - - - @@ -38,7 +17,7 @@ - select * from ${dbName} @@ -80,7 +29,8 @@ + + + + + select + case when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=1 + then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','000',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) + when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=2 + then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','00',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) + when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=3 + then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','0',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) + else concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) + end as document_rule, + right( + case when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=1 + then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','000',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) + when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=2 + then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','00',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) + when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=3 + then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','0',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) + else concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) + end ,4) as documentRuleNum + from ${dbName} where document_rule like concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','%'); + - + insert into ${dbName} @@ -145,7 +120,7 @@ update ${dbName} - set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + set dataStatus= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} and ${key} =#{value} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java index 60375cfb..31f9e6b5 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java @@ -9,7 +9,7 @@ public interface IComparisonService extends IBaseService this.dao = dao; } - //分页查询档案对照数据 + //分页查询通用数据数据 @Override public JsonResultEntity queryEntityPage(JSONObject json) { JSONObject jsonObject = json.getJSONObject("jsonStr"); @@ -51,7 +51,7 @@ public class ComparisonServiceImpl extends BaseService comparisonEntities = comparisonDao.queryComparison(comparisonEntity); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); - return BaseResult.getFailureMessageEntity("查询失败",e.getMessage()); + return BaseResult.getFailureMessageEntity("查询失败"); } Map map = new HashMap<>();//将主表数据存到map中 if (comparisonEntities != null && comparisonEntities.size() > 0) { @@ -68,18 +68,18 @@ public class ComparisonServiceImpl extends BaseService } comparisonEntity.setMap(map); try { - List comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity); + List> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity); PageInfo pageInfo = new PageInfo(comparisonEntitiePages); return BaseResult.getSuccessMessageEntity("查询成功", pageInfo); } catch (Exception e) { - logger.info("查询档案对照错误:{}", e.getMessage()); - return BaseResult.getFailureMessageEntity("查询失败", e.getMessage()); + logger.info("查询通用数据错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("查询失败"); } } return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); } - //新增档案对照数据 + //新增通用数据数据 @Override public JsonResultEntity saveEntity(JSONObject json) { JSONObject jsonObject = json.getJSONObject("jsonStr"); @@ -89,9 +89,9 @@ public class ComparisonServiceImpl extends BaseService if (!checkStr(jsonObject.getString("mdmCode"))) { return BaseResult.getFailureMessageEntity("主数据编码为空"); } - if (!checkStr(jsonObject.getString("rulePrefix"))) { + /*if (!checkStr(jsonObject.getString("rulePrefix"))) { return BaseResult.getFailureMessageEntity("规则为空"); - } + }*/ ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); List comparisonEntities=new ArrayList<>(); @@ -100,7 +100,7 @@ public class ComparisonServiceImpl extends BaseService comparisonEntities = comparisonDao.queryComparison(comparisonEntity); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); - return BaseResult.getFailureMessageEntity("保存失败",e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败"); } String main = jsonObject.getString("main");//获取主表数据 JSONArray jsonArray = jsonObject.getJSONArray("details");//获取子表数据 @@ -114,7 +114,10 @@ public class ComparisonServiceImpl extends BaseService for (String key : jsonObjectMain.keySet()) { if (entity.getDbType().equals("1")) { comparisonEntity.setDbName(entity.getDbName()); - map.put(key, jsonObjectMain.getString(key)); + //如果表中得字段与输入得字段相等，则存起来 + if(entity.getEnName().equals(key)){ + map.put(key, jsonObjectMain.getString(key)); + } } } } @@ -126,7 +129,9 @@ public class ComparisonServiceImpl extends BaseService for (String key : jsonObjectDetails.keySet()) { if (entity.getDbType().equals("2")) { comparisonDetailsEntity.setDbName(entity.getDbName()); - mapDetails.put(key, jsonObjectDetails.getString(key)); + if(entity.getEnName().equals(key)){ + mapDetails.put(key, jsonObjectDetails.getString(key)); + } } } } @@ -140,16 +145,38 @@ public class ComparisonServiceImpl extends BaseService map.put("create_time", new Date()); map.put("modify_time", new Date()); map.put("sts", "Y"); - comparisonEntity.setMap(map); - //生成单据规则 - comparisonEntity.setRulePrefix(jsonObject.getString("rulePrefix")); + //查询单据规则 try { - ComparisonEntity comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); - map.put("document_rule", comparisonEntityRule.getDocumentRule());//单据规则 - map.put("document_rule_num", comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 - } catch (Exception e) { - logger.info("保存档案对照时候生成单据规则错误:{}", e.getMessage()); - return BaseResult.getFailureMessageEntity("保存失败", e.getMessage()); + ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); + comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule); + String documentRule = comparisonEntityRule.getDocumentRule(); + logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}",documentRule); + if(documentRule !=null){ + //获取规则前缀 CK + String rulePrefix=documentRule.substring(0,documentRule.indexOf("-")); + //获取规则中间日期 yyyy-MM-dd + String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-")); + String ruleMiddle = getRuleDate(ruleDate); + //获取规则后缀 + String ruleSuffix= documentRule.substring(documentRule.lastIndexOf("-")+1); + //生成单据规则 + comparisonEntity.setRulePrefix(rulePrefix); + comparisonEntity.setRuleMiddle(ruleMiddle); + comparisonEntity.setRuleSuffix(ruleSuffix); + try { + //新生成单据规则保存到数据库 + comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); + map.put("document_rule", comparisonEntityRule.getDocumentRule());//单据规则 + map.put("document_rule_num", comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 + comparisonEntity.setMap(map); + } catch (Exception e) { + logger.info("保存通用数据时候生成单据规则错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败"); + } + } + }catch (Exception e){ + logger.info("通用数据保存接口中查询单据规则错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败"); } try { //保存主表数据 @@ -170,15 +197,15 @@ public class ComparisonServiceImpl extends BaseService } return BaseResult.getSuccessMessageEntity("保存成功", comparisonEntityOne); } catch (Exception e) { - logger.info("保存档案对照时候错误:{}", e.getMessage()); - return BaseResult.getFailureMessageEntity("保存失败", e.getMessage()); + logger.info("保存通用数据时候错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("保存失败"); } } } return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); } - //更新档案对照数据 + //更新通用数据数据 @Override public JsonResultEntity updateEntity(JSONObject json) { JSONObject jsonObject = json.getJSONObject("jsonStr"); @@ -201,7 +228,7 @@ public class ComparisonServiceImpl extends BaseService comparisonEntities = comparisonDao.queryComparison(comparisonEntity); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); - return BaseResult.getFailureMessageEntity("更新失败",e.getMessage()); + return BaseResult.getFailureMessageEntity("更新失败"); } Map map=new HashMap<>();//将主表数据存到map中 Map mapDetails=new HashMap<>();//将子表数据存到map中 @@ -211,7 +238,9 @@ public class ComparisonServiceImpl extends BaseService for (String key : jsonObjectMain.keySet()) { if (entity.getDbType().equals("1")) { comparisonEntity.setDbName(entity.getDbName()); - map.put(key, jsonObjectMain.getString(key)); + if(entity.getEnName().equals(key)){ + map.put(key, jsonObjectMain.getString(key)); + } } } } @@ -223,7 +252,9 @@ public class ComparisonServiceImpl extends BaseService for (String key : jsonObjectDetails.keySet()) { if (entity.getDbType().equals("2")) { comparisonDetailsEntity.setDbName(entity.getDbName()); - mapDetails.put(key, jsonObjectDetails.getString(key)); + if(entity.getEnName().equals(key)){ + mapDetails.put(key, jsonObjectDetails.getString(key)); + } } } } @@ -243,7 +274,7 @@ public class ComparisonServiceImpl extends BaseService map.put("document_rule",comparisonEntityRule.getDocumentRule());//单据规则 map.put("document_rule_num",comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 }catch (Exception e){ - logger.info("更新档案对照时候生成单据规则错误:{}",e.getMessage()); + logger.info("更新通用数据时候生成单据规则错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("更新失败",e.getMessage()); }*/ try { @@ -260,20 +291,20 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); comparisonDetailsEntity.setMapDetails(mapDetails); comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); - return BaseResult.getSuccessMessageEntity("更新成功", integer); } + return BaseResult.getSuccessMessageEntity("更新成功", integer); }else{ - return BaseResult.getFailureMessageEntity("更新失败", "请查看id是否在表中存在"); + return BaseResult.getFailureMessageEntity("更新失败"); } } catch (Exception e) { - logger.info("更新档案对照时候错误:{}", e.getMessage()); - return BaseResult.getFailureMessageEntity("更新失败", e.getMessage()); + logger.info("更新通用数据时候错误:{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("更新失败"); } } return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); } - //删除当初对照数据 + //删除通用数据 @Override public JsonResultEntity deleteEntity(JSONObject json) { JSONObject jsonObject = json.getJSONObject("jsonStr"); @@ -295,7 +326,7 @@ public class ComparisonServiceImpl extends BaseService comparisonEntities = comparisonDao.queryComparison(comparisonEntity); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); - return BaseResult.getFailureMessageEntity("删除失败",e.getMessage()); + return BaseResult.getFailureMessageEntity("删除失败"); } Map map=new HashMap<>(); if(comparisonEntities !=null && comparisonEntities.size()>0) { @@ -304,7 +335,9 @@ public class ComparisonServiceImpl extends BaseService for (String key : jsonObjectMain.keySet()) { if (entity.getDbType().equals("1")) { comparisonEntity.setDbName(entity.getDbName()); - map.put(key, jsonObjectMain.getString(key)); + if(entity.getEnName().equals(key)){ + map.put(key, jsonObjectMain.getString(key)); + } } if(entity.getDbType().equals("2")){ comparisonDetailsEntity.setDbName(entity.getDbName()); @@ -317,18 +350,38 @@ public class ComparisonServiceImpl extends BaseService try { Integer integer = comparisonDao.deleteComparison(comparisonEntity); if(integer>0){ - comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); - comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); - comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); + if(comparisonDetailsEntity.getDbName()!=null){ + comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); + comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); + comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); + } return BaseResult.getSuccessMessageEntity("删除成功",integer); }else{ return BaseResult.getFailureMessageEntity("删除失败","请查看id是否在表中存在"); } }catch (Exception e){ - logger.info("删除档案对照数据错误:{}",e.getMessage()); - return BaseResult.getFailureMessageEntity("删除失败",e.getMessage()); + logger.info("删除通用数据数据错误:{}",e.getMessage()); + return BaseResult.getFailureMessageEntity("删除失败"); } } return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); } + + //根据不同的日期格式，返回不同的值 + private String getRuleDate(String str){ + switch (str){ + case "yyyy-MM-dd": + return "%Y-%m-%d"; + case "yyyyMMdd": + return "%Y%m%d"; + case "yyyy-MM-dd HH:mm:ss": + return "Y-%m-%d %H:%i:%s"; + case "yyyyMMddHHmmss": + return "%Y%m%d%H%i%s"; + case "yyyyMMddHHmmssSSS": + return "%Y%m%d%H%i%s%f"; + default: + return null; + } + } } From eb9b024b90a51ecfb24107bede1605e460e720a3 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 29 May 2024 17:21:42 +0800 Subject: [PATCH 10/44] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AF=B9=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generalData/dao/IGeneralDataDao.java | 8 ++-- .../dao/impl/GeneralDataDaoImpl.java | 8 ++-- .../generalData/entity/GeneralDataEntity.java | 2 +- .../service/IGeneralDataService.java | 10 ++--- .../service/impl/GeneralDataServiceImpl.java | 38 +++++++++---------- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java index ec391b3a..e7f315c1 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/IGeneralDataDao.java @@ -9,7 +9,7 @@ public interface IGeneralDataDao extends IBaseDao { /** * - * @content 新增通用数据 + * @content 新增档案对照 * @Param * @Return * @Author hecan @@ -19,7 +19,7 @@ public interface IGeneralDataDao extends IBaseDao { /** * - * @content 查询通用数据 + * @content 查询档案对照 * @Param * @Return * @Author hecan @@ -29,7 +29,7 @@ public interface IGeneralDataDao extends IBaseDao { /** * - * @content 编辑通用数据 + * @content 编辑档案对照 * @Param * @Return * @Author hecan @@ -39,7 +39,7 @@ public interface IGeneralDataDao extends IBaseDao { /** * - * @content 删除通用数据 + * @content 删除档案对照 * @Param * @Return * @Author hecan diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java index b94f80c0..914dacca 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/dao/impl/GeneralDataDaoImpl.java @@ -10,28 +10,28 @@ import java.util.List; @Repository(value = "generalDataDaoImpl") public class GeneralDataDaoImpl extends MybatisGenericDao implements IGeneralDataDao { - //新增通用数据 + //新增档案对照 @Override public GeneralDataEntity saveGeneralDataByType(GeneralDataEntity generalDataEntity) { generalDataEntity = super.save(getSqlIdPrifx() + "saveGeneralDataByType", generalDataEntity); return generalDataEntity; } - //查询通用数据 + //查询档案对照 @Override public List queryGeneralData(GeneralDataEntity generalDataEntity) { List query = super.query(getSqlIdPrifx() + "queryGeneralData", generalDataEntity); return query; } - //编辑通用数据 + //编辑档案对照 @Override public Integer updateGeneralDataByType(GeneralDataEntity generalDataEntity) { int update = super.update(getSqlIdPrifx() + "updateGeneralDataByType", generalDataEntity); return update; } - //删除通用数据 + //删除档案对照 @Override public Integer deleteGeneralDataByType(GeneralDataEntity generalDataEntity) { int update = super.update(getSqlIdPrifx() + "deleteGeneralDataByType", generalDataEntity); diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java index 5aef2e9f..ac9bc603 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/entity/GeneralDataEntity.java @@ -4,7 +4,7 @@ import com.hzya.frame.web.entity.BaseEntity; /** * - * @content 通用数据接口实体类 + * @content 档案对照实体类 * @Param * @Return * @Author hecan diff --git a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java index df8dbd47..105511f6 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/generalData/service/IGeneralDataService.java @@ -9,7 +9,7 @@ public interface IGeneralDataService extends IBaseService Date: Wed, 5 Jun 2024 11:43:40 +0800 Subject: [PATCH 11/44] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/IMdmModuleSourceDao.java | 15 ++ .../dao/impl/MdmModuleSourceDaoImpl.java | 17 ++ .../entity/MdmModuleSourceEntity.java | 66 +++++ .../entity/MdmModuleSourceEntity.xml | 245 ++++++++++++++++++ .../service/IMdmModuleSourceService.java | 12 + .../impl/MdmModuleSourceServiceImpl.java | 26 ++ .../mdm/service/impl/MdmServiceImpl.java | 127 ++++++++- 7 files changed, 505 insertions(+), 3 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/IMdmModuleSourceService.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/impl/MdmModuleSourceServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java new file mode 100644 index 00000000..bde093e6 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.mdm.mdmModuleSource.dao; + +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 主数据数据来源(mdm_module_source: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 11:42:56 + */ +public interface IMdmModuleSourceDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java new file mode 100644 index 00000000..5be355b3 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.mdm.mdmModuleSource.dao.impl; + +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.mdm.mdmModuleSource.dao.IMdmModuleSourceDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 主数据数据来源(MdmModuleSource)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 11:42:56 + */ +@Repository(value = "MdmModuleSourceDaoImpl") +public class MdmModuleSourceDaoImpl extends MybatisGenericDao implements IMdmModuleSourceDao{ + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java new file mode 100644 index 00000000..2cc45fb4 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java @@ -0,0 +1,66 @@ +package com.hzya.frame.mdm.mdmModuleSource.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 主数据数据来源(MdmModuleSource)实体类 + * + * @author makejava + * @since 2024-06-05 11:42:57 + */ +public class MdmModuleSourceEntity extends BaseEntity { + + /** 主数据模版ID */ + private String mdmId; + /** 来源类型 */ + private String sourceType; + /** 来源名称 */ + private String sourceName; + /** 来源编码 */ + private String sourceCode; + /** 公司id */ + private String companyId; + + + public String getMdmId() { + return mdmId; + } + + public void setMdmId(String mdmId) { + this.mdmId = mdmId; + } + + public String getSourceType() { + return sourceType; + } + + public void setSourceType(String sourceType) { + this.sourceType = sourceType; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getSourceCode() { + return sourceCode; + } + + public void setSourceCode(String sourceCode) { + this.sourceCode = sourceCode; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml new file mode 100644 index 00000000..cc3bd233 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + id + ,mdm_id + ,source_type + ,source_name + ,source_code + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + insert into mdm_module_source( + + id , + mdm_id , + source_type , + source_name , + source_code , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{mdmId} , + #{sourceType} , + #{sourceName} , + #{sourceCode} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_source a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into mdm_module_source(mdm_id, source_type, source_name, source_code, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.mdmId},#{entity.sourceType},#{entity.sourceName},#{entity.sourceCode},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_module_source(mdm_id, source_type, source_name, source_code, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.mdmId},#{entity.sourceType},#{entity.sourceName},#{entity.sourceCode},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + mdm_id = values(mdm_id), + source_type = values(source_type), + source_name = values(source_name), + source_code = values(source_code), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_module_source set + + mdm_id = #{mdmId}, + source_type = #{sourceType}, + source_name = #{sourceName}, + source_code = #{sourceCode}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + +update mdm_module_source set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update mdm_module_source set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and mdm_id = #{mdmId} + and source_type = #{sourceType} + and source_name = #{sourceName} + and source_code = #{sourceCode} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from mdm_module_source where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/IMdmModuleSourceService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/IMdmModuleSourceService.java new file mode 100644 index 00000000..f622682c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/IMdmModuleSourceService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.mdm.mdmModuleSource.service; + +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 主数据数据来源(MdmModuleSource)表服务接口 + * + * @author makejava + * @since 2024-06-05 11:42:57 + */ +public interface IMdmModuleSourceService extends IBaseService{ +} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/impl/MdmModuleSourceServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/impl/MdmModuleSourceServiceImpl.java new file mode 100644 index 00000000..f9afb989 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/impl/MdmModuleSourceServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.mdm.mdmModuleSource.service.impl; + +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.mdm.mdmModuleSource.dao.IMdmModuleSourceDao; +import com.hzya.frame.mdm.mdmModuleSource.service.IMdmModuleSourceService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 主数据数据来源(MdmModuleSource)表服务实现类 + * + * @author makejava + * @since 2024-06-05 11:42:57 + */ +@Service(value = "mdmModuleSourceService") +public class MdmModuleSourceServiceImpl extends BaseService implements IMdmModuleSourceService { + + private IMdmModuleSourceDao mdmModuleSourceDao; + + @Autowired + public void setMdmModuleSourceDao(IMdmModuleSourceDao dao) { + this.mdmModuleSourceDao = dao; + this.dao = dao; + } +} diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java index 0994442a..6756c7dc 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java @@ -1387,12 +1387,133 @@ public class MdmServiceImpl implements IMdmService { * @return void **/ private void doMdmModuleButton(SysMenuConfigEntity module,List mdmModuleViewButtonEntities, List sysButtonConfigEntities, List sysPopedomOperateEntities) { + //循环设置的按钮，再循环菜单的按钮，如果有把原先的修改状态，如果没有新增 + if(mdmModuleViewButtonEntities != null && mdmModuleViewButtonEntities.size() > 0){ + for (int i = 0; i < mdmModuleViewButtonEntities.size(); i++) { + boolean flag = false; + if(sysButtonConfigEntities != null && sysButtonConfigEntities.size() > 0){ + for (int i1 = 0; i1 < sysButtonConfigEntities.size(); i1++) { + if(mdmModuleViewButtonEntities.get(i).getButtonValue().equals(sysButtonConfigEntities.get(i1).getCode())){ + flag = true; + sysButtonConfigEntities.get(i1).setSts("Y"); + sysButtonConfigEntities.get(i1).setUpdate(); + sysButtonConfigDao.update(sysButtonConfigEntities.get(i1)); + if(sysPopedomOperateEntities != null && sysPopedomOperateEntities.size() > 0){ + for (int i2 = 0; i2 < sysPopedomOperateEntities.size(); i2++) { + if(sysPopedomOperateEntities.get(i2).getOperate().equals(sysButtonConfigEntities.get(i1).getId())){ + sysPopedomOperateEntities.get(i2).setSts("Y"); + sysPopedomOperateEntities.get(i2).setUpdate(); + sysPopedomOperateDao.update(sysPopedomOperateEntities.get(i2)); + } + } + } + break; + } + } + } + //原先没有需要新增 + if(!flag){ + if("new".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){ + SysButtonConfigEntity xz = new SysButtonConfigEntity(); + xz.setCode("new"); + xz.setNameCh("新建"); + xz.setNameEn("new"); + xz.setMenuId(module.getId()); + xz.setIconName(""); + xz.setStyles(""); + xz.setBtnFunction("new"); + xz.setRemark("主数据新建按钮"); + xz.setCreate(); + sysButtonConfigDao.save(xz); + } + if("resize".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())){ - //循环查看按钮 - - + SysButtonConfigEntity cz = new SysButtonConfigEntity(); + cz.setCode("resize"); + cz.setNameCh("重置"); + cz.setNameEn("resize"); + cz.setMenuId(module.getId()); + cz.setIconName(""); + cz.setStyles(""); + cz.setBtnFunction("resize"); + cz.setRemark("主数据重置按钮"); + cz.setCreate(); + sysButtonConfigDao.save(cz); + } + if("search".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { + + SysButtonConfigEntity cx = new SysButtonConfigEntity(); + cx.setCode("search"); + cx.setNameCh("查询"); + cx.setNameEn("search"); + cx.setMenuId(module.getId()); + cx.setIconName(""); + cx.setStyles(""); + cx.setBtnFunction("search"); + cx.setRemark("主数据查询按钮"); + cx.setCreate(); + sysButtonConfigDao.save(cx); + } + if("edit".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { + + SysButtonConfigEntity xg = new SysButtonConfigEntity(); + xg.setCode("edit"); + xg.setNameCh("修改"); + xg.setNameEn("edit"); + xg.setMenuId(module.getId()); + xg.setIconName(""); + xg.setStyles(""); + xg.setBtnFunction("edit"); + xg.setRemark("主数据修改按钮"); + xg.setCreate(); + sysButtonConfigDao.save(xg); + } + if("dele".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { + + SysButtonConfigEntity sc = new SysButtonConfigEntity(); + sc.setCode("dele"); + sc.setNameCh("删除"); + sc.setNameEn("dele"); + sc.setMenuId(module.getId()); + sc.setIconName(""); + sc.setStyles(""); + sc.setBtnFunction("dele"); + sc.setRemark("主数据删除按钮"); + sc.setCreate(); + sysButtonConfigDao.save(sc); + } + if("view".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { + + SysButtonConfigEntity ck = new SysButtonConfigEntity(); + ck.setCode("view"); + ck.setNameCh("查看"); + ck.setNameEn("view"); + ck.setMenuId(module.getId()); + ck.setIconName(""); + ck.setStyles(""); + ck.setBtnFunction("view"); + ck.setRemark("主数据查看按钮"); + ck.setCreate(); + sysButtonConfigDao.save(ck); + } + if("send".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) { + SysButtonConfigEntity xf = new SysButtonConfigEntity(); + xf.setCode("send"); + xf.setNameCh("下发"); + xf.setNameEn("send"); + xf.setMenuId(module.getId()); + xf.setIconName(""); + xf.setStyles(""); + xf.setBtnFunction("send"); + xf.setRemark("主数据下发按钮"); + xf.setCreate(); + sysButtonConfigDao.save(xf); + } + } + } + } } ///** // * @param object From b429c40153e5b067fd8aac78bc44b1a7448ea088 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 5 Jun 2024 11:46:51 +0800 Subject: [PATCH 12/44] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../execsql/service/ExecSqlServiceImpl.java | 4 +- .../sysnew/comparison/dao/IComparisonDao.java | 40 ++++ .../dao/impl/ComparisonDaoImpl.java | 28 +++ .../entity/ComparisonDetailsEntity.xml | 2 +- .../comparison/entity/ComparisonEntity.java | 55 ++++++ .../comparison/entity/ComparisonEntity.xml | 83 ++++---- .../service/IComparisonService.java | 5 + .../service/impl/ComparisonServiceImpl.java | 182 ++++++++++++------ 8 files changed, 292 insertions(+), 107 deletions(-) diff --git a/common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java b/common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java index 468e0c3c..ff02bcc4 100644 --- a/common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java +++ b/common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java @@ -53,7 +53,7 @@ public class ExecSqlServiceImpl implements IExecSqlService { public List> execSelectSql(ExecSqlEntity entity) throws RuntimeException { List> list = new ArrayList<>(); logger.info("=============进入execSelectSql方法============"); - if (null != entity && ObjectUtils.isEmpty(entity.getSql())) { + if (null != entity && null!=entity.getSql()) { //sqlsession // SqlSession sqlSession = getSqlSession(entity.getDatasource_code()); // SqlSession sqlSession = new DataSourceUtil().getDefaultSqlSession(); @@ -61,7 +61,7 @@ public class ExecSqlServiceImpl implements IExecSqlService { logger.info("=============execSelectSql方法要执行的sql：============" + select_sql); if (!select_sql.contains("update") && !select_sql.contains("delete") && !select_sql.contains("insert") && !select_sql.contains("create")) { - list = sqlSession.selectList("com.hzya.frame.sysnew.execsql.entity.ExecSqlEntity.ExecSqlEntity_execsql", entity); + list = sqlSession.selectList("com.hzya.frame.execsql.entity.ExecSqlEntity.ExecSqlEntity_execsql", entity); logger.info("===========execSelectSql方法返回的结果条数=============" + list.size()); } //sqlSession.close(); diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java index d33044c7..42b171db 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java @@ -79,4 +79,44 @@ public interface IComparisonDao extends IBaseDao { * @Date 2024/5/28 14:39 * **/ ComparisonEntity queryComparisonById(ComparisonEntity comparison); + + /** + * + * @content 根据主数据编码查询mdm_module数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 11:37 + * **/ + ComparisonEntity queryComparisonBymdmCode(ComparisonEntity comparison); + + /** + * + * @content 根据mdm_module得id查询mdm_module_db得数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 11:40 + * **/ + List queryComparisonBymdmId(ComparisonEntity comparison); + + /** + * + * @content 根据mdm_module得id查询mdm_module_db_fileds得数据 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 11:45 + * **/ + List queryComparisonBymdmIdFileds(ComparisonEntity comparison); + + /** + * + * @content 根据数据来源内类型是插件的应用类型做分组 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 17:41 + * **/ + List queryModuleSource(); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java index 63281c12..4c8a0298 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java @@ -59,4 +59,32 @@ public class ComparisonDaoImpl extends MybatisGenericDao comparisonEntities = super.query(getSqlIdPrifx() + "queryComparisonById", comparison); return comparisonEntities.get(0); } + + //根据主数据编码查询mdm_module数据 + @Override + public ComparisonEntity queryComparisonBymdmCode(ComparisonEntity comparison) { + ComparisonEntity comparisonEntity =(ComparisonEntity) super.selectOne(getSqlIdPrifx() + "queryComparisonBymdmCode", comparison); + return comparisonEntity; + } + + //根据mdm_module得id查询mdm_module_db得数据 + @Override + public List queryComparisonBymdmId(ComparisonEntity comparison) { + List list =(List) super.selectList(getSqlIdPrifx() + "queryComparisonBymdmId", comparison); + return list; + } + + //根据mdm_module得id查询mdm_module_db_fileds得数据 + @Override + public List queryComparisonBymdmIdFileds(ComparisonEntity comparison) { + List list =(List) super.selectList(getSqlIdPrifx() + "queryComparisonBymdmIdFileds", comparison); + return list; + } + + //根据数据来源内类型是插件的应用类型做分组 + @Override + public List queryModuleSource() { + List list =(List) super.selectList(getSqlIdPrifx() + "queryModuleSource",""); + return list; + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml index 8ca17330..0d1ca13f 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml @@ -55,7 +55,7 @@ update ${dbName} - set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id}, data_status= 'N',delete_status='0' + + + + + + + + - - select - case when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=1 - then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','000',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) - when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=2 - then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','00',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) - when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=3 - then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','0',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) - else concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) - end as document_rule, - right( - case when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=1 - then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','000',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) - when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=2 - then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','00',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) - when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=3 - then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','0',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) - else concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1) - end ,4) as documentRuleNum - from ${dbName} where document_rule like concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','%'); - + select + concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-',ifnull(max(substring_index(document_rule,'-',-1)),'0')+1) as documentRule, + substring_index( + (concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-',ifnull(max(substring_index(document_rule,'-',-1)),'0')+1)),'-',-1 + ) + as documentRuleNum + from ${dbName} where document_rule like concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','%'); + + + + @@ -120,7 +121,7 @@ update ${dbName} - set dataStatus= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + set data_status= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id},delete_status='0' and ${key} =#{value} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java index 31f9e6b5..d03fe903 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java @@ -1,6 +1,7 @@ package com.hzya.frame.sysnew.comparison.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.IBaseService; import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; import com.hzya.frame.web.entity.JsonResultEntity; @@ -15,6 +16,7 @@ public interface IComparisonService extends IBaseService } //分页查询通用数据数据 + @DS("master") @Override public JsonResultEntity queryEntityPage(JSONObject json) { JSONObject jsonObject = json.getJSONObject("jsonStr"); @@ -48,7 +51,9 @@ public class ComparisonServiceImpl extends BaseService List comparisonEntities=new ArrayList<>(); try { //根据主数据编码查询表名称，字段名称等信息 10001 - comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + //comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + + comparisonEntities=getComparisonEntity(comparisonEntity); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("查询失败"); @@ -80,6 +85,7 @@ public class ComparisonServiceImpl extends BaseService } //新增通用数据数据 + @DS("master") @Override public JsonResultEntity saveEntity(JSONObject json) { JSONObject jsonObject = json.getJSONObject("jsonStr"); @@ -97,7 +103,9 @@ public class ComparisonServiceImpl extends BaseService List comparisonEntities=new ArrayList<>(); try { //根据主数据编码查询表名称，字段名称等信息 10001 - comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + + comparisonEntities=getComparisonEntity(comparisonEntity); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("保存失败"); @@ -109,34 +117,8 @@ public class ComparisonServiceImpl extends BaseService Map map = new HashMap<>();//将主表数据存到map中 Map mapDetails = new HashMap<>();//将子表数据存到map中 if (comparisonEntities != null && comparisonEntities.size() > 0) { - for (ComparisonEntity entity : comparisonEntities) { - //遍历主表下面的所有key,字段名 - for (String key : jsonObjectMain.keySet()) { - if (entity.getDbType().equals("1")) { - comparisonEntity.setDbName(entity.getDbName()); - //如果表中得字段与输入得字段相等，则存起来 - if(entity.getEnName().equals(key)){ - map.put(key, jsonObjectMain.getString(key)); - } - } - } - } - if (jsonArray != null && jsonArray.size() > 0) { - for (Object object : jsonArray) { - JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object); - for (ComparisonEntity entity : comparisonEntities) { - //遍历主表下面的所有key,字段名 - for (String key : jsonObjectDetails.keySet()) { - if (entity.getDbType().equals("2")) { - comparisonDetailsEntity.setDbName(entity.getDbName()); - if(entity.getEnName().equals(key)){ - mapDetails.put(key, jsonObjectDetails.getString(key)); - } - } - } - } - } - } + map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); + mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); String uuid = UUIDUtils.getUUID(); map.put("id", uuid); map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); @@ -145,20 +127,23 @@ public class ComparisonServiceImpl extends BaseService map.put("create_time", new Date()); map.put("modify_time", new Date()); map.put("sts", "Y"); + map.put("add_status","0");//新增状态 + map.put("update_status","1");//修改状态 + map.put("delete_status","1");//删除状态 //查询单据规则 try { ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); - comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule); - String documentRule = comparisonEntityRule.getDocumentRule(); + comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule); + String documentRule =comparisonEntityRule.getDocumentRule();; //"KH-2024-05-30-1"; logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}",documentRule); if(documentRule !=null){ - //获取规则前缀 CK + //获取规则前缀 CK String rulePrefix=documentRule.substring(0,documentRule.indexOf("-")); //获取规则中间日期 yyyy-MM-dd String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-")); String ruleMiddle = getRuleDate(ruleDate); //获取规则后缀 - String ruleSuffix= documentRule.substring(documentRule.lastIndexOf("-")+1); + String ruleSuffix= documentRule.substring(documentRule.lastIndexOf("-")+1); //生成单据规则 comparisonEntity.setRulePrefix(rulePrefix); comparisonEntity.setRuleMiddle(ruleMiddle); @@ -225,7 +210,9 @@ public class ComparisonServiceImpl extends BaseService List comparisonEntities=new ArrayList<>(); //根据主数据编码查询表名称，字段名称等信息 10001 try { - comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + + comparisonEntities=getComparisonEntity(comparisonEntity); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("更新失败"); @@ -233,38 +220,15 @@ public class ComparisonServiceImpl extends BaseService Map map=new HashMap<>();//将主表数据存到map中 Map mapDetails=new HashMap<>();//将子表数据存到map中 if(comparisonEntities !=null && comparisonEntities.size()>0) { - for (ComparisonEntity entity : comparisonEntities) { - //遍历主表下面的所有key,字段名 - for (String key : jsonObjectMain.keySet()) { - if (entity.getDbType().equals("1")) { - comparisonEntity.setDbName(entity.getDbName()); - if(entity.getEnName().equals(key)){ - map.put(key, jsonObjectMain.getString(key)); - } - } - } - } - if (jsonArray != null && jsonArray.size() > 0) { - for (Object object : jsonArray) { - JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object); - for (ComparisonEntity entity : comparisonEntities) { - //遍历主表下面的所有key,字段名 - for (String key : jsonObjectDetails.keySet()) { - if (entity.getDbType().equals("2")) { - comparisonDetailsEntity.setDbName(entity.getDbName()); - if(entity.getEnName().equals(key)){ - mapDetails.put(key, jsonObjectDetails.getString(key)); - } - } - } - } - } - } + map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); + mapDetails=spliceDetailMap(comparisonEntities,map,comparisonDetailsEntity,jsonArray); map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("org_id", "0"); map.put("modify_time", new Date()); map.put("sts", "Y"); + map.put("data_status","F");//数据状态 + map.put("update_status","0");//修改状态 comparisonEntity.setMap(map); comparisonEntity.setId(jsonObjectMain.getString("id")); /*//生成单据规则 @@ -288,6 +252,7 @@ public class ComparisonServiceImpl extends BaseService mapDetails.put("org_id", "0"); mapDetails.put("modify_time", new Date()); mapDetails.put("sts", "Y"); + mapDetails.put("data_status","F");//数据状态 comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); comparisonDetailsEntity.setMapDetails(mapDetails); comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); @@ -323,7 +288,9 @@ public class ComparisonServiceImpl extends BaseService List comparisonEntities=new ArrayList<>(); //根据主数据编码查询表名称，字段名称等信息 10001 try { - comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); + + comparisonEntities=getComparisonEntity(comparisonEntity); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("删除失败"); @@ -384,4 +351,93 @@ public class ComparisonServiceImpl extends BaseService return null; } } + + //得到主表数据 + private Map spliceMainMap(List comparisonEntities,JSONObject jsonObjectMain,Map map,ComparisonEntity comparisonEntity){ + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectMain.keySet()) { + if (entity.getDbType().equals("1")) { + comparisonEntity.setDbName(entity.getDbName()); + //如果表中得字段与输入得字段相等，则存起来 + if(entity.getEnName().equals(key)){ + map.put(key, jsonObjectMain.getString(key)); + } + } + } + } + return map; + } + + //得到明细表数据 + private Map spliceDetailMap(List comparisonEntities,Map mapDetails,ComparisonDetailsEntity comparisonDetailsEntity,JSONArray jsonArray){ + if (jsonArray != null && jsonArray.size() > 0) { + for (Object object : jsonArray) { + JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object); + for (ComparisonEntity entity : comparisonEntities) { + //遍历主表下面的所有key,字段名 + for (String key : jsonObjectDetails.keySet()) { + if (entity.getDbType().equals("2")) { + comparisonDetailsEntity.setDbName(entity.getDbName()); + if(entity.getEnName().equals(key)){ + mapDetails.put(key, jsonObjectDetails.getString(key)); + } + } + } + } + } + } + return mapDetails; + } + + //根据主数据编码获取数据，表名称，字段名称等 + public List getComparisonEntity(ComparisonEntity comparisonEntity) { + List comparisonEntities = new ArrayList<>(); + //根据主数据编码查询mdm_module数据 + ComparisonEntity comparisonEntityModule = comparisonDao.queryComparisonBymdmCode(comparisonEntity); + if (comparisonEntityModule != null) { + //根据mdm_module得id查询mdm_module_db得数据 + List comparisonEntitiesModuleDb = comparisonDao.queryComparisonBymdmId(comparisonEntityModule); + //根据mdm_module得id查询mdm_module_db_fileds得数据 + List comparisonEntitiesFiles = comparisonDao.queryComparisonBymdmIdFileds(comparisonEntityModule); + for (ComparisonEntity comparison : comparisonEntitiesModuleDb) { + for (ComparisonEntity comparisonEntitiesFile : comparisonEntitiesFiles) { + if(comparison.getDbId().equals(comparisonEntitiesFile.getDbId())){ + ComparisonEntity comparisonEntityFile=new ComparisonEntity(); + comparisonEntityFile.setChName(comparisonEntitiesFile.getChName()); + comparisonEntityFile.setEnName(comparisonEntitiesFile.getEnName()); + comparisonEntityFile.setFiledType(comparisonEntitiesFile.getFiledType()); + comparisonEntityFile.setAddType(comparisonEntitiesFile.getAddType()); + comparisonEntityFile.setUpdateType(comparisonEntitiesFile.getUpdateType()); + comparisonEntityFile.setShowType(comparisonEntitiesFile.getShowType()); + comparisonEntityFile.setQueryType(comparisonEntitiesFile.getQueryType()); + comparisonEntityFile.setListType(comparisonEntitiesFile.getListType()); + comparisonEntityFile.setViewType(comparisonEntitiesFile.getViewType()); + comparisonEntityFile.setDbName(comparison.getDbName()); + comparisonEntityFile.setDbType(comparison.getDbType()); + comparisonEntityFile.setDbId(comparison.getDbId()); + comparisonEntityFile.setmId(comparisonEntitiesFile.getmId()); + comparisonEntityFile.setMdmName(comparisonEntityModule.getMdmName()); + comparisonEntityFile.setMdmCode(comparisonEntityModule.getMdmCode()); + comparisonEntities.add(comparisonEntityFile); + } + } + } + return comparisonEntities; + } + return null; + } + + //查询数据来源 根据数据来源内类型是插件的应用类型做分组 + public List getComparisonEntityFiles(){ + List comparisonEntities = comparisonDao.queryModuleSource(); + if(CollectionUtils.isNotEmpty(comparisonEntities)){ + for (ComparisonEntity comparisonEntity : comparisonEntities) { + //根据来源类型获取档案数据 比如U8C + + } + } + return null; + } + } From 8b78ebd55537744cb8836b3449f2e92de5d4ce10 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Thu, 6 Jun 2024 08:31:59 +0800 Subject: [PATCH 13/44] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/mdm/entity/MdmDistributeDto.java | 31 + .../hzya/frame/mdm/entity/MdmSourceDto.java | 34 + .../hzya/frame/mdm/entity/MdmViewFiledVo.java | 114 +++ .../com/hzya/frame/mdm/entity/MdmViewVo.java | 64 ++ .../entity/MdmModuleDistributeEntity.java | 12 +- .../dao/IMdmModuleOptionLogDao.java | 15 + .../dao/impl/MdmModuleOptionLogDaoImpl.java | 17 + .../entity/MdmModuleOptionLogEntity.java | 104 +++ .../entity/MdmModuleOptionLogEntity.xml | 272 +++++++ .../dao/IMdmModuleSendLogDao.java | 15 + .../dao/impl/MdmModuleSendLogDaoImpl.java | 17 + .../entity/MdmModuleSendLogEntity.java | 94 +++ .../entity/MdmModuleSendLogEntity.xml | 262 +++++++ .../entity/MdmModuleSourceEntity.xml | 6 +- .../hzya/frame/mdm/service/IMdmService.java | 121 ++- .../frame/mdm/service/IMdmServiceCache.java | 13 + .../mdm/service/impl/MdmServiceCache.java | 113 +++ .../mdm/service/impl/MdmServiceImpl.java | 723 +++++++++++------- 18 files changed, 1726 insertions(+), 301 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/entity/MdmSourceDto.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/entity/MdmViewFiledVo.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/IMdmModuleOptionLogDao.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/impl/MdmModuleOptionLogDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/IMdmModuleSendLogDao.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/impl/MdmModuleSendLogDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.xml diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java new file mode 100644 index 00000000..57b97fdc --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java @@ -0,0 +1,31 @@ +package com.hzya.frame.mdm.entity; + + +import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; +import java.util.List; + +public class MdmDistributeDto { + + + //主数据编码 + private Long mdmCode; + + private List mdmModuleDistributeEntities; + + public List getMdmModuleDistributeEntities() { + return mdmModuleDistributeEntities; + } + + public void setMdmModuleDistributeEntities(List mdmModuleDistributeEntities) { + this.mdmModuleDistributeEntities = mdmModuleDistributeEntities; + } + + public Long getMdmCode() { + return mdmCode; + } + + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmSourceDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmSourceDto.java new file mode 100644 index 00000000..e00af986 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmSourceDto.java @@ -0,0 +1,34 @@ +package com.hzya.frame.mdm.entity; + + +import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; + +import java.util.List; + +public class MdmSourceDto { + + + //主数据编码 + private Long mdmCode; + + private List mdmModuleSourceEntities; + + + public List getMdmModuleSourceEntities() { + return mdmModuleSourceEntities; + } + + public void setMdmModuleSourceEntities(List mdmModuleSourceEntities) { + this.mdmModuleSourceEntities = mdmModuleSourceEntities; + } + + public Long getMdmCode() { + return mdmCode; + } + + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewFiledVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewFiledVo.java new file mode 100644 index 00000000..f1e25c5a --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewFiledVo.java @@ -0,0 +1,114 @@ +package com.hzya.frame.mdm.entity; + +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; +import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; + +import java.util.List; + +public class MdmViewFiledVo { + + //字段id + private String id; + //表名 + private String dbName; + //类型 1、主表 2、明细 + private String dbType; + //主数据模版ID + private String mdmId; + //模版数据库id + private String dbId; + //中文名 + private String chName; + //英文名 + private String enName; + //排序 + private Integer sorts; + /** + * 字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME + */ + private String filedType; + //字段规则 + private List ruleList; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getDbName() { + return dbName; + } + + public void setDbName(String dbName) { + this.dbName = dbName; + } + + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } + + public String getMdmId() { + return mdmId; + } + + public void setMdmId(String mdmId) { + this.mdmId = mdmId; + } + + public String getDbId() { + return dbId; + } + + public void setDbId(String dbId) { + this.dbId = dbId; + } + + public String getChName() { + return chName; + } + + public void setChName(String chName) { + this.chName = chName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public List getRuleList() { + return ruleList; + } + + public void setRuleList(List ruleList) { + this.ruleList = ruleList; + } + + public Integer getSorts() { + return sorts; + } + + public void setSorts(Integer sorts) { + this.sorts = sorts; + } + + public String getFiledType() { + return filedType; + } + + public void setFiledType(String filedType) { + this.filedType = filedType; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java new file mode 100644 index 00000000..8630811e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java @@ -0,0 +1,64 @@ +package com.hzya.frame.mdm.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; + +public class MdmViewVo { + + private String id; + //模版信息 + private MdmModuleEntity mdmModuleEntity; + //模版展示信息 + private MdmModuleViewEntity mdmModuleViewEntity; + //查询条件 + private List queryList; + //列表 + private List listList; + + public List getQueryList() { + return queryList; + } + + public void setQueryList(List queryList) { + this.queryList = queryList; + } + + public List getListList() { + return listList; + } + + public void setListList(List listList) { + this.listList = listList; + } + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public MdmModuleEntity getMdmModuleEntity() { + return mdmModuleEntity; + } + + public void setMdmModuleEntity(MdmModuleEntity mdmModuleEntity) { + this.mdmModuleEntity = mdmModuleEntity; + } + + public MdmModuleViewEntity getMdmModuleViewEntity() { + return mdmModuleViewEntity; + } + + public void setMdmModuleViewEntity(MdmModuleViewEntity mdmModuleViewEntity) { + this.mdmModuleViewEntity = mdmModuleViewEntity; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java index 23df5360..0ce7e336 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java @@ -1,6 +1,9 @@ package com.hzya.frame.mdm.mdmModuleDistribute.entity; import java.util.Date; +import java.util.List; + +import com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity; import com.hzya.frame.web.entity.BaseEntity; /** * 主数据功能应用分发表(MdmModuleDistribute)实体类 @@ -24,7 +27,7 @@ public class MdmModuleDistributeEntity extends BaseEntity { private String enabledState; /** 公司id */ private String companyId; - + private List mdmModuleDistributeDetailEntities; public String getMdmId() { return mdmId; @@ -82,5 +85,12 @@ public class MdmModuleDistributeEntity extends BaseEntity { this.companyId = companyId; } + public List getMdmModuleDistributeDetailEntities() { + return mdmModuleDistributeDetailEntities; + } + + public void setMdmModuleDistributeDetailEntities(List mdmModuleDistributeDetailEntities) { + this.mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailEntities; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/IMdmModuleOptionLogDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/IMdmModuleOptionLogDao.java new file mode 100644 index 00000000..a65bb1bc --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/IMdmModuleOptionLogDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.mdm.mdmModuleOptionLog.dao; + +import com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 主数据模版(mdm_module_option_log: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 16:10:31 + */ +public interface IMdmModuleOptionLogDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/impl/MdmModuleOptionLogDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/impl/MdmModuleOptionLogDaoImpl.java new file mode 100644 index 00000000..b0fc4626 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/impl/MdmModuleOptionLogDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.mdm.mdmModuleOptionLog.dao.impl; + +import com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity; +import com.hzya.frame.mdm.mdmModuleOptionLog.dao.IMdmModuleOptionLogDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 主数据模版(MdmModuleOptionLog)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 16:10:31 + */ +@Repository(value = "MdmModuleOptionLogDaoImpl") +public class MdmModuleOptionLogDaoImpl extends MybatisGenericDao implements IMdmModuleOptionLogDao{ + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.java new file mode 100644 index 00000000..d4af3ede --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.java @@ -0,0 +1,104 @@ +package com.hzya.frame.mdm.mdmModuleOptionLog.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 主数据模版(MdmModuleOptionLog)实体类 + * + * @author makejava + * @since 2024-06-05 16:10:32 + */ +public class MdmModuleOptionLogEntity extends BaseEntity { + //主数据表名 + private String tableName; + //主数据编码 + private Long mdmCode; + /** 主表id */ + private String formmainId; + /** 来源名称 */ + private String sourceName; + /** 编码 */ + private String code; + /** source_data */ + private String sourceData; + /** 操作类型 */ + private String optionType; + /** 操作人 */ + private String optionName; + /** 公司id */ + private String companyId; + + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getSourceData() { + return sourceData; + } + + public void setSourceData(String sourceData) { + this.sourceData = sourceData; + } + + public String getOptionType() { + return optionType; + } + + public void setOptionType(String optionType) { + this.optionType = optionType; + } + + public String getOptionName() { + return optionName; + } + + public void setOptionName(String optionName) { + this.optionName = optionName; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public Long getMdmCode() { + return mdmCode; + } + + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.xml new file mode 100644 index 00000000..af218694 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.xml @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + ,formmain_id + ,source_name + ,code + ,source_data + ,option_type + ,option_name + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + insert into ${tableName}( + + id , + formmain_id , + source_name , + code , + source_data , + option_type , + option_name , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{formmainId} , + #{sourceName} , + #{code} , + #{sourceData} , + #{optionType} , + #{optionName} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${tableName} a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into ${tableName}(formmain_id, source_name, code, source_data, option_type, option_name, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.formmainId},#{entity.sourceName},#{entity.code},#{entity.sourceData},#{entity.optionType},#{entity.optionName},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into ${tableName}(formmain_id, source_name, code, source_data, option_type, option_name, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.formmainId},#{entity.sourceName},#{entity.code},#{entity.sourceData},#{entity.optionType},#{entity.optionName},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + formmain_id = values(formmain_id), + source_name = values(source_name), + code = values(code), + source_data = values(source_data), + option_type = values(option_type), + option_name = values(option_name), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update ${tableName} set + + formmain_id = #{formmainId}, + source_name = #{sourceName}, + code = #{code}, + source_data = #{sourceData}, + option_type = #{optionType}, + option_name = #{optionName}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + +update ${tableName} set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update ${tableName} set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and formmain_id = #{formmainId} + and source_name = #{sourceName} + and code = #{code} + and source_data = #{sourceData} + and option_type = #{optionType} + and option_name = #{optionName} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from ${tableName} where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/IMdmModuleSendLogDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/IMdmModuleSendLogDao.java new file mode 100644 index 00000000..156977bb --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/IMdmModuleSendLogDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.mdm.mdmModuleSendLog.dao; + +import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 主数据模版(mdm_module_send_log: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 16:11:09 + */ +public interface IMdmModuleSendLogDao extends IBaseDao { + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/impl/MdmModuleSendLogDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/impl/MdmModuleSendLogDaoImpl.java new file mode 100644 index 00000000..9e59822d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/impl/MdmModuleSendLogDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.mdm.mdmModuleSendLog.dao.impl; + +import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity; +import com.hzya.frame.mdm.mdmModuleSendLog.dao.IMdmModuleSendLogDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 主数据模版(MdmModuleSendLog)表数据库访问层 + * + * @author makejava + * @since 2024-06-05 16:11:09 + */ +@Repository(value = "MdmModuleSendLogDaoImpl") +public class MdmModuleSendLogDaoImpl extends MybatisGenericDao implements IMdmModuleSendLogDao{ + +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.java new file mode 100644 index 00000000..20995957 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.java @@ -0,0 +1,94 @@ +package com.hzya.frame.mdm.mdmModuleSendLog.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 主数据模版(MdmModuleSendLog)实体类 + * + * @author makejava + * @since 2024-06-05 16:11:10 + */ +public class MdmModuleSendLogEntity extends BaseEntity { + //主数据表名 + private String tableName; + //主数据编码 + private Long mdmCode; + /** 主表id */ + private String formmainId; + /** 目标应用 */ + private String targetApp; + /** 目标api */ + private String targetApi; + /** 源数据 */ + private String sourceData; + /** 操作类型 */ + private String optionType; + /** 公司id */ + private String companyId; + + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + public String getTargetApp() { + return targetApp; + } + + public void setTargetApp(String targetApp) { + this.targetApp = targetApp; + } + + public String getTargetApi() { + return targetApi; + } + + public void setTargetApi(String targetApi) { + this.targetApi = targetApi; + } + + public String getSourceData() { + return sourceData; + } + + public void setSourceData(String sourceData) { + this.sourceData = sourceData; + } + + public String getOptionType() { + return optionType; + } + + public void setOptionType(String optionType) { + this.optionType = optionType; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public Long getMdmCode() { + return mdmCode; + } + + public void setMdmCode(Long mdmCode) { + this.mdmCode = mdmCode; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.xml new file mode 100644 index 00000000..0cea9a23 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + id + ,formmain_id + ,target_app + ,target_api + ,source_data + ,option_type + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + + insert into ${tableName}( + + id , + formmain_id , + target_app , + target_api , + source_data , + option_type , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{formmainId} , + #{targetApp} , + #{targetApi} , + #{sourceData} , + #{optionType} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${tableName} a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into ${tableName}(formmain_id, target_app, target_api, source_data, option_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.formmainId},#{entity.targetApp},#{entity.targetApi},#{entity.sourceData},#{entity.optionType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into ${tableName}(formmain_id, target_app, target_api, source_data, option_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.formmainId},#{entity.targetApp},#{entity.targetApi},#{entity.sourceData},#{entity.optionType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + formmain_id = values(formmain_id), + target_app = values(target_app), + target_api = values(target_api), + source_data = values(source_data), + option_type = values(option_type), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update ${tableName} set + + formmain_id = #{formmainId}, + target_app = #{targetApp}, + target_api = #{targetApi}, + source_data = #{sourceData}, + option_type = #{optionType}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + +update ${tableName} set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update ${tableName} set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and formmain_id = #{formmainId} + and target_app = #{targetApp} + and target_api = #{targetApi} + and source_data = #{sourceData} + and option_type = #{optionType} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from ${tableName} where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml index cc3bd233..df21034b 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml @@ -132,7 +132,7 @@ - + insert into mdm_module_source( id , @@ -172,7 +172,7 @@ ) - + insert into mdm_module_source(mdm_id, source_type, source_name, source_code, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values @@ -180,7 +180,7 @@ - + insert into mdm_module_source(mdm_id, source_type, source_name, source_code, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values diff --git a/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java b/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java index 1369a2a9..b815b318 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java @@ -135,32 +135,103 @@ public interface IMdmService { //JsonResultEntity doSaveMdmModuleRule(JSONObject jsonObject); // // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置查询分发设置 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmModuleDistribute(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询分发设置 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmModuleDistribute(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置保存分发设置 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity doSaveMdmModuleDistribute(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询数据来源 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmModuleSource(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置保存数据来源 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity doSaveMdmModuleSource(JSONObject jsonObject); + + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询下发日志 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity querySendEntityPage(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取下发日志 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity getSendEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除下发日志 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity deleteSendEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询操作日志 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryOptionEntityPage(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取操作日志 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity getOptionEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除操作日志 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity deleteOptionEntity(JSONObject jsonObject); // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置保存分发设置 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity doSaveMdmModuleDistribute(JSONObject jsonObject); - // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据列表显示 树、查询条件、列表字段、按钮 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmShow(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据列表显示 树、查询条件、列表字段、按钮 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmShow(JSONObject jsonObject); // ///** // * @param jsonObject diff --git a/service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java b/service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java index bc3a5ad2..36750991 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java @@ -5,6 +5,9 @@ import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; +import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; +import com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity; import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; @@ -57,4 +60,14 @@ public interface IMdmServiceCache { void saveMdmModuleViewDetail(String id, List mdmModuleViewDetailEntities); void saveMdmModuleViewButton(String id, List mdmModuleViewButtonEntities); + + List queryMdmModuleDistribute(String id,MdmModuleDistributeEntity mdmModuleDistributeEntity); + + void saveMdmModuleDistribute(String id, List mdmModuleDistributeEntities); + + List queryMdmModuleSource(MdmModuleSourceEntity mdmModuleSourceEntity); + + void saveMdmModuleSource(String id, List mdmModuleSourceEntities); + + List queryMdmModuleDistributeDetail(MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity); } diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java index 1e5c7e0f..bf531ea9 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java @@ -13,7 +13,11 @@ import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; import com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao.IMdmModuleDbFiledsRuleDao; import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; import com.hzya.frame.mdm.mdmModuleDistribute.dao.IMdmModuleDistributeDao; +import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; import com.hzya.frame.mdm.mdmModuleDistributeDetail.dao.IMdmModuleDistributeDetailDao; +import com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity; +import com.hzya.frame.mdm.mdmModuleSource.dao.IMdmModuleSourceDao; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; import com.hzya.frame.mdm.mdmModuleView.dao.IMdmModuleViewDao; import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; import com.hzya.frame.mdm.mdmModuleViewButton.dao.IMdmModuleViewButtonDao; @@ -25,6 +29,7 @@ import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity; import com.hzya.frame.mdm.service.IMdmService; import com.hzya.frame.mdm.service.IMdmServiceCache; import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity; +import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; @@ -34,6 +39,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -57,6 +63,8 @@ public class MdmServiceCache implements IMdmServiceCache { @Resource private IMdmModuleDistributeDetailDao mdmModuleDistributeDetailDao; @Resource + private IMdmModuleSourceDao mdmModuleSourceDao; + @Resource private IMdmModuleViewDao mdmModuleViewDao; @Resource private IMdmModuleViewButtonDao mdmModuleViewButtonDao; @@ -229,5 +237,110 @@ public class MdmServiceCache implements IMdmServiceCache { } } } + @Override + @Cacheable(cacheNames="mdmModuleDistribute",key = "#mdmId") + public List queryMdmModuleDistribute(String mdmId,MdmModuleDistributeEntity mdmModuleDistributeEntity) { + List mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(mdmModuleDistributeEntity); + //查询模块下的应用列表 + MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity(); + mdmModuleDistributeDetailEntity.setSts("Y"); + mdmModuleDistributeDetailEntity.setMdmId(mdmId); + List mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity); + if(mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() > 0){ + for (int i = 0; i < mdmModuleDistributeEntities.size(); i++) { + List moduleDistributeDetailEntities = new ArrayList<>(); + if(mdmModuleDistributeDetailEntities != null && mdmModuleDistributeDetailEntities.size() > 0){ + for (int i1 = 0; i1 < mdmModuleDistributeDetailEntities.size(); i1++) { + if(mdmModuleDistributeEntities.get(i).getId().equals(mdmModuleDistributeDetailEntities.get(i1).getDistributeId())){ + moduleDistributeDetailEntities.add(mdmModuleDistributeDetailEntities.get(i1)); + } + } + } + mdmModuleDistributeEntities.get(i).setMdmModuleDistributeDetailEntities(moduleDistributeDetailEntities); + } + } + return mdmModuleDistributeEntities; + } + @Override + @Cacheable(cacheNames="mdmModuleDistributeDetail",key = "#mdmId") + public List queryMdmModuleDistributeDetail(MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity){ + List mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity); + return mdmModuleDistributeDetailEntities; + } + + @Override + @CacheEvict(cacheNames="mdmModuleDistribute",key = "#mdmId") + public void saveMdmModuleDistribute(String mdmId, List mdmModuleDistributeEntities) { + //先删除 + MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity(); + mdmModuleDistributeEntity.setMdmId(mdmId); + mdmModuleDistributeEntity.setUpdate(); + mdmModuleDistributeDao.logicRemoveMultiCondition(mdmModuleDistributeEntity); + //保存主数据 + if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() > 0) { + for (int i = 0; i < mdmModuleDistributeEntities.size(); i++) { + MdmModuleDistributeEntity moduleDistributeEntity = mdmModuleDistributeEntities.get(i); + moduleDistributeEntity.setMdmId(mdmId); + if (moduleDistributeEntity.getId() != null && !"".equals(moduleDistributeEntity.getId())) { + moduleDistributeEntity.setUpdate(); + //修改 + mdmModuleDistributeDao.update(moduleDistributeEntity); + } else { + //新增 + moduleDistributeEntity.setCreate(); + mdmModuleDistributeDao.save(moduleDistributeEntity); + } + if(moduleDistributeEntity.getMdmModuleDistributeDetailEntities() != null && moduleDistributeEntity.getMdmModuleDistributeDetailEntities().size() > 0){ + for (int i1 = 0; i1 < moduleDistributeEntity.getMdmModuleDistributeDetailEntities().size(); i1++) { + MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = moduleDistributeEntity.getMdmModuleDistributeDetailEntities().get(i1); + mdmModuleDistributeDetailEntity.setMdmId(mdmId); + mdmModuleDistributeDetailEntity.setDistributeId(moduleDistributeEntity.getId()); + if (mdmModuleDistributeDetailEntity.getId() != null && !"".equals(mdmModuleDistributeDetailEntity.getId())) { + mdmModuleDistributeDetailEntity.setUpdate(); + //修改 + mdmModuleDistributeDetailDao.update(mdmModuleDistributeDetailEntity); + } else { + //新增 + mdmModuleDistributeDetailEntity.setCreate(); + mdmModuleDistributeDetailDao.save(mdmModuleDistributeDetailEntity); + } + } + } + } + } + } + + @Override + @Cacheable(cacheNames="mdmModuleSource",key = "#mdmId") + public List queryMdmModuleSource(MdmModuleSourceEntity mdmModuleSourceEntity) { + List mdmModuleSourceEntities = mdmModuleSourceDao.queryBase(mdmModuleSourceEntity); + return mdmModuleSourceEntities; + } + + @Override + @CacheEvict(cacheNames="mdmModuleSource",key = "#mdmId") + public void saveMdmModuleSource(String mdmId, List mdmModuleSourceEntities) { + //先删除 + MdmModuleSourceEntity mdmModuleSourceEntity = new MdmModuleSourceEntity(); + mdmModuleSourceEntity.setMdmId(mdmId); + mdmModuleSourceEntity.setUpdate(); + mdmModuleSourceDao.logicRemoveMultiCondition(mdmModuleSourceEntity); + //保存主数据 + if (mdmModuleSourceEntities != null && mdmModuleSourceEntities.size() > 0) { + for (int i = 0; i < mdmModuleSourceEntities.size(); i++) { + MdmModuleSourceEntity mdmModuleSourceEntity1 = mdmModuleSourceEntities.get(i); + mdmModuleSourceEntity1.setMdmId(mdmId); + if (mdmModuleSourceEntity1.getId() != null && !"".equals(mdmModuleSourceEntity1.getId())) { + mdmModuleSourceEntity1.setUpdate(); + //修改 + mdmModuleSourceDao.update(mdmModuleSourceEntity1); + } else { + //新增 + mdmModuleSourceEntity1.setCreate(); + mdmModuleSourceDao.save(mdmModuleSourceEntity1); + } + } + } + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java index 6756c7dc..bf517a33 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java @@ -1,17 +1,19 @@ package com.hzya.frame.mdm.service.impl; import cn.dev33.satoken.stp.StpUtil; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.mdm.entity.DbFiledsDto; import com.hzya.frame.mdm.entity.MdmDbFiledVo; import com.hzya.frame.mdm.entity.MdmDbVo; +import com.hzya.frame.mdm.entity.MdmDistributeDto; import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.entity.MdmModuleViewDto; import com.hzya.frame.mdm.entity.MdmModuleViewVo; +import com.hzya.frame.mdm.entity.MdmSourceDto; +import com.hzya.frame.mdm.entity.MdmViewFiledVo; +import com.hzya.frame.mdm.entity.MdmViewVo; import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao; @@ -23,7 +25,11 @@ import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEnti import com.hzya.frame.mdm.mdmModuleDistribute.dao.IMdmModuleDistributeDao; import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; import com.hzya.frame.mdm.mdmModuleDistributeDetail.dao.IMdmModuleDistributeDetailDao; -import com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity; +import com.hzya.frame.mdm.mdmModuleOptionLog.dao.IMdmModuleOptionLogDao; +import com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity; +import com.hzya.frame.mdm.mdmModuleSendLog.dao.IMdmModuleSendLogDao; +import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; import com.hzya.frame.mdm.mdmModuleView.dao.IMdmModuleViewDao; import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; import com.hzya.frame.mdm.mdmModuleViewButton.dao.IMdmModuleViewButtonDao; @@ -34,19 +40,15 @@ import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity; import com.hzya.frame.mdm.service.IMdmService; import com.hzya.frame.mdm.service.IMdmServiceCache; -import com.hzya.frame.sys.entity.FormmainDeleteDto; -import com.hzya.frame.sys.entity.ModuleDto; -import com.hzya.frame.sys.module.entity.Module; -import com.hzya.frame.sys.roleModule.entity.RoleModule; -import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; import com.hzya.frame.sysnew.buttonConfig.dao.ISysButtonConfigDao; import com.hzya.frame.sysnew.buttonConfig.entity.SysButtonConfigEntity; import com.hzya.frame.sysnew.menuConfig.dao.ISysMenuConfigDao; import com.hzya.frame.sysnew.menuConfig.entity.SysMenuConfigEntity; import com.hzya.frame.sysnew.popedomOperate.dao.ISysPopedomOperateDao; import com.hzya.frame.sysnew.popedomOperate.entity.SysPopedomOperateEntity; -import com.hzya.frame.util.PluginUtils; -import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.sysnew.user.entity.SysUserEntity; +import com.hzya.frame.sysnew.userCompany.entity.SysUserCompanyEntity; +import com.hzya.frame.sysnew.userRoles.entity.SysUserRolesEntity; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; @@ -54,14 +56,10 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; /** @@ -74,6 +72,10 @@ public class MdmServiceImpl implements IMdmService { @Resource private IMdmModuleDao mdmModuleDao; @Resource + private IMdmModuleSendLogDao mdmModuleSendLogDao; + @Resource + private IMdmModuleOptionLogDao mdmModuleOptionLogDao; + @Resource private IMdmServiceCache mdmServiceCache; @Resource private ISysMenuConfigDao sysMenuConfigDao; @@ -1515,6 +1517,366 @@ public class MdmServiceImpl implements IMdmService { } } } + + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询分发设置 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmModuleDistribute(JSONObject object) { + MdmDto entity = getData("jsonStr", object, MdmDto.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询模块下的应用列表 + MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity(); + mdmModuleDistributeEntity.setSts("Y"); + mdmModuleDistributeEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDistributeEntities = mdmServiceCache.queryMdmModuleDistribute(mdmModuleEntity.getId(),mdmModuleDistributeEntity); + return BaseResult.getSuccessMessageEntity("查询成功", mdmModuleDistributeEntities); + } + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置保存分发设置 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity doSaveMdmModuleDistribute(JSONObject object) { + MdmDistributeDto entity = getData("jsonStr", object, MdmDistributeDto.class); + //判断是否有数据 + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + mdmServiceCache.saveMdmModuleDistribute(mdmModuleEntity.getId(),entity.getMdmModuleDistributeEntities()); + return BaseResult.getSuccessMessageEntity("保存发布设置成功"); + } + + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询数据来源 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmModuleSource(JSONObject object) { + MdmDto entity = getData("jsonStr", object, MdmDto.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询模块下的应用列表 + MdmModuleSourceEntity mdmModuleSourceEntity = new MdmModuleSourceEntity(); + mdmModuleSourceEntity.setSts("Y"); + mdmModuleSourceEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleSourceEntities = mdmServiceCache.queryMdmModuleSource(mdmModuleSourceEntity); + return BaseResult.getSuccessMessageEntity("查询成功", mdmModuleSourceEntities); + } + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置保存数据来源 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity doSaveMdmModuleSource(JSONObject object) { + MdmSourceDto entity = getData("jsonStr", object, MdmSourceDto.class); + //判断是否有数据 + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + mdmServiceCache.saveMdmModuleSource(mdmModuleEntity.getId(),entity.getMdmModuleSourceEntities()); + return BaseResult.getSuccessMessageEntity("保存发布设置成功"); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询下发日志 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity querySendEntityPage(JSONObject jsonObject) { + MdmModuleSendLogEntity entity = getData("jsonStr", jsonObject, MdmModuleSendLogEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + break; + } + } + }else { + return BaseResult.getFailureMessageEntity("请先设置数据源"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = mdmModuleSendLogDao.queryByLike(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取下发日志 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity getSendEntity(JSONObject jsonObject) { + MdmModuleSendLogEntity entity = getData("jsonStr", jsonObject, MdmModuleSendLogEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + break; + } + } + }else { + return BaseResult.getFailureMessageEntity("请先设置数据源"); + } + entity = mdmModuleSendLogDao.get(entity.getId()); + if (entity == null) { + return BaseResult.getFailureMessageEntity("获取日志失败"); + } + return BaseResult.getSuccessMessageEntity("获取日志成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除下发日志 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity deleteSendEntity(JSONObject jsonObject) { + MdmModuleSendLogEntity entity = getData("jsonStr", jsonObject, MdmModuleSendLogEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + break; + } + } + }else { + return BaseResult.getFailureMessageEntity("请先设置数据源"); + } + entity.setUpdate(); + mdmModuleSendLogDao.logicRemove(entity); + return BaseResult.getSuccessMessageEntity("删除日志成功"); + } + + + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询操作日志 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryOptionEntityPage(JSONObject jsonObject) { + MdmModuleOptionLogEntity entity = getData("jsonStr", jsonObject, MdmModuleOptionLogEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + break; + } + } + }else { + return BaseResult.getFailureMessageEntity("请先设置数据源"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = mdmModuleOptionLogDao.queryByLike(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取操作日志 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity getOptionEntity(JSONObject jsonObject) { + MdmModuleOptionLogEntity entity = getData("jsonStr", jsonObject, MdmModuleOptionLogEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + break; + } + } + }else { + return BaseResult.getFailureMessageEntity("请先设置数据源"); + } + entity = mdmModuleOptionLogDao.get(entity.getId()); + if (entity == null) { + return BaseResult.getFailureMessageEntity("获取日志失败"); + } + return BaseResult.getSuccessMessageEntity("获取日志成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除操作日志 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity deleteOptionEntity(JSONObject jsonObject) { + MdmModuleOptionLogEntity entity = getData("jsonStr", jsonObject, MdmModuleOptionLogEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + break; + } + } + }else { + return BaseResult.getFailureMessageEntity("请先设置数据源"); + } + entity.setUpdate(); + mdmModuleOptionLogDao.logicRemove(entity); + return BaseResult.getSuccessMessageEntity("删除日志成功"); + } ///** // * @param object // * @return com.hzya.frame.web.entity.JsonResultEntity @@ -2066,266 +2428,83 @@ public class MdmServiceImpl implements IMdmService { // return BaseResult.getSuccessMessageEntity("保存成功"); //} // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置查询分发设置 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmModuleDistribute(JSONObject object) { - // MdmDto entity = getData("jsonStr", object, MdmDto.class); - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // if (entity.getId() == null || "".equals(entity.getId())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询模块下的应用列表 - // MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity(); - // mdmModuleDistributeEntity.setSts("Y"); - // mdmModuleDistributeEntity.setMdmId(entity.getId()); - // List mdmModuleDistributeEntities = mdmModuleDistributeDao.queryBase(mdmModuleDistributeEntity); - // if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() > 0) { - // MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity(); - // mdmModuleDistributeDetailEntity.setSts("Y"); - // mdmModuleDistributeDetailEntity.setMdmId(entity.getId()); - // List mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity); - // if (mdmModuleDistributeDetailEntities != null && mdmModuleDistributeDetailEntities.size() > 0) { - // for (int i = 0; i < mdmModuleDistributeEntities.size(); i++) { - // List addlist = new ArrayList<>(); - // List deletelist = new ArrayList<>(); - // for (int i1 = 0; i1 < mdmModuleDistributeDetailEntities.size(); i1++) { - // if (mdmModuleDistributeEntities.get(i).getAddApi().equals(mdmModuleDistributeDetailEntities.get(i1).getApiId()) - // && mdmModuleDistributeEntities.get(i).getId().equals(mdmModuleDistributeDetailEntities.get(i1).getDistributeId())) { - // addlist.add(mdmModuleDistributeDetailEntities.get(i1)); - // } - // if (mdmModuleDistributeEntities.get(i).getDeleteApi().equals(mdmModuleDistributeDetailEntities.get(i1).getApiId()) - // && mdmModuleDistributeEntities.get(i).getId().equals(mdmModuleDistributeDetailEntities.get(i1).getDistributeId())) { - // deletelist.add(mdmModuleDistributeDetailEntities.get(i1)); - // } - // } - // mdmModuleDistributeEntities.get(i).setAddList(addlist); - // mdmModuleDistributeEntities.get(i).setDeleteList(deletelist); - // } - // } - // } - // return BaseResult.getSuccessMessageEntity("查询成功", mdmModuleDistributeEntities); - //} + // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置保存分发设置 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity doSaveMdmModuleDistribute(JSONObject object) { - // MdmDistributeDto entity = getData("jsonStr", object, MdmDistributeDto.class); - // //判断是否有数据 - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // if (entity.getId() == null || "".equals(entity.getId())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //if(entity.getMdmModuleDistributeEntities() == null ){ - // // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // //} - // //先删除 - // MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity(); - // mdmModuleDistributeEntity.setMdmId(entity.getId()); - // mdmModuleDistributeEntity.setSts("Y"); - // mdmModuleDistributeEntity.setModify_user_id(StpUtil.getLoginIdAsString()); - // mdmModuleDistributeEntity.setModify_time(new Date()); - // mdmModuleDistributeDao.logicRemoveMultiCondition(mdmModuleDistributeEntity); + // - // MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity = new MdmModuleDistributeDetailEntity(); - // mdmModuleDistributeDetailEntity.setMdmId(entity.getId()); - // mdmModuleDistributeDetailEntity.setSts("Y"); - // mdmModuleDistributeDetailEntity.setModify_user_id(StpUtil.getLoginIdAsString()); - // mdmModuleDistributeDetailEntity.setModify_time(new Date()); - // mdmModuleDistributeDetailDao.logicRemoveMultiCondition(mdmModuleDistributeDetailEntity); - // - // //保存主数据 - // List mdmModuleDistributeEntities = entity.getMdmModuleDistributeEntities(); - // - // if (mdmModuleDistributeEntities != null && mdmModuleDistributeEntities.size() > 0) { - // for (int i = 0; i < mdmModuleDistributeEntities.size(); i++) { - // MdmModuleDistributeEntity moduleDistributeEntity = mdmModuleDistributeEntities.get(i); - // moduleDistributeEntity.setMdmId(entity.getId()); - // moduleDistributeEntity.setSts("Y"); - // moduleDistributeEntity.setModify_user_id(StpUtil.getLoginIdAsString()); - // moduleDistributeEntity.setModify_time(new Date()); - // if (moduleDistributeEntity.getId() != null && !"".equals(moduleDistributeEntity.getId())) { - // //修改 - // mdmModuleDistributeDao.update(moduleDistributeEntity); - // } else { - // //新增 - // moduleDistributeEntity.setId(UUIDUtils.getUUID()); - // moduleDistributeEntity.setCreate_user_id(StpUtil.getLoginIdAsString()); - // moduleDistributeEntity.setCreate_time(new Date()); - // mdmModuleDistributeDao.save(moduleDistributeEntity); - // } - // if (moduleDistributeEntity.getAddList() != null && moduleDistributeEntity.getAddList().size() > 0) { - // for (int i1 = 0; i1 < moduleDistributeEntity.getAddList().size(); i1++) { - // MdmModuleDistributeDetailEntity moduleDistributeDetailEntity = moduleDistributeEntity.getAddList().get(i1); - // moduleDistributeDetailEntity.setMdmId(entity.getId()); - // moduleDistributeDetailEntity.setSts("Y"); - // moduleDistributeDetailEntity.setApiId(moduleDistributeEntity.getAddApi()); - // moduleDistributeDetailEntity.setDistributeId(moduleDistributeEntity.getId()); - // moduleDistributeDetailEntity.setModify_user_id(StpUtil.getLoginIdAsString()); - // moduleDistributeDetailEntity.setModify_time(new Date()); - // if (moduleDistributeDetailEntity.getId() != null && !"".equals(moduleDistributeDetailEntity.getId())) { - // //修改 - // mdmModuleDistributeDetailDao.update(moduleDistributeDetailEntity); - // } else { - // //新增 - // moduleDistributeDetailEntity.setId(UUIDUtils.getUUID()); - // moduleDistributeDetailEntity.setCreate_user_id(StpUtil.getLoginIdAsString()); - // moduleDistributeDetailEntity.setCreate_time(new Date()); - // mdmModuleDistributeDetailDao.save(moduleDistributeDetailEntity); - // } - // } - // } - // if (moduleDistributeEntity.getDeleteList() != null && moduleDistributeEntity.getDeleteList().size() > 0) { - // for (int i1 = 0; i1 < moduleDistributeEntity.getDeleteList().size(); i1++) { - // MdmModuleDistributeDetailEntity moduleDistributeDetailEntity = moduleDistributeEntity.getDeleteList().get(i1); - // moduleDistributeDetailEntity.setMdmId(entity.getId()); - // moduleDistributeDetailEntity.setSts("Y"); - // moduleDistributeDetailEntity.setApiId(moduleDistributeEntity.getDeleteApi()); - // moduleDistributeDetailEntity.setDistributeId(moduleDistributeEntity.getId()); - // moduleDistributeDetailEntity.setModify_user_id(StpUtil.getLoginIdAsString()); - // moduleDistributeDetailEntity.setModify_time(new Date()); - // if (moduleDistributeDetailEntity.getId() != null && !"".equals(moduleDistributeDetailEntity.getId())) { - // //修改 - // mdmModuleDistributeDetailDao.update(moduleDistributeDetailEntity); - // } else { - // //新增 - // moduleDistributeDetailEntity.setId(UUIDUtils.getUUID()); - // moduleDistributeDetailEntity.setCreate_user_id(StpUtil.getLoginIdAsString()); - // moduleDistributeDetailEntity.setCreate_time(new Date()); - // mdmModuleDistributeDetailDao.save(moduleDistributeDetailEntity); - // } - // } - // } - // } - // } - // return BaseResult.getSuccessMessageEntity("保存发布设置成功"); - //} - // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据列表显示 树、查询条件、列表字段、按钮 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmShow(JSONObject object) { - // MdmDto entity = getData("jsonStr", object, MdmDto.class); - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询模版 - // MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); - // mdmModuleEntity.setMdmCode(entity.getMdmCode()); - // mdmModuleEntity.setSts("Y"); - // List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); - // if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // - // MdmViewVo mdmViewVo = new MdmViewVo(); - // mdmModuleEntity = mdmModuleEntities.get(0); - // mdmViewVo.setMdmModuleEntity(mdmModuleEntity); - // //查询展示类型 - // MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity(); - // mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleViewEntity.setSts("Y"); - // List moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity); - // if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // mdmModuleViewEntity = moduleViewEntityList.get(0); - // mdmViewVo.setMdmModuleViewEntity(mdmModuleViewEntity); - // - // //查询数据源主表 - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbEntity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); - // if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询数据源表下面的字段 - // MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); - // mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbFiledsEntity.setSts("Y"); - // List mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity); - // if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询字段下的规则 - // MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity(); - // mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbFiledsRuleEntity.setSts("Y"); - // List mdmModuleDbFiledsRuleEntityList = mdmModuleDbFiledsRuleDao.queryBase(mdmModuleDbFiledsRuleEntity); - // if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询设置的查询字段 - // MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity(); - // mdmModuleViewDetailEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleViewDetailEntity.setSts("Y"); - // mdmModuleViewDetailEntity.setViewType("1"); - // List queryList = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity); - // //设置字段 - // List queryListVo = setQueryList(mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, queryList, false); - // mdmViewVo.setQueryList(queryListVo); - // - // //查询用户设置字段 - // MdmModuleUserViewEntity mdmModuleUserViewEntity = new MdmModuleUserViewEntity(); - // mdmModuleUserViewEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleUserViewEntity.setSts("Y"); - // mdmModuleUserViewEntity.setUserId(StpUtil.getLoginIdAsString()); - // List mdmModuleUserViewEntities = mdmModuleUserViewDao.queryBase(mdmModuleUserViewEntity); - // - // //查询设置的查询字段 - // MdmModuleViewDetailEntity mdmModuleViewDetailEntity1 = new MdmModuleViewDetailEntity(); - // mdmModuleViewDetailEntity1.setMdmId(mdmModuleEntity.getId()); - // mdmModuleViewDetailEntity1.setSts("Y"); - // mdmModuleViewDetailEntity1.setViewType("2"); - // List listList = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity1); - // List dolistList = new ArrayList<>(); - // - // if (mdmModuleUserViewEntities != null && mdmModuleUserViewEntities.size() > 0) { - // dolistList = getDolist(listList, mdmModuleUserViewEntities); - // if (dolistList == null || dolistList.size() == 0) { - // dolistList = listList; - // } - // } else { - // dolistList = listList; - // } - // List listListVo = setQueryList(mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, dolistList, true); - // mdmViewVo.setListList(listListVo); - // - // List buttonList = new ArrayList<>(); - // buttonList.add(new MdmViewButtonVo("new", "新建")); - // buttonList.add(new MdmViewButtonVo("resize", "重置")); - // buttonList.add(new MdmViewButtonVo("search", "查询")); - // buttonList.add(new MdmViewButtonVo("edit", "修改")); - // buttonList.add(new MdmViewButtonVo("dele", "删除")); - // buttonList.add(new MdmViewButtonVo("view", "查看")); - // buttonList.add(new MdmViewButtonVo("send", "下发")); - // mdmViewVo.setButtonList(buttonList); - // return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo); - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据列表显示 树、查询条件、列表字段、按钮 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmShow(JSONObject object) { + MdmDto entity = getData("jsonStr", object, MdmDto.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询模版 + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + + //设置模版 + MdmViewVo mdmViewVo = new MdmViewVo(); + mdmViewVo.setMdmModuleEntity(mdmModuleEntity); + //查询展示类型 + MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity(); + mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleViewEntity.setSts("Y"); + List moduleViewEntityList = mdmServiceCache.queryMdmModuleView(mdmModuleViewEntity); + if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + mdmModuleViewEntity = moduleViewEntityList.get(0); + mdmViewVo.setMdmModuleViewEntity(mdmModuleViewEntity); + + //查询数据源主表 + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询数据源表下面的字段 + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbFiledsEntity.setSts("Y"); + List mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询字段下的规则 + MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity(); + mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbFiledsRuleEntity.setSts("Y"); + List mdmModuleDbFiledsRuleEntityList = mdmServiceCache.queryMdmModuleDbFiledsRule(mdmModuleDbFiledsRuleEntity); + if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + + + //查询设置的查询字段 + MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity(); + mdmModuleViewDetailEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleViewDetailEntity.setSts("Y"); + List mdmModuleViewDetailEntities = mdmServiceCache.queryMdmModuleViewDetail(mdmModuleViewDetailEntity); + + + + + return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo); + } // ///** // * @param object From 7b1a18747c3ca211a3e433cef645f27c4d880ae4 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Thu, 6 Jun 2024 08:43:01 +0800 Subject: [PATCH 14/44] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A6=82=E6=9E=9Capi=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=86=85=E5=8C=85=E5=90=AB=20http=20=E6=88=96?= =?UTF-8?q?=E8=80=85=20https=20=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8api?= =?UTF-8?q?=E5=AE=8C=E6=95=B4=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=90=A6=E5=88=99?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20=E5=BA=94=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=20+api=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/service/impl/SysApplicationServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java index 225781f0..bd3c7594 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java @@ -1771,7 +1771,9 @@ public class SysApplicationServiceImpl extends BaseService Date: Fri, 7 Jun 2024 11:19:57 +0800 Subject: [PATCH 15/44] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzya/frame/mdm/entity/MdmDataDto.java | 69 + .../frame/mdm/entity/MdmDataFiledDto.java | 29 + .../frame/mdm/entity/MdmDetailViewVo.java | 41 + .../com/hzya/frame/mdm/entity/MdmDto.java | 153 ++ .../com/hzya/frame/mdm/entity/MdmQuery.java | 69 + .../mdm/mdmModule/dao/IMdmModuleDao.java | 17 + .../mdmModule/dao/impl/MdmModuleDaoImpl.java | 65 +- .../mdm/mdmModule/entity/MdmModuleEntity.xml | 253 ++ .../mdm/mdmModuleDb/dao/IMdmModuleDbDao.java | 10 +- .../dao/impl/MdmModuleDbDaoImpl.java | 26 +- .../mdmModuleDb/entity/MdmModuleDbEntity.xml | 60 + .../entity/MdmModuleDbFiledsEntity.java | 24 + .../hzya/frame/mdm/service/IMdmService.java | 198 +- .../frame/mdm/service/IMdmServiceCache.java | 29 +- .../mdm/service/impl/MdmServiceCache.java | 38 +- .../mdm/service/impl/MdmServiceImpl.java | 2100 +++++++++-------- 16 files changed, 2055 insertions(+), 1126 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/entity/MdmDataFiledDto.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/entity/MdmDetailViewVo.java create mode 100644 service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java new file mode 100644 index 00000000..0370431c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java @@ -0,0 +1,69 @@ +package com.hzya.frame.mdm.entity; + + +import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; + +import java.util.List; + +public class MdmDataDto { + + private String id; + private String tableName; + private String documentRule; + private Integer documentRuleNum; + /** + * 类型 1、主表 2、明细 + */ + private String dbType; + + private List mdmDataFiledDtos; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public List getMdmDataFiledDtos() { + return mdmDataFiledDtos; + } + + public void setMdmDataFiledDtos(List mdmDataFiledDtos) { + this.mdmDataFiledDtos = mdmDataFiledDtos; + } + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Integer getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Integer documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataFiledDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataFiledDto.java new file mode 100644 index 00000000..d9e40e8d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataFiledDto.java @@ -0,0 +1,29 @@ +package com.hzya.frame.mdm.entity; + + +import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; + +import java.util.List; + +public class MdmDataFiledDto { + + private String filedsName; + private String filedsValue; + + public String getFiledsName() { + return filedsName; + } + + public void setFiledsName(String filedsName) { + this.filedsName = filedsName; + } + + public String getFiledsValue() { + return filedsValue; + } + + public void setFiledsValue(String filedsValue) { + this.filedsValue = filedsValue; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDetailViewVo.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDetailViewVo.java new file mode 100644 index 00000000..586e4d7d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDetailViewVo.java @@ -0,0 +1,41 @@ +package com.hzya.frame.mdm.entity; + +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; +import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity; + +import java.util.List; + +public class MdmDetailViewVo { + //模版信息 + private MdmModuleEntity mdmModuleEntity; + //主数据主表 + private MdmModuleDbEntity mainMdmModuleDb; + //主数据子表 + private List sublistMdmModuleDb; + + public MdmModuleEntity getMdmModuleEntity() { + return mdmModuleEntity; + } + + public void setMdmModuleEntity(MdmModuleEntity mdmModuleEntity) { + this.mdmModuleEntity = mdmModuleEntity; + } + + public MdmModuleDbEntity getMainMdmModuleDb() { + return mainMdmModuleDb; + } + + public void setMainMdmModuleDb(MdmModuleDbEntity mainMdmModuleDb) { + this.mainMdmModuleDb = mainMdmModuleDb; + } + + public List getSublistMdmModuleDb() { + return sublistMdmModuleDb; + } + + public void setSublistMdmModuleDb(List sublistMdmModuleDb) { + this.sublistMdmModuleDb = sublistMdmModuleDb; + } +} + diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java index b5e8332d..ae393466 100644 --- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java @@ -17,6 +17,39 @@ public class MdmDto { //主数据子表 private List sublistMdmModuleDb; + + //id + private String id; + //3、新增4、修改 5、查看 + private String showType; + //分页 + private Integer pageNum; + private Integer pageSize; + /** + * 显示字段 + */ + private String viewFiled; + /** + * 上级id字段 + */ + private String upIdFiled; + //主数据名称 + private String mdmName; + //主数据类型 + private String mdmType; + //描述 + private String remark; + //描述 + private String[] ids; + + private String tableName; + private String value; + + private String label; + private String lableValue; + + private String upId; + public Long getMdmCode() { return mdmCode; } @@ -48,5 +81,125 @@ public class MdmDto { public void setSublistMdmModuleDb(List sublistMdmModuleDb) { this.sublistMdmModuleDb = sublistMdmModuleDb; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShowType() { + return showType; + } + + public void setShowType(String showType) { + this.showType = showType; + } + + public Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public String getViewFiled() { + return viewFiled; + } + + public void setViewFiled(String viewFiled) { + this.viewFiled = viewFiled; + } + + public String getUpIdFiled() { + return upIdFiled; + } + + public void setUpIdFiled(String upIdFiled) { + this.upIdFiled = upIdFiled; + } + + public String getMdmName() { + return mdmName; + } + + public void setMdmName(String mdmName) { + this.mdmName = mdmName; + } + + public String getMdmType() { + return mdmType; + } + + public void setMdmType(String mdmType) { + this.mdmType = mdmType; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String[] getIds() { + return ids; + } + + public void setIds(String[] ids) { + this.ids = ids; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getLableValue() { + return lableValue; + } + + public void setLableValue(String lableValue) { + this.lableValue = lableValue; + } + + public String getUpId() { + return upId; + } + + public void setUpId(String upId) { + this.upId = upId; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java new file mode 100644 index 00000000..bda7c895 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmQuery.java @@ -0,0 +1,69 @@ +package com.hzya.frame.mdm.entity; + + +import com.hzya.frame.sys.entity.TemplateKeyValue; + +import java.util.List; + +public class MdmQuery { + + //分页 + private Integer pageNum; + private Integer pageSize; + //表名 + private String tableName; + //查询条件 + private List queryCondition; + //返回字段 + private List returnField; + //明细表查询条件 + private List detailQueryCondition; + + public Integer getPageNum() { + return pageNum; + } + + public void setPageNum(Integer pageNum) { + this.pageNum = pageNum; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public List getQueryCondition() { + return queryCondition; + } + + public void setQueryCondition(List queryCondition) { + this.queryCondition = queryCondition; + } + + public List getReturnField() { + return returnField; + } + + public void setReturnField(List returnField) { + this.returnField = returnField; + } + + public List getDetailQueryCondition() { + return detailQueryCondition; + } + + public void setDetailQueryCondition(List detailQueryCondition) { + this.detailQueryCondition = detailQueryCondition; + } +} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java index e4a499ea..8854d3e8 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java @@ -1,8 +1,13 @@ package com.hzya.frame.mdm.mdmModule.dao; +import com.hzya.frame.mdm.entity.MdmDataDto; +import com.hzya.frame.mdm.entity.MdmDto; +import com.hzya.frame.mdm.entity.MdmQuery; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sys.entity.FormmainDeleteDto; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -22,5 +27,17 @@ public interface IMdmModuleDao extends IBaseDao { Integer createTable(Map maps); Integer alterTable(Map maps); Integer alterTableName(Map maps); + List> queryMdmShowData(MdmQuery entity); + List> queryTemplateDataMore(MdmDto entity); + HashMap queryTemplateDataOne(MdmDto entity); + Integer checkData(Map map); + Integer updateForm(MdmDataDto mdmDataDto); + Integer saveForm(MdmDataDto mdmDataDto); + Integer deleteTemplateById(FormmainDeleteDto formmainDeleteDto); + Integer deleteChilder(FormmainDeleteDto formmainDeleteDto); + List> querySelectData(MdmDto entity); + + List> queryDataAll(MdmDto entity); + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java index f6742f3d..40cd1bab 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java @@ -1,10 +1,15 @@ package com.hzya.frame.mdm.mdmModule.dao.impl; +import com.hzya.frame.mdm.entity.MdmDataDto; +import com.hzya.frame.mdm.entity.MdmDto; +import com.hzya.frame.mdm.entity.MdmQuery; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; +import com.hzya.frame.sys.entity.FormmainDeleteDto; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,7 +30,7 @@ public class MdmModuleDaoImpl extends MybatisGenericDao @Override public MdmModuleEntity getByMdmCode(Long mdmCode) { - MdmModuleEntity mdmModuleEntity = (MdmModuleEntity) super.query(getSqlIdPrifx() + "getByMdmCode",mdmCode); + MdmModuleEntity mdmModuleEntity = (MdmModuleEntity) super.selectOne(getSqlIdPrifx() + "getByMdmCode",mdmCode); return mdmModuleEntity; } @@ -35,8 +40,66 @@ public class MdmModuleDaoImpl extends MybatisGenericDao return o; } + @Override + public List> queryDataAll(MdmDto entity) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "queryDataAll", entity); + return o; + } + @Override + public Integer checkData(Map maps) { + Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkData", maps); + return o; + } + @Override + public Integer updateForm(MdmDataDto mdmDataDto) { + Integer o = super.update(getSqlIdPrifx() + "updateForm", mdmDataDto); + return o; + } + @Override + public List> querySelectData(MdmDto entity) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "querySelectData", entity); + return o; + + } + @Override + public Integer deleteChilder(FormmainDeleteDto entity) { + Integer o = super.delete(getSqlIdPrifx() + "deleteChilder", entity); + return o; + + } + @Override + public Integer deleteTemplateById(FormmainDeleteDto entity) { + Integer o = super.delete(getSqlIdPrifx() + "deleteTemplateById", entity); + return o; + + } + @Override + public Integer saveForm(MdmDataDto mdmDataDto) { + Integer o = super.update(getSqlIdPrifx() + "saveForm", mdmDataDto); + return o; + + } + @Override + public List> queryTemplateDataMore(MdmDto entity) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "queryTemplateDataMore", entity); + return o; + + } + + @Override + public HashMap queryTemplateDataOne(MdmDto entity) { + HashMap o = (HashMap) super.selectOne(getSqlIdPrifx() + "queryTemplateDataOne", entity); + return o; + + } + + @Override + public List> queryMdmShowData(MdmQuery entity) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "queryMdmShowData", entity); + return o; + } @Override public Integer createTable(Map maps) { Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "createTable", maps); diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 4acbf893..4e94d665 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -404,5 +404,258 @@ update mdm_module set sts= 'N' ,modify_time = #{modify_time},modify_user_id = # + + + + + + + + + + + + + update ${tableName} set + + + + + ${item.filedsName} = #{item.filedsValue}, + + + modify_user_id = #{item.filedsValue}, + + + + modify_time = now(), + + where id = #{id} + + + + insert into ${tableName}( + + + + + ${item.filedsName}, + + + create_user_id, + modify_user_id, + + + + create_time, + modify_time, + sts, + + document_rule, + document_rule_num, + + + )values + ( + + + + + #{item.filedsValue}, + + + #{item.filedsValue}, + #{item.filedsValue}, + + + + + now(), + now(), + 'Y', + + ( concat(#{documentRule}, + (SELECT + IF + ( + LENGTH( (SELECT + IFNULL(MAX(b.document_rule_num),0)+1 + FROM + ${tableName} b + WHERE + DATE_FORMAT( b.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )) ) <= ${documentRuleNum}, + LPAD( (SELECT + IFNULL(MAX(c.document_rule_num),0)+1 + FROM + ${tableName} c + WHERE + DATE_FORMAT( c.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )), ${documentRuleNum}, '0' ), + (SELECT + IFNULL(MAX(d.document_rule_num),0)+1 + FROM + ${tableName} d + WHERE + DATE_FORMAT( d.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )) + ) + ) + )), + (SELECT + IF + ( + LENGTH( (SELECT + IFNULL(MAX(e.document_rule_num),0)+1 + FROM + ${tableName} e + WHERE + DATE_FORMAT( e.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )) ) <= ${documentRuleNum}, + LPAD( (SELECT + IFNULL(MAX(f.document_rule_num),0)+1 + FROM + ${tableName} f + WHERE + DATE_FORMAT( f.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )), ${documentRuleNum}, '0' ), + (SELECT + IFNULL(MAX(g.document_rule_num),0)+1 + FROM + ${tableName} g + WHERE + DATE_FORMAT( g.create_time, '%Y-%m' ) = DATE_FORMAT( now(), '%Y-%m' )) + ) + ) + + + ) + + + update ${tableName} set + sts='N',modify_time = now(),modify_user_id = #{loginId} + + and id = #{id} + and formmain_id = #{formmain_id} + and sts='Y' + + + + + update ${tableName} set + sts='N',modify_time = now(),modify_user_id = #{loginId} + + + and ${upIdFiled} like concat(#{upIdFiledValue},'%') + + and sts='Y' + + + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java index 92b955dd..89849461 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java @@ -1,7 +1,11 @@ package com.hzya.frame.mdm.mdmModuleDb.dao; import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 模版数据库表(mdm_module_db: table)表数据库访问层 @@ -10,6 +14,8 @@ import com.hzya.frame.basedao.dao.IBaseDao; * @since 2024-06-03 08:46:48 */ public interface IMdmModuleDbDao extends IBaseDao { - + HashMap getServiceDataById(Map queryData); + List> getServiceByFormmainId(Map queryData); + List> getServiceByDistributeId(Map queryData); } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java index 77d8c8bb..8bf06ee1 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java @@ -4,6 +4,11 @@ import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 模版数据库表(MdmModuleDb)表数据库访问层 * @@ -12,6 +17,25 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; */ @Repository(value = "MdmModuleDbDaoImpl") public class MdmModuleDbDaoImpl extends MybatisGenericDao implements IMdmModuleDbDao{ - + @Override + public HashMap getServiceDataById(Map maps) { + HashMap o = (HashMap) super.selectOne(getSqlIdPrifx() + "getServiceDataById", maps); + return o; + + } + + @Override + public List> getServiceByFormmainId(Map maps) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "getServiceByFormmainId", maps); + return o; + + } + @Override + public List> getServiceByDistributeId(Map maps) { + List> o = (List>) super.selectList(getSqlIdPrifx() + "getServiceByDistributeId", maps); + return o; + + } + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml index 383d4ca7..2340cbcd 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml @@ -238,6 +238,66 @@ update mdm_module_db set sts= 'N' ,modify_time = #{modify_time},modify_user_id delete from mdm_module_db where id = #{id} + + + + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java index 194a0ace..abb89344 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java @@ -41,6 +41,14 @@ public class MdmModuleDbFiledsEntity extends BaseEntity { private String companyId; /** 数据类型 1、新增 2、修改 */ private String dataType; + /** + * roletype + */ + private String roletype; + /** + * roletype + */ + private String roleValue; private List mdmModuleDbFiledsRules; public String getMdmId() { @@ -162,5 +170,21 @@ public class MdmModuleDbFiledsEntity extends BaseEntity { public void setDataType(String dataType) { this.dataType = dataType; } + + public String getRoletype() { + return roletype; + } + + public void setRoletype(String roletype) { + this.roletype = roletype; + } + + public String getRoleValue() { + return roleValue; + } + + public void setRoleValue(String roleValue) { + this.roleValue = roleValue; + } } diff --git a/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java b/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java index b815b318..d588e694 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java @@ -50,7 +50,7 @@ public interface IMdmService { * @param jsonObject * @return com.hzya.frame.web.entity.JsonResultEntity * @Author lvleigang - * @Description 主数据基本信息保存 + * @Description 主数据基本信息修改 * @Date 9:40 上午 2023/10/18 **/ JsonResultEntity doSaveMdmModule(JSONObject jsonObject); @@ -63,31 +63,31 @@ public interface IMdmService { **/ JsonResultEntity queryMdmModuleDb(JSONObject jsonObject); // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置查询数据源的服务 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmModuleServer(JSONObject jsonObject); - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置查询数据源字段的服务 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmModuleServerFiled(JSONObject jsonObject); - // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置查询主表字段 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmModuleServerMainFiled(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询数据源的服务 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmModuleServer(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询数据源字段的服务 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmModuleServerFiled(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询主表字段 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmModuleServerMainFiled(JSONObject jsonObject); /** * @param jsonObject * @return com.hzya.frame.web.entity.JsonResultEntity @@ -233,30 +233,30 @@ public interface IMdmService { **/ JsonResultEntity queryMdmShow(JSONObject jsonObject); // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据查询所有字段 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmShowAll(JSONObject jsonObject); - ///** - // * @Author lvleigang - // * @Description 查询模版数据（list 或者 分页） - // * @Date 1:33 下午 2023/7/12 - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // **/ - //JsonResultEntity queryTemplateData(JSONObject jsonObject); - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据列表显示 业务数据 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmShowData(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据查询所有字段 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmShowAll(JSONObject jsonObject); + /** + * @Author lvleigang + * @Description 查询模版数据（list 或者 分页） + * @Date 1:33 下午 2023/7/12 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + JsonResultEntity queryTemplateData(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据列表显示 业务数据 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmShowData(JSONObject jsonObject); // ///** // * @param jsonObject @@ -266,14 +266,14 @@ public interface IMdmService { // * @Date 9:40 上午 2023/10/18 // **/ //JsonResultEntity queryMdmShowDistribute(JSONObject jsonObject); - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据业务数据树结构 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmShowTreeData(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据业务数据树结构 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmShowTreeData(JSONObject jsonObject); ///** // * @param jsonObject // * @return com.hzya.frame.web.entity.JsonResultEntity @@ -283,49 +283,49 @@ public interface IMdmService { // **/ //JsonResultEntity queryMdmOptionData(JSONObject jsonObject); // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情 区分类型 新增、修改、查看 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmShowDetails(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情 区分类型 新增、修改、查看 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmShowDetails(JSONObject jsonObject); // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情数据 区分类型 新增、修改、查看 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity queryMdmShowDetailsData(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情数据 区分类型 新增、修改、查看 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity queryMdmShowDetailsData(JSONObject jsonObject); // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情数据修改 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity updateMdmShowDetailsData(JSONObject jsonObject); - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情数据新增 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity saveMdmShowDetailsData(JSONObject jsonObject); - // - ///** - // * @param jsonObject - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据删除业务数据 - // * @Date 9:40 上午 2023/10/18 - // **/ - //JsonResultEntity deleteMdmShowDetailsData(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情数据修改 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity updateMdmShowDetailsData(JSONObject jsonObject); + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情数据新增 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity saveMdmShowDetailsData(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据删除业务数据 + * @Date 9:40 上午 2023/10/18 + **/ + JsonResultEntity deleteMdmShowDetailsData(JSONObject jsonObject); // ///** // * @param jsonObject diff --git a/service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java b/service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java index 36750991..4174d5fa 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java @@ -30,14 +30,33 @@ public interface IMdmServiceCache { * @return com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity **/ MdmModuleEntity getMdmModuleEntity(Long mdmCode); + /** + * @Author lvleigang + * @Description 获取模版单据编码规则 + * @Date 10:13 上午 2024/6/3 + * @param mdmTableCodeRuleEntity + * @return com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity + **/ + List queryMdmTableCodeRuleEntity(MdmTableCodeRuleEntity mdmTableCodeRuleEntity); + /** + * @Author lvleigang + * @Description 获取模版表数据 + * @Date 10:13 上午 2024/6/3 + * @param queryDb + * @return com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity + **/ + List queryMdmModuleDb(MdmModuleDbEntity queryDb); + /** + * @Author lvleigang + * @Description 获取模版字段表数据 + * @Date 10:13 上午 2024/6/3 + * @param queryDbFiled + * @return com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity + **/ + List queryMdmModuleDbFileds(MdmModuleDbFiledsEntity queryDbFiled); void updateMdmModuleEntity(MdmModuleEntity entity); - List queryMdmTableCodeRuleEntity(MdmTableCodeRuleEntity mdmTableCodeRuleEntity); - - List queryMdmModuleDb(MdmModuleDbEntity queryDb); - - List queryMdmModuleDbFileds(MdmModuleDbFiledsEntity queryDbFiled); List queryMdmModuleDbFiledsRule(MdmModuleDbFiledsRuleEntity queryDbFiledRule); diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java index bf531ea9..b847f145 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java @@ -87,7 +87,7 @@ public class MdmServiceCache implements IMdmServiceCache { } @Override - @Cacheable(cacheNames="mdmTableCodeRule",key = "#mdmId") + @Cacheable(cacheNames="mdmTableCodeRule",key = "#entity.mdmId") public List queryMdmTableCodeRuleEntity(MdmTableCodeRuleEntity entity) { List mdmTableCodeRuleEntityList = mdmTableCodeRuleDao.queryBase(entity); return mdmTableCodeRuleEntityList; @@ -95,21 +95,21 @@ public class MdmServiceCache implements IMdmServiceCache { @Override - @Cacheable(cacheNames="mdmModuleDb",key = "#mdmId") + @Cacheable(cacheNames="mdmModuleDb",key = "#entity.mdmId") public List queryMdmModuleDb(MdmModuleDbEntity entity) { List mdmModuleDbEntities = mdmModuleDbDao.queryBase(entity); return mdmModuleDbEntities; } @Override - @Cacheable(cacheNames="mdmModuleDbFileds",key = "#mdmId") + @Cacheable(cacheNames="mdmModuleDbFileds",key = "#entity.mdmId") public List queryMdmModuleDbFileds(MdmModuleDbFiledsEntity entity) { List mdmModuleDbFiledsEntities = mdmModuleDbFiledsDao.queryBase(entity); return mdmModuleDbFiledsEntities; } @Override - @Cacheable(cacheNames="mdmModuleDbFiledsRule",key = "#mdmId") + @Cacheable(cacheNames="mdmModuleDbFiledsRule",key = "#entity.mdmId") public List queryMdmModuleDbFiledsRule(MdmModuleDbFiledsRuleEntity entity) { List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(entity); return mdmModuleDbFiledsRuleEntities; @@ -176,23 +176,23 @@ public class MdmServiceCache implements IMdmServiceCache { } @Override - @Cacheable(cacheNames="mdmModuleViewDetail",key = "#mdmId") - public List queryMdmModuleViewDetail(MdmModuleViewDetailEntity mdmModuleViewDetailEntity) { - List mdmModuleViewDetailEntities = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity); + @Cacheable(cacheNames="mdmModuleViewDetail",key = "#entity.mdmId") + public List queryMdmModuleViewDetail(MdmModuleViewDetailEntity entity) { + List mdmModuleViewDetailEntities = mdmModuleViewDetailDao.queryBase(entity); return mdmModuleViewDetailEntities; } @Override - @Cacheable(cacheNames="mdmModuleView",key = "#mdmId") - public List queryMdmModuleView(MdmModuleViewEntity mdmModuleViewEntity) { - List moduleViewEntities = mdmModuleViewDao.queryBase(mdmModuleViewEntity); + @Cacheable(cacheNames="mdmModuleView",key = "#entity.mdmId") + public List queryMdmModuleView(MdmModuleViewEntity entity) { + List moduleViewEntities = mdmModuleViewDao.queryBase(entity); return moduleViewEntities; } @Override - @Cacheable(cacheNames="mdmModuleViewButton",key = "#mdmId") - public List queryMdmModuleViewButton(MdmModuleViewButtonEntity mdmModuleViewButtonEntity) { - List mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(mdmModuleViewButtonEntity); + @Cacheable(cacheNames="mdmModuleViewButton",key = "#entity.mdmId") + public List queryMdmModuleViewButton(MdmModuleViewButtonEntity entity) { + List mdmModuleViewButtonEntities = mdmModuleViewButtonDao.queryBase(entity); return mdmModuleViewButtonEntities; } @@ -263,9 +263,9 @@ public class MdmServiceCache implements IMdmServiceCache { return mdmModuleDistributeEntities; } @Override - @Cacheable(cacheNames="mdmModuleDistributeDetail",key = "#mdmId") - public List queryMdmModuleDistributeDetail(MdmModuleDistributeDetailEntity mdmModuleDistributeDetailEntity){ - List mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailDao.queryBase(mdmModuleDistributeDetailEntity); + @Cacheable(cacheNames="mdmModuleDistributeDetail",key = "#entity.mdmId") + public List queryMdmModuleDistributeDetail(MdmModuleDistributeDetailEntity entity){ + List mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailDao.queryBase(entity); return mdmModuleDistributeDetailEntities; } @@ -312,9 +312,9 @@ public class MdmServiceCache implements IMdmServiceCache { } @Override - @Cacheable(cacheNames="mdmModuleSource",key = "#mdmId") - public List queryMdmModuleSource(MdmModuleSourceEntity mdmModuleSourceEntity) { - List mdmModuleSourceEntities = mdmModuleSourceDao.queryBase(mdmModuleSourceEntity); + @Cacheable(cacheNames="mdmModuleSource",key = "#entity.mdmId") + public List queryMdmModuleSource(MdmModuleSourceEntity entity) { + List mdmModuleSourceEntities = mdmModuleSourceDao.queryBase(entity); return mdmModuleSourceEntities; } diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java index bf517a33..145b9b67 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java @@ -1,16 +1,21 @@ package com.hzya.frame.mdm.service.impl; import cn.dev33.satoken.stp.StpUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hzya.frame.mdm.entity.DbFiledsDto; +import com.hzya.frame.mdm.entity.MdmDataDto; +import com.hzya.frame.mdm.entity.MdmDataFiledDto; import com.hzya.frame.mdm.entity.MdmDbFiledVo; import com.hzya.frame.mdm.entity.MdmDbVo; +import com.hzya.frame.mdm.entity.MdmDetailViewVo; import com.hzya.frame.mdm.entity.MdmDistributeDto; import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.entity.MdmModuleViewDto; import com.hzya.frame.mdm.entity.MdmModuleViewVo; +import com.hzya.frame.mdm.entity.MdmQuery; import com.hzya.frame.mdm.entity.MdmSourceDto; import com.hzya.frame.mdm.entity.MdmViewFiledVo; import com.hzya.frame.mdm.entity.MdmViewVo; @@ -40,6 +45,7 @@ import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity; import com.hzya.frame.mdm.service.IMdmService; import com.hzya.frame.mdm.service.IMdmServiceCache; +import com.hzya.frame.sys.entity.FormmainDeleteDto; import com.hzya.frame.sysnew.buttonConfig.dao.ISysButtonConfigDao; import com.hzya.frame.sysnew.buttonConfig.entity.SysButtonConfigEntity; import com.hzya.frame.sysnew.menuConfig.dao.ISysMenuConfigDao; @@ -49,14 +55,18 @@ import com.hzya.frame.sysnew.popedomOperate.entity.SysPopedomOperateEntity; import com.hzya.frame.sysnew.user.entity.SysUserEntity; import com.hzya.frame.sysnew.userCompany.entity.SysUserCompanyEntity; import com.hzya.frame.sysnew.userRoles.entity.SysUserRolesEntity; +import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; +import org.checkerframework.checker.units.qual.A; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -199,6 +209,11 @@ public class MdmServiceImpl implements IMdmService { if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { return BaseResult.getFailureMessageEntity("系统错误"); } + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if(mdmModuleEntity == null ){ + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setId(mdmModuleEntity.getId()); //修改 entity.setUpdate(); mdmServiceCache.updateMdmModuleEntity(entity); @@ -596,11 +611,11 @@ public class MdmServiceImpl implements IMdmService { documentRule.setEnName("单据规则"); documentRule.setFiledType("3"); documentRule.setAddType("2"); - documentRule.setUpdateType("2"); - documentRule.setShowType("2"); - documentRule.setQueryType("2"); - documentRule.setListType("2"); - documentRule.setViewType("2"); + documentRule.setUpdateType("1"); + documentRule.setShowType("1"); + documentRule.setQueryType("1"); + documentRule.setListType("1"); + documentRule.setViewType("1"); documentRule.setFiledLength("50"); documentRule.setDataType("1"); mdmModuleDbFiledsEntities.add(documentRule); @@ -709,7 +724,7 @@ public class MdmServiceImpl implements IMdmService { MdmModuleDbFiledsEntity option_Name = new MdmModuleDbFiledsEntity(); option_Name.setMdmId(mdmId); option_Name.setDbId(dbId); - option_Name.setChName("option_Name"); + option_Name.setChName("option_name"); option_Name.setEnName("操作人"); option_Name.setFiledType("3"); option_Name.setAddType("2"); @@ -846,7 +861,7 @@ public class MdmServiceImpl implements IMdmService { delete_status.setMdmId(mdmId); delete_status.setDbId(dbId); delete_status.setChName("delete_status"); - delete_status.setEnName("修删除数据状态 0待下发 1已下发"); + delete_status.setEnName("删除数据状态 0待下发 1已下发"); delete_status.setFiledType("3"); delete_status.setAddType("2"); delete_status.setUpdateType("2"); @@ -1779,7 +1794,7 @@ public class MdmServiceImpl implements IMdmService { if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ for (int i = 0; i < mdmModuleDbEntities.size(); i++) { if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ - entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_option_log"); break; } } @@ -1822,7 +1837,7 @@ public class MdmServiceImpl implements IMdmService { if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ for (int i = 0; i < mdmModuleDbEntities.size(); i++) { if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ - entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_option_log"); break; } } @@ -1866,7 +1881,7 @@ public class MdmServiceImpl implements IMdmService { if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0 ){ for (int i = 0; i < mdmModuleDbEntities.size(); i++) { if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ - entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_send_log"); + entity.setTableName(mdmModuleDbEntities.get(i).getDbName()+"_option_log"); break; } } @@ -1877,95 +1892,105 @@ public class MdmServiceImpl implements IMdmService { mdmModuleOptionLogDao.logicRemove(entity); return BaseResult.getSuccessMessageEntity("删除日志成功"); } - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置查询数据源的服务 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmModuleServer(JSONObject object) { - // MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class); - // //判断分页 - // if (entity == null) { - // entity = new MdmModuleDbEntity(); - // } - // //查询数据源表 - // entity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryByLike(entity); - // return BaseResult.getSuccessMessageEntity("查询数据成功", mdmModuleDbEntityList); - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询数据源的服务 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmModuleServer(JSONObject object) { + MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class); + //判断分页 + if (entity == null) { + entity = new MdmModuleDbEntity(); + } + //查询数据源表 + entity.setSts("Y"); + List allDb = mdmModuleDbDao.queryByLike(entity); + List mdmModuleDbEntityList = new ArrayList<>(); + if(allDb != null && allDb.size() > 0){ + for (int i = 0; i < allDb.size(); i++) { + if("1".equals(allDb.get(i).getDbType()) || "2".equals(allDb.get(i).getDbType() )){ + mdmModuleDbEntityList.add(allDb.get(i)); + } + } + } + return BaseResult.getSuccessMessageEntity("查询数据成功", mdmModuleDbEntityList); + } - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置查询数据源的服务的字段 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmModuleServerFiled(JSONObject object) { - // MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class); - // //判断分页 - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // if (entity.getDbName() == null || "".equals(entity.getDbName())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询数据源表 - // entity.setSts("Y"); - // List dblist = mdmModuleDbDao.queryBase(entity); - // if (dblist != null && dblist.size() == 1) { - // MdmModuleDbFiledsEntity queryDbFiled = new MdmModuleDbFiledsEntity(); - // queryDbFiled.setSts("Y"); - // queryDbFiled.setDbId(dblist.get(0).getId()); - // List list = mdmModuleDbFiledsDao.queryBase(queryDbFiled); - // MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); - // mdmModuleDbFiledsEntity.setChName("id"); - // mdmModuleDbFiledsEntity.setEnName("id"); - // list.add(0, mdmModuleDbFiledsEntity); - // return BaseResult.getSuccessMessageEntity("查询数据成功", list); - // } else { - // return BaseResult.getFailureMessageEntity("服务不存在"); - // } - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询数据源的服务的字段 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmModuleServerFiled(JSONObject object) { + MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class); + //判断分页 + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getDbName() == null || "".equals(entity.getDbName())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询数据源表 + entity.setSts("Y"); + List dblist = mdmModuleDbDao.queryBase(entity); + if (dblist != null && dblist.size() == 1) { + MdmModuleDbFiledsEntity queryDbFiled = new MdmModuleDbFiledsEntity(); + queryDbFiled.setSts("Y"); + queryDbFiled.setDbId(dblist.get(0).getId()); + queryDbFiled.setViewType("1"); + List list = mdmModuleDbFiledsDao.queryBase(queryDbFiled); + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setChName("id"); + mdmModuleDbFiledsEntity.setEnName("id"); + list.add(0, mdmModuleDbFiledsEntity); + return BaseResult.getSuccessMessageEntity("查询数据成功", list); + } else { + return BaseResult.getFailureMessageEntity("服务不存在"); + } + } // // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据设置查询主表字段 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmModuleServerMainFiled(JSONObject object) { - // MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class); - // //判断分页 - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // if (entity.getMdmId() == null || "".equals(entity.getMdmId())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询数据源表 - // entity.setSts("Y"); - // entity.setDbType("1"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(entity); - // if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() == 1) { - // MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); - // mdmModuleDbFiledsEntity.setSts("Y"); - // mdmModuleDbFiledsEntity.setDbId(mdmModuleDbEntityList.get(0).getId()); - // List list = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity); - // return BaseResult.getSuccessMessageEntity("查询数据成功", list); - // } else if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("请先配置数据源"); - // } else { - // return BaseResult.getFailureMessageEntity("查询数据失败"); - // } - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据设置查询主表字段 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmModuleServerMainFiled(JSONObject object) { + MdmModuleDbEntity entity = getData("jsonStr", object, MdmModuleDbEntity.class); + //判断分页 + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmId() == null || "".equals(entity.getMdmId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询数据源表 + entity.setSts("Y"); + entity.setDbType("1"); + List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(entity); + if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() == 1) { + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setSts("Y"); + mdmModuleDbFiledsEntity.setViewType("1"); + mdmModuleDbFiledsEntity.setDbId(mdmModuleDbEntityList.get(0).getId()); + List list = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity); + return BaseResult.getSuccessMessageEntity("查询数据成功", list); + } else if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("请先配置数据源"); + } else { + return BaseResult.getFailureMessageEntity("查询数据失败"); + } + } @@ -2493,68 +2518,131 @@ public class MdmServiceImpl implements IMdmService { return BaseResult.getFailureMessageEntity("系统错误"); } - //查询设置的查询字段 MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity(); mdmModuleViewDetailEntity.setMdmId(mdmModuleEntity.getId()); mdmModuleViewDetailEntity.setSts("Y"); List mdmModuleViewDetailEntities = mdmServiceCache.queryMdmModuleViewDetail(mdmModuleViewDetailEntity); - - - - + if (mdmModuleViewDetailEntities == null || mdmModuleViewDetailEntities.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + List queryList = getFiledByType("1",mdmModuleViewDetailEntities,mdmModuleDbEntityList,mdmModuleDbFiledsEntityList,mdmModuleDbFiledsRuleEntityList); + mdmViewVo.setQueryList(queryList); + List listList = getFiledByType("2",mdmModuleViewDetailEntities,mdmModuleDbEntityList,mdmModuleDbFiledsEntityList,mdmModuleDbFiledsRuleEntityList); + mdmViewVo.setListList(listList); return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo); } + + /** + * @Author lvleigang + * @Description 根据类型获取字段 + * @Date 9:18 上午 2024/6/6 + * @param viewType 类型 + * @param mdmModuleViewDetailEntities 显示设置的字段 + * @param mdmModuleDbEntityList 表 + * @param mdmModuleDbFiledsEntityList 表字段 + * @param mdmModuleDbFiledsRuleEntityList 字段规则 + * @return java.util.List + **/ + private List getFiledByType(String viewType, List mdmModuleViewDetailEntities, List mdmModuleDbEntityList, List mdmModuleDbFiledsEntityList, List mdmModuleDbFiledsRuleEntityList) { + List mdmViewFiledVos = new ArrayList<>(); + if(mdmModuleViewDetailEntities != null && mdmModuleViewDetailEntities.size() > 0){ + for (int i = 0; i < mdmModuleViewDetailEntities.size(); i++) { + if(viewType.equals(mdmModuleViewDetailEntities.get(i).getViewType())){ + //类型一致 + MdmViewFiledVo mdmViewFiledVo = new MdmViewFiledVo(); + mdmViewFiledVo.setId(mdmModuleViewDetailEntities.get(i).getViewFiled()); + for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { + if(mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleViewDetailEntities.get(i).getViewFiled())){ + for (int i2 = 0; i2 < mdmModuleDbEntityList.size(); i2++) { + if(mdmModuleDbEntityList.get(i2).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())){ + mdmViewFiledVo.setDbName(mdmModuleDbEntityList.get(i2).getDbName()); + mdmViewFiledVo.setDbType(mdmModuleDbEntityList.get(i2).getDbType()); + mdmViewFiledVo.setMdmId(mdmModuleDbEntityList.get(i2).getMdmId()); + mdmViewFiledVo.setDbId(mdmModuleDbEntityList.get(i2).getId()); + + break; + } + } + mdmViewFiledVo.setChName(mdmModuleDbFiledsEntityList.get(i1).getChName()); + mdmViewFiledVo.setEnName(mdmModuleDbFiledsEntityList.get(i1).getEnName()); + mdmViewFiledVo.setFiledType(mdmModuleDbFiledsEntityList.get(i1).getFiledType()); + //字段规则 + if(mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0){ + List ruleList = new ArrayList<>(); + for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) { + if(mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())){ + ruleList.add(mdmModuleDbFiledsRuleEntityList.get(i2)); + } + } + mdmViewFiledVo.setRuleList(ruleList); + } + break; + } + } + } + } + } + if(mdmViewFiledVos != null && mdmViewFiledVos.size() > 0){ + for (int i = 0; i < mdmViewFiledVos.size(); i++) { + mdmViewFiledVos.get(i).setSorts(i); + } + } + return mdmViewFiledVos; + } // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据查询所有字段 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmShowAll(JSONObject object) { - // MdmDto entity = getData("jsonStr", object, MdmDto.class); - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // if (entity.getId() == null || "".equals(entity.getId())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询设置各种类型字段 - // //查询模版数据源 - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setMdmId(entity.getId()); - // mdmModuleDbEntity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); - // List listFiled = new ArrayList<>(); - // if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) { - // MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); - // mdmModuleDbFiledsEntity.setMdmId(entity.getId()); - // mdmModuleDbFiledsEntity.setSts("Y"); - // List mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity); - // // - // if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) { - // for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { - // if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { - // for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { - // if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) { - // if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // //1、主表 - // listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); - // } else { - // //2、明细 - // listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); - // } - // } - // } - // } - // } - // } - // } - // return BaseResult.getSuccessMessageEntity("查询视图成功", listFiled); - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据查询所有字段 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmShowAll(JSONObject object) { + MdmDto entity = getData("jsonStr", object, MdmDto.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询设置各种类型字段 + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + //查询模版数据源 + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + List listFiled = new ArrayList<>(); + if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) { + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbFiledsEntity.setSts("Y"); + List mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + // + if (mdmModuleDbEntityList != null && mdmModuleDbEntityList.size() > 0) { + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + if("1".equals(mdmModuleDbEntityList.get(i).getDbType()) || "2".equals(mdmModuleDbEntityList.get(i).getDbType())){ + if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { + for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { + if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) { + if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { + //1、主表 + listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【主表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); + } else { + //2、明细 + listFiled.add(new MdmDbFiledVo(mdmModuleDbFiledsEntityList.get(i1).getId(), "【子表:" + mdmModuleDbEntityList.get(i).getDbName() + "】" + mdmModuleDbFiledsEntityList.get(i1).getChName())); + } + } + } + } + } + } + } + } + return BaseResult.getSuccessMessageEntity("查询视图成功", listFiled); + } // ///** // * @param mdmModuleRoleButtonEntities @@ -2751,28 +2839,28 @@ public class MdmServiceImpl implements IMdmService { // mdmViewFiledVos.add(mdmViewFiledVo); //} // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据列表显示 业务数据 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmShowData(JSONObject object) { - // MdmQuery entity = getData("jsonStr", object, MdmQuery.class); - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // //判断分页 - // if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { - // return BaseResult.getFailureMessageEntity("分页查询参数不存在"); - // } - // PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); - // List> businessResult = mdmModuleDao.queryMdmShowData(entity); - // PageInfo pageInfo = new PageInfo(businessResult); - // return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据列表显示 业务数据 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmShowData(JSONObject object) { + MdmQuery entity = getData("jsonStr", object, MdmQuery.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List> businessResult = mdmModuleDao.queryMdmShowData(entity); + PageInfo pageInfo = new PageInfo(businessResult); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } // ///** // * @param object @@ -2857,143 +2945,147 @@ public class MdmServiceImpl implements IMdmService { // return BaseResult.getSuccessMessageEntity("查询数据成功", returnData); //} // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 查询数据（list 或者 分页） - // * @Date 1:33 下午 2023/7/12 - // **/ - //@Override - //public JsonResultEntity queryTemplateData(JSONObject object) { - // MdmDto entity = getData("jsonStr", object, MdmDto.class); - // //校验是否有servecr传参 - // if (!checkStr(entity.getTableName())) { - // return BaseResult.getFailureMessageEntity("请先传递服务名"); - // } - // if (!checkStr(entity.getValue())) { - // return BaseResult.getFailureMessageEntity("请先传递存储字段"); - // } - // if (!checkStr(entity.getLabel())) { - // return BaseResult.getFailureMessageEntity("请先传递显示字段"); - // } - // if (entity.getPageNum() != null && entity.getPageSize() != null) { - // PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); - // List> mapList = mdmModuleDao.querySelectData(entity); - // PageInfo pageInfo = new PageInfo(mapList); - // return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); - // } else { - // List> mapList = mdmModuleDao.querySelectData(entity); - // return BaseResult.getSuccessMessageEntity("查询数据成功", mapList); - // } - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询数据（list 或者 分页） + * @Date 1:33 下午 2023/7/12 + **/ + @Override + public JsonResultEntity queryTemplateData(JSONObject object) { + MdmDto entity = getData("jsonStr", object, MdmDto.class); + //校验是否有servecr传参 + if (!checkStr(entity.getTableName())) { + return BaseResult.getFailureMessageEntity("请先传递服务名"); + } + if (!checkStr(entity.getValue())) { + return BaseResult.getFailureMessageEntity("请先传递存储字段"); + } + if (!checkStr(entity.getLabel())) { + return BaseResult.getFailureMessageEntity("请先传递显示字段"); + } + if (entity.getPageNum() != null && entity.getPageSize() != null) { + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List> mapList = mdmModuleDao.querySelectData(entity); + PageInfo pageInfo = new PageInfo(mapList); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } else { + List> mapList = mdmModuleDao.querySelectData(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", mapList); + } + } // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 业务数据树形结构，数据查询 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmShowTreeData(JSONObject object) { - // MdmDto entity = getData("jsonStr", object, MdmDto.class); - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // //if (entity.getTableName() == null || "".equals(entity.getTableName())) { - // // return BaseResult.getFailureMessageEntity("系统错误"); - // //} - // if (entity.getLabel() == null || "".equals(entity.getLabel())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // if (entity.getUpId() == null || "".equals(entity.getUpId())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // if (entity.getMdmCode() != null && !"".equals(entity.getMdmCode())) { - // //查询模版 - // MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); - // mdmModuleEntity.setMdmCode(entity.getMdmCode()); - // mdmModuleEntity.setSts("Y"); - // List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); - // if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询数据源主表 - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setMdmId(mdmModuleEntities.get(0).getId()); - // mdmModuleDbEntity.setDbType("1"); - // mdmModuleDbEntity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); - // if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // mdmModuleDbEntity = mdmModuleDbEntityList.get(0); - // entity.setTableName(mdmModuleDbEntity.getDbName()); - // } + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 业务数据树形结构，数据查询 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmShowTreeData(JSONObject object) { + MdmDto entity = getData("jsonStr", object, MdmDto.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + //if (entity.getTableName() == null || "".equals(entity.getTableName())) { + // return BaseResult.getFailureMessageEntity("系统错误"); + //} + if (entity.getLabel() == null || "".equals(entity.getLabel())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getUpId() == null || "".equals(entity.getUpId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + + } + //查询模版 + MdmModuleEntity mdmModuleEntities = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if (mdmModuleEntities == null ) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询数据源主表 + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntities.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + if("1".equals(mdmModuleDbEntityList.get(i).getDbType())){ + mdmModuleDbEntity = mdmModuleDbEntityList.get(i); + break; + } + } + entity.setTableName(mdmModuleDbEntity.getDbName()); + + + + if (checkStr(entity.getId())) { + if (!checkStr(entity.getValue())) { + return BaseResult.getFailureMessageEntity("请先传递存储字段"); + } + if (entity.getId().contains(",")) { + String[] strArray = entity.getId().split(","); // 使用逗号和空格作为分隔符 + entity.setIds(strArray); + List> mapList = mdmModuleDao.queryTemplateDataMore(entity); + if (mapList == null || mapList.size() == 0) { + List> returnList = new ArrayList<>(); + return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); + } + List> returnList = gettochilder(strArray, 0, mapList); + return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); + } else { + HashMap mapList = mdmModuleDao.queryTemplateDataOne(entity); + if (mapList == null || mapList.size() == 0) { + List> returnList = new ArrayList<>(); + return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); + } + List> returnList = new ArrayList<>(); + returnList.add(mapList); + return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); + } + } else { + List> mapList = mdmModuleDao.queryDataAll(entity); + List> returnList = new ArrayList<>(); + + if (mapList != null && mapList.size() > 0) { + for (int i = 0; i < mapList.size(); i++) { + //默认为根 + if (mapList.get(i).get(entity.getUpId()) == null || "".equals(mapList.get(i).get(entity.getUpId()))) { + List> children = getchilder(mapList.get(i).get("qsdfg").toString(), mapList, entity); + HashMap re = new HashMap<>(); + re.put("id", mapList.get(i).get("qsdfg")); + re.put("label", mapList.get(i).get(entity.getLabel())); + re.put("upID", mapList.get(i).get(entity.getUpId())); + if (children != null && children.size() > 0) { + re.put("children", children); + } + returnList.add(re); + } + } + } + return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); + } + } // - // - // if (checkStr(entity.getId())) { - // if (!checkStr(entity.getValue())) { - // return BaseResult.getFailureMessageEntity("请先传递存储字段"); - // } - // if (entity.getId().contains(",")) { - // String[] strArray = entity.getId().split(","); // 使用逗号和空格作为分隔符 - // entity.setIds(strArray); - // List> mapList = mdmModuleDao.queryTemplateDataMore(entity); - // if (mapList == null || mapList.size() == 0) { - // List> returnList = new ArrayList<>(); - // return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); - // } - // List> returnList = gettochilder(strArray, 0, mapList); - // return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); - // } else { - // HashMap mapList = mdmModuleDao.queryTemplateDataOne(entity); - // if (mapList == null || mapList.size() == 0) { - // List> returnList = new ArrayList<>(); - // return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); - // } - // List> returnList = new ArrayList<>(); - // returnList.add(mapList); - // return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); - // } - // } else { - // List> mapList = mdmModuleDao.queryDataAll(entity); - // List> returnList = new ArrayList<>(); - // - // if (mapList != null && mapList.size() > 0) { - // for (int i = 0; i < mapList.size(); i++) { - // //默认为根 - // if (mapList.get(i).get(entity.getUpId()) == null || "".equals(mapList.get(i).get(entity.getUpId()))) { - // List> children = getchilder(mapList.get(i).get("qsdfg").toString(), mapList, entity); - // HashMap re = new HashMap<>(); - // re.put("id", mapList.get(i).get("qsdfg")); - // re.put("label", mapList.get(i).get(entity.getLabel())); - // re.put("upID", mapList.get(i).get(entity.getUpId())); - // if (children != null && children.size() > 0) { - // re.put("children", children); - // } - // returnList.add(re); - // } - // } - // } - // return BaseResult.getSuccessMessageEntity("查询数据成功", returnList); - // } - //} - // - //private List> gettochilder(String[] strArray, int i, List> mapList) { - // List> maps = new ArrayList<>(); - // for (int i1 = 0; i1 < mapList.size(); i1++) { - // if (strArray[i].equals(mapList.get(i1).get("id").toString())) { - // if (strArray.length >= (i + 2)) { - // mapList.get(i1).put("children", gettochilder(strArray, i + 1, mapList)); - // } - // maps.add(mapList.get(i1)); - // break; - // } - // } - // return maps; - //} + private List> gettochilder(String[] strArray, int i, List> mapList) { + List> maps = new ArrayList<>(); + for (int i1 = 0; i1 < mapList.size(); i1++) { + if (strArray[i].equals(mapList.get(i1).get("id").toString())) { + if (strArray.length >= (i + 2)) { + mapList.get(i1).put("children", gettochilder(strArray, i + 1, mapList)); + } + maps.add(mapList.get(i1)); + break; + } + } + return maps; + } // //private HashMap getFathers(List> mapListAll, HashMap mapList, MdmDto entity) { // if (mapList.get("upID") == null) { @@ -3018,198 +3110,202 @@ public class MdmServiceImpl implements IMdmService { // return a; //} // - //private List> getchilder(String stringObjectHashMap, List> mapList, MdmDto entity) { - // List> returnList = new ArrayList<>(); - // if (mapList != null && mapList.size() > 0) { - // for (int i = 0; i < mapList.size(); i++) { - // //等于上级id的时候 - // if (stringObjectHashMap.equals(mapList.get(i).get(entity.getUpId()))) { - // List> children = getchilder(mapList.get(i).get(entity.getUpId()) + "," + mapList.get(i).get("qsdfg"), mapList, entity); - // HashMap re = new HashMap<>(); - // re.put("id", mapList.get(i).get("qsdfg")); - // re.put("label", mapList.get(i).get(entity.getLabel())); - // re.put("upID", mapList.get(i).get(entity.getUpId())); - // if (children != null && children.size() > 0) { - // re.put("children", children); - // } - // returnList.add(re); - // } - // } - // } - // return returnList; - //} + private List> getchilder(String stringObjectHashMap, List> mapList, MdmDto entity) { + List> returnList = new ArrayList<>(); + if (mapList != null && mapList.size() > 0) { + for (int i = 0; i < mapList.size(); i++) { + //等于上级id的时候 + if (stringObjectHashMap.equals(mapList.get(i).get(entity.getUpId()))) { + List> children = getchilder(mapList.get(i).get(entity.getUpId()) + "," + mapList.get(i).get("qsdfg"), mapList, entity); + HashMap re = new HashMap<>(); + re.put("id", mapList.get(i).get("qsdfg")); + re.put("label", mapList.get(i).get(entity.getLabel())); + re.put("upID", mapList.get(i).get(entity.getUpId())); + if (children != null && children.size() > 0) { + re.put("children", children); + } + returnList.add(re); + } + } + } + return returnList; + } // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情 区分类型 新增、修改、查看 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmShowDetails(JSONObject object) { - // MdmDto entity = getData("jsonStr", object, MdmDto.class); - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // if (entity.getShowType() == null || "".equals(entity.getShowType())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询模版 - // MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); - // mdmModuleEntity.setMdmCode(entity.getMdmCode()); - // mdmModuleEntity.setSts("Y"); - // List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); - // if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // MdmDetailViewVo mdmViewVo = new MdmDetailViewVo(); - // mdmModuleEntity = mdmModuleEntities.get(0); - // mdmViewVo.setMdmModuleEntity(mdmModuleEntity); - // - // //查询数据源主表 - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbEntity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); - // if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询数据源表下面的字段 - // MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); - // mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbFiledsEntity.setSts("Y"); - // List mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity); - // if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询字段下的规则 - // MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity(); - // mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbFiledsRuleEntity.setSts("Y"); - // List mdmModuleDbFiledsRuleEntityList = mdmModuleDbFiledsRuleDao.queryBase(mdmModuleDbFiledsRuleEntity); - // if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity(); - // mdmModuleViewDetailEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleViewDetailEntity.setSts("Y"); - // mdmModuleViewDetailEntity.setViewType(entity.getShowType());//设置显示字段类型 - // List mdmModuleViewDetailEntityList = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity); - // //组装数据 - // assembleMdmShowDetails(mdmViewVo, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, mdmModuleViewDetailEntityList, entity.getShowType()); - // return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo); - //} - // - ///** - // * @param mdmViewVo 返回对象 - // * @param mdmModuleDbEntityList 数据源表 - // * @param mdmModuleDbFiledsEntityList 数据源字段 - // * @param mdmModuleDbFiledsRuleEntityList 数据源字段规则 - // * @param mdmModuleViewDetailEntityList 数据源显示字段 - // * @return void - // * @Author lvleigang - // * @Description 组装显示字段 - // * @Date 9:10 上午 2023/11/6 - // **/ - //private void assembleMdmShowDetails(MdmDetailViewVo mdmViewVo, List mdmModuleDbEntityList, List mdmModuleDbFiledsEntityList, List mdmModuleDbFiledsRuleEntityList, List mdmModuleViewDetailEntityList, String showType) { - // //主数据主表 - // MdmModuleDbEntity mainMdmModuleDb = new MdmModuleDbEntity(); - // List mainMdmModuleDbFileds = new ArrayList<>(); - // //主数据子表 - // List sublistMdmModuleDb = new ArrayList<>(); - // - // if (mdmModuleViewDetailEntityList != null && mdmModuleViewDetailEntityList.size() > 0) { - // //先循环数据源表，设置出数据字段 - // for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { - // if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // //1、主表 2、明细 - // mainMdmModuleDb = mdmModuleDbEntityList.get(i); - // //循环字段表 - // if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { - // for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { - // if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) { - // for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) { - // if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) { - // mainMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1)); - // List mdmModuleDbFiledsRules = new ArrayList<>(); - // //循环字段属性 - // if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) { - // for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) { - // if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId()) - // && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) { - // mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2)); - // } - // } - // } - // mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules); - // } - // } - // } - // } - // } - // } else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // //2、明细 - // sublistMdmModuleDb.add(mdmModuleDbEntityList.get(i)); - // //循环字段表 - // if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { - // List sublistMdmModuleDbFileds = new ArrayList<>(); - // for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { - // if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) { - // for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) { - // if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) { - // sublistMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1)); - // List mdmModuleDbFiledsRules = new ArrayList<>(); - // //循环字段属性 - // if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) { - // for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) { - // if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId()) - // && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) { - // mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2)); - // } - // } - // } - // mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules); - // } - // } - // - // } - // } - // mdmModuleDbEntityList.get(i).setSublistMdmModuleDbFileds(sublistMdmModuleDbFileds); - // } - // } - // } - // mainMdmModuleDb.setSublistMdmModuleDbFileds(mainMdmModuleDbFileds); - // mdmViewVo.setMainMdmModuleDb(mainMdmModuleDb); - // //主数据子表 - // List mdmModuleDb = new ArrayList<>(); - // if (sublistMdmModuleDb != null && sublistMdmModuleDb.size() > 0) { - // for (int i = 0; i < sublistMdmModuleDb.size(); i++) { - // if (sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds() != null && sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds().size() > 0) { - // mdmModuleDb.add(sublistMdmModuleDb.get(i)); - // } - // } - // } - // if ("5".equals(showType)) { - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setDbName(mainMdmModuleDb.getDbName() + "_distribute"); - // mdmModuleDbEntity.setRemark(mainMdmModuleDb.getRemark() + "分发表"); - // mdmModuleDbEntity.setDbType("2"); - // List mdmModuleDbFiledsEntityList1 = getDistributeRole(); - // mdmModuleDbEntity.setSublistMdmModuleDbFileds(mdmModuleDbFiledsEntityList1); - // mdmModuleDb.add(mdmModuleDbEntity); - // } - // mdmViewVo.setSublistMdmModuleDb(mdmModuleDb); - // - // - // } else { - // mdmViewVo.setMainMdmModuleDb(mainMdmModuleDb); - // mdmViewVo.setSublistMdmModuleDb(sublistMdmModuleDb); - // } - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情 区分类型 新增、修改、查看 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmShowDetails(JSONObject object) { + MdmDto entity = getData("jsonStr", object, MdmDto.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getShowType() == null || "".equals(entity.getShowType())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询模版 + //List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); + MdmModuleEntity mdmModuleEntities = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if (mdmModuleEntities == null) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmDetailViewVo mdmViewVo = new MdmDetailViewVo(); + mdmViewVo.setMdmModuleEntity(mdmModuleEntities); + + //查询数据源主表 + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntities.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询数据源表下面的字段 + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntities.getId()); + mdmModuleDbFiledsEntity.setSts("Y"); + List mdmModuleDbFiledsEntityList = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + if (mdmModuleDbFiledsEntityList == null || mdmModuleDbFiledsEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询字段下的规则 + MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity(); + mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntities.getId()); + mdmModuleDbFiledsRuleEntity.setSts("Y"); + List mdmModuleDbFiledsRuleEntityList = mdmServiceCache.queryMdmModuleDbFiledsRule(mdmModuleDbFiledsRuleEntity); + if (mdmModuleDbFiledsRuleEntityList == null || mdmModuleDbFiledsRuleEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleViewDetailEntity mdmModuleViewDetailEntity = new MdmModuleViewDetailEntity(); + mdmModuleViewDetailEntity.setMdmId(mdmModuleEntities.getId()); + mdmModuleViewDetailEntity.setSts("Y"); + mdmModuleViewDetailEntity.setViewType(entity.getShowType());//设置显示字段类型 + List queryAll = mdmModuleViewDetailDao.queryBase(mdmModuleViewDetailEntity); + List mdmModuleViewDetailEntityList = new ArrayList<>(); + if(queryAll != null && queryAll.size() > 0){ + for (int i = 0; i < queryAll.size(); i++) { + if(entity.getShowType().equals(queryAll.get(i).getViewType())){ + mdmModuleViewDetailEntityList.add(queryAll.get(i)); + } + } + } + //组装数据 + assembleMdmShowDetails(mdmViewVo, mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, mdmModuleViewDetailEntityList, entity.getShowType()); + return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo); + } + + /** + * @param mdmViewVo 返回对象 + * @param mdmModuleDbEntityList 数据源表 + * @param mdmModuleDbFiledsEntityList 数据源字段 + * @param mdmModuleDbFiledsRuleEntityList 数据源字段规则 + * @param mdmModuleViewDetailEntityList 数据源显示字段 + * @return void + * @Author lvleigang + * @Description 组装显示字段 + * @Date 9:10 上午 2023/11/6 + **/ + private void assembleMdmShowDetails(MdmDetailViewVo mdmViewVo, List mdmModuleDbEntityList, List mdmModuleDbFiledsEntityList, List mdmModuleDbFiledsRuleEntityList, List mdmModuleViewDetailEntityList, String showType) { + //主数据主表 + MdmModuleDbEntity mainMdmModuleDb = new MdmModuleDbEntity(); + List mainMdmModuleDbFileds = new ArrayList<>(); + //主数据子表 + List sublistMdmModuleDb = new ArrayList<>(); + + if (mdmModuleViewDetailEntityList != null && mdmModuleViewDetailEntityList.size() > 0) { + //先循环数据源表，设置出数据字段 + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { + //1、主表 2、明细 + mainMdmModuleDb = mdmModuleDbEntityList.get(i); + //循环字段表 + if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { + for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { + if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) { + for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) { + if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) { + mainMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1)); + List mdmModuleDbFiledsRules = new ArrayList<>(); + //循环字段属性 + if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) { + for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) { + if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId()) + && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) { + mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2)); + } + } + } + mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules); + } + } + } + } + } + } else if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) { + //2、明细 + sublistMdmModuleDb.add(mdmModuleDbEntityList.get(i)); + //循环字段表 + if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { + List sublistMdmModuleDbFileds = new ArrayList<>(); + for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { + if (mdmModuleDbEntityList.get(i).getId().equals(mdmModuleDbFiledsEntityList.get(i1).getDbId())) { + for (int b = 0; b < mdmModuleViewDetailEntityList.size(); b++) { + if (mdmModuleViewDetailEntityList.get(b).getViewFiled().equals(mdmModuleDbFiledsEntityList.get(i1).getId())) { + sublistMdmModuleDbFileds.add(mdmModuleDbFiledsEntityList.get(i1)); + List mdmModuleDbFiledsRules = new ArrayList<>(); + //循环字段属性 + if (mdmModuleDbFiledsRuleEntityList != null && mdmModuleDbFiledsRuleEntityList.size() > 0) { + for (int i2 = 0; i2 < mdmModuleDbFiledsRuleEntityList.size(); i2++) { + if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getDbId()) + && mdmModuleDbFiledsEntityList.get(i1).getId().equals(mdmModuleDbFiledsRuleEntityList.get(i2).getFiledId())) { + mdmModuleDbFiledsRules.add(mdmModuleDbFiledsRuleEntityList.get(i2)); + } + } + } + mdmModuleDbFiledsEntityList.get(i1).setMdmModuleDbFiledsRules(mdmModuleDbFiledsRules); + } + } + + } + } + mdmModuleDbEntityList.get(i).setSublistMdmModuleDbFileds(sublistMdmModuleDbFileds); + } + } + } + mainMdmModuleDb.setSublistMdmModuleDbFileds(mainMdmModuleDbFileds); + mdmViewVo.setMainMdmModuleDb(mainMdmModuleDb); + //主数据子表 + List mdmModuleDb = new ArrayList<>(); + if (sublistMdmModuleDb != null && sublistMdmModuleDb.size() > 0) { + for (int i = 0; i < sublistMdmModuleDb.size(); i++) { + if (sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds() != null && sublistMdmModuleDb.get(i).getSublistMdmModuleDbFileds().size() > 0) { + mdmModuleDb.add(sublistMdmModuleDb.get(i)); + } + } + } + //if ("5".equals(showType)) { + // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + // mdmModuleDbEntity.setDbName(mainMdmModuleDb.getDbName() + "_distribute"); + // mdmModuleDbEntity.setRemark(mainMdmModuleDb.getRemark() + "分发表"); + // mdmModuleDbEntity.setDbType("2"); + // List mdmModuleDbFiledsEntityList1 = getDistributeRole(); + // mdmModuleDbEntity.setSublistMdmModuleDbFileds(mdmModuleDbFiledsEntityList1); + // mdmModuleDb.add(mdmModuleDbEntity); + //} + mdmViewVo.setSublistMdmModuleDb(mdmModuleDb); + + } else { + mdmViewVo.setMainMdmModuleDb(mainMdmModuleDb); + mdmViewVo.setSublistMdmModuleDb(sublistMdmModuleDb); + } + } // //private List getDistributeRole() { // List mdmModuleDbFiledsEntityList = new ArrayList<>(); @@ -3389,248 +3485,239 @@ public class MdmServiceImpl implements IMdmService { // } //} // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情数据 区分类型 新增、修改、查看 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity queryMdmShowDetailsData(JSONObject object) { - // MdmDto entity = getData("jsonStr", object, MdmDto.class); - // if (entity == null) { - // return BaseResult.getFailureMessageEntity("参数不允许为空"); - // } - // if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // if (entity.getId() == null || "".equals(entity.getId())) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // //查询模版 - // MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); - // mdmModuleEntity.setMdmCode(entity.getMdmCode()); - // mdmModuleEntity.setSts("Y"); - // List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); - // if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // mdmModuleEntity = mdmModuleEntities.get(0); - // //查询数据源主表 - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbEntity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); - // if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // String tablename = null; - // JSONObject jsonObject = new JSONObject(); - // for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { - // //查询数据 - // Map queryData = new HashMap<>(); - // queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名 - // if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // queryData.put("detailFlag", false);//是否明细 - // queryData.put("id", entity.getId());//字段 - // HashMap datas = mdmModuleDbDao.getServiceDataById(queryData); - // jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), datas); - // tablename = mdmModuleDbEntityList.get(i).getDbName() + "_distribute"; - // } else { - // queryData.put("detailFlag", true);//是否明细 - // queryData.put("id", entity.getId());//字段 - // List> datas = mdmModuleDbDao.getServiceByFormmainId(queryData); - // jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), datas); - // } - // } - // if (tablename != null && !"".equals(tablename)) { - // Map queryData = new HashMap<>(); - // queryData.put("tableName", tablename);//表名 - // queryData.put("id", entity.getId());//字段 - // List> datas = mdmModuleDbDao.getServiceByDistributeId(queryData); - // jsonObject.put(tablename, datas); - // } + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情数据 区分类型 新增、修改、查看 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity queryMdmShowDetailsData(JSONObject object) { + MdmDto entity = getData("jsonStr", object, MdmDto.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询模版 + + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode()); + if (mdmModuleEntity == null ) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询数据源主表 + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + String tablename = null; + JSONObject jsonObject = new JSONObject(); + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + //查询数据 + Map queryData = new HashMap<>(); + queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名 + if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { + queryData.put("detailFlag", false);//是否明细 + queryData.put("id", entity.getId());//字段 + HashMap datas = mdmModuleDbDao.getServiceDataById(queryData); + jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), datas); + tablename = mdmModuleDbEntityList.get(i).getDbName() + "_distribute"; + } else { + queryData.put("detailFlag", true);//是否明细 + queryData.put("id", entity.getId());//字段 + List> datas = mdmModuleDbDao.getServiceByFormmainId(queryData); + jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), datas); + } + } + if (tablename != null && !"".equals(tablename)) { + Map queryData = new HashMap<>(); + queryData.put("tableName", tablename);//表名 + queryData.put("id", entity.getId());//字段 + List> datas = mdmModuleDbDao.getServiceByDistributeId(queryData); + jsonObject.put(tablename, datas); + } + + + return BaseResult.getSuccessMessageEntity("获取数据成功", jsonObject); + } + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情数据修改 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity updateMdmShowDetailsData(JSONObject object) { + JSONObject jsonObject = getstrObj("jsonStr", object); + //校验是否有servecr传参 + if (!checkData(jsonObject, "mdmCode")) { + return BaseResult.getFailureMessageEntity("请先传递服务名"); + } + if (!checkData(jsonObject, "data")) { + return BaseResult.getFailureMessageEntity("请先传递要修改的数据"); + } + JSONObject saveData = jsonObject.getJSONObject("data"); + //校验唯一 + MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); + mdmModuleEntity.setMdmCode(jsonObject.getLong("mdmCode")); + mdmModuleEntity.setSts("Y"); + List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); + if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + mdmModuleEntity = mdmModuleEntities.get(0); + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); + if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + String res = checkDataOnly(jsonObject.getInteger("mdmCode"), saveData, true, mdmModuleEntity, mdmModuleDbEntityList); + + if (res == null || "".equals(res)) { + return BaseResult.getSuccessMessageEntity("修改数据成功"); + } else { + return BaseResult.getFailureMessageEntity(res); + } + } + + + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情数据新增 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity saveMdmShowDetailsData(JSONObject object) { + JSONObject jsonObject = getstrObj("jsonStr", object); + //校验是否有servecr传参 + if (!checkData(jsonObject, "mdmCode")) { + return BaseResult.getFailureMessageEntity("请先传递服务名"); + } + if (!checkData(jsonObject, "data")) { + return BaseResult.getFailureMessageEntity("请先传递要修改的数据"); + } + JSONObject saveData = jsonObject.getJSONObject("data"); + //校验唯一 + MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); + mdmModuleEntity.setMdmCode(jsonObject.getLong("mdmCode")); + mdmModuleEntity.setSts("Y"); + List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); + if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + mdmModuleEntity = mdmModuleEntities.get(0); + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); + if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + String res = checkDataOnly(jsonObject.getInteger("mdmCode"), saveData, false, mdmModuleEntity, mdmModuleDbEntityList); + + if (res == null || "".equals(res)) { + return BaseResult.getSuccessMessageEntity("保存数据成功"); + } else { + return BaseResult.getFailureMessageEntity(res); + } + } // // - // return BaseResult.getSuccessMessageEntity("获取数据成功", jsonObject); - //} - // - // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情数据修改 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity updateMdmShowDetailsData(JSONObject object) { - // JSONObject jsonObject = getstrObj("jsonStr", object); - // //校验是否有servecr传参 - // if (!checkData(jsonObject, "mdmCode")) { - // return BaseResult.getFailureMessageEntity("请先传递服务名"); - // } - // if (!checkData(jsonObject, "data")) { - // return BaseResult.getFailureMessageEntity("请先传递要修改的数据"); - // } - // JSONObject saveData = jsonObject.getJSONObject("data"); - // //校验唯一 - // MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); - // mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode")); - // mdmModuleEntity.setSts("Y"); - // List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); - // if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // mdmModuleEntity = mdmModuleEntities.get(0); - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbEntity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); - // if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // String res = checkDataOnly(jsonObject.getInteger("mdmCode"), saveData, true, mdmModuleEntity, mdmModuleDbEntityList); - // - // if (res == null || "".equals(res)) { - // return BaseResult.getSuccessMessageEntity("修改数据成功"); - // } else { - // return BaseResult.getFailureMessageEntity(res); - // } - //} - // - // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情数据新增 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity saveMdmShowDetailsData(JSONObject object) { - // JSONObject jsonObject = getstrObj("jsonStr", object); - // //校验是否有servecr传参 - // if (!checkData(jsonObject, "mdmCode")) { - // return BaseResult.getFailureMessageEntity("请先传递服务名"); - // } - // if (!checkData(jsonObject, "data")) { - // return BaseResult.getFailureMessageEntity("请先传递要修改的数据"); - // } - // JSONObject saveData = jsonObject.getJSONObject("data"); - // //校验唯一 - // MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); - // mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode")); - // mdmModuleEntity.setSts("Y"); - // List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); - // if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // mdmModuleEntity = mdmModuleEntities.get(0); - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbEntity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); - // if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // String res = checkDataOnly(jsonObject.getInteger("mdmCode"), saveData, false, mdmModuleEntity, mdmModuleDbEntityList); - // - // if (res == null || "".equals(res)) { - // return BaseResult.getSuccessMessageEntity("保存数据成功"); - // } else { - // return BaseResult.getFailureMessageEntity(res); - // } - //} - // - // - ///** - // * @param object - // * @return com.hzya.frame.web.entity.JsonResultEntity - // * @Author lvleigang - // * @Description 主数据详情数据修改 - // * @Date 9:40 上午 2023/10/18 - // **/ - //@Override - //public JsonResultEntity deleteMdmShowDetailsData(JSONObject object) { - // JSONObject jsonObject = getstrObj("jsonStr", object); - // //校验是否有servecr传参 - // if (!checkData(jsonObject, "mdmCode")) { - // return BaseResult.getFailureMessageEntity("请先传递服务名"); - // } - // if (!checkData(jsonObject, "id")) { - // return BaseResult.getFailureMessageEntity("请先传递要删除的数据"); - // } - // //校验唯一 - // MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); - // mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode")); - // mdmModuleEntity.setSts("Y"); - // List mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity); - // if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // mdmModuleEntity = mdmModuleEntities.get(0); - // MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); - // mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbEntity.setSts("Y"); - // List mdmModuleDbEntityList = mdmModuleDbDao.queryBase(mdmModuleDbEntity); - // if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { - // if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // - // //查询视图，如果树形，删除下级及子集 - // //查询展示类型 - // MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity(); - // mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleViewEntity.setSts("Y"); - // List moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity); - // if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) { - // return BaseResult.getFailureMessageEntity("系统错误"); - // } - // mdmModuleViewEntity = moduleViewEntityList.get(0); - // - // - // //删除自己 - // FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto(); - // formmainDeleteDto.setId(jsonObject.getString("id")); - // formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString()); - // formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); - // if (mdmModuleViewEntity != null && mdmModuleViewEntity.getViewName() != null && "1".equals(mdmModuleViewEntity.getViewName()) && - // mdmModuleViewEntity.getUpIdFiled() != null && !"".equals(mdmModuleViewEntity.getUpIdFiled())) { - // formmainDeleteDto.setUpIdFiled(mdmModuleViewEntity.getUpIdFiled()); - // - // Map queryData = new HashMap<>(); - // queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名 - // queryData.put("detailFlag", false);//是否明细 - // queryData.put("id", jsonObject.getString("id"));//字段 - // HashMap datas = mdmModuleDbDao.getServiceDataById(queryData); - // String upValue = null; - // if (datas != null && datas.get(mdmModuleViewEntity.getUpIdFiled()) != null) { - // upValue = datas.get(mdmModuleViewEntity.getUpIdFiled()).toString(); - // } - // if (upValue != null) { - // formmainDeleteDto.setUpIdFiledValue(upValue + "," + jsonObject.getString("id")); - // } else { - // formmainDeleteDto.setUpIdFiledValue(jsonObject.getString("id")); - // } - // mdmModuleDao.deleteChilder(formmainDeleteDto); - // } - // mdmModuleDao.deleteTemplateById(formmainDeleteDto); - // - // } else { - // //删除明细 - // FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto(); - // formmainDeleteDto.setFormmain_id(jsonObject.getString("id")); - // formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString()); - // formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); - // mdmModuleDao.deleteTemplateById(formmainDeleteDto); - // } - // } - // return BaseResult.getSuccessMessageEntity("删除数据成功"); - //} + /** + * @param object + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 主数据详情数据修改 + * @Date 9:40 上午 2023/10/18 + **/ + @Override + public JsonResultEntity deleteMdmShowDetailsData(JSONObject object) { + JSONObject jsonObject = getstrObj("jsonStr", object); + //校验是否有servecr传参 + if (!checkData(jsonObject, "mdmCode")) { + return BaseResult.getFailureMessageEntity("请先传递服务名"); + } + if (!checkData(jsonObject, "id")) { + return BaseResult.getFailureMessageEntity("请先传递要删除的数据"); + } + //校验唯一 + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(jsonObject.getLong("mdmCode")); + if (mdmModuleEntity == null ) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbEntity.setSts("Y"); + List mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { + + //查询视图，如果树形，删除下级及子集 + //查询展示类型 + MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity(); + mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleViewEntity.setSts("Y"); + List moduleViewEntityList = mdmServiceCache.queryMdmModuleView(mdmModuleViewEntity); + if (moduleViewEntityList == null || moduleViewEntityList.size() != 1) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + mdmModuleViewEntity = moduleViewEntityList.get(0); + + + //删除自己 + FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto(); + formmainDeleteDto.setId(jsonObject.getString("id")); + formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString()); + formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); + if (mdmModuleViewEntity != null && mdmModuleViewEntity.getViewName() != null && "1".equals(mdmModuleViewEntity.getViewName()) && + mdmModuleViewEntity.getUpIdFiled() != null && !"".equals(mdmModuleViewEntity.getUpIdFiled())) { + formmainDeleteDto.setUpIdFiled(mdmModuleViewEntity.getUpIdFiled()); + + Map queryData = new HashMap<>(); + queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名 + queryData.put("detailFlag", false);//是否明细 + queryData.put("id", jsonObject.getString("id"));//字段 + HashMap datas = mdmModuleDbDao.getServiceDataById(queryData); + String upValue = null; + if (datas != null && datas.get(mdmModuleViewEntity.getUpIdFiled()) != null) { + upValue = datas.get(mdmModuleViewEntity.getUpIdFiled()).toString(); + } + if (upValue != null) { + formmainDeleteDto.setUpIdFiledValue(upValue + "," + jsonObject.getString("id")); + } else { + formmainDeleteDto.setUpIdFiledValue(jsonObject.getString("id")); + } + mdmModuleDao.deleteChilder(formmainDeleteDto); + } + mdmModuleDao.deleteTemplateById(formmainDeleteDto); + + } else { + //删除明细 + FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto(); + formmainDeleteDto.setFormmain_id(jsonObject.getString("id")); + formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString()); + formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); + mdmModuleDao.deleteTemplateById(formmainDeleteDto); + } + } + return BaseResult.getSuccessMessageEntity("删除数据成功"); + } // // ///** @@ -3790,267 +3877,282 @@ public class MdmServiceImpl implements IMdmService { // //} // - ///** - // * @param mdmCode - // * @param saveData - // * @param mdmModuleEntity - // * @param mdmModuleDbEntityList - // * @param flag 修改 新增 - // * @return java.lang.String - // * @Author lvleigang - // * @Description 校验数据 - // * @Date 11:20 上午 2023/11/6 - // **/ - //private String checkDataOnly(Integer mdmCode, JSONObject saveData, boolean flag, MdmModuleEntity mdmModuleEntity, List mdmModuleDbEntityList) { - // StringBuffer str = new StringBuffer(); - // - // //查询字段 - // //查询字段下的必填规则 - // MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); - // mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbFiledsEntity.setSts("Y"); - // mdmModuleDbFiledsEntity.setRoletype("required"); - // mdmModuleDbFiledsEntity.setRoleValue("true"); - // List mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity); - // - // if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { - // for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { - // if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName()); - // for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { - // if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) { - // if (jsonObject.get(mdmModuleDbFiledsEntityList.get(i1).getEnName()) == null || "".equals(jsonObject.getString(mdmModuleDbFiledsEntityList.get(i1).getEnName()))) { - // if (str.toString() != null && !"".equals(str.toString())) { - // str.append("；"); - // } - // str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "不为空"); - // } - // } - // } - // } else { - // JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName()); - // if (jsonArray != null && jsonArray.size() > 0) { - // for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { - // if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) { - // for (int i2 = 0; i2 < jsonArray.size(); i2++) { - // JSONObject jsonObject = jsonArray.getJSONObject(i2); - // if (jsonObject.get(mdmModuleDbFiledsEntityList.get(i1).getEnName()) == null || "".equals(jsonObject.getString(mdmModuleDbFiledsEntityList.get(i1).getEnName()))) { - // if (str.toString() != null && !"".equals(str.toString())) { - // str.append("；"); - // } - // str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "不为空"); - // break; - // } - // } - // } - // } - // } - // } - // } - // } - // - // if (str == null || "".equals(str.toString())) { - // //校验数据 - // MdmModuleDbFiledsEntity onlyFiledsEntity = new MdmModuleDbFiledsEntity(); - // onlyFiledsEntity.setMdmId(mdmModuleEntity.getId()); - // onlyFiledsEntity.setSts("Y"); - // onlyFiledsEntity.setRoletype("fieldsSole"); - // onlyFiledsEntity.setRoleValue("true"); - // - // List onlyEntityList = mdmModuleDbFiledsDao.queryBase(onlyFiledsEntity); - // - // if (onlyEntityList != null && onlyEntityList.size() > 0) { - // for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { - // if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName()); - // for (int i1 = 0; i1 < onlyEntityList.size(); i1++) { - // if (onlyEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) { - // //校验唯一 - // Map map = new HashMap<>(); - // map.put("tableName", mdmModuleDbEntityList.get(i).getDbName()); - // if (flag) { - // map.put("id", jsonObject.getString("id")); - // } - // map.put("filedName", onlyEntityList.get(i1).getEnName()); - // map.put("filedValue", jsonObject.getString(onlyEntityList.get(i1).getEnName())); - // Integer count = mdmModuleDao.checkData(map); - // if (count > 0) { - // if (str.toString() != null && !"".equals(str.toString())) { - // str.append("；"); - // } - // str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "已存在"); - // } - // } - // } - // } else { - // JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName()); - // if (jsonArray != null && jsonArray.size() > 0) { - // for (int i1 = 0; i1 < onlyEntityList.size(); i1++) { - // if (onlyEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) { - // for (int i2 = 0; i2 < jsonArray.size(); i2++) { - // JSONObject jsonObject = jsonArray.getJSONObject(i2); - // - // //校验唯一 - // Map map = new HashMap<>(); - // map.put("tableName", mdmModuleDbEntityList.get(i).getDbName()); - // if (flag) { - // map.put("id", jsonObject.getString("id")); - // } - // map.put("filedName", onlyEntityList.get(i1).getEnName()); - // map.put("filedValue", jsonObject.getString(onlyEntityList.get(i1).getEnName())); - // Integer count = mdmModuleDao.checkData(map); - // if (count > 0) { - // if (str.toString() != null && !"".equals(str.toString())) { - // str.append("；"); - // } - // str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "已存在"); - // break; - // } - // } - // } - // } - // } - // } - // } - // } - // } - // - // - // //保存数据 - // if (str == null || "".equals(str.toString())) { - // String id = UUIDUtils.getUUID(); - // for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { - // if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName()); - // //保存数据 - // MdmDataDto mdmDataDto = new MdmDataDto(); - // mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); - // MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity(); - // mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbFiledsEntity1.setDbId(mdmModuleDbEntityList.get(i).getId()); - // mdmModuleDbFiledsEntity1.setSts("Y"); - // List fileds = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity1); - // //查询单据规则 - // MdmTableCodeRuleEntity mdmTableCodeRuleEntity = new MdmTableCodeRuleEntity(); - // mdmTableCodeRuleEntity.setMdmId(mdmModuleEntity.getId()); - // mdmTableCodeRuleEntity.setDbId(mdmModuleDbEntityList.get(i).getId()); - // mdmTableCodeRuleEntity.setSts("Y"); - // List mdmTableCodeRuleEntities = mdmTableCodeRuleDao.queryBase(mdmTableCodeRuleEntity); - // StringBuffer document_rule = new StringBuffer(); - // Integer document_rule_num = 0; - // if (mdmTableCodeRuleEntities != null && mdmTableCodeRuleEntities.size() > 0) { - // for (int i1 = 0; i1 < mdmTableCodeRuleEntities.size(); i1++) { - // //1、连接符号 2、字符串 3、日期 4、流水号 - // if ("1".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) { - // document_rule.append("-"); - // } else if ("2".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) { - // document_rule.append(mdmTableCodeRuleEntities.get(i1).getDbValue()); - // } else if ("3".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) { - // SimpleDateFormat sdf = new SimpleDateFormat(mdmTableCodeRuleEntities.get(i1).getDbValue());//要转换的时间格式 - // String stra = sdf.format(new Date()); - // document_rule.append(stra); - // } else if ("4".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) { - // document_rule_num = mdmTableCodeRuleEntities.get(i1).getDbValue().length(); - // } - // } - // } - // List mdmDataFiledDtos = new ArrayList<>(); - // for (int i1 = 0; i1 < fileds.size(); i1++) { - // if (jsonObject.get(fileds.get(i1).getEnName()) != null) { - // MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); - // mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName()); - // mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName())); - // mdmDataFiledDtos.add(mdmDataFiledDto); - // } - // } - // MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); - // mdmDataFiledDto.setFiledsName("logid"); - // mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString()); - // mdmDataFiledDtos.add(mdmDataFiledDto); - // mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); - // if (flag) { - // mdmDataDto.setId(jsonObject.getString("id")); - // id = jsonObject.getString("id"); - // int a = mdmModuleDao.updateForm(mdmDataDto); - // } else { - // - // mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType()); - // mdmDataDto.setDocumentRule(document_rule.toString()); - // mdmDataDto.setDocumentRuleNum(document_rule_num); - // MdmDataFiledDto ids = new MdmDataFiledDto(); - // ids.setFiledsName("id"); - // ids.setFiledsValue(id); - // mdmDataFiledDtos.add(ids); - // mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); - // int a = mdmModuleDao.saveForm(mdmDataDto); - // } - // } - // } - // - // for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { - // if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) { - // //删除明细 - // FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto(); - // formmainDeleteDto.setFormmain_id(id); - // formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString()); - // formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); - // mdmModuleDao.deleteTemplateById(formmainDeleteDto); - // - // JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName()); - // if (jsonArray != null && jsonArray.size() > 0) { - // MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity(); - // mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId()); - // mdmModuleDbFiledsEntity1.setDbId(mdmModuleDbEntityList.get(i).getId()); - // mdmModuleDbFiledsEntity1.setSts("Y"); - // List fileds = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity1); - // - // for (int i2 = 0; i2 < jsonArray.size(); i2++) { - // JSONObject jsonObject = jsonArray.getJSONObject(i2); - // //保存数据 - // MdmDataDto mdmDataDto = new MdmDataDto(); - // mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); - // List mdmDataFiledDtos = new ArrayList<>(); - // for (int i1 = 0; i1 < fileds.size(); i1++) { - // MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); - // mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName()); - // mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName())); - // mdmDataFiledDtos.add(mdmDataFiledDto); - // } - // MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); - // mdmDataFiledDto.setFiledsName("logid"); - // mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString()); - // mdmDataFiledDtos.add(mdmDataFiledDto); - // - // MdmDataFiledDto formain_id = new MdmDataFiledDto(); - // formain_id.setFiledsName("formmain_id"); - // formain_id.setFiledsValue(id); - // mdmDataFiledDtos.add(formain_id); - // - // mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); - // if (jsonObject.getString("id") != null) { - // MdmDataFiledDto sts = new MdmDataFiledDto(); - // sts.setFiledsName("sts"); - // sts.setFiledsValue("Y"); - // mdmDataFiledDtos.add(sts); - // mdmDataDto.setId(jsonObject.getString("id")); - // int a = mdmModuleDao.updateForm(mdmDataDto); - // } else { - // MdmDataFiledDto ids = new MdmDataFiledDto(); - // ids.setFiledsName("id"); - // ids.setFiledsValue(UUIDUtils.getUUID()); - // mdmDataFiledDtos.add(ids); - // mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); - // mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType()); - // int a = mdmModuleDao.saveForm(mdmDataDto); - // } - // } - // } - // } - // } - // } - // return str.toString(); - //} - // + /** + * @param mdmCode + * @param saveData + * @param mdmModuleEntity + * @param mdmModuleDbEntityList + * @param flag 修改 新增 + * @return java.lang.String + * @Author lvleigang + * @Description 校验数据 + * @Date 11:20 上午 2023/11/6 + **/ + private String checkDataOnly(Integer mdmCode, JSONObject saveData, boolean flag, MdmModuleEntity mdmModuleEntity, List mdmModuleDbEntityList) { + StringBuffer str = new StringBuffer(); + + //查询字段 + //查询字段下的必填规则 + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbFiledsEntity.setSts("Y"); + mdmModuleDbFiledsEntity.setRoletype("required"); + mdmModuleDbFiledsEntity.setRoleValue("true"); + List mdmModuleDbFiledsEntityList = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity); + + if (mdmModuleDbFiledsEntityList != null && mdmModuleDbFiledsEntityList.size() > 0) { + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { + JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName()); + for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { + if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) { + if (jsonObject.get(mdmModuleDbFiledsEntityList.get(i1).getEnName()) == null || "".equals(jsonObject.getString(mdmModuleDbFiledsEntityList.get(i1).getEnName()))) { + if (str.toString() != null && !"".equals(str.toString())) { + str.append("；"); + } + str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "不为空"); + } + } + } + } else { + JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName()); + if (jsonArray != null && jsonArray.size() > 0) { + for (int i1 = 0; i1 < mdmModuleDbFiledsEntityList.size(); i1++) { + if (mdmModuleDbFiledsEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) { + for (int i2 = 0; i2 < jsonArray.size(); i2++) { + JSONObject jsonObject = jsonArray.getJSONObject(i2); + if (jsonObject.get(mdmModuleDbFiledsEntityList.get(i1).getEnName()) == null || "".equals(jsonObject.getString(mdmModuleDbFiledsEntityList.get(i1).getEnName()))) { + if (str.toString() != null && !"".equals(str.toString())) { + str.append("；"); + } + str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "不为空"); + break; + } + } + } + } + } + } + } + } + + if (str == null || "".equals(str.toString())) { + //校验数据 + MdmModuleDbFiledsEntity onlyFiledsEntity = new MdmModuleDbFiledsEntity(); + onlyFiledsEntity.setMdmId(mdmModuleEntity.getId()); + onlyFiledsEntity.setSts("Y"); + onlyFiledsEntity.setRoletype("fieldsSole"); + onlyFiledsEntity.setRoleValue("true"); + + List onlyEntityList = mdmModuleDbFiledsDao.queryBase(onlyFiledsEntity); + + if (onlyEntityList != null && onlyEntityList.size() > 0) { + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { + JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName()); + for (int i1 = 0; i1 < onlyEntityList.size(); i1++) { + if (onlyEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) { + //校验唯一 + Map map = new HashMap<>(); + map.put("tableName", mdmModuleDbEntityList.get(i).getDbName()); + if (flag) { + map.put("id", jsonObject.getString("id")); + } + map.put("filedName", onlyEntityList.get(i1).getEnName()); + map.put("filedValue", jsonObject.getString(onlyEntityList.get(i1).getEnName())); + Integer count = mdmModuleDao.checkData(map); + if (count > 0) { + if (str.toString() != null && !"".equals(str.toString())) { + str.append("；"); + } + str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "已存在"); + } + } + } + } else { + JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName()); + if (jsonArray != null && jsonArray.size() > 0) { + for (int i1 = 0; i1 < onlyEntityList.size(); i1++) { + if (onlyEntityList.get(i1).getDbId().equals(mdmModuleDbEntityList.get(i).getId())) { + for (int i2 = 0; i2 < jsonArray.size(); i2++) { + JSONObject jsonObject = jsonArray.getJSONObject(i2); + + //校验唯一 + Map map = new HashMap<>(); + map.put("tableName", mdmModuleDbEntityList.get(i).getDbName()); + if (flag) { + map.put("id", jsonObject.getString("id")); + } + map.put("filedName", onlyEntityList.get(i1).getEnName()); + map.put("filedValue", jsonObject.getString(onlyEntityList.get(i1).getEnName())); + Integer count = mdmModuleDao.checkData(map); + if (count > 0) { + if (str.toString() != null && !"".equals(str.toString())) { + str.append("；"); + } + str.append(mdmModuleDbEntityList.get(i).getRemark() + "的" + mdmModuleDbFiledsEntityList.get(i1).getChName() + "已存在"); + break; + } + } + } + } + } + } + } + } + } + + + //保存数据 + if (str == null || "".equals(str.toString())) { + String id = UUIDUtils.getUUID(); + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) { + JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName()); + //保存数据 + MdmDataDto mdmDataDto = new MdmDataDto(); + mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbFiledsEntity1.setDbId(mdmModuleDbEntityList.get(i).getId()); + mdmModuleDbFiledsEntity1.setSts("Y"); + List fileds = mdmModuleDbFiledsDao.queryBase(mdmModuleDbFiledsEntity1); + //查询单据规则 + MdmTableCodeRuleEntity mdmTableCodeRuleEntity = new MdmTableCodeRuleEntity(); + mdmTableCodeRuleEntity.setMdmId(mdmModuleEntity.getId()); + mdmTableCodeRuleEntity.setDbId(mdmModuleDbEntityList.get(i).getId()); + mdmTableCodeRuleEntity.setSts("Y"); + List allMdmTableCodeRuleEntities = mdmServiceCache.queryMdmTableCodeRuleEntity(mdmTableCodeRuleEntity); + List mdmTableCodeRuleEntities = new ArrayList<>(); + if(allMdmTableCodeRuleEntities != null && allMdmTableCodeRuleEntities.size() > 0){ + for (int i1 = 0; i1 < allMdmTableCodeRuleEntities.size(); i1++) { + if(mdmModuleDbEntityList.get(i).getId().equals(allMdmTableCodeRuleEntities.get(i1).getDbId())){ + mdmTableCodeRuleEntities.add(allMdmTableCodeRuleEntities.get(i1)); + } + } + } + StringBuffer document_rule = new StringBuffer(); + Integer document_rule_num = 0; + if (mdmTableCodeRuleEntities != null && mdmTableCodeRuleEntities.size() > 0) { + for (int i1 = 0; i1 < mdmTableCodeRuleEntities.size(); i1++) { + //1、连接符号 2、字符串 3、日期 4、流水号 + if ("1".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) { + document_rule.append("-"); + } else if ("2".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) { + document_rule.append(mdmTableCodeRuleEntities.get(i1).getDbValue()); + } else if ("3".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) { + SimpleDateFormat sdf = new SimpleDateFormat(mdmTableCodeRuleEntities.get(i1).getDbValue());//要转换的时间格式 + String stra = sdf.format(new Date()); + document_rule.append(stra); + } else if ("4".equals(mdmTableCodeRuleEntities.get(i1).getDbType())) { + document_rule_num = mdmTableCodeRuleEntities.get(i1).getDbValue().length(); + } + } + } + List mdmDataFiledDtos = new ArrayList<>(); + for (int i1 = 0; i1 < fileds.size(); i1++) { + if (jsonObject.get(fileds.get(i1).getEnName()) != null) { + MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); + mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName()); + mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName())); + mdmDataFiledDtos.add(mdmDataFiledDto); + } + } + MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); + mdmDataFiledDto.setFiledsName("logid"); + mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString()); + mdmDataFiledDtos.add(mdmDataFiledDto); + mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); + if (flag) { + mdmDataDto.setId(jsonObject.getString("id")); + id = jsonObject.getString("id"); + int a = mdmModuleDao.updateForm(mdmDataDto); + } else { + + mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType()); + mdmDataDto.setDocumentRule(document_rule.toString()); + mdmDataDto.setDocumentRuleNum(document_rule_num); + MdmDataFiledDto ids = new MdmDataFiledDto(); + ids.setFiledsName("id"); + ids.setFiledsValue(id); + mdmDataFiledDtos.add(ids); + mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); + int a = mdmModuleDao.saveForm(mdmDataDto); + } + } + } + + for (int i = 0; i < mdmModuleDbEntityList.size(); i++) { + if ("2".equals(mdmModuleDbEntityList.get(i).getDbType())) { + //删除明细 + FormmainDeleteDto formmainDeleteDto = new FormmainDeleteDto(); + formmainDeleteDto.setFormmain_id(id); + formmainDeleteDto.setLoginId(StpUtil.getLoginIdAsString()); + formmainDeleteDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); + mdmModuleDao.deleteTemplateById(formmainDeleteDto); + + JSONArray jsonArray = saveData.getJSONArray(mdmModuleDbEntityList.get(i).getDbName()); + if (jsonArray != null && jsonArray.size() > 0) { + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId()); + mdmModuleDbFiledsEntity1.setSts("Y"); + List allfileds = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity1); + List fileds = new ArrayList<>(); + if(allfileds != null && allfileds.size() > 0){ + for (int i1 = 0; i1 < allfileds.size(); i1++) { + if(mdmModuleDbEntityList.get(i).getId().equals(allfileds.get(i1).getDbId())){ + fileds.add(allfileds.get(i1)); + } + } + } + + for (int i2 = 0; i2 < jsonArray.size(); i2++) { + JSONObject jsonObject = jsonArray.getJSONObject(i2); + //保存数据 + MdmDataDto mdmDataDto = new MdmDataDto(); + mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName()); + List mdmDataFiledDtos = new ArrayList<>(); + for (int i1 = 0; i1 < fileds.size(); i1++) { + MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); + mdmDataFiledDto.setFiledsName(fileds.get(i1).getEnName()); + mdmDataFiledDto.setFiledsValue(jsonObject.getString(fileds.get(i1).getEnName())); + mdmDataFiledDtos.add(mdmDataFiledDto); + } + MdmDataFiledDto mdmDataFiledDto = new MdmDataFiledDto(); + mdmDataFiledDto.setFiledsName("logid"); + mdmDataFiledDto.setFiledsValue(StpUtil.getLoginIdAsString()); + mdmDataFiledDtos.add(mdmDataFiledDto); + + MdmDataFiledDto formain_id = new MdmDataFiledDto(); + formain_id.setFiledsName("formmain_id"); + formain_id.setFiledsValue(id); + mdmDataFiledDtos.add(formain_id); + + mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); + if (jsonObject.getString("id") != null) { + MdmDataFiledDto sts = new MdmDataFiledDto(); + sts.setFiledsName("sts"); + sts.setFiledsValue("Y"); + mdmDataFiledDtos.add(sts); + mdmDataDto.setId(jsonObject.getString("id")); + int a = mdmModuleDao.updateForm(mdmDataDto); + } else { + MdmDataFiledDto ids = new MdmDataFiledDto(); + ids.setFiledsName("id"); + ids.setFiledsValue(UUIDUtils.getUUID()); + mdmDataFiledDtos.add(ids); + mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos); + mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType()); + int a = mdmModuleDao.saveForm(mdmDataDto); + } + } + } + } + } + } + return str.toString(); + } + /** * @param jsonObject From 3a9fcceb61cae8b85e238a8c390c40e2dc7471d5 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Fri, 7 Jun 2024 11:26:18 +0800 Subject: [PATCH 16/44] =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdmModuleSource/dao/IMdmModuleSourceDao.java | 14 +++++++++++++- .../dao/impl/MdmModuleSourceDaoImpl.java | 13 ++++++++++++- .../entity/MdmModuleSourceEntity.xml | 9 +++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java index bde093e6..cc3b08c8 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java @@ -1,7 +1,9 @@ package com.hzya.frame.mdm.mdmModuleSource.dao; import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; /** * 主数据数据来源(mdm_module_source: table)表数据库访问层 @@ -10,6 +12,16 @@ import com.hzya.frame.basedao.dao.IBaseDao; * @since 2024-06-05 11:42:56 */ public interface IMdmModuleSourceDao extends IBaseDao { + + /** + * + * @content 根据数据来源内类型是插件的应用类型做分组 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/6 10:43 + * **/ + List MdmModuleSourceentityGroupByType(); } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java index 5be355b3..b7cc9034 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java @@ -4,6 +4,9 @@ import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; import com.hzya.frame.mdm.mdmModuleSource.dao.IMdmModuleSourceDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + /** * 主数据数据来源(MdmModuleSource)表数据库访问层 * @@ -12,6 +15,14 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; */ @Repository(value = "MdmModuleSourceDaoImpl") public class MdmModuleSourceDaoImpl extends MybatisGenericDao implements IMdmModuleSourceDao{ - + //根据数据来源内类型是插件的应用类型做分组 + @Override + public List MdmModuleSourceentityGroupByType() { + List list =(List) super.selectList(getSqlIdPrifx() + "MdmModuleSourceentityGroupByType", ""); + return list; + } + + + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml index df21034b..6476ebba 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml @@ -131,6 +131,15 @@ order by ${sort} ${order} + + + insert into mdm_module_source( From 3489a1e274eb06624531fa50c72c838fce425906 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Fri, 7 Jun 2024 16:57:42 +0800 Subject: [PATCH 17/44] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/webapp/entrance/service/impl/EntranceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java index 093550aa..86d047b0 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java @@ -235,7 +235,7 @@ public class EntranceServiceImpl implements IEntranceService { public Object platformInterface(ServletRequest servletRequest, ServletResponse servletResponse) throws InvocationTargetException, IllegalAccessException { HttpServletRequest request = (HttpServletRequest) servletRequest; //tailuo 要访问的Bean名称 - String service = request.getHeader("tl"); + String service = request.getHeader("yatl"); //bean方法 String serviceMethod = request.getHeader("yadj"); String body = ServletUtil.getBody(servletRequest); From 875470a326ac9f6082854024e35a8252dd78cc5a Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 11 Jun 2024 09:00:19 +0800 Subject: [PATCH 18/44] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=8F=92=E4=BB=B6=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdmModuleSource/entity/MdmModuleSourceEntity.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml index 6476ebba..245446f4 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml @@ -132,12 +132,11 @@ - + select plugin_code,plugin_name,source_name,source_code + from mdm_module_source source + left join sys_application_plugin plug on plug.id=source.source_code + where source_type='1' and source.sts='Y' and plug.sts='Y' From 239e037d8830c3d28fa232075759a9797c1d9652 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 11 Jun 2024 09:55:44 +0800 Subject: [PATCH 19/44] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=8F=92=E4=BB=B6=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../masterData/dao/IMasterDataDao.java | 23 +++ .../dao/impl/MasterDataDaoImpl.java | 31 ++++ .../service/IMasterDataOrgsService.java | 19 +++ .../service/IMasterDataProjectService.java | 19 +++ .../impl/MasterDataOrgsServiceImpl.java | 138 ++++++++++++++++++ .../impl/MasterDataProjectServiceImpl.java | 132 +++++++++++++++++ 6 files changed, 362 insertions(+) create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/IMasterDataDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/impl/MasterDataDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataOrgsService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataProjectService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataProjectServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/IMasterDataDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/IMasterDataDao.java new file mode 100644 index 00000000..8fb8ce73 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/IMasterDataDao.java @@ -0,0 +1,23 @@ +package com.hzya.frame.sysnew.comparison.masterData.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; + +import java.util.HashMap; +import java.util.List; + +public interface IMasterDataDao extends IBaseService { + + + /** + * + * @content 查询U8C档案 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/6 11:56 + * **/ + @DS("swu8c") + List> queryArchives(String str); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/impl/MasterDataDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/impl/MasterDataDaoImpl.java new file mode 100644 index 00000000..ad9f3588 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/dao/impl/MasterDataDaoImpl.java @@ -0,0 +1,31 @@ +package com.hzya.frame.sysnew.comparison.masterData.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.execsql.service.IExecSqlService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.sysnew.comparison.masterData.dao.IMasterDataDao; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.List; + +@Repository(value = "masterDataDaoImpl") +public class MasterDataDaoImpl extends BaseService implements IMasterDataDao { + + @Autowired + private IExecSqlService execSqlService; + + @DS("swu8c") + @Override + public List> queryArchives(String str) { + try { + List> hashMaps = execSqlService.execSelectSql(str, ""); + return hashMaps; + }catch (Exception e){ + logger.info("U8C主数据档案用户档案没有需要同步中台的数据"); + return null; + } + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataOrgsService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataOrgsService.java new file mode 100644 index 00000000..1e08f408 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataOrgsService.java @@ -0,0 +1,19 @@ +package com.hzya.frame.sysnew.comparison.masterData.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface IMasterDataOrgsService extends IBaseService { + /** + * + * @content 查询组织档案 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/4 16:57 + * **/ + JsonResultEntity queryOrgsArchives(JSONObject jsonObject); + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataProjectService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataProjectService.java new file mode 100644 index 00000000..6b6799c1 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataProjectService.java @@ -0,0 +1,19 @@ +package com.hzya.frame.sysnew.comparison.masterData.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.web.entity.JsonResultEntity; + +public interface IMasterDataProjectService extends IBaseService { + + /** + * + * @content 查询项目档案 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/6 16:10 + * **/ + JsonResultEntity queryProjectArchives(JSONObject jsonObject); +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java new file mode 100644 index 00000000..c6fe35a5 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java @@ -0,0 +1,138 @@ +package com.hzya.frame.sysnew.comparison.masterData.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.dateutil.DateUtil; +import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.sysnew.comparison.masterData.dao.impl.MasterDataDaoImpl; +import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataOrgsService; +import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataProjectService; +import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +@Service("masterDataOrgsServiceImpl") +public class MasterDataOrgsServiceImpl extends BaseService implements IMasterDataOrgsService { + + @Autowired + private MasterDataDaoImpl masterDataDaoImpl; + @Autowired + private ComparisonServiceImpl comparisonServiceimpl; + @Autowired + private MdmModuleSourceDaoImpl mdmModuleSourceDaoImpl; + + private String ts = ""; + //查询用户档案并同步中台 + @Override + public JsonResultEntity queryOrgsArchives(JSONObject json) { + JSONObject jsonObject = json.getJSONObject("jsonStr"); + //查询主数据来源表，根据来源类型为插件得进行分类，获取来源名称和编码 + List list = mdmModuleSourceDaoImpl.MdmModuleSourceentityGroupByType(); + if (CollectionUtils.isEmpty(list)) { + logger.info("数据来源表中没有类型为插件得数据,无法获取来源名称和来源编码"); + return BaseResult.getFailureMessageEntity("数据来源表无插件类型"); + } + for (MdmModuleSourceEntity mdmModuleSourceEntity : list) { + //此处应该根据来源编码进行case ，暂时测试使用U8C + switch (mdmModuleSourceEntity.getPluginCode()) { + case "MdmOrgPlugin": + if (null == ts || "".equals(ts)) { + ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss"); + } + ts = "'" + ts + "'"; + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select pk_corp as id,unitcode as org_code,unitname as org_name,"); + stringBuffer.append("saleaddr as org_address,countryarea as org_countryzone,memo as org_memo,"); + stringBuffer.append("industry as org_ncindustry,fathercorp as org_fatherorg,legalbodycode as org_principal,"); + stringBuffer.append("phone1 as org_tel from bd_corp where dr='0' and ts>"+ts); + try { + List> hashMaps = masterDataDaoImpl.queryArchives(stringBuffer.toString()); + logger.info("查询出来的值为:{}",hashMaps); + if (null != hashMaps && hashMaps.size() > 0) { + ParametricAssembly(mdmModuleSourceEntity,hashMaps,"10001"); + } else { + logger.info("U8C主数据档案组织档案没有需要同步中台的数据"); + return null; + } + } catch (Exception e) { + logger.info("查询主数据档案组织档案错误:{}", e.getMessage()); + } + break; + default: + break; + } + } + return BaseResult.getSuccessMessageEntity("组织档案同步成功"); + } + + + + + + //查询档案参数组装 + private void ParametricAssembly(MdmModuleSourceEntity mdmModuleSourceEntity,List> hashMaps,String mdmCode){ + for (HashMap hashMap : hashMaps) { + JSONObject jsonObjectUser = new JSONObject(); + JSONObject jsonStr = new JSONObject(); + jsonObjectUser.put("id", hashMap.get("id")); + jsonObjectUser.put("mdmCode", mdmCode); + jsonStr.put("jsonStr", jsonObjectUser); + //先查询编码和名称查询是否存在 + JsonResultEntity jsonResultEntity = comparisonServiceimpl.queryEntityPage(jsonStr); + Object attribute = jsonResultEntity.getAttribute(); + logger.info("得到的attribute值为：{}", attribute); + JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute); + JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list"); + //如果jsonArrayList为null，说明没有值，在表中不存在 + if (jsonArrayList == null || jsonArrayList.size() == 0) { + //将查询出来得数据调用通用接口新增，保存到表中 + JSONObject main = new JSONObject(); + for(String key:hashMap.keySet()) { + main.put(key, hashMap.get(key)); + } + jsonObjectUser.put("main", main); + jsonObjectUser.put("sourceName",mdmModuleSourceEntity.getSourceName()); + jsonObjectUser.put("code",mdmModuleSourceEntity.getSourceCode()); + jsonObjectUser.put("optionName", "数智中台"); + jsonStr.put("jsonStr", jsonObjectUser); + try { + comparisonServiceimpl.saveEntity(jsonStr); + } catch (Exception e) { + logger.info("U8C主数据档案新增档案失败,失败原因:{}",e.getMessage()); + } + } else { + for (Object o : jsonArrayList) { + JSONObject jsonObjectUpdate = JSON.parseObject(String.valueOf(o)); + String id = jsonObjectUpdate.getString("id"); + JSONObject main = new JSONObject(); + for(String key:hashMap.keySet()) { + main.put(key, hashMap.get(key)); + main.put("id",id); + } + jsonObjectUser.put("main", main); + jsonObjectUser.put("sourceName",mdmModuleSourceEntity.getSourceName()); + jsonObjectUser.put("code",mdmModuleSourceEntity.getSourceCode()); + jsonObjectUser.put("optionName", "数智中台"); + jsonStr.put("jsonStr", jsonObjectUser); + try { + comparisonServiceimpl.updateEntity(jsonStr); + } catch (Exception e) { + logger.info("U8C主数据档案更新档案失败,失败原因:{}", e.getMessage()); + } + } + } + } + } + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataProjectServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataProjectServiceImpl.java new file mode 100644 index 00000000..a0f39bd0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataProjectServiceImpl.java @@ -0,0 +1,132 @@ +package com.hzya.frame.sysnew.comparison.masterData.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.dateutil.DateUtil; +import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; +import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; +import com.hzya.frame.sysnew.comparison.masterData.dao.impl.MasterDataDaoImpl; +import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataProjectService; +import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +@Service("masterDataProjectServiceImpl") +public class MasterDataProjectServiceImpl extends BaseService implements IMasterDataProjectService { + + @Autowired + private MasterDataDaoImpl masterDataDaoImpl; + @Autowired + private ComparisonServiceImpl comparisonServiceimpl; + @Autowired + private MdmModuleSourceDaoImpl mdmModuleSourceDaoImpl; + + private String ts = ""; + + //同步项目档案 + public JsonResultEntity queryProjectArchives(JSONObject json){ + JSONObject jsonObject = json.getJSONObject("jsonStr"); + //查询主数据来源表，根据来源类型为插件得进行分类，获取来源名称和编码 + List list = mdmModuleSourceDaoImpl.MdmModuleSourceentityGroupByType(); + if (CollectionUtils.isEmpty(list)) { + logger.info("数据来源表中没有类型为插件得数据,无法获取来源名称和来源编码"); + return BaseResult.getFailureMessageEntity("数据来源表无插件类型"); + } + for (MdmModuleSourceEntity mdmModuleSourceEntity : list) { + //此处应该根据来源编码进行case ，暂时测试使用U8C + switch (mdmModuleSourceEntity.getPluginCode()) { + case "MdmProjectPlugin": + if (null == ts || "".equals(ts)) { + ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss"); + } + ts = "'" + ts + "'"; + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select pk_jobbasfil as id,jobcode as project_code, jobname as project_name from bd_jobbasfil where dr='0' and ts>" + ts); + try { + List> hashMaps = masterDataDaoImpl.queryArchives(stringBuffer.toString()); + logger.info("查询出来的值为:{}",hashMaps); + if (null != hashMaps && hashMaps.size() > 0) { + ParametricAssembly(mdmModuleSourceEntity,hashMaps,"10002"); + } else { + logger.info("U8C主数据档案项目档案没有需要同步中台的数据"); + return null; + } + } catch (Exception e) { + logger.info("查询主数据档案项目档案错误:{}", e.getMessage()); + } + break; + default: + break; + } + } + return BaseResult.getSuccessMessageEntity("项目档案同步成功"); + } + + + //查询档案参数组装 + public JsonResultEntity ParametricAssembly(MdmModuleSourceEntity mdmModuleSourceEntity,List> hashMaps,String mdmCode){ + for (HashMap hashMap : hashMaps) { + JSONObject jsonObjectUser = new JSONObject(); + JSONObject jsonStr = new JSONObject(); + jsonObjectUser.put("id", hashMap.get("id")); + jsonObjectUser.put("mdmCode", mdmCode); + jsonStr.put("jsonStr", jsonObjectUser); + //先查询编码和名称查询是否存在 + JsonResultEntity jsonResultEntity = comparisonServiceimpl.queryEntityPage(jsonStr); + Object attribute = jsonResultEntity.getAttribute(); + logger.info("得到的attribute值为：{}", attribute); + JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute); + JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list"); + //如果jsonArrayList为null，说明没有值，在表中不存在 + if (jsonArrayList == null || jsonArrayList.size() == 0) { + //将查询出来得数据调用通用接口新增，保存到表中 + JSONObject main = new JSONObject(); + for(String key:hashMap.keySet()) { + main.put(key, hashMap.get(key)); + } + jsonObjectUser.put("main", main); + jsonObjectUser.put("sourceName",mdmModuleSourceEntity.getSourceName()); + jsonObjectUser.put("code",mdmModuleSourceEntity.getSourceCode()); + jsonObjectUser.put("optionName", "数智中台"); + jsonStr.put("jsonStr", jsonObjectUser); + try { + comparisonServiceimpl.saveEntity(jsonStr); + } catch (Exception e) { + logger.info("U8C主数据档案新增用户档案失败,失败原因:{}",e.getMessage()); + } + } else { + for (Object o : jsonArrayList) { + JSONObject jsonObjectUpdate = JSON.parseObject(String.valueOf(o)); + String id = jsonObjectUpdate.getString("id"); + JSONObject main = new JSONObject(); + for(String key:hashMap.keySet()) { + main.put(key, hashMap.get(key)); + main.put("id",id); + } + jsonObjectUser.put("main", main); + jsonObjectUser.put("sourceName",mdmModuleSourceEntity.getSourceName()); + jsonObjectUser.put("code",mdmModuleSourceEntity.getSourceCode()); + jsonObjectUser.put("optionName", "数智中台"); + jsonStr.put("jsonStr", jsonObjectUser); + try { + comparisonServiceimpl.updateEntity(jsonStr); + } catch (Exception e) { + logger.info("U8C主数据档案更新用户档案失败,失败原因:{}", e.getMessage()); + } + } + } + } + return null; + } + +} From 506833e26299ff362beed0a7ef69e779172ce3cd Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 11 Jun 2024 09:56:18 +0800 Subject: [PATCH 20/44] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=92=8C=E7=BB=84=E7=BB=87=E6=A1=A3=E6=A1=88=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/masterData/org/dao/IMdmOrgDao.java | 15 + .../org/dao/impl/MdmOrgDaoImpl.java | 16 + .../masterData/org/entity/MdmOrgEntity.java | 196 +++++++++ .../masterData/org/entity/MdmOrgEntity.xml | 388 ++++++++++++++++++ .../org/plugin/MdmOrgPluginInitializer.java | 62 +++ .../org/service/IMdmOrgService.java | 12 + .../org/service/impl/MdmOrgServiceImpl.java | 25 ++ .../project/dao/IMdmProjectDao.java | 15 + .../project/dao/impl/MdmProjectDaoImpl.java | 16 + .../project/entity/MdmProjectEntity.java | 186 +++++++++ .../project/entity/MdmProjectEntity.xml | 377 +++++++++++++++++ .../plugin/MdmProjectPluginInitializer.java | 64 +++ .../project/service/IMdmProjectService.java | 12 + .../service/impl/MdmProjectServiceImpl.java | 25 ++ 14 files changed, 1409 insertions(+) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java new file mode 100644 index 00000000..7f9d06c5 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java @@ -0,0 +1,15 @@ +package masterData.dao; + +import masterData.entity.MdmOrgEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 组织档案(mdm_org: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-07 18:30:04 + */ +public interface IMdmOrgDao extends IBaseDao { + +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java new file mode 100644 index 00000000..3648d6b9 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java @@ -0,0 +1,16 @@ +package masterData.dao.impl; + +import masterData.entity.MdmOrgEntity; +import masterData.dao.IMdmOrgDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 组织档案(MdmOrg)表数据库访问层 + * + * @author makejava + * @since 2024-06-07 18:30:04 + */ +public class MdmOrgDaoImpl extends MybatisGenericDao implements IMdmOrgDao{ + +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java new file mode 100644 index 00000000..8d502635 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java @@ -0,0 +1,196 @@ +package masterData.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 组织档案(MdmOrg)实体类 + * + * @author makejava + * @since 2024-06-07 18:30:04 + */ +public class MdmOrgEntity extends BaseEntity { + + /** 单据规则 */ + private String documentRule; + /** 单据规则流水号 */ + private Long documentRuleNum; + /** 组织编码 */ + private String orgCode; + /** 组织名称 */ + private String orgName; + /** 地址 */ + private String orgAddress; + /** 国家地区 */ + private String orgCountryzone; + /** 内部编码 */ + private String orgInnercode; + /** 说明 */ + private String orgMemo; + /** 助记码 */ + private String orgMnecode; + /** 所属行业 */ + private String orgNcindustry; + /** 上级业务单元 */ + private String orgFatherorg; + /** 负责人 */ + private String orgPrincipal; + /** 电话 */ + private String orgTel; + /** 数据状态 Y正常 N删除 F修改 */ + private String dataStatus; + /** 新增数据状态 0待下发 1已下发 */ + private String addStatus; + /** 修改数据状态 0待下发 1已下发 */ + private String updateStatus; + /** 删除数据状态 0待下发 1已下发 */ + private String deleteStatus; + /** 公司id */ + private String companyId; + + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getOrgCode() { + return orgCode; + } + + public void setOrgCode(String orgCode) { + this.orgCode = orgCode; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getOrgAddress() { + return orgAddress; + } + + public void setOrgAddress(String orgAddress) { + this.orgAddress = orgAddress; + } + + public String getOrgCountryzone() { + return orgCountryzone; + } + + public void setOrgCountryzone(String orgCountryzone) { + this.orgCountryzone = orgCountryzone; + } + + public String getOrgInnercode() { + return orgInnercode; + } + + public void setOrgInnercode(String orgInnercode) { + this.orgInnercode = orgInnercode; + } + + public String getOrgMemo() { + return orgMemo; + } + + public void setOrgMemo(String orgMemo) { + this.orgMemo = orgMemo; + } + + public String getOrgMnecode() { + return orgMnecode; + } + + public void setOrgMnecode(String orgMnecode) { + this.orgMnecode = orgMnecode; + } + + public String getOrgNcindustry() { + return orgNcindustry; + } + + public void setOrgNcindustry(String orgNcindustry) { + this.orgNcindustry = orgNcindustry; + } + + public String getOrgFatherorg() { + return orgFatherorg; + } + + public void setOrgFatherorg(String orgFatherorg) { + this.orgFatherorg = orgFatherorg; + } + + public String getOrgPrincipal() { + return orgPrincipal; + } + + public void setOrgPrincipal(String orgPrincipal) { + this.orgPrincipal = orgPrincipal; + } + + public String getOrgTel() { + return orgTel; + } + + public void setOrgTel(String orgTel) { + this.orgTel = orgTel; + } + + public String getDataStatus() { + return dataStatus; + } + + public void setDataStatus(String dataStatus) { + this.dataStatus = dataStatus; + } + + public String getAddStatus() { + return addStatus; + } + + public void setAddStatus(String addStatus) { + this.addStatus = addStatus; + } + + public String getUpdateStatus() { + return updateStatus; + } + + public void setUpdateStatus(String updateStatus) { + this.updateStatus = updateStatus; + } + + public String getDeleteStatus() { + return deleteStatus; + } + + public void setDeleteStatus(String deleteStatus) { + this.deleteStatus = deleteStatus; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml new file mode 100644 index 00000000..c14c6a01 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,document_rule + ,document_rule_num + ,org_code + ,org_name + ,org_address + ,org_countryzone + ,org_innercode + ,org_memo + ,org_mnecode + ,org_ncindustry + ,org_fatherorg + ,org_principal + ,org_tel + ,data_status + ,add_status + ,update_status + ,delete_status + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + insert into mdm_org( + + id , + document_rule , + document_rule_num , + org_code , + org_name , + org_address , + org_countryzone , + org_innercode , + org_memo , + org_mnecode , + org_ncindustry , + org_fatherorg , + org_principal , + org_tel , + data_status , + add_status , + update_status , + delete_status , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{documentRule} , + #{documentRuleNum} , + #{orgCode} , + #{orgName} , + #{orgAddress} , + #{orgCountryzone} , + #{orgInnercode} , + #{orgMemo} , + #{orgMnecode} , + #{orgNcindustry} , + #{orgFatherorg} , + #{orgPrincipal} , + #{orgTel} , + #{dataStatus} , + #{addStatus} , + #{updateStatus} , + #{deleteStatus} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_org a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into mdm_org(document_rule, document_rule_num, org_code, org_name, org_address, org_countryzone, org_innercode, org_memo, org_mnecode, org_ncindustry, org_fatherorg, org_principal, org_tel, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.orgCode},#{entity.orgName},#{entity.orgAddress},#{entity.orgCountryzone},#{entity.orgInnercode},#{entity.orgMemo},#{entity.orgMnecode},#{entity.orgNcindustry},#{entity.orgFatherorg},#{entity.orgPrincipal},#{entity.orgTel},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_org(document_rule, document_rule_num, org_code, org_name, org_address, org_countryzone, org_innercode, org_memo, org_mnecode, org_ncindustry, org_fatherorg, org_principal, org_tel, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.orgCode},#{entity.orgName},#{entity.orgAddress},#{entity.orgCountryzone},#{entity.orgInnercode},#{entity.orgMemo},#{entity.orgMnecode},#{entity.orgNcindustry},#{entity.orgFatherorg},#{entity.orgPrincipal},#{entity.orgTel},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + document_rule = values(document_rule), + document_rule_num = values(document_rule_num), + org_code = values(org_code), + org_name = values(org_name), + org_address = values(org_address), + org_countryzone = values(org_countryzone), + org_innercode = values(org_innercode), + org_memo = values(org_memo), + org_mnecode = values(org_mnecode), + org_ncindustry = values(org_ncindustry), + org_fatherorg = values(org_fatherorg), + org_principal = values(org_principal), + org_tel = values(org_tel), + data_status = values(data_status), + add_status = values(add_status), + update_status = values(update_status), + delete_status = values(delete_status), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_org set + + document_rule = #{documentRule}, + document_rule_num = #{documentRuleNum}, + org_code = #{orgCode}, + org_name = #{orgName}, + org_address = #{orgAddress}, + org_countryzone = #{orgCountryzone}, + org_innercode = #{orgInnercode}, + org_memo = #{orgMemo}, + org_mnecode = #{orgMnecode}, + org_ncindustry = #{orgNcindustry}, + org_fatherorg = #{orgFatherorg}, + org_principal = #{orgPrincipal}, + org_tel = #{orgTel}, + data_status = #{dataStatus}, + add_status = #{addStatus}, + update_status = #{updateStatus}, + delete_status = #{deleteStatus}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + +update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and document_rule = #{documentRule} + and document_rule_num = #{documentRuleNum} + and org_code = #{orgCode} + and org_name = #{orgName} + and org_address = #{orgAddress} + and org_countryzone = #{orgCountryzone} + and org_innercode = #{orgInnercode} + and org_memo = #{orgMemo} + and org_mnecode = #{orgMnecode} + and org_ncindustry = #{orgNcindustry} + and org_fatherorg = #{orgFatherorg} + and org_principal = #{orgPrincipal} + and org_tel = #{orgTel} + and data_status = #{dataStatus} + and add_status = #{addStatus} + and update_status = #{updateStatus} + and delete_status = #{deleteStatus} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from mdm_org where id = #{id} + + + + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java new file mode 100644 index 00000000..f4e7c8f6 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java @@ -0,0 +1,62 @@ +package com.hzya.frame.plugin.masterData.org.plugin; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataOrgsServiceImpl; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 组织档案(MdmOrg)表服务接口 + * + * @author makejava + * @since 2024-06-07 18:30:05 + */ +public class MdmOrgPluginInitializer extends PluginBaseEntity{ + Logger logger = LoggerFactory.getLogger(MdmOrgPluginInitializer.class); + @Autowired + private MasterDataOrgsServiceImpl masterDataOrgsService; + + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "MdmOrgPlugin"; + } + + @Override + public String getPluginName() { + return "MdmOrgPlugin插件"; + } + + @Override + public String getPluginLabel() { + return "MdmOrgPlugin"; + } + + @Override + public String getPluginType() { + return "1"; + } + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) { + try { + logger.info("======开始执行主数据档案组织档案同步========"); + return masterDataOrgsService.queryOrgsArchives(requestJson); + }catch (Exception e){ + logger.info("======执行主数据档案组织档案同步失败:{}========",e.getMessage()); + e.printStackTrace(); + } + return null; + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java new file mode 100644 index 00000000..fe82b199 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java @@ -0,0 +1,12 @@ +package masterData.service; + +import masterData.entity.MdmOrgEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 组织档案(MdmOrg)表服务接口 + * + * @author makejava + * @since 2024-06-07 18:30:05 + */ +public interface IMdmOrgService extends IBaseService{ +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java new file mode 100644 index 00000000..700a73ce --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java @@ -0,0 +1,25 @@ +package masterData.service.impl; + +import masterData.entity.MdmOrgEntity; +import masterData.dao.IMdmOrgDao; +import masterData.service.IMdmOrgService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 组织档案(MdmOrg)表服务实现类 + * + * @author makejava + * @since 2024-06-07 18:30:05 + */ +public class MdmOrgServiceImpl extends BaseService implements IMdmOrgService { + + private IMdmOrgDao mdmOrgDao; + + @Autowired + public void setMdmOrgDao(IMdmOrgDao dao) { + this.mdmOrgDao = dao; + this.dao = dao; + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java new file mode 100644 index 00000000..7389b3cc --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java @@ -0,0 +1,15 @@ +package masterData.dao; + +import masterData.entity.MdmProjectEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 项目档案(mdm_project: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-07 18:29:23 + */ +public interface IMdmProjectDao extends IBaseDao { + +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java new file mode 100644 index 00000000..3da10ccc --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java @@ -0,0 +1,16 @@ +package masterData.dao.impl; + +import masterData.entity.MdmProjectEntity; +import masterData.dao.IMdmProjectDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 项目档案(MdmProject)表数据库访问层 + * + * @author makejava + * @since 2024-06-07 18:29:23 + */ +public class MdmProjectDaoImpl extends MybatisGenericDao implements IMdmProjectDao{ + +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java new file mode 100644 index 00000000..958d6fc5 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java @@ -0,0 +1,186 @@ +package masterData.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 项目档案(MdmProject)实体类 + * + * @author makejava + * @since 2024-06-07 18:29:23 + */ +public class MdmProjectEntity extends BaseEntity { + + /** 单据规则 */ + private String documentRule; + /** 单据规则流水号 */ + private Long documentRuleNum; + /** 项目编码 */ + private String projectCode; + /** 项目名称 */ + private String projectName; + /** 单据类型 */ + private String projectBillType; + /** 备注 */ + private String projectMemo; + /** 币种 */ + private String projectCurrtype; + /** 责任人 */ + private String projectDutier; + /** 责任部门 */ + private String projectDutyDept; + /** 管理组织 */ + private String projectOrg; + /** 父项目 */ + private String projectParentpro; + /** 项目简称 */ + private String projectShName; + /** 数据状态 Y正常 N删除 F修改 */ + private String dataStatus; + /** 新增数据状态 0待下发 1已下发 */ + private String addStatus; + /** 修改数据状态 0待下发 1已下发 */ + private String updateStatus; + /** 删除数据状态 0待下发 1已下发 */ + private String deleteStatus; + /** 公司id */ + private String companyId; + + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getProjectCode() { + return projectCode; + } + + public void setProjectCode(String projectCode) { + this.projectCode = projectCode; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getProjectBillType() { + return projectBillType; + } + + public void setProjectBillType(String projectBillType) { + this.projectBillType = projectBillType; + } + + public String getProjectMemo() { + return projectMemo; + } + + public void setProjectMemo(String projectMemo) { + this.projectMemo = projectMemo; + } + + public String getProjectCurrtype() { + return projectCurrtype; + } + + public void setProjectCurrtype(String projectCurrtype) { + this.projectCurrtype = projectCurrtype; + } + + public String getProjectDutier() { + return projectDutier; + } + + public void setProjectDutier(String projectDutier) { + this.projectDutier = projectDutier; + } + + public String getProjectDutyDept() { + return projectDutyDept; + } + + public void setProjectDutyDept(String projectDutyDept) { + this.projectDutyDept = projectDutyDept; + } + + public String getProjectOrg() { + return projectOrg; + } + + public void setProjectOrg(String projectOrg) { + this.projectOrg = projectOrg; + } + + public String getProjectParentpro() { + return projectParentpro; + } + + public void setProjectParentpro(String projectParentpro) { + this.projectParentpro = projectParentpro; + } + + public String getProjectShName() { + return projectShName; + } + + public void setProjectShName(String projectShName) { + this.projectShName = projectShName; + } + + public String getDataStatus() { + return dataStatus; + } + + public void setDataStatus(String dataStatus) { + this.dataStatus = dataStatus; + } + + public String getAddStatus() { + return addStatus; + } + + public void setAddStatus(String addStatus) { + this.addStatus = addStatus; + } + + public String getUpdateStatus() { + return updateStatus; + } + + public void setUpdateStatus(String updateStatus) { + this.updateStatus = updateStatus; + } + + public String getDeleteStatus() { + return deleteStatus; + } + + public void setDeleteStatus(String deleteStatus) { + this.deleteStatus = deleteStatus; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + +} + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml new file mode 100644 index 00000000..6003878f --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,document_rule + ,document_rule_num + ,project_code + ,project_name + ,project_bill_type + ,project_memo + ,project_currtype + ,project_dutier + ,project_duty_dept + ,project_org + ,project_parentpro + ,project_sh_name + ,data_status + ,add_status + ,update_status + ,delete_status + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + insert into mdm_project( + + id , + document_rule , + document_rule_num , + project_code , + project_name , + project_bill_type , + project_memo , + project_currtype , + project_dutier , + project_duty_dept , + project_org , + project_parentpro , + project_sh_name , + data_status , + add_status , + update_status , + delete_status , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sorts, + sts, + + )values( + + #{id} , + #{documentRule} , + #{documentRuleNum} , + #{projectCode} , + #{projectName} , + #{projectBillType} , + #{projectMemo} , + #{projectCurrtype} , + #{projectDutier} , + #{projectDutyDept} , + #{projectOrg} , + #{projectParentpro} , + #{projectShName} , + #{dataStatus} , + #{addStatus} , + #{updateStatus} , + #{deleteStatus} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_project a WHERE a.sts = 'Y' ), + 'Y', + + ) + + + + insert into mdm_project(document_rule, document_rule_num, project_code, project_name, project_bill_type, project_memo, project_currtype, project_dutier, project_duty_dept, project_org, project_parentpro, project_sh_name, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.projectCode},#{entity.projectName},#{entity.projectBillType},#{entity.projectMemo},#{entity.projectCurrtype},#{entity.projectDutier},#{entity.projectDutyDept},#{entity.projectOrg},#{entity.projectParentpro},#{entity.projectShName},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into mdm_project(document_rule, document_rule_num, project_code, project_name, project_bill_type, project_memo, project_currtype, project_dutier, project_duty_dept, project_org, project_parentpro, project_sh_name, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.projectCode},#{entity.projectName},#{entity.projectBillType},#{entity.projectMemo},#{entity.projectCurrtype},#{entity.projectDutier},#{entity.projectDutyDept},#{entity.projectOrg},#{entity.projectParentpro},#{entity.projectShName},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + document_rule = values(document_rule), + document_rule_num = values(document_rule_num), + project_code = values(project_code), + project_name = values(project_name), + project_bill_type = values(project_bill_type), + project_memo = values(project_memo), + project_currtype = values(project_currtype), + project_dutier = values(project_dutier), + project_duty_dept = values(project_duty_dept), + project_org = values(project_org), + project_parentpro = values(project_parentpro), + project_sh_name = values(project_sh_name), + data_status = values(data_status), + add_status = values(add_status), + update_status = values(update_status), + delete_status = values(delete_status), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update mdm_project set + + document_rule = #{documentRule}, + document_rule_num = #{documentRuleNum}, + project_code = #{projectCode}, + project_name = #{projectName}, + project_bill_type = #{projectBillType}, + project_memo = #{projectMemo}, + project_currtype = #{projectCurrtype}, + project_dutier = #{projectDutier}, + project_duty_dept = #{projectDutyDept}, + project_org = #{projectOrg}, + project_parentpro = #{projectParentpro}, + project_sh_name = #{projectShName}, + data_status = #{dataStatus}, + add_status = #{addStatus}, + update_status = #{updateStatus}, + delete_status = #{deleteStatus}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + +update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and document_rule = #{documentRule} + and document_rule_num = #{documentRuleNum} + and project_code = #{projectCode} + and project_name = #{projectName} + and project_bill_type = #{projectBillType} + and project_memo = #{projectMemo} + and project_currtype = #{projectCurrtype} + and project_dutier = #{projectDutier} + and project_duty_dept = #{projectDutyDept} + and project_org = #{projectOrg} + and project_parentpro = #{projectParentpro} + and project_sh_name = #{projectShName} + and data_status = #{dataStatus} + and add_status = #{addStatus} + and update_status = #{updateStatus} + and delete_status = #{deleteStatus} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from mdm_project where id = #{id} + + + + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java new file mode 100644 index 00000000..0a554a69 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java @@ -0,0 +1,64 @@ +package com.hzya.frame.plugin.masterData.project.plugin; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataProjectServiceImpl; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 项目档案(MdmProject)表服务接口 + * + * @author makejava + * @since 2024-06-07 18:29:23 + */ +public class MdmProjectPluginInitializer extends PluginBaseEntity{ + Logger logger = LoggerFactory.getLogger(MdmProjectPluginInitializer.class); + + @Autowired + private MasterDataProjectServiceImpl masterDataProjectService; + + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "MdmProjectPlugin"; + } + + @Override + public String getPluginName() { + return "MdmProjectPlugin插件"; + } + + @Override + public String getPluginLabel() { + return "MdmProjectPlugin"; + } + + @Override + public String getPluginType() { + return "1"; + } + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) { + try { + logger.info("=====开始执行主数据档案项目档案同步======="); + JsonResultEntity jsonResultEntity = masterDataProjectService.queryProjectArchives(requestJson); + return jsonResultEntity; + }catch (Exception e){ + logger.info("======执行主数据档案项目档案同步失败:{}",e.getMessage()); + e.printStackTrace(); + } + return null; + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java new file mode 100644 index 00000000..58e801b2 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java @@ -0,0 +1,12 @@ +package masterData.service; + +import masterData.entity.MdmProjectEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 项目档案(MdmProject)表服务接口 + * + * @author makejava + * @since 2024-06-07 18:29:23 + */ +public interface IMdmProjectService extends IBaseService{ +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java new file mode 100644 index 00000000..4dc5e249 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java @@ -0,0 +1,25 @@ +package masterData.service.impl; + +import masterData.entity.MdmProjectEntity; +import masterData.dao.IMdmProjectDao; +import masterData.service.IMdmProjectService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 项目档案(MdmProject)表服务实现类 + * + * @author makejava + * @since 2024-06-07 18:29:23 + */ +public class MdmProjectServiceImpl extends BaseService implements IMdmProjectService { + + private IMdmProjectDao mdmProjectDao; + + @Autowired + public void setMdmProjectDao(IMdmProjectDao dao) { + this.mdmProjectDao = dao; + this.dao = dao; + } +} From f379c3d821ddab92e24bf10611557b33764743d1 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 11 Jun 2024 09:56:39 +0800 Subject: [PATCH 21/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java index 2cc45fb4..84e0358b 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java @@ -20,7 +20,15 @@ public class MdmModuleSourceEntity extends BaseEntity { private String sourceCode; /** 公司id */ private String companyId; + private String pluginCode;//插件编码 + public String getPluginCode() { + return pluginCode; + } + + public void setPluginCode(String pluginCode) { + this.pluginCode = pluginCode; + } public String getMdmId() { return mdmId; From 65aaa0878baa226830e374a2f32d10e6506dd6b2 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 11 Jun 2024 09:57:29 +0800 Subject: [PATCH 22/44] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sysnew/comparison/dao/IComparisonDao.java | 9 - .../dao/impl/ComparisonDaoImpl.java | 6 - .../comparison/entity/ComparisonEntity.java | 6 +- .../comparison/entity/ComparisonEntity.xml | 15 +- .../service/impl/ComparisonServiceImpl.java | 201 +++++++++++++++--- 5 files changed, 181 insertions(+), 56 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java index 42b171db..97653c9a 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java @@ -110,13 +110,4 @@ public interface IComparisonDao extends IBaseDao { * **/ List queryComparisonBymdmIdFileds(ComparisonEntity comparison); - /** - * - * @content 根据数据来源内类型是插件的应用类型做分组 - * @Param - * @Return - * @Author hecan - * @Date 2024/6/4 17:41 - * **/ - List queryModuleSource(); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java index 4c8a0298..d50098cb 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java @@ -81,10 +81,4 @@ public class ComparisonDaoImpl extends MybatisGenericDao queryModuleSource() { - List list =(List) super.selectList(getSqlIdPrifx() + "queryModuleSource",""); - return list; - } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java index a47e7a3f..6a97f2b4 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java @@ -32,7 +32,7 @@ public class ComparisonEntity extends BaseEntity { private String rulePrefix;//规则前缀 CK-yyyyMMdd-0001中的CK private String ruleMiddle;//规则中间 CK-yyyyMMdd-0001中的yyyyMMdd - private String ruleSuffix;//规则后缀 CK-yyyyMMdd-0001中的0001 + private int ruleSuffix;//规则后缀 CK-yyyyMMdd-0001中的0001 private String mId;//mdm_module的id private String dbId;//mdm_module_db的id @@ -100,11 +100,11 @@ public class ComparisonEntity extends BaseEntity { this.ruleMiddle = ruleMiddle; } - public String getRuleSuffix() { + public int getRuleSuffix() { return ruleSuffix; } - public void setRuleSuffix(String ruleSuffix) { + public void setRuleSuffix(int ruleSuffix) { this.ruleSuffix = ruleSuffix; } diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml index 906661bd..d24c345d 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml @@ -35,7 +35,7 @@ left join mdm_module_db moddb on m.id=moddb.mdm_id left join mdm_module_db_fileds filed on filed.mdm_id=m.id and filed.db_id=moddb.id - where m.mdm_code= #{mdmCode} + where m.mdm_code= #{mdmCode} and (moddb.db_type='1' or moddb.db_type='2') @@ -61,7 +61,7 @@ update_type as updateType,show_type as showType, query_type as queryType, list_type as listType, view_type as viewType,mdm_id as mId,db_id as dbId from mdm_module_db_fileds - where mdm_id= #{mId} and sts='Y' + where db_id= #{dbId} and sts='Y' @@ -74,21 +74,14 @@ - - - - insert into ${dbName} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java index 931ed6e6..76ba706d 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java @@ -6,16 +6,21 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.github.pagehelper.PageInfo; import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; +import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; +import com.hzya.frame.mdm.service.impl.MdmServiceCache; +import com.hzya.frame.sysnew.comparison.controlsLog.dao.impl.ControlsLogDaoImpl; import com.hzya.frame.sysnew.comparison.dao.IComparisonDao; import com.hzya.frame.sysnew.comparison.dao.IComparisonDetailsDao; import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity; import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity; import com.hzya.frame.sysnew.comparison.service.IComparisonService; -import com.hzya.frame.sysnew.generalData.dao.IGeneralDataDao; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; +import org.apache.ivy.Main; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import sun.java2d.pipe.AAShapePipe; @@ -30,6 +35,12 @@ public class ComparisonServiceImpl extends BaseService @Autowired private IComparisonDetailsDao comparisonDetailsDao; + @Autowired + private ControlsLogDaoImpl controlsLogDaoimpl; + + @Autowired + private MdmServiceCache mdmServiceCache; + @Autowired public void setGeneralDataDao(IComparisonDao dao) { this.comparisonDao = dao; @@ -53,7 +64,8 @@ public class ComparisonServiceImpl extends BaseService //根据主数据编码查询表名称，字段名称等信息 10001 //comparisonEntities = comparisonDao.queryComparison(comparisonEntity); - comparisonEntities=getComparisonEntity(comparisonEntity); + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("查询失败"); @@ -95,6 +107,9 @@ public class ComparisonServiceImpl extends BaseService if (!checkStr(jsonObject.getString("mdmCode"))) { return BaseResult.getFailureMessageEntity("主数据编码为空"); } + if (!checkStr(jsonObject.getString("optionName"))) { + return BaseResult.getFailureMessageEntity("操作人为空"); + } /*if (!checkStr(jsonObject.getString("rulePrefix"))) { return BaseResult.getFailureMessageEntity("规则为空"); }*/ @@ -105,7 +120,8 @@ public class ComparisonServiceImpl extends BaseService //根据主数据编码查询表名称，字段名称等信息 10001 // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); - comparisonEntities=getComparisonEntity(comparisonEntity); + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("保存失败"); @@ -119,20 +135,27 @@ public class ComparisonServiceImpl extends BaseService if (comparisonEntities != null && comparisonEntities.size() > 0) { map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); - String uuid = UUIDUtils.getUUID(); - map.put("id", uuid); + String uuid=null; + if(jsonObjectMain.getString("id")==null){ + uuid = UUIDUtils.getUUID(); + map.put("id", uuid); + }else{ + uuid = jsonObjectMain.getString("id"); + map.put("id", jsonObjectMain.getString("id")); + } map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("org_id", "0"); map.put("create_time", new Date()); map.put("modify_time", new Date()); map.put("sts", "Y"); + map.put("data_status","Y");//新增状态 map.put("add_status","0");//新增状态 map.put("update_status","1");//修改状态 map.put("delete_status","1");//删除状态 + ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); //查询单据规则 try { - ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule); String documentRule =comparisonEntityRule.getDocumentRule();; //"KH-2024-05-30-1"; logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}",documentRule); @@ -143,7 +166,8 @@ public class ComparisonServiceImpl extends BaseService String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-")); String ruleMiddle = getRuleDate(ruleDate); //获取规则后缀 - String ruleSuffix= documentRule.substring(documentRule.lastIndexOf("-")+1); + String ruleSuffixLength= documentRule.substring(documentRule.lastIndexOf("-")+1); + int ruleSuffix = ruleSuffixLength.length(); //生成单据规则 comparisonEntity.setRulePrefix(rulePrefix); comparisonEntity.setRuleMiddle(ruleMiddle); @@ -168,7 +192,8 @@ public class ComparisonServiceImpl extends BaseService ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntity); //保存子表数据 if (mapDetails != null && mapDetails.size() > 0) { - mapDetails.put("id", UUIDUtils.getUUID()); + String uuidDetail = UUIDUtils.getUUID(); + mapDetails.put("id", uuidDetail); mapDetails.put("formmain_id", uuid); mapDetails.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); mapDetails.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); @@ -176,11 +201,17 @@ public class ComparisonServiceImpl extends BaseService mapDetails.put("create_time", new Date()); mapDetails.put("modify_time", new Date()); mapDetails.put("sts", "Y"); + mapDetails.put("data_status","Y");//新增状态 comparisonDetailsEntity.setMapDetails(mapDetails); ComparisonDetailsEntity comparisonDetailsEntityOne = comparisonDetailsDao.saveComparisonDetails(comparisonDetailsEntity); - comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); + //comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); + map.put("details",mapDetails); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); } - return BaseResult.getSuccessMessageEntity("保存成功", comparisonEntityOne); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + return BaseResult.getSuccessMessageEntity("保存成功", map); } catch (Exception e) { logger.info("保存通用数据时候错误:{}", e.getMessage()); return BaseResult.getFailureMessageEntity("保存失败"); @@ -200,6 +231,9 @@ public class ComparisonServiceImpl extends BaseService if (!checkStr(jsonObject.getString("mdmCode"))) { return BaseResult.getFailureMessageEntity("主数据编码为空"); } + if (!checkStr(jsonObject.getString("optionName"))) { + return BaseResult.getFailureMessageEntity("操作人为空"); + } ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); JSONObject jsonObjectMain=jsonObject.getJSONObject("main");//获取主表数据 @@ -212,7 +246,8 @@ public class ComparisonServiceImpl extends BaseService try { // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); - comparisonEntities=getComparisonEntity(comparisonEntity); + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("更新失败"); @@ -221,7 +256,7 @@ public class ComparisonServiceImpl extends BaseService Map mapDetails=new HashMap<>();//将子表数据存到map中 if(comparisonEntities !=null && comparisonEntities.size()>0) { map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); - mapDetails=spliceDetailMap(comparisonEntities,map,comparisonDetailsEntity,jsonArray); + mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443"); map.put("org_id", "0"); @@ -256,7 +291,11 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); comparisonDetailsEntity.setMapDetails(mapDetails); comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); } + //保存操作日志 + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); return BaseResult.getSuccessMessageEntity("更新成功", integer); }else{ return BaseResult.getFailureMessageEntity("更新失败"); @@ -290,7 +329,8 @@ public class ComparisonServiceImpl extends BaseService try { // comparisonEntities = comparisonDao.queryComparison(comparisonEntity); - comparisonEntities=getComparisonEntity(comparisonEntity); + //comparisonEntities=getComparisonEntity(comparisonEntity); + comparisonEntities=getComparisonEntityCache(comparisonEntity,"main"); }catch (Exception e){ logger.info("根据主数据编码查询信息错误:{}",e.getMessage()); return BaseResult.getFailureMessageEntity("删除失败"); @@ -321,7 +361,9 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); + controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); } + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); return BaseResult.getSuccessMessageEntity("删除成功",integer); }else{ return BaseResult.getFailureMessageEntity("删除失败","请查看id是否在表中存在"); @@ -390,6 +432,92 @@ public class ComparisonServiceImpl extends BaseService return mapDetails; } + //根据主数据编码获取主表和明细表表名称，表字段信息 + public List getComparisonEntityCache(ComparisonEntity comparison,String type){ + List comparisonEntities = new ArrayList<>(); + //根据主数据编号获取模板主表 + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(Long.valueOf(comparison.getMdmCode())); + //根据模板主表id获取模版表数据 + if(mdmModuleEntity!=null){ + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbEntities)){ + for (MdmModuleDbEntity moduleDbEntity : mdmModuleDbEntities) { + switch (type){ + case "main": + //获取主表和明细表的字段信息 + if(moduleDbEntity.getDbType().equals("1") || moduleDbEntity.getDbType().equals("2")){ + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity=new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbFiledsEntities)){ + for (MdmModuleDbFiledsEntity moduleDbFiledsEntity : mdmModuleDbFiledsEntities) { + if (moduleDbFiledsEntity.getDbId().equals(moduleDbEntity.getId())) { + ComparisonEntity comparisonEntityFile = new ComparisonEntity(); + comparisonEntityFile.setChName(moduleDbFiledsEntity.getChName()); + comparisonEntityFile.setEnName(moduleDbFiledsEntity.getEnName()); + comparisonEntityFile.setFiledType(moduleDbFiledsEntity.getFiledType()); + comparisonEntityFile.setAddType(moduleDbFiledsEntity.getAddType()); + comparisonEntityFile.setUpdateType(moduleDbFiledsEntity.getUpdateType()); + comparisonEntityFile.setShowType(moduleDbFiledsEntity.getShowType()); + comparisonEntityFile.setQueryType(moduleDbFiledsEntity.getQueryType()); + comparisonEntityFile.setListType(moduleDbFiledsEntity.getListType()); + comparisonEntityFile.setViewType(moduleDbFiledsEntity.getViewType()); + comparisonEntityFile.setDbName(moduleDbEntity.getDbName()); + comparisonEntityFile.setDbType(moduleDbEntity.getDbType()); + comparisonEntityFile.setDbId(moduleDbEntity.getId()); + comparisonEntityFile.setmId(mdmModuleEntity.getId()); + comparisonEntityFile.setMdmName(mdmModuleEntity.getMdmName()); + comparisonEntityFile.setMdmCode(String.valueOf(mdmModuleEntity.getMdmCode())); + comparisonEntities.add(comparisonEntityFile); + } + } + } + } + break; + case "option": + //获取主表和明细表的字段信息 + if(moduleDbEntity.getDbType().equals("3")){ + MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity=new MdmModuleDbFiledsEntity(); + mdmModuleDbFiledsEntity.setDbId(moduleDbEntity.getId()); + List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(mdmModuleDbFiledsEntity); + if(CollectionUtils.isNotEmpty(mdmModuleDbFiledsEntities)){ + for (MdmModuleDbFiledsEntity moduleDbFiledsEntity : mdmModuleDbFiledsEntities) { + if (moduleDbFiledsEntity.getDbId().equals(moduleDbEntity.getId())) { + ComparisonEntity comparisonEntityFile = new ComparisonEntity(); + comparisonEntityFile.setChName(moduleDbFiledsEntity.getChName()); + comparisonEntityFile.setEnName(moduleDbFiledsEntity.getEnName()); + comparisonEntityFile.setFiledType(moduleDbFiledsEntity.getFiledType()); + comparisonEntityFile.setAddType(moduleDbFiledsEntity.getAddType()); + comparisonEntityFile.setUpdateType(moduleDbFiledsEntity.getUpdateType()); + comparisonEntityFile.setShowType(moduleDbFiledsEntity.getShowType()); + comparisonEntityFile.setQueryType(moduleDbFiledsEntity.getQueryType()); + comparisonEntityFile.setListType(moduleDbFiledsEntity.getListType()); + comparisonEntityFile.setViewType(moduleDbFiledsEntity.getViewType()); + comparisonEntityFile.setDbName(moduleDbEntity.getDbName()); + comparisonEntityFile.setDbType(moduleDbEntity.getDbType()); + comparisonEntityFile.setDbId(moduleDbEntity.getId()); + comparisonEntityFile.setmId(mdmModuleEntity.getId()); + comparisonEntityFile.setMdmName(mdmModuleEntity.getMdmName()); + comparisonEntityFile.setMdmCode(String.valueOf(mdmModuleEntity.getMdmCode())); + comparisonEntities.add(comparisonEntityFile); + } + } + } + } + break; + default: + break; + } + + } + } + return comparisonEntities; + } + return null; + } + //根据主数据编码获取数据，表名称，字段名称等 public List getComparisonEntity(ComparisonEntity comparisonEntity) { List comparisonEntities = new ArrayList<>(); @@ -398,7 +526,38 @@ public class ComparisonServiceImpl extends BaseService if (comparisonEntityModule != null) { //根据mdm_module得id查询mdm_module_db得数据 List comparisonEntitiesModuleDb = comparisonDao.queryComparisonBymdmId(comparisonEntityModule); - //根据mdm_module得id查询mdm_module_db_fileds得数据 + if(CollectionUtils.isNotEmpty(comparisonEntitiesModuleDb)) { + for (ComparisonEntity comparison : comparisonEntitiesModuleDb) { + //查询出主表和明细表信息 + if(comparison.getDbType().equals("1")||comparison.getDbType().equals("2")) { + //根据mdm_module_db的id查询对应表的字段 + List comparisonEntitiesFiles = comparisonDao.queryComparisonBymdmIdFileds(comparison); + if (CollectionUtils.isNotEmpty(comparisonEntitiesFiles)) { + for (ComparisonEntity comparisonEntitiesFile : comparisonEntitiesFiles) { + ComparisonEntity comparisonEntityFile = new ComparisonEntity(); + comparisonEntityFile.setChName(comparisonEntitiesFile.getChName()); + comparisonEntityFile.setEnName(comparisonEntitiesFile.getEnName()); + comparisonEntityFile.setFiledType(comparisonEntitiesFile.getFiledType()); + comparisonEntityFile.setAddType(comparisonEntitiesFile.getAddType()); + comparisonEntityFile.setUpdateType(comparisonEntitiesFile.getUpdateType()); + comparisonEntityFile.setShowType(comparisonEntitiesFile.getShowType()); + comparisonEntityFile.setQueryType(comparisonEntitiesFile.getQueryType()); + comparisonEntityFile.setListType(comparisonEntitiesFile.getListType()); + comparisonEntityFile.setViewType(comparisonEntitiesFile.getViewType()); + comparisonEntityFile.setDbName(comparison.getDbName()); + comparisonEntityFile.setDbType(comparison.getDbType()); + comparisonEntityFile.setDbId(comparison.getDbId()); + comparisonEntityFile.setmId(comparisonEntitiesFile.getmId()); + comparisonEntityFile.setMdmName(comparisonEntityModule.getMdmName()); + comparisonEntityFile.setMdmCode(comparisonEntityModule.getMdmCode()); + comparisonEntities.add(comparisonEntityFile); + } + } + } + } + } + + /* //根据mdm_module得id查询mdm_module_db_fileds得数据 List comparisonEntitiesFiles = comparisonDao.queryComparisonBymdmIdFileds(comparisonEntityModule); for (ComparisonEntity comparison : comparisonEntitiesModuleDb) { for (ComparisonEntity comparisonEntitiesFile : comparisonEntitiesFiles) { @@ -422,22 +581,10 @@ public class ComparisonServiceImpl extends BaseService comparisonEntities.add(comparisonEntityFile); } } - } + }*/ return comparisonEntities; } return null; } - //查询数据来源 根据数据来源内类型是插件的应用类型做分组 - public List getComparisonEntityFiles(){ - List comparisonEntities = comparisonDao.queryModuleSource(); - if(CollectionUtils.isNotEmpty(comparisonEntities)){ - for (ComparisonEntity comparisonEntity : comparisonEntities) { - //根据来源类型获取档案数据 比如U8C - - } - } - return null; - } - } From e4d2e03fcfba6dd76e699ed0ac508c07f5669e22 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Tue, 11 Jun 2024 10:14:38 +0800 Subject: [PATCH 23/44] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controlsLog/dao/IControlsLogDao.java | 20 +++ .../dao/impl/ControlsLogDaoImpl.java | 32 +++++ .../controlsLog/entity/ControlsLogEntity.java | 78 ++++++++++ .../controlsLog/entity/ControlsLogEntity.xml | 136 ++++++++++++++++++ 4 files changed, 266 insertions(+) create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/IControlsLogDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/impl/ControlsLogDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/entity/ControlsLogEntity.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/entity/ControlsLogEntity.xml diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/IControlsLogDao.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/IControlsLogDao.java new file mode 100644 index 00000000..1ef9f35c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/IControlsLogDao.java @@ -0,0 +1,20 @@ +package com.hzya.frame.sysnew.comparison.controlsLog.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.comparison.controlsLog.entity.ControlsLogEntity; + +public interface IControlsLogDao extends IBaseDao { + + /** + * + * @content 操作日志保存 + * @Param formmainId:主表id,sourceName：来源名称，code：来源编码,sourceData:源数据,optionType:操作类型,optionName:操作人,dbName:数据库名称 + * @Return + * @Author hecan + * @Date 2024/6/5 15:29 + * **/ + @DS("master") + ControlsLogEntity saveControlsLog(String formmainId,String sourceName,String code,String sourceData,String optionType,String optionName,String dbName); + +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/impl/ControlsLogDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/impl/ControlsLogDaoImpl.java new file mode 100644 index 00000000..7db1b35b --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/dao/impl/ControlsLogDaoImpl.java @@ -0,0 +1,32 @@ +package com.hzya.frame.sysnew.comparison.controlsLog.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.comparison.controlsLog.dao.IControlsLogDao; +import com.hzya.frame.sysnew.comparison.controlsLog.entity.ControlsLogEntity; +import com.hzya.frame.uuid.UUIDUtils; +import org.springframework.stereotype.Repository; + +@Repository(value = "controlsLogDaoImpl") +public class ControlsLogDaoImpl extends MybatisGenericDao implements IControlsLogDao { + + //操作日志新增 + @Override + @DS("master") + public ControlsLogEntity saveControlsLog(String formmainId,String sourceName,String code,String sourceData,String optionType,String optionName,String dbName) { + ControlsLogEntity controlsLogEntity=new ControlsLogEntity(); + controlsLogEntity.setId(UUIDUtils.getUUID()); + controlsLogEntity.setFormmainId(formmainId); + controlsLogEntity.setSourceName(sourceName); + controlsLogEntity.setCode(code); + controlsLogEntity.setSourceData(sourceData); + controlsLogEntity.setOptionType(optionType); + controlsLogEntity.setOptionName(optionName); + controlsLogEntity.setDbName(dbName); + controlsLogEntity.setCreate_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); + controlsLogEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); + controlsLogEntity.setOrg_id("0"); + ControlsLogEntity save = super.save(getSqlIdPrifx() + "saveControlsLog", controlsLogEntity); + return save; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/entity/ControlsLogEntity.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/entity/ControlsLogEntity.java new file mode 100644 index 00000000..68f0d3ae --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/entity/ControlsLogEntity.java @@ -0,0 +1,78 @@ +package com.hzya.frame.sysnew.comparison.controlsLog.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * + * @content 操作日志实体类 + * @Param + * @Return + * @Author hecan + * @Date 2024/6/5 11:58 + * **/ +public class ControlsLogEntity extends BaseEntity { + private String formmainId;//主表id + private String sourceName;//来源名称 + private String code;//编码 + private String sourceData;//源数据 + private String optionType;//操作类型 + private String optionName;//操作人 + + private String dbName;//表名称 + + public String getDbName() { + return dbName; + } + + public void setDbName(String dbName) { + this.dbName = dbName; + } + + public String getFormmainId() { + return formmainId; + } + + public void setFormmainId(String formmainId) { + this.formmainId = formmainId; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getSourceData() { + return sourceData; + } + + public void setSourceData(String sourceData) { + this.sourceData = sourceData; + } + + public String getOptionType() { + return optionType; + } + + public void setOptionType(String optionType) { + this.optionType = optionType; + } + + public String getOptionName() { + return optionName; + } + + public void setOptionName(String optionName) { + this.optionName = optionName; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/entity/ControlsLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/entity/ControlsLogEntity.xml new file mode 100644 index 00000000..7670ef99 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/controlsLog/entity/ControlsLogEntity.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into ${dbName} + + id, + formmain_id, + code , + source_name , + source_data , + option_type , + option_name , + sorts , + create_user_id , + modify_user_id , + org_id , + company_id , + create_time, + modify_time, + sts + + values + + #{id}, + #{formmainId}, + #{code} , + #{sourceName} , + #{sourceData} , + #{optionType} , + #{optionName} , + #{sorts} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${dbName} a WHERE a.sts = 'Y' ), + #{create_user_id} , + #{modify_user_id} , + #{org_id} , + #{companyId} , + #{create_time} , + now() , + #{modify_time} , + now() , + #{sts} , + 'Y' + + + + + + update ${dbName} set + + formmain_id = #{formmainId}, + source_name = #{sourceName}, + code = #{code}, + source_data = #{sourceData}, + option_type = #{optionType}, + option_name = #{optionName}, + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + modify_time = now(), + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId} + + where id=#{id} and sts='Y' + + + + + + update + ${dbName} + set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id} + + formmain_id = #{formmainId}, + source_name = #{sourceName}, + code = #{code}, + source_data = #{sourceData}, + option_type = #{optionType}, + option_name = #{optionName}, + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and id=#{id} and sts='Y' + + + + + From 5f27f7d6310262a0cca1ff9364ed6b29e73709d3 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 11 Jun 2024 11:19:51 +0800 Subject: [PATCH 24/44] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SysExtensionApiEntity.java | 32 +++++++++++++++++++ .../impl/SysApplicationServiceImpl.java | 3 ++ 2 files changed, 35 insertions(+) diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysExtensionApiEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysExtensionApiEntity.java index 90c7ed64..7668e887 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysExtensionApiEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysExtensionApiEntity.java @@ -1,6 +1,8 @@ package com.hzya.frame.sysnew.application.entity; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; + import java.util.Map; public class SysExtensionApiEntity { @@ -11,6 +13,12 @@ public class SysExtensionApiEntity { private String querys; /** body */ private String bodys; + /** 发送方应用 */ + private SysApplicationEntity sendApp; + /** 接收方应用 */ + private SysApplicationEntity receiveApp; + /** 接收方api */ + private SysApplicationApiEntity receiveApi; public Map getHeaders() { return headers; @@ -35,5 +43,29 @@ public class SysExtensionApiEntity { public void setBodys(String bodys) { this.bodys = bodys; } + + public SysApplicationEntity getSendApp() { + return sendApp; + } + + public void setSendApp(SysApplicationEntity sendApp) { + this.sendApp = sendApp; + } + + public SysApplicationEntity getReceiveApp() { + return receiveApp; + } + + public void setReceiveApp(SysApplicationEntity receiveApp) { + this.receiveApp = receiveApp; + } + + public SysApplicationApiEntity getReceiveApi() { + return receiveApi; + } + + public void setReceiveApi(SysApplicationApiEntity receiveApi) { + this.receiveApi = receiveApi; + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java index bd3c7594..5775b7fc 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java @@ -1725,6 +1725,9 @@ public class SysApplicationServiceImpl extends BaseService Date: Tue, 11 Jun 2024 14:27:42 +0800 Subject: [PATCH 25/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0api=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E5=BA=94=E7=94=A8=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MasterDataOrgsServiceImpl.java | 8 ++--- .../impl/MasterDataProjectServiceImpl.java | 8 ++--- .../service/IComparisonService.java | 16 +++++++--- .../service/impl/ComparisonServiceImpl.java | 31 +++++++++++++++---- 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java index c6fe35a5..e382aabf 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataOrgsServiceImpl.java @@ -102,8 +102,8 @@ public class MasterDataOrgsServiceImpl extends BaseService comparisonEntity.setDbName(entity.getDbName()); if(!"mdmCode".equals(key)){ map.put(key, jsonObject.getString(key)); + map.remove("appName"); + map.remove("appCode"); } } } @@ -207,10 +211,10 @@ public class ComparisonServiceImpl extends BaseService //comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); map.put("details",mapDetails); //保存操作日志 - controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); } //保存操作日志 - controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); return BaseResult.getSuccessMessageEntity("保存成功", map); } catch (Exception e) { logger.info("保存通用数据时候错误:{}", e.getMessage()); @@ -292,10 +296,10 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setMapDetails(mapDetails); comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity); //保存操作日志 - controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); } //保存操作日志 - controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); return BaseResult.getSuccessMessageEntity("更新成功", integer); }else{ return BaseResult.getFailureMessageEntity("更新失败"); @@ -318,6 +322,9 @@ public class ComparisonServiceImpl extends BaseService if (!checkStr(jsonObject.getString("mdmCode"))) { return BaseResult.getFailureMessageEntity("主数据编码为空"); } + if (!checkStr(jsonObject.getString("optionName"))) { + return BaseResult.getFailureMessageEntity("操作人为空"); + } ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class); ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity(); JSONObject jsonObjectMain=jsonObject.getJSONObject("main");//获取主表数据 @@ -361,9 +368,9 @@ public class ComparisonServiceImpl extends BaseService comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id")); comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443"); comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity); - controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(comparisonDetailsEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); } - controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("sourceName"),jsonObject.getString("code"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); + controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口删除",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); return BaseResult.getSuccessMessageEntity("删除成功",integer); }else{ return BaseResult.getFailureMessageEntity("删除失败","请查看id是否在表中存在"); @@ -376,6 +383,18 @@ public class ComparisonServiceImpl extends BaseService return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数"); } + //根据应用key和应用密钥获取应用编码和应用名称 + @Override + public SysExtensionApiEntity getAppNameAndCode(SysExtensionApiEntity sysExtensionApiEntity) { + String bodys = sysExtensionApiEntity.getBodys(); + SysApplicationEntity sendApp = sysExtensionApiEntity.getSendApp(); + JSONObject jsonObject = JSON.parseObject(bodys); + jsonObject.put("appName",sendApp.getName()); + jsonObject.put("appCode",sendApp.getAppId()); + sysExtensionApiEntity.setBodys(jsonObject.toJSONString()); + return sysExtensionApiEntity; + } + //根据不同的日期格式，返回不同的值 private String getRuleDate(String str){ switch (str){ From 2f3480d256baa5827a3c45332576421c2cd6727b Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 13 Jun 2024 10:08:56 +0800 Subject: [PATCH 26/44] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=85=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/masterData/org/dao/IMdmOrgDao.java | 6 +++--- .../org/dao/impl/MdmOrgDaoImpl.java | 8 ++++---- .../masterData/org/entity/MdmOrgEntity.java | 2 +- .../masterData/org/entity/MdmOrgEntity.xml | 20 +++++++++---------- .../org/service/IMdmOrgService.java | 5 +++-- .../org/service/impl/MdmOrgServiceImpl.java | 11 +++++----- .../project/dao/IMdmProjectDao.java | 7 ++++--- .../project/dao/impl/MdmProjectDaoImpl.java | 9 +++++---- .../project/entity/MdmProjectEntity.java | 2 +- .../project/entity/MdmProjectEntity.xml | 20 +++++++++---------- .../project/service/IMdmProjectService.java | 5 +++-- .../service/impl/MdmProjectServiceImpl.java | 11 +++++----- .../dao/impl/MdmModuleSourceDaoImpl.java | 2 +- 13 files changed, 57 insertions(+), 51 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java index 7f9d06c5..bfe0e1cd 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java @@ -1,7 +1,7 @@ -package masterData.dao; +package com.hzya.frame.plugin.masterData.org.dao; -import masterData.entity.MdmOrgEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; /** * 组织档案(mdm_org: table)表数据库访问层 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java index 3648d6b9..dc0271b5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java @@ -1,7 +1,7 @@ -package masterData.dao.impl; +package com.hzya.frame.plugin.masterData.org.dao.impl; -import masterData.entity.MdmOrgEntity; -import masterData.dao.IMdmOrgDao; +import com.hzya.frame.plugin.masterData.org.dao.IMdmOrgDao; +import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; /** @@ -10,7 +10,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * @author makejava * @since 2024-06-07 18:30:04 */ -public class MdmOrgDaoImpl extends MybatisGenericDao implements IMdmOrgDao{ +public class MdmOrgDaoImpl extends MybatisGenericDao implements IMdmOrgDao { } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java index 8d502635..55aa6f31 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java @@ -1,4 +1,4 @@ -package masterData.entity; +package com.hzya.frame.plugin.masterData.org.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml index c14c6a01..9c5e813e 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -60,7 +60,7 @@ ,company_id - select from mdm_org @@ -98,7 +98,7 @@ - select count(1) from mdm_org and id = #{id} @@ -134,7 +134,7 @@ - select from mdm_org @@ -172,7 +172,7 @@ - select from mdm_org @@ -210,7 +210,7 @@ - + insert into mdm_org( id , @@ -316,7 +316,7 @@ org_id = values(org_id), company_id = values(company_id) - + update mdm_org set document_rule = #{documentRule}, @@ -347,12 +347,12 @@ update mdm_org set where id = #{id} - + update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java index fe82b199..fa37d8cd 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java @@ -1,7 +1,8 @@ -package masterData.service; +package com.hzya.frame.plugin.masterData.org.service; -import masterData.entity.MdmOrgEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; + /** * 组织档案(MdmOrg)表服务接口 * diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java index 700a73ce..f4f543ee 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java @@ -1,9 +1,10 @@ -package masterData.service.impl; +package com.hzya.frame.plugin.masterData.org.service.impl; -import masterData.entity.MdmOrgEntity; -import masterData.dao.IMdmOrgDao; -import masterData.service.IMdmOrgService; -import org.springframework.stereotype.Service; + +import com.hzya.frame.plugin.masterData.org.dao.IMdmOrgDao; +import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; +import com.hzya.frame.plugin.masterData.org.service.IMdmOrgService; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java index 7389b3cc..8b130a7f 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java @@ -1,7 +1,8 @@ -package masterData.dao; +package com.hzya.frame.plugin.masterData.project.dao; -import masterData.entity.MdmProjectEntity; -import com.hzya.frame.basedao.dao.IBaseDao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; /** * 项目档案(mdm_project: table)表数据库访问层 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java index 3da10ccc..ae270f7d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java @@ -1,7 +1,8 @@ -package masterData.dao.impl; +package com.hzya.frame.plugin.masterData.project.dao.impl; -import masterData.entity.MdmProjectEntity; -import masterData.dao.IMdmProjectDao; + +import com.hzya.frame.plugin.masterData.project.dao.IMdmProjectDao; +import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; /** @@ -10,7 +11,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * @author makejava * @since 2024-06-07 18:29:23 */ -public class MdmProjectDaoImpl extends MybatisGenericDao implements IMdmProjectDao{ +public class MdmProjectDaoImpl extends MybatisGenericDao implements IMdmProjectDao { } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java index 958d6fc5..fba1cf1c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java @@ -1,4 +1,4 @@ -package masterData.entity; +package com.hzya.frame.plugin.masterData.project.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml index 6003878f..93ec1958 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -58,7 +58,7 @@ ,company_id - select from mdm_project @@ -95,7 +95,7 @@ - select count(1) from mdm_project and id = #{id} @@ -130,7 +130,7 @@ - select from mdm_project @@ -167,7 +167,7 @@ - select from mdm_project @@ -204,7 +204,7 @@ - + insert into mdm_project( id , @@ -307,7 +307,7 @@ org_id = values(org_id), company_id = values(company_id) - + update mdm_project set document_rule = #{documentRule}, @@ -337,12 +337,12 @@ update mdm_project set where id = #{id} - + update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java index 58e801b2..f35a9209 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java @@ -1,7 +1,8 @@ -package masterData.service; +package com.hzya.frame.plugin.masterData.project.service; -import masterData.entity.MdmProjectEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; + /** * 项目档案(MdmProject)表服务接口 * diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java index 4dc5e249..0284f229 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java @@ -1,9 +1,10 @@ -package masterData.service.impl; +package com.hzya.frame.plugin.masterData.project.service.impl; -import masterData.entity.MdmProjectEntity; -import masterData.dao.IMdmProjectDao; -import masterData.service.IMdmProjectService; -import org.springframework.stereotype.Service; + +import com.hzya.frame.plugin.masterData.project.dao.IMdmProjectDao; +import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; +import com.hzya.frame.plugin.masterData.project.service.IMdmProjectService; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java index b7cc9034..4e025854 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java @@ -18,7 +18,7 @@ public class MdmModuleSourceDaoImpl extends MybatisGenericDao MdmModuleSourceentityGroupByType() { - List list =(List) super.selectList(getSqlIdPrifx() + "MdmModuleSourceentityGroupByType", ""); + List list =(List) super.selectList(getSqlIdPrifx() + "queryMdmModuleSourceentityGroupByType", ""); return list; } From e753410b89ef42babb01c319c085d7473bf42b8c Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Mon, 17 Jun 2024 11:49:50 +0800 Subject: [PATCH 27/44] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E5=BA=94=E7=94=A8=E6=B7=BB=E5=8A=A0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/IMdmModuleDistributeDao.java | 2 +- .../dao/impl/MdmModuleDistributeDaoImpl.java | 2 +- .../entity/MdmModuleDistributeEntity.java | 32 +- .../entity/MdmModuleDistributeEntity.xml | 50 ++- .../service/IMdmModuleDistributeService.java | 2 +- .../impl/MdmModuleDistributeServiceImpl.java | 2 +- .../MdmModuleDistributeDetailEntity.xml | 2 - .../entity/MdmModuleOptionLogEntity.xml | 2 - .../entity/MdmModuleSendLogEntity.xml | 2 - .../entity/MdmModuleSourceEntity.xml | 2 - .../script/dao/ISysApplicationScriptDao.java | 15 + .../dao/impl/SysApplicationScriptDaoImpl.java | 17 + .../entity/SysApplicationScriptEntity.java | 116 +++++++ .../entity/SysApplicationScriptEntity.xml | 304 ++++++++++++++++++ .../service/ISysApplicationScriptService.java | 12 + .../impl/SysApplicationScriptServiceImpl.java | 26 ++ .../service/ISysApplicationService.java | 60 ++++ .../impl/SysApplicationServiceImpl.java | 156 +++++++++ 18 files changed, 778 insertions(+), 26 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/sysnew/application/script/dao/ISysApplicationScriptDao.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/application/script/dao/impl/SysApplicationScriptDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/application/script/entity/SysApplicationScriptEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/sysnew/application/script/service/ISysApplicationScriptService.java create mode 100644 service/src/main/java/com/hzya/frame/sysnew/application/script/service/impl/SysApplicationScriptServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java index 895f30cd..5ccc1e4d 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java @@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao; * 主数据功能应用分发表(mdm_module_distribute: table)表数据库访问层 * * @author makejava - * @since 2024-06-14 10:06:36 + * @since 2024-06-17 11:05:32 */ public interface IMdmModuleDistributeDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java index 4c029e80..20fcd94f 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java @@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * 主数据功能应用分发表(MdmModuleDistribute)表数据库访问层 * * @author makejava - * @since 2024-06-14 10:06:36 + * @since 2024-06-17 11:05:32 */ @Repository(value = "MdmModuleDistributeDaoImpl") public class MdmModuleDistributeDaoImpl extends MybatisGenericDao implements IMdmModuleDistributeDao{ diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java index 9b6677b9..08ff46f7 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java @@ -9,7 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity; * 主数据功能应用分发表(MdmModuleDistribute)实体类 * * @author makejava - * @since 2024-06-14 10:06:36 + * @since 2024-06-17 11:05:33 */ public class MdmModuleDistributeEntity extends BaseEntity { @@ -19,10 +19,16 @@ public class MdmModuleDistributeEntity extends BaseEntity { private String appId; /** 修改接口 */ private String updateApi; + /** 修改插件 */ + private String updateScript; /** 新增接口 */ private String addApi; + /** 新增插件 */ + private String addScript; /** 删除接口 */ private String deleteApi; + /** 删除插件 */ + private String deleteScript; /** 启用停用 0、停用1、启用 */ private String enabledState; /** 主表ID */ @@ -56,6 +62,14 @@ public class MdmModuleDistributeEntity extends BaseEntity { this.updateApi = updateApi; } + public String getUpdateScript() { + return updateScript; + } + + public void setUpdateScript(String updateScript) { + this.updateScript = updateScript; + } + public String getAddApi() { return addApi; } @@ -64,6 +78,14 @@ public class MdmModuleDistributeEntity extends BaseEntity { this.addApi = addApi; } + public String getAddScript() { + return addScript; + } + + public void setAddScript(String addScript) { + this.addScript = addScript; + } + public String getDeleteApi() { return deleteApi; } @@ -72,6 +94,14 @@ public class MdmModuleDistributeEntity extends BaseEntity { this.deleteApi = deleteApi; } + public String getDeleteScript() { + return deleteScript; + } + + public void setDeleteScript(String deleteScript) { + this.deleteScript = deleteScript; + } + public String getEnabledState() { return enabledState; } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml index 20e5de5b..d7822968 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml @@ -7,8 +7,11 @@ + + + @@ -26,8 +29,11 @@ ,mdm_id ,app_id ,update_api + ,update_script ,add_api + ,add_script ,delete_api + ,delete_script ,enabled_state ,db_id ,sorts @@ -39,13 +45,6 @@ ,org_id ,company_id - - - + select + + from sys_application_script where id = #{ id } and sts='Y' + + + + + + + + + + + + + + + + insert into sys_application_script( + + id , + app_id , + script_name , + script_code , + script_version , + class_name , + script_data , + script_remark , + release_date , + script_status , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{appId} , + #{scriptName} , + #{scriptCode} , + #{scriptVersion} , + CONCAT('g','_',LAST_INSERT_ID()) , + #{scriptData} , + #{scriptRemark} , + #{releaseDate} , + #{scriptStatus} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into sys_application_script(app_id, script_name, script_code, script_version, class_name, script_data, script_remark, release_date, script_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.appId},#{entity.scriptName},#{entity.scriptCode},#{entity.scriptVersion},#{entity.className},#{entity.scriptData},#{entity.scriptRemark},#{entity.releaseDate},#{entity.scriptStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into sys_application_script(app_id, script_name, script_code, script_version, class_name, script_data, script_remark, release_date, script_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.appId},#{entity.scriptName},#{entity.scriptCode},#{entity.scriptVersion},#{entity.className},#{entity.scriptData},#{entity.scriptRemark},#{entity.releaseDate},#{entity.scriptStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + app_id = values(app_id), + script_name = values(script_name), + script_code = values(script_code), + script_version = values(script_version), + class_name = values(class_name), + script_data = values(script_data), + script_remark = values(script_remark), + release_date = values(release_date), + script_status = values(script_status), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update sys_application_script set + + app_id = #{appId}, + script_name = #{scriptName}, + script_code = #{scriptCode}, + script_version = #{scriptVersion}, + class_name = #{className}, + script_data = #{scriptData}, + script_remark = #{scriptRemark}, + release_date = #{releaseDate}, + script_status = #{scriptStatus}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where id = #{id} + + + +update sys_application_script set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update sys_application_script set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and app_id = #{appId} + and script_name = #{scriptName} + and script_code = #{scriptCode} + and script_version = #{scriptVersion} + and class_name = #{className} + and script_data = #{scriptData} + and script_remark = #{scriptRemark} + and release_date = #{releaseDate} + and script_status = #{scriptStatus} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from sys_application_script where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/script/service/ISysApplicationScriptService.java b/service/src/main/java/com/hzya/frame/sysnew/application/script/service/ISysApplicationScriptService.java new file mode 100644 index 00000000..73d7588d --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/application/script/service/ISysApplicationScriptService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.sysnew.application.script.service; + +import com.hzya.frame.sysnew.application.script.entity.SysApplicationScriptEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 脚本表(SysApplicationScript)表服务接口 + * + * @author makejava + * @since 2024-06-17 11:07:22 + */ +public interface ISysApplicationScriptService extends IBaseService{ +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/script/service/impl/SysApplicationScriptServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/script/service/impl/SysApplicationScriptServiceImpl.java new file mode 100644 index 00000000..59ef35e1 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/sysnew/application/script/service/impl/SysApplicationScriptServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.sysnew.application.script.service.impl; + +import com.hzya.frame.sysnew.application.script.entity.SysApplicationScriptEntity; +import com.hzya.frame.sysnew.application.script.dao.ISysApplicationScriptDao; +import com.hzya.frame.sysnew.application.script.service.ISysApplicationScriptService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 脚本表(SysApplicationScript)表服务实现类 + * + * @author makejava + * @since 2024-06-17 11:07:22 + */ +@Service(value = "sysApplicationScriptService") +public class SysApplicationScriptServiceImpl extends BaseService implements ISysApplicationScriptService { + + private ISysApplicationScriptDao sysApplicationScriptDao; + + @Autowired + public void setSysApplicationScriptDao(ISysApplicationScriptDao dao) { + this.sysApplicationScriptDao = dao; + this.dao = dao; + } +} diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java index a4711b39..ad1077cf 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java @@ -357,4 +357,64 @@ public interface ISysApplicationService extends IBaseService sysApplicationScriptEntities = sysApplicationScriptDao.queryByLike(entity); + PageInfo pageInfo = new PageInfo(sysApplicationScriptEntities); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } + + /** + * @param object + * @return + * @Author lvleigang + * @Description 脚本查询接口 + * @Date 2:09 下午 2023/9/23 + **/ + @Override + public JsonResultEntity queryAppScript(JSONObject object) { + SysApplicationScriptEntity entity = getData("jsonStr", object, SysApplicationScriptEntity.class); + List sysApplicationScriptEntities = sysApplicationScriptDao.queryByLike(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", sysApplicationScriptEntities); + } + + /** + * @param object + * @return + * @Author lvleigang + * @Description 脚本修改接口 + * @Date 2:09 下午 2023/9/23 + **/ + @Override + public JsonResultEntity saveAppScript(JSONObject object) { + SysApplicationScriptEntity entity = getData("jsonStr", object, SysApplicationScriptEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getScriptCode() == null || "".equals(entity.getScriptCode())) { + return BaseResult.getFailureMessageEntity("请先输入脚本编号"); + } + if (entity.getScriptData() == null || "".equals(entity.getScriptData())) { + return BaseResult.getFailureMessageEntity("请先输入脚本内容"); + } + entity.setCreate(); + sysApplicationScriptDao.save(entity); + return BaseResult.getSuccessMessageEntity("保存脚本成功", entity.getId()); + } + + /** + * @param object + * @return + * @Author lvleigang + * @Description 脚本修改接口 + * @Date 2:09 下午 2023/9/23 + **/ + @Override + public JsonResultEntity updateAppScript(JSONObject object) { + SysApplicationScriptEntity entity = getData("jsonStr", object, SysApplicationScriptEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getScriptCode() == null || "".equals(entity.getScriptCode())) { + return BaseResult.getFailureMessageEntity("请先输入脚本编号"); + } + if (entity.getScriptData() == null || "".equals(entity.getScriptData())) { + return BaseResult.getFailureMessageEntity("请先输入脚本内容"); + } + entity.setUpdate(); + sysApplicationScriptDao.update(entity); + return BaseResult.getSuccessMessageEntity("修改脚本成功"); + } + + /** + * @param object + * @return + * @Author lvleigang + * @Description 脚本删除接口 + * @Date 2:10 下午 2023/9/23 + **/ + @Override + public JsonResultEntity deleteAppScript(JSONObject object) { + SysApplicationScriptEntity entity = getData("jsonStr", object, SysApplicationScriptEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + sysApplicationScriptDao.logicRemoveMultiCondition(entity); + return BaseResult.getSuccessMessageEntity("删除脚本成功"); + } + + /** + * @param object + * @return + * @Author lvleigang + * @Description 获取脚本接口 + * @Date 2:10 下午 2023/9/23 + **/ + @Override + public JsonResultEntity getAppScript(JSONObject object) { + SysApplicationScriptEntity entity = getData("jsonStr", object, SysApplicationScriptEntity.class); + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + //查询接口 + SysApplicationScriptEntity sysApplicationScriptEntity = sysApplicationScriptDao.get(entity.getId()); + return BaseResult.getSuccessMessageEntity("查询数据成功", sysApplicationScriptEntity); + } + + /** + * @param object + * @return + * @Author lvleigang + * @Description 脚本启用停用接口 + * @Date 2:10 下午 2023/9/23 + **/ + @Override + public JsonResultEntity enableOrDisableAppScript(JSONObject object) { + SysApplicationScriptEntity entity = getData("jsonStr", object, SysApplicationScriptEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getScriptStatus() == null || "".equals(entity.getScriptStatus())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + sysApplicationScriptDao.update(entity); + if ("1".equals(entity.getScriptStatus())) {// 1启用2停用 + return BaseResult.getSuccessMessageEntity("启用成功"); + } else { + return BaseResult.getSuccessMessageEntity("停用成功"); + } + } } From 37d45b8ab0dd608de79040f23ca209f41a0fad10 Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Tue, 18 Jun 2024 11:08:43 +0800 Subject: [PATCH 28/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E8=AF=AD=E8=A8=80groovydemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GroovyIntegrationServiceImpl.java | 51 +++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java index 580c718c..c4d69b2d 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java @@ -6,8 +6,6 @@ import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService; import com.hzya.frame.util.GroovyUtil; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import groovy.lang.GroovyClassLoader; -import groovy.lang.GroovyObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -24,28 +22,41 @@ import org.springframework.stereotype.Service; public class GroovyIntegrationServiceImpl implements IGroovyIntegrationService { private static final Logger logger = LoggerFactory.getLogger(GroovyIntegrationServiceImpl.class); -// public static void main(String[] args) { -// HelloWorld helloWorld = new HelloWorld(); -// System.out.println(helloWorld.sayHello()); -// } - - public static void main(String[] args) throws IllegalAccessException, InstantiationException { - GroovyClassLoader groovyClassLoader = new GroovyClassLoader(); - - // 动态编译和加载Groovy脚本 - Class groovyClass = groovyClassLoader.parseClass("println(\"1231231\")"); - - // 创建Groovy类的实例 - GroovyObject groovyObject = (GroovyObject) groovyClass.newInstance(); - // 执行Groovy脚本 - JSONObject jsonObject = new JSONObject(); - jsonObject.put("name", "张三"); - Object returnObj = groovyObject.invokeMethod("run", jsonObject.toJSONString()); - } @Override public JsonResultEntity groovyScriptExecution(JSONObject jsonObject) { Object object = GroovyUtil.execute(jsonObject); return BaseResult.getSuccessMessageEntity(object); } + + public static void main(String[] args) { + java.lang.String str = "{\"project_org\":\"\",\"modify_time\":\"2024-06-17 16:52:34\",\"project_duty_dept\":null,\"project_name\":\"凯伍德组织档案\",\"document_rule_num\":1,\"add_status\":\"0\",\"delete_status\":\"1\",\"project_dutier\":\"\",\"id\":\"fb12734c8267488b96833633e68a7abc\",\"data_status\":\"F\",\"modify_user_id\":\"c796fd9ba4c9f5ff3cc2fa41a040e443\",\"sorts\":1,\"project_memo\":\"\",\"document_rule\":\"XM-2024-06-17-00001\",\"create_user_id\":\"c796fd9ba4c9f5ff3cc2fa41a040e443\",\"create_time\":\"2024-06-17 16:42:18\",\"company_id\":null,\"project_sh_name\":\"\",\"project_code\":\"01004\",\"project_currtype\":\"\",\"update_status\":\"0\",\"sts\":\"Y\",\"org_id\":\"0\",\"project_parentpro\":\"\",\"project_bill_type\":\"\"}"; + + A88772 s = new A88772(); + s .execute(str); + } + static class A88772 { + String execute(String jsonStr) { + com.alibaba.fastjson.JSONObject reqData = com.alibaba.fastjson.JSON.parseObject(jsonStr); + com.alibaba.fastjson.JSONObject returnObject = new com.alibaba.fastjson.JSONObject(); + com.alibaba.fastjson.JSONObject ufinterfaceObject = new com.alibaba.fastjson.JSONObject(); + ufinterfaceObject.put("billtype", "supplier"); ufinterfaceObject.put("isexchange", "Y"); + ufinterfaceObject.put("replace", "Y"); ufinterfaceObject.put("sender", "OA"); + ufinterfaceObject.put("account", "01"); ufinterfaceObject.put("groupcode", "00"); + com.alibaba.fastjson.JSONObject billObject = new com.alibaba.fastjson.JSONObject(); + com.alibaba.fastjson.JSONObject billheadObject = new com.alibaba.fastjson.JSONObject(); + billheadObject.put("code", reqData.get("project_code")); billheadObject.put("supprop", "0"); + billheadObject.put("custstate", "1"); billheadObject.put("pk_supplierclass", "S01"); + billheadObject.put("pk_country", "CN"); billheadObject.put("pk_timezone", "P0800"); + billheadObject.put("pk_format", "ZH-CN"); billheadObject.put("enablestate", "2"); + billheadObject.put("name", reqData.get("project_sh_name")); billheadObject.put("pk_group", "00"); + billheadObject.put("pk_org", "003"); billheadObject.put("taxpayerid", "087981489021135119"); + returnObject.put("ufinterface",ufinterfaceObject); billObject.put("billhead", billheadObject); returnObject.put("bill",billObject); + System.out.println( returnObject.toJSONString()); + return returnObject.toJSONString(); + } + } + + + } From db50cf0c1aa4c3032c28eabeace1b8df3c766bf3 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 18 Jun 2024 16:29:47 +0800 Subject: [PATCH 29/44] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E9=87=8D=E6=96=B0=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/MdmModulePluginInitializer.java | 422 ++++++++++++++++++ .../plugin/mdmDistribute/pluginCfg.xml | 6 + .../spring/spring-buildpackage-plugin.xml | 5 + .../test/java/com/hzya/frame/temButtom.java | 14 + .../mdm/mdmModule/dao/IMdmModuleDao.java | 5 + .../mdmModule/dao/impl/MdmModuleDaoImpl.java | 17 + .../mdm/mdmModule/entity/MdmModuleEntity.xml | 18 + .../service/impl/MdmModuleServiceImpl.java | 10 + .../entity/MdmModuleDbFiledsEntity.java | 2 - .../dao/IMdmModuleDistributeDao.java | 2 +- .../dao/impl/MdmModuleDistributeDaoImpl.java | 2 +- .../entity/MdmModuleDistributeEntity.java | 15 +- .../entity/MdmModuleDistributeEntity.xml | 34 +- .../service/IMdmModuleDistributeService.java | 2 +- .../impl/MdmModuleDistributeServiceImpl.java | 2 +- .../api/entity/SysApplicationApiEntity.java | 38 ++ .../application/entity/SysApplicationDto.java | 11 +- .../entity/SysApplicationEntity.java | 10 + .../entity/SysApplicationEntity.xml | 22 +- .../application/entity/SysApplicationVo.java | 10 + 20 files changed, 626 insertions(+), 21 deletions(-) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/pluginCfg.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/spring/spring-buildpackage-plugin.xml diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java new file mode 100644 index 00000000..a4e83262 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java @@ -0,0 +1,422 @@ +package com.hzya.frame.plugin.mdmDistribute.plugin; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity; +import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity; +import com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao.IMdmModuleDbFiledsRuleDao; +import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; +import com.hzya.frame.mdm.mdmModuleDistribute.dao.IMdmModuleDistributeDao; +import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity; +import com.hzya.frame.mdm.service.IMdmServiceCache; +import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; +import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; +import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; +import com.hzya.frame.sysnew.application.script.dao.ISysApplicationScriptDao; +import com.hzya.frame.sysnew.application.script.entity.SysApplicationScriptEntity; +import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.http.HttpEntity; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; + +import javax.annotation.Resource; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 主数据模版(MdmModule)表服务接口 + * + * @author makejava + * @since 2024-06-18 10:33:32 + */ +public class MdmModulePluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(MdmModulePluginInitializer.class); + @Resource + private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao; + @Resource + private IIntegrationTaskLivingDetailsService taskLivingDetailsService; + @Resource + private ISysApplicationApiDao sysApplicationApiDao; + @Resource + private ISysApplicationDao sysApplicationDao; + @Resource + private ISysApplicationScriptDao sysApplicationScriptDao; + @Resource + private IMdmModuleDistributeDao mdmModuleDistributeDao; + @Resource + private IGroovyIntegrationService groovyIntegrationService; + @Resource + private IMdmModuleDbFiledsRuleDao mdmModuleDbFiledsRuleDao; + @Resource + private IMdmModuleDao mdmModuleDao; + @Resource + private IMdmServiceCache mdmServiceCache; + + @Value("${ax.url}") + private String url ; + + //多线程请求加锁 HttpRequest 构造方法是静态的 + private final Object lock = new Object(); + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "MdmModulePlugin"; + } + + @Override + public String getPluginName() { + return "MdmModulePlugin插件"; + } + + @Override + public String getPluginLabel() { + return "MdmModulePlugin"; + } + + @Override + public String getPluginType() { + return "1"; + } + + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) { + try{ + //重试方法 + if (null != requestJson) { + //如果这个id不为空，说明是重试的 + String id = requestJson.getString("integration_task_living_details_id"); + if (StrUtil.isNotEmpty(id)) { + //查询日志表 + IntegrationTaskLivingDetailsEntity taskDetailEntity = taskLivingDetailsService.get(id); + if (null != taskDetailEntity && JSONUtil.isTypeJSON(taskDetailEntity.getRootAppPk())){ + //拿到这张表的源系统ID + JSONObject jsonObject = JSONObject.parseObject(taskDetailEntity.getRootAppPk()); + Long mdmCode = jsonObject.getLong("mdmCode");//主数据编码 + String documentRule = jsonObject.getString("documentRule");//行数据的单据规则编码 + String distributeId = jsonObject.getString("distributeId");//发送表id + String type = jsonObject.getString("type");//发送类型，1、新增2、修改3、删除 + if(mdmCode == null || documentRule == null || distributeId == null || type == null + || "".equals(mdmCode) || "".equals(documentRule) || "".equals(distributeId) || "".equals(type)){ + taskDetailEntity.setResult("系统保存参数错误"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("系统保存参数错误"); + } + String apiId = null; + String scriptId = null; + //查找对应数据，组装数据发送 + + //获取主数据信息 + MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(mdmCode); + if(mdmModuleEntity == null || mdmModuleEntity.getId() == null ){ + taskDetailEntity.setResult("主数据不存在"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("主数据不存在"); + + } + + //获取主数据db + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity); + if(mdmModuleDbEntities == null || mdmModuleDbEntities.size() == 0){ + taskDetailEntity.setResult("主数据数据源不存在"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("主数据数据源不存在"); + + } + + //获取分发表 + //获取分发的接口 + MdmModuleDistributeEntity mdmModuleDistributeEntity = mdmModuleDistributeDao.get(distributeId); + if(mdmModuleDistributeEntity == null || mdmModuleDistributeEntity.getId() == null ){ + taskDetailEntity.setResult("分发不存在"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("分发不存在"); + + } + // 启用停用 0、停用 + if("0".equals(mdmModuleDistributeEntity.getEnabledState())){ + taskDetailEntity.setResult("分发已停用"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("分发已停用"); + + } + // 启用停用 0、停用 + //if("1".equals(mdmModuleDistributeEntity.getEnabledType())){ + // taskDetailEntity.setResult("分发为手动下发"); + // taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + // return BaseResult.getFailureMessageEntity("分发为手动下发"); + //} + //1、新增2、修改3、删除 + if("1".equals(type)){ + apiId = mdmModuleDistributeEntity.getAddApi(); + scriptId = mdmModuleDistributeEntity.getAddScript(); + }else if("2".equals(type)){ + apiId = mdmModuleDistributeEntity.getUpdateApi(); + scriptId = mdmModuleDistributeEntity.getUpdateScript(); + + }else if("3".equals(type)){ + apiId = mdmModuleDistributeEntity.getDeleteApi(); + scriptId = mdmModuleDistributeEntity.getDeleteScript(); + } + if(apiId == null || "".equals(apiId)){ + taskDetailEntity.setResult("分发接口未选择，请先选择"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("分发接口未选择，请先选择"); + + } + SysApplicationScriptEntity scriptEntity = null; + if(scriptId != null && !"".equals(scriptId)){ + scriptEntity = sysApplicationScriptDao.get(scriptId); + if(scriptEntity == null || scriptEntity.getId() == null ){ + taskDetailEntity.setResult("分发接口脚本不存在"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("分发接口脚本不存在"); + } + } + SysApplicationApiEntity apiEntity = sysApplicationApiDao.get(apiId); + if(apiEntity == null || apiEntity.getId() == null ){ + taskDetailEntity.setResult("分发接口不存在"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("分发接口不存在"); + + } + SysApplicationEntity sysApplicationEntity = sysApplicationDao.get(apiEntity.getAppId()); + if(sysApplicationEntity == null || sysApplicationEntity.getId() == null ){ + taskDetailEntity.setResult("应用不存在"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("应用不存在"); + + } + + //获取主数据db字段，以及字段的规则 + MdmModuleDbFiledsEntity queryFild = new MdmModuleDbFiledsEntity(); + queryFild.setMdmId(mdmModuleEntity.getId()); + List mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(queryFild); + MdmModuleDbFiledsRuleEntity queryFildRule = new MdmModuleDbFiledsRuleEntity(); + queryFildRule.setMdmId(mdmModuleEntity.getId()); + queryFildRule.setRuleCode("service"); + List mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(queryFildRule); + //获取主数据db对应的实体表的数据 + JSONObject object = new JSONObject(); + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + if("1".equals(mdmModuleDbEntities.get(i).getDbType())){ + Map map = new HashMap<>(); + map.put("tableName",mdmModuleDbEntities.get(i).getDbName()); + map.put("documentRule",documentRule); + object = mdmModuleDao.queryMdmST(map); + if(object.getString("id") == null || "".equals(object.getString("id")) ){ + taskDetailEntity.setResult("当前数据不存在"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("当前数据不存在"); + } + //查看主表是否有字段是关联的 + if(mdmModuleDbFiledsRuleEntities != null && mdmModuleDbFiledsRuleEntities.size() > 0){ + for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntities.size(); i1++) { + if(mdmModuleDbFiledsRuleEntities.get(i1).getDbId().equals(mdmModuleDbEntities.get(i).getId())){ + if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){ + for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) { + if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){ + Map mapDetail = new HashMap<>(); + mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue()); + mapDetail.put("id",object.getString(mdmModuleDbFiledsEntities.get(i2).getEnName())); + JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail); + object.put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail); + } + } + } + } + } + } + } + } + + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + if("2".equals(mdmModuleDbEntities.get(i).getDbType())){ + Map map = new HashMap<>(); + map.put("tableName",mdmModuleDbEntities.get(i).getDbName()); + map.put("formmainId",object.getString("id")); + List detail = mdmModuleDao.queryMdmSTDetail(map); + //查看主表是否有字段是关联的 + if(detail != null && detail.size() > 0){ + if(mdmModuleDbFiledsRuleEntities != null && mdmModuleDbFiledsRuleEntities.size() > 0){ + for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntities.size(); i1++) { + if(mdmModuleDbFiledsRuleEntities.get(i1).getDbId().equals(mdmModuleDbEntities.get(i).getId())){ + if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){ + for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) { + if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){ + for (int i3 = 0; i3 < detail.size(); i3++) { + Map mapDetail = new HashMap<>(); + mapDetail.put("tableName",mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue()); + mapDetail.put("id",detail.get(i3).getString(mdmModuleDbFiledsEntities.get(i2).getEnName())); + JSONObject objectDetail = mdmModuleDao.queryMdmST(mapDetail); + detail.get(i3).put(mdmModuleDbFiledsEntities.get(i2).getEnName(),objectDetail); + } + } + } + } + } + } + } + } + object.put(mdmModuleDbEntities.get(i).getDbName(),detail); + } + } + //执行脚本 + JSONObject groovy = new JSONObject(); + JSONObject parameterJson = new JSONObject(); + parameterJson.put("header",apiEntity.getHeaderInValue()); + //parameterJson.put("body",apiEntity.getBodyIn()); + parameterJson.put("data",object); + if(scriptEntity != null && scriptEntity.getId() != null ){ + groovy.put("code",scriptEntity.getScriptCode()); + groovy.put("className",scriptEntity.getClassName()); + groovy.put("name",scriptEntity.getScriptName()); + groovy.put("methodStr",scriptEntity.getScriptData()); + groovy.put("parameterJson",parameterJson); + try { + JsonResultEntity jsonResultEntity = groovyIntegrationService.groovyScriptExecution(groovy); + if(!jsonResultEntity.isFlag()){ + taskDetailEntity.setResult("分发脚本转换错误"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("分发脚本转换错误"); + } + JSONObject returnGroovy = JSONObject.parseObject(jsonResultEntity.getAttribute().toString()); + }catch (Exception e){ + taskDetailEntity.setResult("分发脚本转换错误"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("分发脚本转换错误"); + } + } + Map headers = new HashMap<>(); + headers.put("publicKey","ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj"); + headers.put("secretKey","fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="); + headers.put("appId",sysApplicationEntity.getAppId().toString()); + headers.put("apiCode",apiEntity.getApiCode().toString()); + //组装数据发送 + JsonResultEntity jsonResultEntity = sendData(apiEntity,headers,object.toJSONString()); + if(jsonResultEntity.isFlag()){ + taskDetailEntity.setResult("发送成功"); + taskLivingDetailsService.saveLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("发送成功"); + }else { + taskDetailEntity.setResult("发送错误"); + taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); + return BaseResult.getFailureMessageEntity("发送错误"); + } + } + }else { + //执行正常逻辑 + + + } + } + logger.info("执行成功"); + return BaseResult.getSuccessMessageEntity("执行成功"); + } catch (Exception e) { + logger.error("执行失败{}",e.getMessage()); + } + return BaseResult.getSuccessMessageEntity("执行成功"); + } + + private JsonResultEntity sendData(SysApplicationApiEntity applicationApiEntity, Map headers ,String bodys ) { + StringBuffer urls = new StringBuffer(url); + + HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); + // HttpClient + CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build(); + HttpPost post = new HttpPost(urls.toString()); + CloseableHttpResponse response = null; + + RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(Integer.valueOf(applicationApiEntity.getTimeoutPeriod())).build(); + post.setConfig(requestConfig);//设置请求参数【超时时间】 + + if (headers != null && headers.size() > 0) { + for (String key : headers.keySet()) { + post.setHeader(key, headers.get(key)); + } + } + StringBuilder body = new StringBuilder(); + boolean flag = true; + try { + if (bodys != null && !"".equals(bodys)) { + ByteArrayEntity entity = new ByteArrayEntity(bodys.getBytes("UTF-8")); + entity.setContentType("application/json"); + post.setEntity(entity); + } + response = closeableHttpClient.execute(post); + + HttpEntity entity = response.getEntity(); + synchronized (lock) { + body.append(EntityUtils.toString(entity,"UTF-8")); + } + flag = true; + logger.info("返回结果：" + body); + } catch (Exception e) { + logger.error("请求错误：" + e.getMessage()); + body.append(e.getMessage()); + flag = false; + } finally { + try { + // 关闭响应对象 + if (response != null) { + response.close(); + } + // 关闭响应对象 + if (closeableHttpClient != null) { + closeableHttpClient.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + + } + if (flag) { + if (JSONUtil.isTypeJSON(body.toString())) { + JsonResultEntity jsonResultEntity = JSONObject.parseObject(body.toString(),JsonResultEntity.class); + if(jsonResultEntity.isFlag()){ + return BaseResult.getSuccessMessageEntity("转发成功", body); + }else { + return BaseResult.getFailureMessageEntity("转发失败", body); + } + }else { + return BaseResult.getFailureMessageEntity("转发失败", body); + } + } else { + return BaseResult.getFailureMessageEntity("转发失败", body); + } + } +} diff --git a/buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/pluginCfg.xml new file mode 100644 index 00000000..7b7b63b8 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/pluginCfg.xml @@ -0,0 +1,6 @@ + + +MdmModulePlugin +MdmModulePlugin插件 +90000001 + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..4952fc4c --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/buildpackage/src/test/java/com/hzya/frame/temButtom.java b/buildpackage/src/test/java/com/hzya/frame/temButtom.java index e3154559..7f827971 100644 --- a/buildpackage/src/test/java/com/hzya/frame/temButtom.java +++ b/buildpackage/src/test/java/com/hzya/frame/temButtom.java @@ -2,6 +2,7 @@ package com.hzya.frame; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.plugin.mdmDistribute.plugin.MdmModulePluginInitializer; import com.hzya.frame.plugin.seeyonExt.plugin.SeeyonExtPluginInitializer; import com.hzya.frame.util.AESUtil; import org.junit.Test; @@ -23,6 +24,8 @@ public class temButtom { @Resource SeeyonExtPluginInitializer seeyonExtPluginInitializer; + @Resource + MdmModulePluginInitializer mdmModulePluginInitializer; @Test public void seeyonExtTest(){ JSONObject jsonStr = new JSONObject(); @@ -36,6 +39,17 @@ public class temButtom { } } + @Test + public void mdm(){ + JSONObject jsonStr = new JSONObject(); + jsonStr.put("integration_task_living_details_id","123123123123"); + try { + mdmModulePluginInitializer.executeBusiness(jsonStr); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + @Test public void test01() { String a = AESUtil.encrypt("hzya@1314"); diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java index 5a2b602f..f40843a7 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java @@ -1,5 +1,6 @@ package com.hzya.frame.mdm.mdmModule.dao; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.mdm.entity.MdmDataDto; import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.entity.MdmQuery; @@ -47,5 +48,9 @@ public interface IMdmModuleDao extends IBaseDao { Integer deleteTable(Map maps); + + JSONObject queryMdmST(Map maps); + List queryMdmSTDetail(Map maps); + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java index c7435918..36537041 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.mdm.mdmModule.dao.impl; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.mdm.entity.MdmDataDto; import com.hzya.frame.mdm.entity.MdmDto; import com.hzya.frame.mdm.entity.MdmQuery; @@ -125,6 +126,9 @@ public class MdmModuleDaoImpl extends MybatisGenericDao Integer o = (Integer) super.delete(getSqlIdPrifx() + "deleteTable", maps); return o; } + + + @Override public Integer alterTable(Map maps) { Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "alterTable", maps); @@ -142,5 +146,18 @@ public class MdmModuleDaoImpl extends MybatisGenericDao return o; } + + @Override + public JSONObject queryMdmST(Map maps) { + JSONObject o = (JSONObject) super.selectOne(getSqlIdPrifx() + "queryMdmST", maps); + return o; + } + + @Override + public List queryMdmSTDetail(Map maps) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryMdmSTDetail", maps); + return o; + } + } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 7dbd9244..75ff1531 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -792,5 +792,23 @@ where id = #{id} + + + + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java index 677329b2..2bae850a 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java @@ -495,6 +495,16 @@ public class MdmModuleServiceImpl extends BaseService i //新增 设置日志表 setMdmField(mdmModuleDbEntity1, mdmModuleDbFiledsEntities); } + for (int i = 0; i < mdmModuleDbEntities.size(); i++) { + //查看表是否存在 + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setDbName(mdmModuleDbEntities.get(i).getDbName()); + mdmModuleDbEntity.setSts("Y"); + int a = mdmModuleDbDao.getCount(mdmModuleDbEntity); + if(a > 0){ + return BaseResult.getFailureMessageEntity("表已存在，请修改"); + } + } mdmServiceCache.saveOrUpdateMdmModuleDb(entity.getMdmId(), mdmModuleDbEntities); mdmServiceCache.saveOrUpdateMdmModuleDbFileds(entity.getMdmId(), mdmModuleDbFiledsEntities); diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java index 80e26fd1..3e1debd5 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java @@ -1,11 +1,9 @@ package com.hzya.frame.mdm.mdmModuleDbFileds.entity; -import java.util.Date; import java.util.List; import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity; import com.hzya.frame.web.entity.BaseEntity; -import org.apache.poi.ss.formula.functions.T; /** * 模版数据库字段表(MdmModuleDbFileds)实体类 diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java index 5ccc1e4d..ffa3cacc 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java @@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao; * 主数据功能应用分发表(mdm_module_distribute: table)表数据库访问层 * * @author makejava - * @since 2024-06-17 11:05:32 + * @since 2024-06-18 11:39:46 */ public interface IMdmModuleDistributeDao extends IBaseDao { diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java index 20fcd94f..83ba2db8 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java @@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * 主数据功能应用分发表(MdmModuleDistribute)表数据库访问层 * * @author makejava - * @since 2024-06-17 11:05:32 + * @since 2024-06-18 11:39:46 */ @Repository(value = "MdmModuleDistributeDaoImpl") public class MdmModuleDistributeDaoImpl extends MybatisGenericDao implements IMdmModuleDistributeDao{ diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java index 08ff46f7..30fcf0dc 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java @@ -9,7 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity; * 主数据功能应用分发表(MdmModuleDistribute)实体类 * * @author makejava - * @since 2024-06-17 11:05:33 + * @since 2024-06-18 11:39:46 */ public class MdmModuleDistributeEntity extends BaseEntity { @@ -17,6 +17,8 @@ public class MdmModuleDistributeEntity extends BaseEntity { private String mdmId; /** 应用id */ private String appId; + /** 触发类型 0、手动1、自动 */ + private String enabledType; /** 修改接口 */ private String updateApi; /** 修改插件 */ @@ -35,8 +37,9 @@ public class MdmModuleDistributeEntity extends BaseEntity { private String dbId; /** 公司id */ private String companyId; + /** 公司id */ + private List mdmModuleDistributeDetailEntities; - private List mdmModuleDistributeDetailEntities; public String getMdmId() { return mdmId; @@ -54,6 +57,14 @@ public class MdmModuleDistributeEntity extends BaseEntity { this.appId = appId; } + public String getEnabledType() { + return enabledType; + } + + public void setEnabledType(String enabledType) { + this.enabledType = enabledType; + } + public String getUpdateApi() { return updateApi; } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml index d7822968..0a959f0f 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml @@ -6,6 +6,7 @@ + @@ -28,6 +29,7 @@ id ,mdm_id ,app_id + ,enabled_type ,update_api ,update_script ,add_api @@ -45,6 +47,13 @@ ,org_id ,company_id + + + - + insert into mdm_module_distribute( id , mdm_id , app_id , + enabled_type , update_api , update_script , add_api , @@ -190,6 +204,7 @@ sts , org_id , company_id , + sorts, sts, )values( @@ -197,6 +212,7 @@ #{id} , #{mdmId} , #{appId} , + #{enabledType} , #{updateApi} , #{updateScript} , #{addApi} , @@ -213,28 +229,30 @@ #{sts} , #{org_id} , #{companyId} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_distribute a WHERE a.sts = 'Y' ), 'Y', ) - - insert into mdm_module_distribute(mdm_id, app_id, update_api, update_script, add_api, add_script, delete_api, delete_script, enabled_state, db_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + + insert into mdm_module_distribute(mdm_id, app_id, enabled_type, update_api, update_script, add_api, add_script, delete_api, delete_script, enabled_state, db_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values - (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.updateScript},#{entity.addApi},#{entity.addScript},#{entity.deleteApi},#{entity.deleteScript},#{entity.enabledState},#{entity.dbId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + (#{entity.mdmId},#{entity.appId},#{entity.enabledType},#{entity.updateApi},#{entity.updateScript},#{entity.addApi},#{entity.addScript},#{entity.deleteApi},#{entity.deleteScript},#{entity.enabledState},#{entity.dbId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') - - insert into mdm_module_distribute(mdm_id, app_id, update_api, update_script, add_api, add_script, delete_api, delete_script, enabled_state, db_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + + insert into mdm_module_distribute(mdm_id, app_id, enabled_type, update_api, update_script, add_api, add_script, delete_api, delete_script, enabled_state, db_id, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values - (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.updateScript},#{entity.addApi},#{entity.addScript},#{entity.deleteApi},#{entity.deleteScript},#{entity.enabledState},#{entity.dbId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + (#{entity.mdmId},#{entity.appId},#{entity.enabledType},#{entity.updateApi},#{entity.updateScript},#{entity.addApi},#{entity.addScript},#{entity.deleteApi},#{entity.deleteScript},#{entity.enabledState},#{entity.dbId},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) on duplicate key update mdm_id = values(mdm_id), app_id = values(app_id), + enabled_type = values(enabled_type), update_api = values(update_api), update_script = values(update_script), add_api = values(add_api), @@ -256,6 +274,7 @@ update mdm_module_distribute set mdm_id = #{mdmId}, app_id = #{appId}, + enabled_type = #{enabledType}, update_api = #{updateApi}, update_script = #{updateScript}, add_api = #{addApi}, @@ -286,6 +305,7 @@ update mdm_module_distribute set sts= 'N' ,modify_time = #{modify_time},modify_ and id = #{id} and mdm_id = #{mdmId} and app_id = #{appId} + and enabled_type = #{enabledType} and update_api = #{updateApi} and update_script = #{updateScript} and add_api = #{addApi} diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java index 7f674ad3..46befe7b 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java @@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService; * 主数据功能应用分发表(MdmModuleDistribute)表服务接口 * * @author makejava - * @since 2024-06-17 11:05:33 + * @since 2024-06-18 11:39:46 */ public interface IMdmModuleDistributeService extends IBaseService{ } diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java index bfab4787..29bbea60 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java @@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService; * 主数据功能应用分发表(MdmModuleDistribute)表服务实现类 * * @author makejava - * @since 2024-06-17 11:05:33 + * @since 2024-06-18 11:39:46 */ @Service(value = "mdmModuleDistributeService") public class MdmModuleDistributeServiceImpl extends BaseService implements IMdmModuleDistributeService { diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java index e0fc5061..577ec4ca 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java @@ -1,6 +1,11 @@ package com.hzya.frame.sysnew.application.api.entity; +import java.util.ArrayList; import java.util.Date; +import java.util.List; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.web.entity.BaseEntity; /** * 应用api(SysApplicationApi)实体类 @@ -291,5 +296,38 @@ public class SysApplicationApiEntity extends BaseEntity { public void setReturnSuccessValue(String returnSuccessValue) { this.returnSuccessValue = returnSuccessValue; } + + public List getHeaderInValue() { + List jsonObjects = new ArrayList<>(); + if(headerIn != null && !"".equals(headerIn)){ + JSONArray headers = JSONArray.parseArray(headerIn); + if(headers != null && headers.size() > 0){ + for (int i = 0; i < headers.size(); i++) { + JSONObject object = new JSONObject(); + object.put(headers.getJSONObject(i).getString("parameterName"),headers.getJSONObject(i).getString("example")); + jsonObjects.add(object); + } + } + } + return jsonObjects; + } + + public String getQueryInValue() { + StringBuffer jsonObjects = new StringBuffer(); + if(queryIn != null && !"".equals(queryIn)){ + JSONArray querys = JSONArray.parseArray(queryIn); + if(querys != null && querys.size() > 0){ + for (int i = 0; i < querys.size(); i++) { + if(i != 0){ + jsonObjects.append("&"); + } + jsonObjects.append(querys.getJSONObject(i).getString("parameterName")); + jsonObjects.append("="); + jsonObjects.append(querys.getJSONObject(i).getString("example")); + } + } + } + return jsonObjects.toString(); + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java index 5a797b9a..e619ae21 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java @@ -59,7 +59,8 @@ public class SysApplicationDto { private String systemAddress; //api接口参数表 private List apiParas; - + /** 系统类型 1、致远OA 2、用友U8C 3、用友BIP */ + private String appType; //数据源 private SysApplicationDatabaseEntity databaseEntity; private Integer pageNum; @@ -262,5 +263,13 @@ public class SysApplicationDto { public void setSystemAddress(String systemAddress) { this.systemAddress = systemAddress; } + + public String getAppType() { + return appType; + } + + public void setAppType(String appType) { + this.appType = appType; + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java index 0e9a8131..3eb1ff34 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java @@ -43,6 +43,8 @@ public class SysApplicationEntity extends BaseEntity { /** 数据源是否启用（1、开启 2、关闭） */ private String dbStatus; + /** 系统类型 1、致远OA 2、用友U8C 3、用友BIP */ + private String appType; /** appid */ private Integer appId; /** ip白名单 */ @@ -191,5 +193,13 @@ public class SysApplicationEntity extends BaseEntity { public void setSystemAddress(String systemAddress) { this.systemAddress = systemAddress; } + + public String getAppType() { + return appType; + } + + public void setAppType(String appType) { + this.appType = appType; + } } diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml index 2187fa57..63ca8873 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml @@ -22,6 +22,7 @@ + @@ -51,7 +52,8 @@ ,interface_address ,interface_status ,db_status - ,sorts + ,app_type + ,sorts ,org_id ,sts ,create_time @@ -90,6 +92,7 @@ and interface_address = #{interfaceAddress} and interface_status = #{interfaceStatus} and db_status = #{dbStatus} + and app_type = #{appType} and sorts = #{sorts} and org_id = #{org_id} and sts = #{sts} @@ -126,6 +129,7 @@ and interface_address = #{interfaceAddress} and interface_status = #{interfaceStatus} and db_status = #{dbStatus} + and app_type = #{appType} and sorts = #{sorts} and org_id = #{org_id} and sts = #{sts} @@ -164,6 +168,7 @@ and interface_address like concat('%',#{interfaceAddress},'%') and interface_status like concat('%',#{interfaceStatus},'%') and db_status like concat('%',#{dbStatus},'%') + and app_type like concat('%',#{appType},'%') and sorts like concat('%',#{sorts},'%') and org_id like concat('%',#{org_id},'%') and sts like concat('%',#{sts},'%') @@ -202,6 +207,7 @@ or interface_address = #{interfaceAddress} or interface_status = #{interfaceStatus} or db_status = #{dbStatus} + or app_type = #{appType} or sorts = #{sorts} or org_id = #{org_id} or sts = #{sts} @@ -239,6 +245,7 @@ interface_address , interface_status , db_status , + app_type , sorts , org_id , sts , @@ -271,6 +278,7 @@ #{interfaceAddress} , #{interfaceStatus} , #{dbStatus} , + #{appType} , #{sorts} , #{org_id} , #{sts} , @@ -285,18 +293,18 @@ - insert into sys_application(app_logo, app_status, name, version_number, app_id, system_address, access_mode, affiliation_field, manufacturer, app_introduction, client_path, web_path, program_path, public_key, secret_key, interface_address, interface_status, db_status, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id, sts) + insert into sys_application(app_logo, app_status, name, version_number, app_id, system_address, access_mode, affiliation_field, manufacturer, app_introduction, client_path, web_path, program_path, public_key, secret_key, interface_address, interface_status, db_status,app_type, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id, sts) values - (#{entity.appLogo},#{entity.appStatus},#{entity.name},#{entity.versionNumber},#{entity.appId},#{entity.systemAddress},#{entity.accessMode},#{entity.affiliationField},#{entity.manufacturer},#{entity.appIntroduction},#{entity.clientPath},#{entity.webPath},#{entity.programPath},#{entity.publicKey},#{entity.secretKey},#{entity.interfaceAddress},#{entity.interfaceStatus},#{entity.dbStatus},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id}, 'Y') + (#{entity.appLogo},#{entity.appStatus},#{entity.name},#{entity.versionNumber},#{entity.appId},#{entity.systemAddress},#{entity.accessMode},#{entity.affiliationField},#{entity.manufacturer},#{entity.appIntroduction},#{entity.clientPath},#{entity.webPath},#{entity.programPath},#{entity.publicKey},#{entity.secretKey},#{entity.interfaceAddress},#{entity.interfaceStatus},#{entity.dbStatus},#{entity.appType},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id}, 'Y') - insert into sys_application(app_logo, app_status, name, version_number,app_id,system_address, access_mode, affiliation_field, manufacturer, app_introduction, client_path, web_path, program_path, public_key, secret_key, interface_address, interface_status, db_status, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id) + insert into sys_application(app_logo, app_status, name, version_number,app_id,system_address, access_mode, affiliation_field, manufacturer, app_introduction, client_path, web_path, program_path, public_key, secret_key, interface_address, interface_status, db_status,app_type, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id) values - (#{entity.appLogo},#{entity.appStatus},#{entity.name},#{entity.versionNumber},#{entity.appId},#{entity.systemAddress},#{entity.accessMode},#{entity.affiliationField},#{entity.manufacturer},#{entity.appIntroduction},#{entity.clientPath},#{entity.webPath},#{entity.programPath},#{entity.publicKey},#{entity.secretKey},#{entity.interfaceAddress},#{entity.interfaceStatus},#{entity.dbStatus},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id}) + (#{entity.appLogo},#{entity.appStatus},#{entity.name},#{entity.versionNumber},#{entity.appId},#{entity.systemAddress},#{entity.accessMode},#{entity.affiliationField},#{entity.manufacturer},#{entity.appIntroduction},#{entity.clientPath},#{entity.webPath},#{entity.programPath},#{entity.publicKey},#{entity.secretKey},#{entity.interfaceAddress},#{entity.interfaceStatus},#{entity.dbStatus},#{entity.appType},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id}) on duplicate key update app_logo = values(app_logo), @@ -317,6 +325,7 @@ interface_address = values(interface_address), interface_status = values(interface_status), db_status = values(db_status), + app_type = values(app_type), sorts = values(sorts), org_id = values(org_id), sts = values(sts), @@ -346,6 +355,7 @@ update sys_application set interface_address = #{interfaceAddress}, interface_status = #{interfaceStatus}, db_status = #{dbStatus}, + app_type = #{appType}, sorts = #{sorts}, org_id = #{org_id}, sts = #{sts}, @@ -384,6 +394,7 @@ update sys_application set sts= 'N' ,modify_time = #{modify_time},modify_user_i and interface_address = #{interfaceAddress} and interface_status = #{interfaceStatus} and db_status = #{dbStatus} + and app_type = #{appType} and sorts = #{sorts} and sts = #{sts} and sts='Y' @@ -411,6 +422,7 @@ update sys_application set sts= 'N' ,modify_time = #{modify_time},modify_user_i ,a.app_introduction as appIntroduction ,a.interface_status as interfaceStatus ,a.db_status as dbStatus + ,a.app_type as appType from sys_application a and a.affiliation_field = #{affiliationField} diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationVo.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationVo.java index cb3bf8a6..2d6670ef 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationVo.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationVo.java @@ -37,6 +37,8 @@ public class SysApplicationVo { /** 应用是否启用（1、启用 2、停用） */ private String appStatus; + /** 系统类型 1、致远OA 2、用友U8C 3、用友BIP */ + private String appType; public String getId() { return id; } @@ -148,5 +150,13 @@ public class SysApplicationVo { public void setSystemAddress(String systemAddress) { this.systemAddress = systemAddress; } + + public String getAppType() { + return appType; + } + + public void setAppType(String appType) { + this.appType = appType; + } } From 2d4b3af64c684b089b20673d3589b8771e1ea28e Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 18 Jun 2024 17:17:11 +0800 Subject: [PATCH 30/44] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E9=87=8D=E6=96=B0=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/MdmModulePluginInitializer.java | 42 ++++++++++++------- .../api/entity/SysApplicationApiEntity.xml | 4 +- .../service/IGroovyIntegrationService.java | 3 +- .../impl/GroovyIntegrationServiceImpl.java | 5 ++- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java index a4e83262..e8e9d374 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java @@ -18,6 +18,7 @@ import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; +import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; import com.hzya.frame.sysnew.application.script.dao.ISysApplicationScriptDao; import com.hzya.frame.sysnew.application.script.entity.SysApplicationScriptEntity; import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService; @@ -118,6 +119,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { if (null != requestJson) { //如果这个id不为空，说明是重试的 String id = requestJson.getString("integration_task_living_details_id"); + //执行重新发送 if (StrUtil.isNotEmpty(id)) { //查询日志表 IntegrationTaskLivingDetailsEntity taskDetailEntity = taskLivingDetailsService.get(id); @@ -298,27 +300,33 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { //执行脚本 JSONObject groovy = new JSONObject(); JSONObject parameterJson = new JSONObject(); - parameterJson.put("header",apiEntity.getHeaderInValue()); - //parameterJson.put("body",apiEntity.getBodyIn()); + parameterJson.put("header",apiEntity.getHeaderIn()); + parameterJson.put("body",apiEntity.getBodyIn()); + parameterJson.put("query",apiEntity.getQueryIn()); parameterJson.put("data",object); + /** head */ + Map header = null; + /** query */ + String querys = null; + /** body */ + String bodys = object.toJSONString(); if(scriptEntity != null && scriptEntity.getId() != null ){ groovy.put("code",scriptEntity.getScriptCode()); groovy.put("className",scriptEntity.getClassName()); groovy.put("name",scriptEntity.getScriptName()); groovy.put("methodStr",scriptEntity.getScriptData()); groovy.put("parameterJson",parameterJson); + JSONObject groovyStr = new JSONObject(); + groovyStr.put("jsonStr",groovy); try { - JsonResultEntity jsonResultEntity = groovyIntegrationService.groovyScriptExecution(groovy); - if(!jsonResultEntity.isFlag()){ - taskDetailEntity.setResult("分发脚本转换错误"); - taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); - return BaseResult.getFailureMessageEntity("分发脚本转换错误"); - } - JSONObject returnGroovy = JSONObject.parseObject(jsonResultEntity.getAttribute().toString()); + SysExtensionApiEntity jsonResultEntity = groovyIntegrationService.groovyScriptExecution(groovy); + header = jsonResultEntity.getHeaders(); + querys = jsonResultEntity.getQuerys(); + bodys = jsonResultEntity.getBodys(); }catch (Exception e){ taskDetailEntity.setResult("分发脚本转换错误"); taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity); - return BaseResult.getFailureMessageEntity("分发脚本转换错误"); + //return BaseResult.getFailureMessageEntity("分发脚本转换错误"); } } Map headers = new HashMap<>(); @@ -326,8 +334,11 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { headers.put("secretKey","fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="); headers.put("appId",sysApplicationEntity.getAppId().toString()); headers.put("apiCode",apiEntity.getApiCode().toString()); + if(header != null){ + headers.putAll(header); + } //组装数据发送 - JsonResultEntity jsonResultEntity = sendData(apiEntity,headers,object.toJSONString()); + JsonResultEntity jsonResultEntity = sendData(apiEntity,headers,bodys,querys); if(jsonResultEntity.isFlag()){ taskDetailEntity.setResult("发送成功"); taskLivingDetailsService.saveLogFailToSuccess(taskDetailEntity); @@ -339,7 +350,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { } } }else { - //执行正常逻辑 + //执行正常下发 } @@ -352,9 +363,12 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { return BaseResult.getSuccessMessageEntity("执行成功"); } - private JsonResultEntity sendData(SysApplicationApiEntity applicationApiEntity, Map headers ,String bodys ) { + private JsonResultEntity sendData(SysApplicationApiEntity applicationApiEntity, Map headers ,String bodys ,String querys) { StringBuffer urls = new StringBuffer(url); - + if (querys != null) { + urls.append("?"); + urls.append(querys); + } HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); // HttpClient CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build(); diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml index f6596703..3b543b9a 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml @@ -85,7 +85,7 @@ a.id, a.api_status, b.name as app_name, - b.interfaceAddress as app_url, + b.interface_address as app_url, a.app_id, a.catalogue_id, c.name as catalogue_name, @@ -704,7 +704,7 @@ where id = #{id} - select a.id, a.catalogue_id AS catalogueId, diff --git a/service/src/main/java/com/hzya/frame/sysnew/grovy/service/IGroovyIntegrationService.java b/service/src/main/java/com/hzya/frame/sysnew/grovy/service/IGroovyIntegrationService.java index c28bd496..ae475ac4 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/grovy/service/IGroovyIntegrationService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/grovy/service/IGroovyIntegrationService.java @@ -1,6 +1,7 @@ package com.hzya.frame.sysnew.grovy.service; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; import com.hzya.frame.web.entity.JsonResultEntity; /** @@ -21,5 +22,5 @@ public interface IGroovyIntegrationService { * @param jsonObject 请求参数对象 * @return com.hzya.frame.web.entity.JsonResultEntity **/ - JsonResultEntity groovyScriptExecution(JSONObject jsonObject); + SysExtensionApiEntity groovyScriptExecution(JSONObject jsonObject); } diff --git a/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java index 580c718c..3cc6c067 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java @@ -2,6 +2,7 @@ package com.hzya.frame.sysnew.grovy.service.impl; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService; import com.hzya.frame.util.GroovyUtil; import com.hzya.frame.web.entity.BaseResult; @@ -44,8 +45,8 @@ public class GroovyIntegrationServiceImpl implements IGroovyIntegrationService { } @Override - public JsonResultEntity groovyScriptExecution(JSONObject jsonObject) { + public SysExtensionApiEntity groovyScriptExecution(JSONObject jsonObject) { Object object = GroovyUtil.execute(jsonObject); - return BaseResult.getSuccessMessageEntity(object); + return new SysExtensionApiEntity(); } } From 7fa07577f0f0cd4a1880e8f63820bfeb3306a5ac Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Wed, 19 Jun 2024 09:54:19 +0800 Subject: [PATCH 31/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81byteBodys?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ISysApplicationService.java | 10 + .../impl/SysApplicationServiceImpl.java | 394 ++++++++++++++++-- .../controler/EntranceController.java | 6 +- 3 files changed, 385 insertions(+), 25 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java index ad1077cf..e1f3290a 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java @@ -417,4 +417,14 @@ public interface ISysApplicationService extends IBaseService oldheaderMap = ServletUtil.getHeaderMap(request); + String oldquerys = request.getQueryString(); + //应用key + String publicKey = request.getHeader("publicKey"); + //应用密钥 + String secretKey = request.getHeader("secretKey"); + //appId + String appId = request.getHeader("appId"); + //apiCode + String apiCode = request.getHeader("apiCode"); + + String ip = IPHelper.getIpAddr(request); + if (publicKey == null || "".equals(publicKey)) { + return BaseResult.getFailureMessageEntity("请先传递公钥"); + } + if (secretKey == null || "".equals(secretKey)) { + return BaseResult.getFailureMessageEntity("请先传递密钥"); + } + if (appId == null || "".equals(appId)) { + return BaseResult.getFailureMessageEntity("请先传递接收方应用"); + } + if (apiCode == null || "".equals(apiCode)) { + return BaseResult.getFailureMessageEntity("请先传递发送接口"); + } + + logger.info("请求参数：publicKey：【" + publicKey + "】secretKey：【" + secretKey + "】appId：【" + appId + "】apiCode：【" + apiCode); + //根据请求a应用的公钥、密钥是否能查找到一条数据 + + SysApplicationEntity sendApp = getAppByPublicKeySecretKey(publicKey, secretKey); + if (sendApp == null) { + //saveLog(new SysApplicationEntity(), new SysApplicationEntity(), new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,"公钥、密钥错误"); + return BaseResult.getFailureMessageEntity("公钥、密钥错误,请联系管理员"); + } + //判断应用是否启用 + if (sendApp.getAppStatus() == null || !"1".equals(sendApp.getAppStatus())) { + saveLog(sendApp, new SysApplicationEntity(), new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,sendApp.getName() + "应用未启用"); + return BaseResult.getFailureMessageEntity(sendApp.getName() + "应用未启用,请联系管理员"); + } + + + SysApplicationEntity receiveApp = getAppByAppId(appId); + if (receiveApp == null) { + saveLog(sendApp, new SysApplicationEntity(), new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,"根据appId:" + appId + "未匹配到应用"); + return BaseResult.getFailureMessageEntity("根据appId:" + appId + "未匹配到应用,请联系管理员"); + } + //判断应用是否启用 + if (receiveApp.getAppStatus() == null || !"1".equals(receiveApp.getAppStatus())) { + saveLog(sendApp, receiveApp, new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + "应用未启用" ); + return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用未启用,请联系管理员"); + } + //判断应用接口是否启用 + if (receiveApp.getInterfaceStatus() == null || !"1".equals(receiveApp.getInterfaceStatus())) { + saveLog(sendApp, receiveApp, new SysApplicationApiEntity(), oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + "应用接口环境未启用" ); + return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用接口环境未启用,请联系管理员"); + } + + SysApplicationApiEntity receiveApi = getApiByAppIdApiCode(receiveApp.getId(), apiCode); + if (receiveApi == null) { + saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + ":" + apiCode + "未启用或者未创建" ); + return BaseResult.getFailureMessageEntity(receiveApp.getName() + ":" + apiCode + "未启用或者未创建"); + } + + SysApplicationApiAuthEntity sysApplicationApiAuthEntity = getApiAuthByNameAppId(sendApp.getId(), receiveApp.getId()); + if (sysApplicationApiAuthEntity == null) { + saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + "应用权限配置错误" ); + return BaseResult.getFailureMessageEntity(receiveApp.getName() + "应用权限配置错误"); + } + if (sysApplicationApiAuthEntity.getSystemAddress() != null && !"".equals(sysApplicationApiAuthEntity.getSystemAddress()) + && !sysApplicationApiAuthEntity.getSystemAddress().contains(ip)) { + saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApp.getName() + "发送应用" + receiveApp.getName() + "的ip白名单配置错误" ); + return BaseResult.getFailureMessageEntity(receiveApp.getName() + "发送应用" + receiveApp.getName() + "的ip白名单配置错误"); + } + + SysApplicationApiAuthDetailEntity sysApplicationApiAuthDetailEntity = getApiAuthDetailByAppIdApiIdTripartiteSystemId(receiveApp.getId(), receiveApi.getId(), sysApplicationApiAuthEntity.getId()); + if (sysApplicationApiAuthDetailEntity == null) { + saveLog(sendApp, receiveApp, receiveApi, oldbodys, null, oldheaderMap, null, null, oldquerys, null, null, false,receiveApi.getApiName() + "未授权给" + sendApp.getName() ); + return BaseResult.getFailureMessageEntity(receiveApi.getApiName() + "未授权给" + sendApp.getName() + "，请联系管理员"); + } + SysExtensionApiEntity sysExtensionApiEntity = new SysExtensionApiEntity(); + + + List a = Arrays.asList(new String[]{"apicode", "appid", "secretkey", "publickey", "x-forwarded-for", "cookie", "x-forwarded-proto", "x-real-ip", "content-length", "accept-language", "host", "content-type", "connection", "cache-control", "accept-encoding", "pragma", "accept", "user-agent"}); + Map headers = new HashMap<>(); + if (receiveApi.getHeaderIn() != null && !"".equals(receiveApi.getHeaderIn())) { + JSONArray jsonArray = JSONArray.parseArray(receiveApi.getHeaderIn()); + if (jsonArray != null && jsonArray.size() > 0) { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject object1 = jsonArray.getJSONObject(i); + headers.put(object1.getString("parameterName"), object1.getString("example")); + } + } + } + if (oldheaderMap != null && oldheaderMap.size() > 0) { + for (Map.Entry entry : oldheaderMap.entrySet()) { + if (!a.contains(entry.getKey())) { + headers.put(entry.getKey(), entry.getValue()); + } + } + } + + + + sysExtensionApiEntity.setSendApp(sendApp); + sysExtensionApiEntity.setReceiveApp(receiveApp); + sysExtensionApiEntity.setReceiveApi(receiveApi); + sysExtensionApiEntity.setHeaders(headers); + sysExtensionApiEntity.setQuerys(oldquerys); + sysExtensionApiEntity.setBodys(oldbodys); + Method[] methods = null; + Object object = null; + + + + + // 判断是否有内部api 是否扩展api 1、启用 2、停用 + if (receiveApi.getExtensionApi() != null && "1".equals(receiveApi.getExtensionApi()) + && receiveApi.getBeanName() != null && !"".equals(receiveApi.getBeanName()) + && receiveApi.getFunName() != null && !"".equals(receiveApi.getFunName()) + ) { + //获取类 + try { + object = ApplicationContextUtil.getBeanByName(receiveApi.getBeanName()); + } catch (SecurityException e) { + + } + //获取类下面的方法 + methods = object.getClass().getMethods(); + if (methods == null || methods.length == 0) { + return BaseResult.getFailureMessageEntity("未找到内部方法，请联系管理员"); + } + for (Method m : methods) { + if (null != m) { + if (m.getName().equals(receiveApi.getFunName().trim())) { + try { + logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); + sysExtensionApiEntity = (SysExtensionApiEntity) m.invoke(object, sysExtensionApiEntity); + logger.info("invoke结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); + } catch (Exception e) { + logger.error("invokeException{}", e.getMessage()); + return BaseResult.getFailureMessageEntity("内部方法执行错误，请联系管理员"); + } + } + } + } + + } + headers = sysExtensionApiEntity.getHeaders(); + String querys = sysExtensionApiEntity.getQuerys(); + + byte[] byteBodys = sysExtensionApiEntity.getByteBodys(); + //设置参数获取参数 + StringBuffer url = new StringBuffer(); + if(!receiveApi.getDestinationAddress().toLowerCase().startsWith("http")){ + url.append(receiveApp.getInterfaceAddress()); + } + url.append(receiveApi.getDestinationAddress()); + if (querys != null) { + url.append("?"); + url.append(querys); + } + Integer outTime = 6000; + if (receiveApi.getTimeoutPeriod() != null && !"".equals(receiveApi.getTimeoutPeriod())) { + outTime = Integer.valueOf(receiveApi.getTimeoutPeriod()); + } + //1、POST 2、GET + String method = "POST"; + if ("2".equals(receiveApi.getRequestMethod())) { + method = "GET"; + } + //List a = Arrays.asList(new String[]{"apicode", "appid", "secretkey", "publickey", "x-forwarded-for", "cookie", "x-forwarded-proto", "x-real-ip", "content-length", "accept-language", "host", "content-type", "connection", "cache-control", "accept-encoding", "pragma", "accept", "user-agent"}); + //Map headers = new HashMap<>(); + //if (receiveApi.getHeaderIn() != null && !"".equals(receiveApi.getHeaderIn())) { + // JSONArray jsonArray = JSONArray.parseArray(receiveApi.getHeaderIn()); + // if (jsonArray != null && jsonArray.size() > 0) { + // for (int i = 0; i < jsonArray.size(); i++) { + // JSONObject object1 = jsonArray.getJSONObject(i); + // headers.put(object1.getString("parameterName"), object1.getString("example")); + // } + // } + //} + //if (headerMap != null && headerMap.size() > 0) { + // for (Map.Entry entry : headerMap.entrySet()) { + // if (!a.contains(entry.getKey())) { + // headers.put(entry.getKey(), entry.getValue()); + // } + // } + //} + + + if ("POST".equals(method)) { + HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); + // HttpClient + CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build(); + HttpPost post = new HttpPost(url.toString()); + CloseableHttpResponse response = null; + + RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(outTime).build(); + post.setConfig(requestConfig);//设置请求参数【超时时间】 + + if (headers != null && headers.size() > 0) { + for (String key : headers.keySet()) { + post.setHeader(key, headers.get(key)); + } + } + StringBuilder body = new StringBuilder(); + boolean flag = true; + try { + if (byteBodys != null && !"".equals(byteBodys)) { + ByteArrayEntity entity = new ByteArrayEntity(byteBodys); + entity.setContentType("application/json"); + post.setEntity(entity); + } + response = closeableHttpClient.execute(post); + + HttpEntity entity = response.getEntity(); + synchronized (lock) { + body.append(EntityUtils.toString(entity,"UTF-8")); + } + flag = true; + logger.info("返回结果：" + body); + } catch (Exception e) { + logger.error("请求错误：" + e.getMessage()); + body.append(e.getMessage()); + flag = false; + } finally { + try { + // 关闭响应对象 + if (response != null) { + response.close(); + } + // 关闭响应对象 + if (closeableHttpClient != null) { + closeableHttpClient.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + + } + logger.info("保存日志开始"); + SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,String.valueOf(byteBodys), oldheaderMap,headers, headers, oldquerys,querys, body.toString(),true,null); + if (methods != null && methods.length > 0) { + for (Method m : methods) { + if (null != m) { + if (m.getName().equals(receiveApi.getFunName().trim()+"CallBack")) { + try { + logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); + m.invoke(object, sysMessageManageLogEntity); + logger.info("invoke结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); + } catch (Exception e) { + logger.error("invokeException{}", e.getMessage()); + } + } + } + } + } + logger.info("保存日志结束"); + if (flag) { + if (JSONUtil.isTypeJSON(body.toString())) { + JSONObject jsonObject = JSONObject.parseObject(body.toString()); + if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){ + return BaseResult.getSuccessMessageEntity("转发成功", jsonObject); + }else { + return BaseResult.getFailureMessageEntity("转发失败", jsonObject); + } + } else { + if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){ + return BaseResult.getSuccessMessageEntity("转发成功", body); + }else { + return BaseResult.getFailureMessageEntity("转发失败", body); + } + } + } else { + return BaseResult.getFailureMessageEntity("转发失败", body); + } + + } else {//GET + + HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); + // HttpClient + CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build(); + HttpGet get = new HttpGet(url.toString()); + CloseableHttpResponse response = null; + + RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(outTime).build(); + get.setConfig(requestConfig);//设置请求参数【超时时间】 + if (headers != null && headers.size() > 0) { + for (String key : headers.keySet()) { + get.setHeader(key, headers.get(key)); + } + } + StringBuilder body = new StringBuilder(); + + boolean flag = true; + try { + response = closeableHttpClient.execute(get); + HttpEntity entity = response.getEntity(); + synchronized (lock) { + body.append(EntityUtils.toString(entity,"UTF-8")); + } + flag = true; + logger.info("返回结果：" + body); + } catch (Exception e) { + logger.error("请求错误：" + e.getMessage()); + body.append(e.getMessage()); + flag = false; + } finally { + try { + // 关闭响应对象 + if (response != null) { + response.close(); + } + // 关闭响应对象 + if (closeableHttpClient != null) { + closeableHttpClient.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + logger.info("保存日志开始"); + SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,String.valueOf(byteBodys), oldheaderMap,headers, headers, oldquerys,querys, body.toString(), true,null); + if (methods != null && methods.length > 0) { + for (Method m : methods) { + if (null != m) { + if (m.getName().equals(receiveApi.getFunName().trim()+"CallBack")) { + try { + logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); + m.invoke(object, sysMessageManageLogEntity); + logger.info("invoke结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); + } catch (Exception e) { + logger.error("invokeException{}", e.getMessage()); + } + } + } + } + } + logger.info("保存日志结束"); + if (flag) { + if (JSONUtil.isTypeJSON(body.toString())) { + JSONObject jsonObject = JSONObject.parseObject(body.toString()); + if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){ + return BaseResult.getSuccessMessageEntity("转发成功", jsonObject); + }else { + return BaseResult.getFailureMessageEntity("转发失败", jsonObject); + } + } else { + if(sysMessageManageLogEntity.getStatus() != null && "3".equals(sysMessageManageLogEntity.getStatus())){ + return BaseResult.getSuccessMessageEntity("转发成功", body); + }else { + return BaseResult.getFailureMessageEntity("转发失败", body); + } + } + } else { + return BaseResult.getFailureMessageEntity("转发失败", body); + } + } + } } diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java index 0ae99bfc..9b994348 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java @@ -164,5 +164,9 @@ public class EntranceController { public JsonResultEntity externalCallInterface(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception { return sysApplicationService.externalCallInterface(servletRequest,servletResponse); } - + @RequestMapping(value = "/externalCallInterface") + @ResponseBody + public JsonResultEntity externalCallInterfaceToESB(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception { + return sysApplicationService.externalCallInterfaceToESB(servletRequest,servletResponse); + } } From f645cb96db1d34bf3cc3523348c04ec0d3f06bbc Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Wed, 19 Jun 2024 10:03:46 +0800 Subject: [PATCH 32/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0byte=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/entity/SysExtensionApiEntity.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysExtensionApiEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysExtensionApiEntity.java index 7668e887..baff9a85 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysExtensionApiEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysExtensionApiEntity.java @@ -13,6 +13,8 @@ public class SysExtensionApiEntity { private String querys; /** body */ private String bodys; + //byteBodys + private byte[] byteBodys; /** 发送方应用 */ private SysApplicationEntity sendApp; /** 接收方应用 */ @@ -67,5 +69,13 @@ public class SysExtensionApiEntity { public void setReceiveApi(SysApplicationApiEntity receiveApi) { this.receiveApi = receiveApi; } + + public byte[] getByteBodys() { + return byteBodys; + } + + public void setByteBodys(byte[] byteBodys) { + this.byteBodys = byteBodys; + } } From 351ed98ab475b527cbdadd7c89a8b296f4bd99e0 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 19 Jun 2024 10:05:15 +0800 Subject: [PATCH 33/44] =?UTF-8?q?cbs8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cbs8/service/impl/Cbs8ServiceImpl.java | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java index 08e91d12..d3d74a91 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java @@ -7,9 +7,7 @@ import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.hzya.frame.cbs8.dto.req.ElecRequestDTO; -import com.hzya.frame.cbs8.dto.req.PayResultRequestDTO; -import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO; +import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.dto.res.*; import com.hzya.frame.cbs8.service.ICbs8Service; import com.hzya.frame.cbs8.util.CBSUtil; @@ -164,4 +162,45 @@ public class Cbs8ServiceImpl implements ICbs8Service { } return null; } + + /** + * 代发代扣 支付申请 + * @param paymentApplySubmitReqDTO + * @param paymentApplyAgentList + */ + @Override + public PayResponseDTO agentPayApply(PaymentApplySubmitReqDTO paymentApplySubmitReqDTO, List paymentApplyAgentList) { + AgentPayRequestDTO param = new AgentPayRequestDTO(); + param.setPaymentApplySubmitReqDTO(paymentApplySubmitReqDTO); + param.setPaymentApplyAgentDTO(paymentApplyAgentList); + String params = JSON.toJSONString(param); + Map headerMap = MapBuilder.create(true) + .put("apiCode", "8000260003") + .put("publicKey","ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj") + .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") + .put("appId","800026") + .build(); + String result = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(params).timeout(60000).execute().body(); + if (StrUtil.isNotEmpty(result)){ + CbsResponseDTO cbsResponseDTO = JSONObject.parseObject(result, CbsResponseDTO.class); + List dataList = cbsResponseDTO.getData(); + if (CollectionUtils.isNotEmpty(dataList)){ + JSONObject o = dataList.get(0); + PayResponseDTO payResponseDTO = JSON.toJavaObject(o, PayResponseDTO.class); + return payResponseDTO; + } + } + return null; + } + + /** + * 代发代扣 详情查询 + * + * @param agentPayResultRequestDTO + * @return + */ + @Override + public AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO) { + return null; + } } From 2f6f7e1755ce20d73af57d9e53e35938ce3deedc Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 19 Jun 2024 10:06:03 +0800 Subject: [PATCH 34/44] =?UTF-8?q?cbs8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cbs8/service/impl/Cbs8ExtServiceImpl.java | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java index 0e3edd92..3a35e8c2 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java @@ -4,10 +4,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.cbs8.dto.req.ElecRequestDTO; -import com.hzya.frame.cbs8.dto.req.PayRequestDTO; -import com.hzya.frame.cbs8.dto.req.PayResultRequestDTO; -import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO; +import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.service.ICbs8ExtService; import com.hzya.frame.cbs8.util.CBSUtil; import com.hzya.frame.cbs8.util.CbsAccessToken; @@ -85,6 +82,30 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { return entity; } + /** + * 代发代扣 支付申请 + * + * @param entity + * @return + */ + @Override + public SysExtensionApiEntity agentPayApply(SysExtensionApiEntity entity) { + String boyds = entity.getBodys(); + if (StrUtil.isNotEmpty(boyds)){ + AgentPayRequestDTO agentPayRequest = JSONObject.parseObject(boyds,AgentPayRequestDTO.class); + String requestData = JSONObject.toJSONString(agentPayRequest); + //签名 + long timestamp = System.currentTimeMillis(); + String sign = CBSUtil.sign(requestData,timestamp); + //加密 + byte[] encryptedData = CBSUtil.encrypt(requestData); + Map header = getHeaders(sign,timestamp); + entity.setBodys(Base64.getEncoder().encodeToString(encryptedData)); + entity.setHeaders(header); + } + return entity; + } + /** * 交易结果查询 * From e64978e5e9a214e2d48f956cfabf115afe9cd960 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 19 Jun 2024 10:06:53 +0800 Subject: [PATCH 35/44] =?UTF-8?q?cbs8=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/PayApplyPluginInitializer.java | 2 +- .../cbs8/service/ICbsPluginService.java | 19 ++++++++ .../service/impl/CbsPluginServiceImpl.java | 48 +++++++++++++++++-- 3 files changed, 64 insertions(+), 5 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java index 65c4ac12..05bed205 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java @@ -97,7 +97,7 @@ public class PayApplyPluginInitializer extends PluginBaseEntity { @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { //支付申请 - // cbsPluginService.applyPay(requestJson); + cbsPluginService.applyPay(requestJson); return null; } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java index f4491c0a..ae6401b4 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java @@ -1,8 +1,13 @@ package com.hzya.frame.plugin.cbs8.service; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.cbs8.dto.req.AgentPayResultRequestDTO; import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO; +import com.hzya.frame.cbs8.dto.res.AgentPayResultResDTO; +import com.hzya.frame.cbs8.dto.res.PayResponseDTO; import com.hzya.frame.cbs8.dto.res.TransactionDetailDTO; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; import java.util.List; @@ -39,4 +44,18 @@ public interface ICbsPluginService { * @param transactionDetailReqDTO */ List queryTransactionDetail(TransactionDetailReqDTO transactionDetailReqDTO); + + /** + * 代发代扣 支付申请 + * @param paymentEntity + * @param agentPaymentDetailList + */ + PayResponseDTO applyAgentPay(AgentPaymentEntity paymentEntity, List agentPaymentDetailList); + + /** + * 代发代扣 结果详情查询 + * @param agentPayResultRequestDTO + * @return + */ + AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java index 8cdc00ae..3aca9eaa 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java @@ -1,18 +1,19 @@ package com.hzya.frame.plugin.cbs8.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.cbs8.dto.req.ElecRequestDTO; -import com.hzya.frame.cbs8.dto.req.PayResultRequestDTO; -import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO; +import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.dto.res.*; import com.hzya.frame.cbs8.service.ICbs8Service; import com.hzya.frame.cbs8.util.CBSUtil; import com.hzya.frame.cbs8.util.PayState; import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity; import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; import com.hzya.frame.seeyon.cbs8.service.ICbsLogService; @@ -22,6 +23,7 @@ import com.hzya.frame.seeyon.entity.CtpFileEntity; import com.hzya.frame.seeyon.service.ICtpAttachmentService; import com.hzya.frame.seeyon.util.RestUtil; import com.hzya.frame.uuid.UUIDLong; +import com.hzya.frame.web.exception.BaseSystemException; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,6 +51,8 @@ public class CbsPluginServiceImpl implements ICbsPluginService { @Autowired private ICtpAttachmentService ctpAttachmentService; + @Autowired + private RestUtil restUtil; @Value("${cbs8.elec_path}") private String elec_path; @Value("${OA.data_source_code}") @@ -177,7 +181,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService { CtpFileEntity cpFileEntity = new CtpFileEntity(); cpFileEntity.setFile(file); cpFileEntity.setDataSourceCode(oa_data_source_code); - JSONObject jsonObjectUpload = RestUtil.fileUpload(file,"8000240005"); + JSONObject jsonObjectUpload = restUtil.fileUpload(file,"8000240005"); String file_url = jsonObjectUpload.getString("fileUrl"); if (null != jsonObjectUpload && StrUtil.isNotEmpty(file_url)) { String sub_reference = String.valueOf(UUIDLong.longUUID()); @@ -232,4 +236,40 @@ public class CbsPluginServiceImpl implements ICbsPluginService { return resultList; } + + /** + * 代发代扣 支付申请 + * + * @param paymentEntity + * @param agentPaymentDetailList + */ + @Override + public PayResponseDTO applyAgentPay(AgentPaymentEntity paymentEntity, List agentPaymentDetailList) { + if (null != paymentEntity && CollectionUtils.isNotEmpty(agentPaymentDetailList)){ + PaymentApplySubmitReqDTO paymentApplySubmitReqDTO = BeanUtil.copyProperties(paymentEntity,PaymentApplySubmitReqDTO.class); + List paymentApplyAgentList = new ArrayList<>(); + for (AgentPaymentDetailEntity detailEntity : agentPaymentDetailList) { + PaymentApplyAgentDTO detailDTO = BeanUtil.copyProperties(detailEntity,PaymentApplyAgentDTO.class); + paymentApplyAgentList.add(detailDTO); + } + PayResponseDTO payResponseDTO = cbs8Service.agentPayApply(paymentApplySubmitReqDTO,paymentApplyAgentList); + return payResponseDTO; + }else { + throw new BaseSystemException("参数不能为空"); + } + } + + /** + * 代发代扣 结果详情查询 + * + * @param agentPayResultRequestDTO + * @return + */ + @Override + public AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO) { + if (null != agentPayResultRequestDTO && StrUtil.isNotEmpty(agentPayResultRequestDTO.getBusNum())){ + AgentPayResultResDTO agentPayResultResDTO = cbs8Service.agentPayResult(agentPayResultRequestDTO); + } + return null; + } } From 5b19809ef0493d632922ca1a0d5e7d12565191de Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 19 Jun 2024 10:07:12 +0800 Subject: [PATCH 36/44] =?UTF-8?q?cbs8=20=E6=8E=A5=E5=8F=A3=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cbs8/dto/req/AgentPayRequestDTO.java | 32 +++ .../dto/req/AgentPayResultRequestDTO.java | 20 ++ .../cbs8/dto/req/PaymentApplyAgentDTO.java | 132 +++++++++++++ .../dto/req/PaymentApplySubmitReqDTO.java | 182 ++++++++++++++++++ .../cbs8/dto/res/TransactionDetailDTO.java | 2 +- .../frame/cbs8/service/ICbs8ExtService.java | 8 + .../hzya/frame/cbs8/service/ICbs8Service.java | 19 +- 7 files changed, 391 insertions(+), 4 deletions(-) create mode 100644 service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayRequestDTO.java create mode 100644 service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayResultRequestDTO.java create mode 100644 service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplyAgentDTO.java create mode 100644 service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayRequestDTO.java b/service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayRequestDTO.java new file mode 100644 index 00000000..1a906cba --- /dev/null +++ b/service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayRequestDTO.java @@ -0,0 +1,32 @@ +package com.hzya.frame.cbs8.dto.req; + +import java.util.List; + +/** + * @Description 代发代扣请求参数 + * @Author xiangerlin + * @Date 2024/6/18 16:20 + **/ +public class AgentPayRequestDTO { + + //代发表头 + private PaymentApplySubmitReqDTO paymentApplySubmitReqDTO; + //代发明细 + private List paymentApplyAgentDTO; + + public PaymentApplySubmitReqDTO getPaymentApplySubmitReqDTO() { + return paymentApplySubmitReqDTO; + } + + public void setPaymentApplySubmitReqDTO(PaymentApplySubmitReqDTO paymentApplySubmitReqDTO) { + this.paymentApplySubmitReqDTO = paymentApplySubmitReqDTO; + } + + public List getPaymentApplyAgentDTO() { + return paymentApplyAgentDTO; + } + + public void setPaymentApplyAgentDTO(List paymentApplyAgentDTO) { + this.paymentApplyAgentDTO = paymentApplyAgentDTO; + } +} diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayResultRequestDTO.java b/service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayResultRequestDTO.java new file mode 100644 index 00000000..a4ef80c8 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayResultRequestDTO.java @@ -0,0 +1,20 @@ +package com.hzya.frame.cbs8.dto.req; + +/** + * @Description 代发代扣详情查询请求参数 + * @Author xiangerlin + * @Date 2024/6/18 17:40 + **/ +public class AgentPayResultRequestDTO { + + //申请单编号。 代发代扣支付接口会返回这个单号的 + private String busNum; + + public String getBusNum() { + return busNum; + } + + public void setBusNum(String busNum) { + this.busNum = busNum; + } +} diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplyAgentDTO.java b/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplyAgentDTO.java new file mode 100644 index 00000000..509165a3 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplyAgentDTO.java @@ -0,0 +1,132 @@ +package com.hzya.frame.cbs8.dto.req; + +/** + * @Description 代发代扣明细 + * @Author xiangerlin + * @Date 2024/6/18 13:45 + **/ +public class PaymentApplyAgentDTO { + //每笔明细金额 + private String dtlAmount; + //收款账号 + private String dtlRevAccount; + //联行号 同行可不传，跨行必传 + private String dtlCnapsCode; + //收款账户名称 + private String dtlRevName; + //收款开户行 ,如果传的联行号能匹配到对应到开户行，cbs8会自动带出 + private String dtlRevBankName; + + + + //是否跨行 Y跨行 N同行 + private String dtlBankFlag; + //明细用途 + private String dtlPurpose; + //明细摘要 + private String dtlRemark; + //收款账号银行号｜地区码 + private String dtlRevBankArea; + //收款开户地 + private String dtlRevBankCity; + //明细序号，从1开始递增 + private int dtlSeqNum; + //备用字段 一共6个 + private String dtlExtend1; + + public String getDtlAmount() { + return dtlAmount; + } + + public void setDtlAmount(String dtlAmount) { + this.dtlAmount = dtlAmount; + } + + public String getDtlRevAccount() { + return dtlRevAccount; + } + + public void setDtlRevAccount(String dtlRevAccount) { + this.dtlRevAccount = dtlRevAccount; + } + + public String getDtlCnapsCode() { + return dtlCnapsCode; + } + + public void setDtlCnapsCode(String dtlCnapsCode) { + this.dtlCnapsCode = dtlCnapsCode; + } + + public String getDtlRevName() { + return dtlRevName; + } + + public void setDtlRevName(String dtlRevName) { + this.dtlRevName = dtlRevName; + } + + public String getDtlRevBankName() { + return dtlRevBankName; + } + + public void setDtlRevBankName(String dtlRevBankName) { + this.dtlRevBankName = dtlRevBankName; + } + + public String getDtlBankFlag() { + return dtlBankFlag; + } + + public void setDtlBankFlag(String dtlBankFlag) { + this.dtlBankFlag = dtlBankFlag; + } + + public String getDtlPurpose() { + return dtlPurpose; + } + + public void setDtlPurpose(String dtlPurpose) { + this.dtlPurpose = dtlPurpose; + } + + public String getDtlRemark() { + return dtlRemark; + } + + public void setDtlRemark(String dtlRemark) { + this.dtlRemark = dtlRemark; + } + + public String getDtlRevBankArea() { + return dtlRevBankArea; + } + + public void setDtlRevBankArea(String dtlRevBankArea) { + this.dtlRevBankArea = dtlRevBankArea; + } + + public String getDtlRevBankCity() { + return dtlRevBankCity; + } + + public void setDtlRevBankCity(String dtlRevBankCity) { + this.dtlRevBankCity = dtlRevBankCity; + } + + public int getDtlSeqNum() { + return dtlSeqNum; + } + + public void setDtlSeqNum(int dtlSeqNum) { + this.dtlSeqNum = dtlSeqNum; + } + + public String getDtlExtend1() { + return dtlExtend1; + } + + public void setDtlExtend1(String dtlExtend1) { + this.dtlExtend1 = dtlExtend1; + } +} diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java b/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java new file mode 100644 index 00000000..ed5e55a7 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/cbs8/dto/req/PaymentApplySubmitReqDTO.java @@ -0,0 +1,182 @@ +package com.hzya.frame.cbs8.dto.req; + +/** + * @Description 批量代发代扣 203代发 201代扣 + * @Author xiangerlin + * @Date 2024/6/18 11:58 + **/ +public class PaymentApplySubmitReqDTO { + //业务参考号 + private String referenceNum; + /** + * 业务类型 + * 201-代扣 + * 203-代发 + * 代发工资传203 + */ + private String busType; + //总金额 小数位2位 + private String amount; + //币种 + private String currency; + //付款账号 + private String payAccount; + //用途 + private String purpose; + // 以上是必填字段 + + + + //备注 + private String summary; + //期望支付时间 + private String expectTime; + //公私标识 1对私 0对公 + private String personalFlag; + //加急标志 1加急 0不加急 + private String urgentTag; + //是否实时 1实时 0落地 + private String realTimeTag; + /** + * 同城标志 0同城 1异地 + * 收/付账号所属同一个城市为同城，否则为异地 + */ + private String cityFlag; + //银行备用字段 一共8个 + private String bankExtend1; + + //客户备用字段1 + private String erpExtend1; + //客户备用字段1 + private String erpExtend2; + //客户备用字段1 + private String erpExtend3; + + public String getReferenceNum() { + return referenceNum; + } + + public void setReferenceNum(String referenceNum) { + this.referenceNum = referenceNum; + } + + public String getBusType() { + return busType; + } + + public void setBusType(String busType) { + this.busType = busType; + } + + public String getAmount() { + return amount; + } + + public void setAmount(String amount) { + this.amount = amount; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } + + public String getPayAccount() { + return payAccount; + } + + public void setPayAccount(String payAccount) { + this.payAccount = payAccount; + } + + public String getPurpose() { + return purpose; + } + + public void setPurpose(String purpose) { + this.purpose = purpose; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getExpectTime() { + return expectTime; + } + + public void setExpectTime(String expectTime) { + this.expectTime = expectTime; + } + + public String getPersonalFlag() { + return personalFlag; + } + + public void setPersonalFlag(String personalFlag) { + this.personalFlag = personalFlag; + } + + public String getUrgentTag() { + return urgentTag; + } + + public void setUrgentTag(String urgentTag) { + this.urgentTag = urgentTag; + } + + public String getRealTimeTag() { + return realTimeTag; + } + + public void setRealTimeTag(String realTimeTag) { + this.realTimeTag = realTimeTag; + } + + public String getCityFlag() { + return cityFlag; + } + + public void setCityFlag(String cityFlag) { + this.cityFlag = cityFlag; + } + + public String getBankExtend1() { + return bankExtend1; + } + + public void setBankExtend1(String bankExtend1) { + this.bankExtend1 = bankExtend1; + } + + public String getErpExtend1() { + return erpExtend1; + } + + public void setErpExtend1(String erpExtend1) { + this.erpExtend1 = erpExtend1; + } + + public String getErpExtend2() { + return erpExtend2; + } + + public void setErpExtend2(String erpExtend2) { + this.erpExtend2 = erpExtend2; + } + + public String getErpExtend3() { + return erpExtend3; + } + + public void setErpExtend3(String erpExtend3) { + this.erpExtend3 = erpExtend3; + } +} diff --git a/service/src/main/java/com/hzya/frame/cbs8/dto/res/TransactionDetailDTO.java b/service/src/main/java/com/hzya/frame/cbs8/dto/res/TransactionDetailDTO.java index b51a41fa..9cd4e3cd 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/dto/res/TransactionDetailDTO.java +++ b/service/src/main/java/com/hzya/frame/cbs8/dto/res/TransactionDetailDTO.java @@ -5,7 +5,7 @@ package com.hzya.frame.cbs8.dto.res; * @Author xiangerlin * @Date 2023/12/29 16:40 **/ -public class TransactionDetailDTO extends TransactionResParentDTO{ +public class TransactionDetailDTO{ private String accountNo;//银行账号 private String accountName;//银行名称 private String bankType;//银行类型 diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8ExtService.java b/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8ExtService.java index f4961dc9..5f47a625 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8ExtService.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8ExtService.java @@ -16,6 +16,13 @@ public interface ICbs8ExtService { */ SysExtensionApiEntity payApply(SysExtensionApiEntity entity); + /** + * 代发代扣 支付申请 + * @param entity + * @return + */ + SysExtensionApiEntity agentPayApply(SysExtensionApiEntity entity); + /** * 交易结果查询 * @param entity @@ -49,4 +56,5 @@ public interface ICbs8ExtService { * @return */ SysExtensionApiEntity elecQuery(SysExtensionApiEntity entity); + } diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8Service.java b/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8Service.java index 138991ac..2b55c362 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8Service.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/ICbs8Service.java @@ -1,9 +1,7 @@ package com.hzya.frame.cbs8.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.cbs8.dto.req.ElecRequestDTO; -import com.hzya.frame.cbs8.dto.req.PayResultRequestDTO; -import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO; +import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.dto.res.*; import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; @@ -50,4 +48,19 @@ public interface ICbs8Service { * @return */ CbsResDataDTO queryTransactionDetail(TransactionDetailReqDTO transactionDetailReqDTO); + + /** + * 代发代扣 支付申请 + * @param paymentApplySubmitReqDTO + * @param paymentApplyAgentList + */ + PayResponseDTO agentPayApply(PaymentApplySubmitReqDTO paymentApplySubmitReqDTO, List paymentApplyAgentList); + + /** + * 代发代扣 详情查询 + * @param agentPayResultRequestDTO + * @return + */ + AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO); + } From 73c5eb06cfc515ed275a624ef535715b36857f41 Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Wed, 19 Jun 2024 10:10:22 +0800 Subject: [PATCH 37/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0externalCallInterfaceTo?= =?UTF-8?q?ESB=E6=96=B9=E6=B3=95=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/webapp/entrance/controler/EntranceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java index 9b994348..3fab59ec 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java @@ -164,7 +164,7 @@ public class EntranceController { public JsonResultEntity externalCallInterface(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception { return sysApplicationService.externalCallInterface(servletRequest,servletResponse); } - @RequestMapping(value = "/externalCallInterface") + @RequestMapping(value = "/externalCallInterfaceToESB") @ResponseBody public JsonResultEntity externalCallInterfaceToESB(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception { return sysApplicationService.externalCallInterfaceToESB(servletRequest,servletResponse); From 2b624f5813cd6f0c374cdb2b2ddf96401c5a8bab Mon Sep 17 00:00:00 2001 From: "476474485@qq.com" Date: Wed, 19 Jun 2024 11:31:30 +0800 Subject: [PATCH 38/44] =?UTF-8?q?=E8=AA=BF=E6=95=B4Base64.getEncoder().enc?= =?UTF-8?q?odeToString(encryptedData)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysApplicationServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java index 5ea665e8..d36dc4b2 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java @@ -2630,7 +2630,7 @@ public class SysApplicationServiceImpl extends BaseService 0) { for (Method m : methods) { if (null != m) { @@ -2747,7 +2746,7 @@ public class SysApplicationServiceImpl extends BaseService 0) { for (Method m : methods) { if (null != m) { From e4d0f19e027257d58bcec9e790792c1f62181329 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 19 Jun 2024 13:47:44 +0800 Subject: [PATCH 39/44] =?UTF-8?q?cbs8=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AgentPayResultPluginInitializer.java | 111 +++++++++++++++ .../PayApplyAgentPluginInitializer.java | 128 ++++++++++++++++++ .../plugin/PayApplyPluginInitializer.java | 2 +- .../service/impl/CbsPluginServiceImpl.java | 1 + 4 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java new file mode 100644 index 00000000..ac1c5224 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java @@ -0,0 +1,111 @@ +package com.hzya.frame.plugin.cbs8.plugin; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.cbs8.dto.req.AgentPayResultRequestDTO; +import com.hzya.frame.cbs8.dto.res.AgentPayResultResDTO; +import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.checkerframework.checker.units.qual.A; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/6/18 17:22 + **/ +public class AgentPayResultPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(AgentPayResultPluginInitializer.class); + + @Autowired + private ICbsPluginService cbsPluginService; + + /*** + * 插件初始化方法 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-02 10:48 + * @Param [] + * @return void + **/ + @Override + public void initialize() { + + } + + /**** + * 插件销毁方法 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + /**** + * 插件的ID + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginId() { + return "CBS8AgentPayResultPlugin"; + } + + /**** + * 插件的名称 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginName() { + return "cbs8代发代扣详情查询插件"; + } + + /**** + * 插件的显示值 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginLabel() { + return "cbs8代发代扣详情查询插件"; + } + + /*** + * 插件类型 1、场景插件 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-02 14:01 + * @Param [] + * @return java.lang.String + **/ + @Override + public String getPluginType() { + return "1"; + } + + /*** + * 执行业务代码 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-07 11:20 + * @param requestJson 执行业务代码的参数 + * @return void + **/ + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + //1、查询代发代扣交易未完成代 + //2、调用cbs接口 + AgentPayResultRequestDTO agentPayResultRequestDTO = new AgentPayResultRequestDTO(); + agentPayResultRequestDTO.setBusNum(""); + AgentPayResultResDTO agentPayResultResDTO = cbsPluginService.agentPayResult(agentPayResultRequestDTO); + //更新OA表单 + //记录日志 + return null; + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java new file mode 100644 index 00000000..3866684d --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java @@ -0,0 +1,128 @@ +package com.hzya.frame.plugin.cbs8.plugin; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.cbs8.dto.res.PayResponseDTO; +import com.hzya.frame.plugin.cbs8.service.ICbsPluginService; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity; +import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity; +import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.commons.collections.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/6/18 14:03 + **/ +public class PayApplyAgentPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(PayApplyAgentPluginInitializer.class); + @Autowired + private ICbsPluginService cbsPluginService; + + + @Autowired + private IAgentPaymentService agentPaymentService; + + + /*** + * 插件初始化方法 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-02 10:48 + * @Param [] + * @return void + **/ + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + /**** + * 插件销毁方法 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + /**** + * 插件的ID + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginId() { + return "CBS8PayApplyAgentPlugin"; + } + + /**** + * 插件的名称 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginName() { + return "cbs8代发代扣插件"; + } + + /**** + * 插件的显示值 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginLabel() { + return "cbs8代发代扣插件"; + } + + /*** + * 插件类型 1、场景插件 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-02 14:01 + * @Param [] + * @return java.lang.String + **/ + @Override + public String getPluginType() { + return "1"; + } + + /*** + * 执行业务代码 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-07 11:20 + * @param requestJson 执行业务代码的参数 + * @return void + **/ + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + //1、查询代支付的 + AgentPaymentEntity agentPaymentEntity = new AgentPaymentEntity(); + List agentPaymentList = agentPaymentService.queryUnpaid(agentPaymentEntity); + if (CollectionUtils.isNotEmpty(agentPaymentList)){ + for (AgentPaymentEntity paymentEntity : agentPaymentList) { + AgentPaymentDetailEntity detailEntity = new AgentPaymentDetailEntity(); + detailEntity.setFormmainId(paymentEntity.getId()); + List agentPaymentDetailList = agentPaymentService.queryDetails(detailEntity); + if (CollectionUtils.isNotEmpty(agentPaymentDetailList)){ + //调用代发代扣接口 + PayResponseDTO payResponseDTO = cbsPluginService.applyAgentPay(paymentEntity, agentPaymentDetailList); + //更新OA表单 + //记录日志 + } + } + } + return null; + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java index 05bed205..df88f720 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java @@ -97,7 +97,7 @@ public class PayApplyPluginInitializer extends PluginBaseEntity { @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { //支付申请 - cbsPluginService.applyPay(requestJson); + //cbsPluginService.applyPay(requestJson); return null; } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java index 3aca9eaa..b81840ce 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java @@ -269,6 +269,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService { public AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO) { if (null != agentPayResultRequestDTO && StrUtil.isNotEmpty(agentPayResultRequestDTO.getBusNum())){ AgentPayResultResDTO agentPayResultResDTO = cbs8Service.agentPayResult(agentPayResultRequestDTO); + return agentPayResultResDTO; } return null; } From 442fbb602e54e3daa755fdf0d2e852976625ee42 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 19 Jun 2024 13:58:05 +0800 Subject: [PATCH 40/44] =?UTF-8?q?cbs8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cbs8/service/impl/Cbs8ExtServiceImpl.java | 109 ++++++++---------- .../cbs8/service/impl/Cbs8ServiceImpl.java | 68 ++++++++--- 2 files changed, 105 insertions(+), 72 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java index 3a35e8c2..57e49443 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java @@ -8,7 +8,6 @@ import com.hzya.frame.cbs8.dto.req.*; import com.hzya.frame.cbs8.service.ICbs8ExtService; import com.hzya.frame.cbs8.util.CBSUtil; import com.hzya.frame.cbs8.util.CbsAccessToken; -import com.hzya.frame.cbs8.util.SM2Util; import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; import com.hzya.frame.stringutil.StringUtil; import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; @@ -62,21 +61,8 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { payRequestDTO.setPayAccount(null); } String requestData = JSONObject.toJSONString(payRequestDTO); - //签名 - long timestamp = System.currentTimeMillis(); - String sign = CBSUtil.sign(requestData,timestamp); - //加密 - byte[] encryptedData = CBSUtil.encrypt(requestData); - Map header = new HashMap(); - header.put(CBSUtil.SIGN_HEADER_NAME,sign); - header.put(CBSUtil.TIMESTAMP_HEADER,Long.toString(timestamp)); - header.put(HTTP.CONTENT_TYPE,CBSUtil.TARGET_CONTENT_TYPE); - header.put(CBSUtil.AUTHORIZATION,CBSUtil.BEARER+ CbsAccessToken.getToken()); - entity.setBodys(Base64.getEncoder().encodeToString(encryptedData)); - entity.setHeaders(header); - - String body = HttpRequest.post("https://cbs8-openapi-reprd.csuat.cmburl.cn/openapi/payment/openapi/v1/payment-apply-common").addHeaders(header).body(encryptedData).execute().body(); - System.out.println(body); + //加密 签名 + encrypAndsign(entity,requestData); } } return entity; @@ -94,14 +80,8 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { if (StrUtil.isNotEmpty(boyds)){ AgentPayRequestDTO agentPayRequest = JSONObject.parseObject(boyds,AgentPayRequestDTO.class); String requestData = JSONObject.toJSONString(agentPayRequest); - //签名 - long timestamp = System.currentTimeMillis(); - String sign = CBSUtil.sign(requestData,timestamp); - //加密 - byte[] encryptedData = CBSUtil.encrypt(requestData); - Map header = getHeaders(sign,timestamp); - entity.setBodys(Base64.getEncoder().encodeToString(encryptedData)); - entity.setHeaders(header); + //加密签名 + encrypAndsign(entity, requestData); } return entity; } @@ -119,17 +99,8 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { PayResultRequestDTO payResultRequest = JSONObject.parseObject(bodys,PayResultRequestDTO.class); if (null != payResultRequest && StrUtil.isNotEmpty(payResultRequest.getReferenceNum())){ String requestData = JSONObject.toJSONString(payResultRequest); - //签名 - long timestamp = System.currentTimeMillis(); - String sign = CBSUtil.sign(requestData,timestamp); - //加密 - byte[] encryptedData = CBSUtil.encrypt(requestData); - Map header = getHeaders(sign,timestamp); - entity.setBodys(Base64.getEncoder().encodeToString(encryptedData)); - entity.setHeaders(header); - byte[] bodyBytes = HttpRequest.post("https://cbs8-openapi-reprd.csuat.cmburl.cn/openapi/payment/openapi/v2/detail").addHeaders(header).body(encryptedData).execute().bodyBytes(); - //解密报文 - String decrypt = CBSUtil.decrypt(bodyBytes); + //加密 签名 + encrypAndsign(entity,requestData); }else { throw new BaseSystemException("业务参考号不能为空！！！！"); } @@ -149,14 +120,8 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { if (StrUtil.isEmpty(bodys)){ TransactionDetailReqDTO transactionDetailReqDTO = JSONObject.parseObject(bodys,TransactionDetailReqDTO.class); String requestData = JSONObject.toJSONString(transactionDetailReqDTO); - //签名 - long timestamp = System.currentTimeMillis(); - String sign = CBSUtil.sign(requestData,timestamp); - //加密 - byte[] encryptedData = CBSUtil.encrypt(requestData); - Map header = getHeaders(sign,timestamp); - entity.setBodys(Base64.getEncoder().encodeToString(encryptedData)); - entity.setHeaders(header); + ////加密签名 + encrypAndsign(entity, requestData); } return entity; } @@ -169,9 +134,18 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { */ @Override public SysExtensionApiEntity payApplyAgent(SysExtensionApiEntity entity) { - return null; + String bodys = entity.getBodys(); + if (StrUtil.isNotEmpty(bodys)){ + AgentPayRequestDTO agentPayRequest = JSONObject.parseObject(bodys,AgentPayRequestDTO.class); + String requestData = JSONObject.toJSONString(agentPayRequest); + ////加密签名 + encrypAndsign(entity, requestData); + } + return entity; } + + /** * 代发代扣结果查询 * @@ -180,7 +154,13 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { */ @Override public SysExtensionApiEntity payApplyAgentResult(SysExtensionApiEntity entity) { - return null; + String bodys = entity.getBodys(); + if (StrUtil.isNotEmpty(bodys)){ + AgentPayResultRequestDTO agentPayResultRequestDTO = JSONObject.parseObject(bodys,AgentPayResultRequestDTO.class); + String requestData = JSONObject.toJSONString(agentPayResultRequestDTO); + encrypAndsign(entity,requestData); + } + return entity; } /** @@ -195,25 +175,20 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { if (StrUtil.isNotEmpty(bodys)){ ElecRequestDTO elecRequestDTO = JSONObject.parseObject(bodys,ElecRequestDTO.class); String requestData = JSONObject.toJSONString(elecRequestDTO); - //签名 - long timestamp = System.currentTimeMillis(); - String sign = CBSUtil.sign(requestData,timestamp); - //加密 - byte[] encryptedData = CBSUtil.encrypt(requestData); - Map header = getHeaders(sign,timestamp); - entity.setBodys(Base64.getEncoder().encodeToString(encryptedData)); - entity.setHeaders(header); - byte[] bodyBytes = HttpRequest.post("https://cbs8-openapi-reprd.csuat.cmburl.cn/openapi/account/openapi/v1/electronic-bill/query").addHeaders(header).body(encryptedData).execute().bodyBytes(); - //解密报文 - String decrypt = CBSUtil.decrypt(bodyBytes); - System.out.println(decrypt); + //加密 签名 + encrypAndsign(entity,requestData); } return entity; } - - private Map getHeaders(String sign,long timestamp){ + /** + * 请求头 + * @param sign + * @param timestamp + * @return + */ + private Map headersValueOf(String sign, long timestamp){ Map header = new HashMap(); header.put(CBSUtil.SIGN_HEADER_NAME,sign); header.put(CBSUtil.TIMESTAMP_HEADER,Long.toString(timestamp)); @@ -221,4 +196,20 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService { header.put(CBSUtil.AUTHORIZATION,CBSUtil.BEARER+ CbsAccessToken.getToken()); return header; } + + /** + * 加密 签名 + * @param entity 接口转发参数对象 + * @param requestData 请求参数json字符串 + */ + private void encrypAndsign(SysExtensionApiEntity entity, String requestData) { + //签名 + long timestamp = System.currentTimeMillis(); + String sign = CBSUtil.sign(requestData,timestamp); + //加密 + byte[] encryptedData = CBSUtil.encrypt(requestData); + Map header = headersValueOf(sign,timestamp); + entity.setBodys(Base64.getEncoder().encodeToString(encryptedData)); + entity.setHeaders(header); + } } diff --git a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java index d3d74a91..a2aad83d 100644 --- a/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java @@ -13,11 +13,13 @@ import com.hzya.frame.cbs8.service.ICbs8Service; import com.hzya.frame.cbs8.util.CBSUtil; import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity; import com.hzya.frame.seeyon.cbs8.service.IPaymentService; +import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Base64; import java.util.List; import java.util.Map; @@ -39,8 +41,10 @@ public class Cbs8ServiceImpl implements ICbs8Service { .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") .put("appId","800026") .build(); - String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(JSONObject.toJSONString(paymentEntity)).timeout(60000).execute().body(); - PayResponseDTO payResponseDTO = JSONObject.parseObject(body,PayResponseDTO.class); + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterfaceToESB").addHeaders(headerMap).body(JSONObject.toJSONString(paymentEntity)).timeout(60000).execute().body(); + //解密响应报文 + String result = decryptResBody(body); + PayResponseDTO payResponseDTO = JSONObject.parseObject(result,PayResponseDTO.class); return payResponseDTO; } @@ -59,14 +63,13 @@ public class Cbs8ServiceImpl implements ICbs8Service { .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") .put("appId","800026") .build(); - String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(JSONObject.toJSONString(resultRequestDTO)).timeout(60000).execute().body(); - if (StrUtil.isEmpty(body)){ - CbsResponseDTO cbsResponseDTO = JSONObject.parseObject(body, CbsResponseDTO.class); - if (CollectionUtils.isNotEmpty(cbsResponseDTO.getData())){ - List dataList = cbsResponseDTO.getData(); - List payResultList = CBSUtil.convertJsonArrayToList(dataList, PayResultResDTO.class); - return payResultList; - } + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterfaceToESB").addHeaders(headerMap).body(JSONObject.toJSONString(resultRequestDTO)).timeout(60000).execute().body(); + String result = decryptResBody(body); + CbsResponseDTO cbsResponseDTO = JSONObject.parseObject(result, CbsResponseDTO.class); + if (CollectionUtils.isNotEmpty(cbsResponseDTO.getData())){ + List dataList = cbsResponseDTO.getData(); + List payResultList = CBSUtil.convertJsonArrayToList(dataList, PayResultResDTO.class); + return payResultList; } return null; } @@ -102,7 +105,8 @@ public class Cbs8ServiceImpl implements ICbs8Service { .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") .put("appId","800026") .build(); - String result = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(params).timeout(60000).execute().body(); + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterfaceToESB").addHeaders(headerMap).body(params).timeout(60000).execute().body(); + String result = decryptResBody(body); if (StrUtil.isNotEmpty(result)){ CbsResponseDTO cbsResponseDTO = JSONObject.parseObject(result, CbsResponseDTO.class); if (null != cbsResponseDTO){ @@ -146,7 +150,8 @@ public class Cbs8ServiceImpl implements ICbs8Service { .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") .put("appId","800026") .build(); - String result = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(params).timeout(60000).execute().body(); + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterfaceToESB").addHeaders(headerMap).body(params).timeout(60000).execute().body(); + String result = decryptResBody(body); if (StrUtil.isNotEmpty(result)){ CbsResponseDTO cbsResponseDTO = JSONObject.parseObject(result, CbsResponseDTO.class); if (null != cbsResponseDTO){ @@ -180,7 +185,8 @@ public class Cbs8ServiceImpl implements ICbs8Service { .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") .put("appId","800026") .build(); - String result = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(params).timeout(60000).execute().body(); + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterfaceToESB").addHeaders(headerMap).body(params).timeout(60000).execute().body(); + String result = decryptResBody(body); if (StrUtil.isNotEmpty(result)){ CbsResponseDTO cbsResponseDTO = JSONObject.parseObject(result, CbsResponseDTO.class); List dataList = cbsResponseDTO.getData(); @@ -201,6 +207,42 @@ public class Cbs8ServiceImpl implements ICbs8Service { */ @Override public AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO) { + Map headerMap = MapBuilder.create(true) + .put("apiCode", "8000260004") + .put("publicKey","ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj") + .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") + .put("appId","800026") + .build(); + String params = JSON.toJSONString(agentPayResultRequestDTO); + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterfaceToESB").addHeaders(headerMap).body(params).timeout(60000).execute().body(); + //解密报文 + String result = decryptResBody(body); + if (StrUtil.isNotEmpty(result)){ + CbsResponseDTO cbsResponseDTO = JSONObject.parseObject(result, CbsResponseDTO.class); + List dataList = cbsResponseDTO.getData(); + if (CollectionUtils.isNotEmpty(dataList)){ + JSONObject o = dataList.get(0); + AgentPayResultResDTO agentPayResultResDTO = JSON.toJavaObject(o, AgentPayResultResDTO.class); + return agentPayResultResDTO; + } + } + return null; + } + + /** + * 解密响应报文 + * @param body + * @return + */ + private String decryptResBody(String body){ + if (StrUtil.isNotEmpty(body)){ + JsonResultEntity resultEntity = JSONObject.parseObject(body,JsonResultEntity.class); + String bodyBase64 = String.valueOf(resultEntity.getAttribute()); + byte[] bodyBytes = Base64.getDecoder().decode(bodyBase64); + //解密报文 + String result = CBSUtil.decrypt(bodyBytes); + return result; + } return null; } } From 375e1619b044acdab9ccd1409b55a50e523a2e92 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 19 Jun 2024 14:36:58 +0800 Subject: [PATCH 41/44] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B2=A1=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java index a1801a1d..78744a9f 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/PaymentServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; public class PaymentServiceImpl extends BaseService implements IPaymentService { - public static final String oa_datasource_code = "123"; + private IPaymentDao paymentDao; @Autowired From f1fcd9658ad9b635558c566e80c92cf567062ab3 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 19 Jun 2024 14:45:09 +0800 Subject: [PATCH 42/44] =?UTF-8?q?=E5=B7=AE=E6=97=85=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E6=8A=A5=E9=94=80=E5=8D=95=E6=B5=8B=E8=AF=95sql=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seeyon/cbs8/entity/PaymentEntity.xml | 135 +++++++++++++++++- 1 file changed, 129 insertions(+), 6 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml index d6e57e45..f92fd9d4 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml @@ -66,10 +66,51 @@ - select + + -- 差旅费报销单 + SELECT + formson_0210.id as oaId, -- 主表id + 'formson_0210' as tableName, -- 表名 + COL_SUMMARY.SUBJECT as title, -- 单据标题 + unit.name as payCompany, -- 付款公司 + '差旅费报销单' as billName, + 'field0072' as payResultField, -- 支付结果字段 + 'field0073' as payDateField, -- 打款日期字段 + '' as receiptFiled,-- 电子回单字段 + COL_SUMMARY.id as summaryId, + formmain_0209.field0017||'-'||formson_0210.sort as referenceNum, -- 单据编号 + formmain_0209.START_DATE as startDate, -- 单据日期 + formmain_0209.FINISHEDFLAG as finishedflag, -- 流程状态 + formson_0210.field0073 as payDate, -- 打款日期 + formson_0210.field0072 as payResult, -- 支付结果 + REGEXP_REPLACE(formmain_0209.field0042, '[[:space:]]', '') as payAccount, -- 付款账户 + REGEXP_REPLACE(formmain_0209.field0041, '[[:space:]]', '') as payBankName, -- 付款开户行 + formmain_0209.field0035 as amount, -- 金额 + formmain_0209.field0038 as purpose, -- 用途 + formmain_0209.field0038 as cbsAbstract, -- 摘要 + REGEXP_REPLACE(formson_0210.field0069, '[[:space:]]', '') as revAccount, -- 收款账户 + formson_0210.field0068 as revBankName, -- 收款开户行 + '' as revAccountName, -- 收款人 + REGEXP_REPLACE(formson_0210.field0071, '[[:space:]]', '') as cnapsCode, -- 收款联行号 + item.showvalue as personalFlag,-- 公私标记 + '' as revBankType,-- 收款银行类型 + '10' as currency,-- 币种 + '' as busType,-- 业务类型 + '' as receipt -- 电子回单 + from + formson_0210 + LEFT JOIN formmain_0209 ON formson_0210.FORMMAIN_ID = formmain_0209.id + LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0209.id + LEFT JOIN CTP_AFFAIR ON CTP_AFFAIR.object_id = COL_SUMMARY.id + left join CTP_ENUM_ITEM item on item.id =formson_0210.field0070 + left join ORG_UNIT unit on unit.id =formmain_0209.field0002 + -- left join V_USER_VIEW_ALL us on us.staffid=formmain_0209.field0024 + WHERE 1=1 + -- and formmain_0209.field0035>0 + and CTP_AFFAIR.node_name = '发起者' and CTP_AFFAIR.COMPLETE_TIME is null and CTP_AFFAIR.STATE = 3 referenceNum = #{referenceNum} and busType = #{busType} @@ -127,10 +209,51 @@