GrpU8查询接口修改

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<AcctVouchInfoEntity, String> implements IAcctVouchInfoDao {
 
+    @DS("#entity.dataSourceCode")
     @Override
     public List<AcctVouchInfoEntityVo> queryData(AcctVouchInfoEntity entity) {
         List<AcctVouchInfoEntityVo> o = (List<AcctVouchInfoEntityVo>) super.selectList(getSqlIdPrifx() + "queryData", entity);

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<AcctVouchInfoEntity,
      * @Description 数据表
      * @Date 11:52 上午 2024/3/27
      **/
-    JsonResultEntity queryData(JSONObject jsonObject);
+    Object queryData(JSONObject jsonObject);
+
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 数据表
+     * @Date 11:52 上午 2024/3/27
+     **/
+    SysExtensionApiEntity addDataSourceCode(SysExtensionApiEntity jsonObject);
 }

service/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/impl/AcctVouchInfoServiceImpl.java

@@ -3,19 +3,26 @@ package com.hzya.frame.grpU8.acctVouchInfo.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
+import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
+import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
 import com.hzya.frame.sysnew.user.entity.SysUserEntity;
+import com.hzya.frame.util.bipV3.SHA256Util;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
 import com.hzya.frame.grpU8.acctVouchInfo.dao.IAcctVouchInfoDao;
 import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
 import com.hzya.frame.grpU8.acctVouchInfo.service.IAcctVouchInfoService;
+import org.apache.commons.lang3.StringUtils;
 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 java.util.List;
+import java.util.Map;
 
 /**
  * 子表(AcctVouchInfo)表服务实现类
@@ -28,6 +35,9 @@ public class AcctVouchInfoServiceImpl extends BaseService<AcctVouchInfoEntity, S
      
     private IAcctVouchInfoDao acctVouchInfoDao;
 
+    @Resource
+    private ISysApplicationDatabaseDao sysApplicationDatabaseDao;
+    
     @Autowired
 	public void setAcctVouchInfoDao(IAcctVouchInfoDao dao) {
 		this.acctVouchInfoDao = dao;
@@ -42,7 +52,7 @@ public class AcctVouchInfoServiceImpl extends BaseService<AcctVouchInfoEntity, S
 	 * @Date 11:52 上午 2024/3/27
 	 **/
 	@Override
-	public JsonResultEntity queryData(JSONObject jsonObject) {
+	public Object queryData(JSONObject jsonObject) {
 		AcctVouchInfoEntity entity = getData("jsonStr", jsonObject, AcctVouchInfoEntity.class);
 		if(entity == null ){
 			entity = new AcctVouchInfoEntity();
@@ -52,10 +62,44 @@ public class AcctVouchInfoServiceImpl extends BaseService<AcctVouchInfoEntity, S
 			PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
 			List<AcctVouchInfoEntityVo> 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<AcctVouchInfoEntityVo> 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<SysApplicationDatabaseEntity> 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;
 	}
 }

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<DictAcctSubjEntity, String> implements IDictAcctSubjDao{
-
+    @DS("#entity.dataSourceCode")
     @Override
     public List<DictAcctSubjEntityVo> queryData(DictAcctSubjEntity entity) {
         List<DictAcctSubjEntityVo> o = (List<DictAcctSubjEntityVo>) super.selectList(getSqlIdPrifx() + "queryData", entity);

service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/IDictAcctSubjService.java

@@ -18,5 +18,5 @@ public interface IDictAcctSubjService extends IBaseService<DictAcctSubjEntity, S
      * @Description 数据表
      * @Date 11:52 上午 2024/3/27
      **/
-    JsonResultEntity queryData(JSONObject jsonObject);
+    Object queryData(JSONObject jsonObject);
 }

service/src/main/java/com/hzya/frame/grpU8/dictAcctSubj/service/impl/DictAcctSubjServiceImpl.java

@@ -42,7 +42,7 @@ public class DictAcctSubjServiceImpl extends BaseService<DictAcctSubjEntity, Str
 	 * @Date 11:52 上午 2024/3/27
 	 **/
 	@Override
-	public JsonResultEntity queryData(JSONObject jsonObject) {
+	public Object queryData(JSONObject jsonObject) {
 		DictAcctSubjEntity entity = getData("jsonStr", jsonObject, DictAcctSubjEntity.class);
 		if(entity == null ){
 			entity = new DictAcctSubjEntity();
@@ -52,10 +52,15 @@ public class DictAcctSubjServiceImpl extends BaseService<DictAcctSubjEntity, Str
 			PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
 			List<DictAcctSubjEntityVo> 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<DictAcctSubjEntityVo> list = dictAcctSubjDao.queryData(entity);
-			return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+			JSONObject object = new JSONObject();
-		}
+			object.put("status","success");
+			object.put("data",list);
+			return object;		}
 	}
 }

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<DictCheckTypeEntity, String> implements IDictCheckTypeDao{
 
+    @DS("#entity.dataSourceCode")
     @Override
     public List<DictCheckTypeEntityVo> queryData(DictCheckTypeEntity entity) {
         List<DictCheckTypeEntityVo> o = (List<DictCheckTypeEntityVo>) super.selectList(getSqlIdPrifx() + "queryData", entity);

service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/IDictCheckTypeService.java

@@ -18,5 +18,5 @@ public interface IDictCheckTypeService extends IBaseService<DictCheckTypeEntity,
      * @Description 数据表
      * @Date 11:52 上午 2024/3/27
      **/
-    JsonResultEntity queryData(JSONObject jsonObject);
+    Object queryData(JSONObject jsonObject);
 }

service/src/main/java/com/hzya/frame/grpU8/dictCheckType/service/impl/DictCheckTypeServiceImpl.java

@@ -42,7 +42,7 @@ public class DictCheckTypeServiceImpl extends BaseService<DictCheckTypeEntity, S
 	 * @Date 11:52 上午 2024/3/27
 	 **/
 	@Override
-	public JsonResultEntity queryData(JSONObject jsonObject) {
+	public Object queryData(JSONObject jsonObject) {
 		DictCheckTypeEntity entity = getData("jsonStr", jsonObject, DictCheckTypeEntity.class);
 		if(entity == null ){
 			entity = new DictCheckTypeEntity();
@@ -52,10 +52,16 @@ public class DictCheckTypeServiceImpl extends BaseService<DictCheckTypeEntity, S
 			PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
 			List<DictCheckTypeEntityVo> 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<DictCheckTypeEntityVo> list = dictCheckTypeDao.queryData(entity);
-			return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+			JSONObject object = new JSONObject();
+			object.put("status","success");
+			object.put("data",list);
+			return object;
 		}
 	}
 }