From 92916e872c590129cf2e47da06c50b5ae03c8e20 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Fri, 9 Aug 2024 16:46:34 +0800 Subject: [PATCH] =?UTF-8?q?GrpU8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/impl/AcctVouchInfoDaoImpl.java | 2 + .../service/IAcctVouchInfoService.java | 12 ++++- .../impl/AcctVouchInfoServiceImpl.java | 52 +++++++++++++++++-- .../dao/impl/DictAcctSubjDaoImpl.java | 3 +- .../service/IDictAcctSubjService.java | 2 +- .../service/impl/DictAcctSubjServiceImpl.java | 13 +++-- .../dao/impl/DictCheckTypeDaoImpl.java | 2 + .../service/IDictCheckTypeService.java | 2 +- .../impl/DictCheckTypeServiceImpl.java | 12 +++-- 9 files changed, 85 insertions(+), 15 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java index 38e0cd95..cfbf3b6b 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.grpU8.acctVouchInfo.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; import com.hzya.frame.grpU8.acctVouchInfo.dao.IAcctVouchInfoDao; @@ -18,6 +19,7 @@ import java.util.List; @Repository(value = "AcctVouchInfoDaoImpl") public class AcctVouchInfoDaoImpl extends MybatisGenericDao implements IAcctVouchInfoDao { + @DS("#entity.dataSourceCode") @Override public List queryData(AcctVouchInfoEntity entity) { List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity); diff --git a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java index 22bd525c..0c41c1fb 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java +++ b/service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java @@ -1,6 +1,7 @@ package com.hzya.frame.grpU8.acctVouchInfo.service; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; import com.hzya.frame.basedao.service.IBaseService; @@ -18,5 +19,14 @@ public interface IAcctVouchInfoService extends IBaseService implements IAcctVouchInfoService { private IAcctVouchInfoDao acctVouchInfoDao; + + @Resource + private ISysApplicationDatabaseDao sysApplicationDatabaseDao; @Autowired public void setAcctVouchInfoDao(IAcctVouchInfoDao dao) { @@ -42,7 +52,7 @@ public class AcctVouchInfoServiceImpl extends BaseService list = acctVouchInfoDao.queryData(entity); PageInfo pageInfo = new PageInfo(list); - return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + JSONObject object = new JSONObject(); + object.put("status","success"); + object.put("data",pageInfo); + return object; }else { List list = acctVouchInfoDao.queryData(entity); - return BaseResult.getSuccessMessageEntity("查询数据成功", list); + JSONObject object = new JSONObject(); + object.put("status","success"); + object.put("data",list); + return object; } + } + + /** + * @param entity + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 数据表 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public SysExtensionApiEntity addDataSourceCode(SysExtensionApiEntity entity) { + try { + SysApplicationEntity applicationEntity = entity.getReceiveApp(); + SysApplicationDatabaseEntity sysApplicationDatabaseEntity = new SysApplicationDatabaseEntity(); + sysApplicationDatabaseEntity.setSts("Y"); + sysApplicationDatabaseEntity.setDbStatus("1"); + sysApplicationDatabaseEntity.setAppId(applicationEntity.getId()); + sysApplicationDatabaseEntity.setDataSourceCode("master"); + List sysDataSourceEntities = sysApplicationDatabaseDao.queryDSBase(sysApplicationDatabaseEntity); + if(sysDataSourceEntities != null && sysDataSourceEntities.size() > 0){ + String parm = entity.getBodys(); + JSONObject jsonObject = JSONObject.parseObject(parm); + jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode()); + entity.setBodys(jsonObject.toJSONString()); + } + } catch (Exception e) { + e.printStackTrace(); } + return entity; } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java index d29909f5..ad55ad36 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/dao/impl/DictAcctSubjDaoImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.grpU8.dictAcctSubj.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity; import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo; import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity; @@ -18,7 +19,7 @@ import java.util.List; */ @Repository(value = "DictAcctSubjDaoImpl") public class DictAcctSubjDaoImpl extends MybatisGenericDao implements IDictAcctSubjDao{ - + @DS("#entity.dataSourceCode") @Override public List queryData(DictAcctSubjEntity entity) { List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity); diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java index cfc15097..cde9e036 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java +++ b/service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java @@ -18,5 +18,5 @@ public interface IDictAcctSubjService extends IBaseService list = dictAcctSubjDao.queryData(entity); PageInfo pageInfo = new PageInfo(list); - return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + JSONObject object = new JSONObject(); + object.put("status","success"); + object.put("data",pageInfo); + return object; }else { List list = dictAcctSubjDao.queryData(entity); - return BaseResult.getSuccessMessageEntity("查询数据成功", list); - } + JSONObject object = new JSONObject(); + object.put("status","success"); + object.put("data",list); + return object; } } } diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java index a0b0809d..76955876 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.grpU8.dictCheckType.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity; import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo; import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity; @@ -19,6 +20,7 @@ import java.util.List; @Repository(value = "DictCheckTypeDaoImpl") public class DictCheckTypeDaoImpl extends MybatisGenericDao implements IDictCheckTypeDao{ + @DS("#entity.dataSourceCode") @Override public List queryData(DictCheckTypeEntity entity) { List o = (List) super.selectList(getSqlIdPrifx() + "queryData", entity); diff --git a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java index 6fb1e77f..b47bb474 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java +++ b/service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java @@ -18,5 +18,5 @@ public interface IDictCheckTypeService extends IBaseService list = dictCheckTypeDao.queryData(entity); PageInfo pageInfo = new PageInfo(list); - return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + JSONObject object = new JSONObject(); + object.put("status","success"); + object.put("data",pageInfo); + return object; }else { List list = dictCheckTypeDao.queryData(entity); - return BaseResult.getSuccessMessageEntity("查询数据成功", list); + JSONObject object = new JSONObject(); + object.put("status","success"); + object.put("data",list); + return object; } } }