hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj

This commit is contained in:
yuqh 2024-09-09 15:28:54 +08:00
parent ed40e4f4c8 c78e10f059
commit 72f98441a1
10 changed files with 1562 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildpackage/src/main/resources/application-llg.yml
View File

@ -42,6 +42,8 @@ spring:
savefile:
# 文件保存路径
path: /Users/apple/Desktop/log/local
tomcatpath: /Users/apple/Desktop/log/local
pluginpath: /Users/apple/Desktop/log/local
zt:
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
cbs8:

16
service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
View File

@ -962,19 +962,25 @@ where id = #{id}
${item.leftBracket} ${item.filedId}
<choose>
<when test="item.compareType == '1'.toString() ">
=
= #{item.filedVaule}
</when>
<when test="item.compareType == '2'.toString() ">
!=
!= #{item.filedVaule}
</when>
<when test="item.compareType == '3'.toString() ">
&gt;
&gt; #{item.filedVaule}
</when>
<when test="item.compareType == '4'.toString() ">
&lt;
&lt; #{item.filedVaule}
</when>
<when test="item.compareType == '5'.toString() ">
like concat('%',#{item.filedVaule},'%')
</when>
<when test="item.compareType == '6'.toString() ">
not like concat('%',#{item.filedVaule},'%')
</when>
</choose>
#{item.filedVaule}
<choose>
<when test="item.connectionSymbol == '1'.toString() ">
<choose>

20
service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
View File

@ -46,6 +46,8 @@ import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEn
import com.hzya.frame.sysnew.messageManageLog.dao.ISysMessageManageLogDao;
import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity;
import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogPageVo;
import com.hzya.frame.sysnew.pushMessage.entity.SysPushMessageEntity;
import com.hzya.frame.sysnew.sendMessageLog.service.ISysSendMessageLogService;
import com.hzya.frame.util.AESUtil;
import com.hzya.frame.util.IPHelper;
import com.hzya.frame.uuid.UUIDUtils;
@ -90,6 +92,8 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
@Resource
private ISysApplicationApiDao sysApplicationApiDao;
@Resource
private ISysSendMessageLogService sysSendMessageLogService;
@Resource
private ISysMessageManageLogDao sysMessageManageLogDao;
@Resource
private DsDataSourceUtil dsDataSourceUtil;
@ -2638,9 +2642,21 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
sysMessageManageLogEntity.setModify_time(new Date());
sysMessageManageLogEntity.setSts("Y");
taskExecutor.execute(() -> doEsbTask(sysMessageManageLogEntity));
SysPushMessageEntity sysPushMessageEntity = new SysPushMessageEntity();
sysPushMessageEntity.setSendAppName(sendApp.getName());
sysPushMessageEntity.setReceiveAppName(receiveApp.getName());
sysPushMessageEntity.setReceiveApiName(receiveApi.getApiName());
sysPushMessageEntity.setReceiveApiCode(receiveApi.getApiCode());
sysPushMessageEntity.setReturnData(sysMessageManageLogEntity.getReturnData());
sysPushMessageEntity.setStatus(sysMessageManageLogEntity.getStatus());
taskExecutor.execute(() -> sendMssage(sysPushMessageEntity));
return sysMessageManageLogEntity;
}
private void sendMssage(SysPushMessageEntity sysPushMessageEntity) {
sysSendMessageLogService.sendMessage(sysPushMessageEntity);
}
private SysMessageManageLogEntity updateLog(SysApplicationEntity sendApp, SysApplicationEntity receiveApp, SysApplicationApiEntity receiveApi,
String oldbodys,String bodys,
Map<String, String> oldheaderMap,Map<String, String> headerMap,
@ -2793,6 +2809,9 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
sysMessageManageLogEntity.setModify_time(new Date());
sysMessageManageLogEntity.setSts("Y");
taskExecutor.execute(() -> doEsbTaskNew(sysMessageManageLogEntity));
return sysMessageManageLogEntity;
}
@ -2805,6 +2824,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
**/
private void doEsbTask(SysMessageManageLogEntity manageLogEntities) {
sysMessageManageLogDao.save(manageLogEntities);
}
private void doEsbTaskNew(SysMessageManageLogEntity manageLogEntities) {
sysMessageManageLogDao.update(manageLogEntities);

19
service/src/main/java/com/hzya/frame/u8c/Encapsulation/dao/IEncapsulationDao.java Normal file
View File

@ -0,0 +1,19 @@
package com.hzya.frame.u8c.Encapsulation.dao;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity;
import java.util.List;
/**
* (bd_corp: table)表数据库访问层
*
* @author makejava
* @since 2023-09-06 14:47:17
*/
public interface IEncapsulationDao extends IBaseDao<EncapsulationEntity, String> {
List<EncapsulationEntity> queryCgrkddh(EncapsulationEntity encapsulationEntity);
}

32
service/src/main/java/com/hzya/frame/u8c/Encapsulation/dao/impl/EncapsulationDaoImpl.java Normal file
View File

@ -0,0 +1,32 @@
package com.hzya.frame.u8c.Encapsulation.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo;
import com.hzya.frame.u8c.Encapsulation.dao.IEncapsulationDao;
import com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* (BdCorp)表数据库访问层
*
* @author makejava
* @since 2023-09-06 14:47:17
*/
@Repository("encapsulationDaoImpl")
public class EncapsulationDaoImpl extends MybatisGenericDao<EncapsulationEntity, String> implements IEncapsulationDao {
@DS("#entity.dataSourceCode")
@Override
public List<EncapsulationEntity> queryCgrkddh(EncapsulationEntity entity) {
List<EncapsulationEntity> o = (List<EncapsulationEntity>) super.selectList(getSqlIdPrifx() + "queryCgrkddh", entity);
return o;
}
}

33
service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.java Normal file
View File

@ -0,0 +1,33 @@
package com.hzya.frame.u8c.Encapsulation.entity;
import com.hzya.frame.web.entity.BaseEntity;
/**
* (BdCorp)实体类
*
* @author makejava
* @since 2023-09-06 14:47:18
*/
public class EncapsulationEntity extends BaseEntity {
//单据号
private String code;
//单据类型
private String type;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}

18
service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.u8c.Encapsulation.dao.impl.EncapsulationDaoImpl">
<select id="queryCgrkddh" resultType="com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity" parameterType = "com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity">
SELECT
vbillcode as code
FROM
ic_general_h
WHERE
cgeneralhid in (
SELECT cgeneralhid FROM ic_general_b WHERE vfirstbillcode = #{code} and csourcetype = #{type}
)
</select>
</mapper>

104
service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/IEncapsulationService.java Normal file
View File

@ -0,0 +1,104 @@
package com.hzya.frame.u8c.Encapsulation.service;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
import com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity;
/**
* (BdCorp)表服务接口
*
* @author makejava
* @since 2023-09-06 14:47:18
*/
public interface IEncapsulationService extends IBaseService<EncapsulationEntity, String> {
/**
* @Author lvleigang
* @Description 采购订单删除接口
* 0、根据采购订单号查询入库单号,1、库存采购入库单取消签字，2、库存采购入库单删除,3、采购订单弃审,4、采购订单删除
* @Date 9:44 上午 2024/9/4
* @param jsonObject
* @return java.lang.Object
**/
Object purchaseOrderDelete(JSONObject jsonObject);
SysExtensionApiEntity addPurchaseOrderDelete(SysExtensionApiEntity jsonObject);
/**
* @Author lvleigang
* @Description 采购入库单删除接口
* 1、库存采购入库单取消签字，2、库存采购入库单删除
* @Date 9:44 上午 2024/9/4
* @param jsonObject
* @return java.lang.Object
**/
Object purchaseWarehousingDelete(JSONObject jsonObject);
SysExtensionApiEntity addPurchaseWarehousingDelete(SysExtensionApiEntity jsonObject);
/**
* @Author lvleigang
* @Description 销售订单删除接口
* 0、根据销售钉订单号查询出销售出库单号，1、库存销售出库单取消签字,2、库存销售出库单删除,3、销售订单取消审批,4、销售订单删除
* @Date 9:44 上午 2024/9/4
* @param jsonObject
* @return java.lang.Object
**/
Object salesOrderDelete(JSONObject jsonObject);
SysExtensionApiEntity addSalesOrderDelete(SysExtensionApiEntity jsonObject);
/**
* @Author lvleigang
* @Description 调拨订单删除接口
* 0、根据调拨订单号查询调拨入库，调拨出库单据，1、库存调拨出库取消签字 2、库存调拨出库删除 3、调拨入库取消签字 4、调拨入库删除 5、调拨订单弃审 6、调拨订单删除
* @Date 9:44 上午 2024/9/4
* @param jsonObject
* @return java.lang.Object
**/
Object transferOrderDelete(JSONObject jsonObject);
SysExtensionApiEntity addTransferOrderDelete(SysExtensionApiEntity jsonObject);
/**
* @Author lvleigang
* @Description 产成品入库删除接口
* 1、库存产成品入库单取消签字 2、库存产成品入库单删除
* @Date 9:44 上午 2024/9/4
* @param jsonObject
* @return java.lang.Object
**/
Object finishedProductsAreStoredDelete(JSONObject jsonObject);
SysExtensionApiEntity addFinishedProductsAreStoredDelete(SysExtensionApiEntity jsonObject);
/**
* @Author lvleigang
* @Description 材料出库删除接口
* 1、库存材料出库取消签字 2、库存材料出库单删除
* @Date 9:44 上午 2024/9/4
* @param jsonObject
* @return java.lang.Object
**/
Object materialDeliveryDelete(JSONObject jsonObject);
SysExtensionApiEntity addMaterialDeliveryDelete(SysExtensionApiEntity jsonObject);
/**
* @Author lvleigang
* @Description 其他出库单删除接口
* 1、库存其他出库取消签字 2、库存其他出库删除
* @Date 9:44 上午 2024/9/4
* @param jsonObject
* @return java.lang.Object
**/
Object otherWarehouseOrdersDelete(JSONObject jsonObject);
SysExtensionApiEntity addOtherWarehouseOrdersDelete(SysExtensionApiEntity jsonObject);
/**
* @Author lvleigang
* @Description 其他入库单删除接口
* 1、库存其他入库单取消签字. 2、库存其他入库删除
* @Date 9:44 上午 2024/9/4
* @param jsonObject
* @return java.lang.Object
**/
Object otherWarehouseReceiptDelete(JSONObject jsonObject);
SysExtensionApiEntity addOtherWarehouseReceiptDelete(SysExtensionApiEntity jsonObject);
}

1319
service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java Normal file
View File

File diff suppressed because it is too large Load Diff

8
webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
View File

@ -183,10 +183,10 @@ public class EntranceServiceImpl implements IEntranceService {
Method[] methods = object.getClass().getMethods();
logger.info("methodsLength:" + methods.length);
if (methods == null || methods.length == 0) {
logger.info("当前methods:" + methods + "methodsLength = " + methods.length);
logger.error("当前methods:" + methods + "methodsLength = " + methods.length);
throw new BaseSystemException(service + "未找到" + serviceMethod + "方法");
} else {
logger.info("当前methods222222:" + methods + "methodsLength = " + methods.length);
logger.info("当前methods:" + methods + "methodsLength = " + methods.length);
}
for (Method m : methods) {
//logger.info("当前mnAME:" + m.getName() + " :serviceMethod = " + serviceMethod.trim());
@ -271,10 +271,10 @@ public class EntranceServiceImpl implements IEntranceService {
Method[] methods = object.getClass().getMethods();
logger.info("methodsLength:" + methods.length);
if (methods == null || methods.length == 0) {
logger.info("当前methods:" + methods + "methodsLength = " + methods.length);
logger.error("当前methods:" + methods + "methodsLength = " + methods.length);
return BaseResult.getFailureMessageEntity(service + "未找到" + serviceMethod + "方法");
} else {
logger.error("当前methods2:" + methods + "methodsLength = " + methods.length);
logger.info("当前methods:" + methods + "methodsLength = " + methods.length);
}
for (Method m : methods) {
//logger.info("当前mnAME:" + m.getName() + " :serviceMethod = " + serviceMethod.trim());