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

Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into dev

This commit is contained in:
476474485@qq.com 2024-05-11 14:40:12 +08:00
parent 3cd0edd14f 18e3d55698
commit 1293b479ea
24 changed files with 200 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -182,7 +181,6 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module a WHERE a.sts = 'Y' ),</if>
<if test="sts == null ">'Y',</if>
</trim>
)
@ -276,13 +274,15 @@ where id = #{id}
a.remark as remark,
a.create_time as createTime,
a.modify_time as modifyTime,
c.view_name as createUserId,
m.view_name as modifyUserId
d.person_name as createUserId,
n.person_name as modifyUserId
from
mdm_module a
LEFT JOIN sys_dictionaryshop_new sd on sd.column_value = a.mdm_type and sd.tab_name = 'mdm' and sd.column_name = 'mdm_type' and sd.used_sts = '1'
LEFT JOIN sys_user c on c.id = a.create_user_id and c.sts = 'Y'
LEFT JOIN sys_person d on d.id = c.person_id and d.sts = 'Y'
LEFT JOIN sys_user m on m.id = a.modify_user_id and m.sts = 'Y'
LEFT JOIN sys_person n on n.id = m.person_id and n.sts = 'Y'
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and a.id like concat('%',#{id},'%')</if>
<if test="mdmName != null and mdmName != ''">and a.mdm_name like concat('%',#{mdmName},'%')</if>

5
service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
View File

@ -150,7 +150,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -167,9 +166,7 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_db a WHERE a.sts =
'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)

5
service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml
View File

@ -174,7 +174,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -193,9 +192,7 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_db_fileds a WHERE
a.sts = 'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)

2
service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
View File

@ -169,7 +169,6 @@
<if test="modify_time != null"> modify_time , </if>
<if test="sts != null and sts != ''"> sts , </if>
<if test="org_id != null and org_id != ''"> org_id , </if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -190,7 +189,6 @@
<if test="modify_time != null"> #{modify_time} ,</if>
<if test="sts != null and sts != ''"> #{sts} ,</if>
<if test="org_id != null and org_id != ''"> #{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_db_fileds_rule a WHERE a.sts = 'Y' ),</if>
<if test="sts == null ">'Y',</if>
</trim>
)

5
service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml
View File

@ -152,7 +152,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -169,9 +168,7 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from
mdm_module_db_fileds_rule_files a WHERE a.sts = 'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)

2
service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml
View File

@ -169,7 +169,6 @@
<if test="org_id != null and org_id != ''"> org_id , </if>
<if test="addPlug != null and addPlug != ''"> add_plug , </if>
<if test="deletePlug != null and deletePlug != ''"> delete_plug , </if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -190,7 +189,6 @@
<if test="org_id != null and org_id != ''"> #{org_id} ,</if>
<if test="addPlug != null and addPlug != ''"> #{addPlug} ,</if>
<if test="deletePlug != null and deletePlug != ''"> #{deletePlug} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_distribute a WHERE a.sts = 'Y' ),</if>
<if test="sts == null ">'Y',</if>
</trim>
)

2
service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml
View File

@ -204,7 +204,6 @@
<if test="sts != null and sts != ''"> sts , </if>
<if test="org_id != null and org_id != ''"> org_id , </if>
<if test="coordinate != null and coordinate != ''"> coordinate , </if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -230,7 +229,6 @@
<if test="sts != null and sts != ''"> #{sts} ,</if>
<if test="org_id != null and org_id != ''"> #{org_id} ,</if>
<if test="coordinate != null and coordinate != ''"> #{coordinate} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_distribute_detail a WHERE a.sts = 'Y' ),</if>
<if test="sts == null ">'Y',</if>
</trim>
)

5
service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml
View File

@ -136,7 +136,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -151,9 +150,7 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_role a WHERE a.sts
= 'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)

5
service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml
View File

@ -167,7 +167,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -185,9 +184,7 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_role_button a
WHERE a.sts = 'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)

5
service/src/main/java/com/hzya/frame/mdm/mdmModuleUserView/entity/MdmModuleUserViewEntity.xml
View File

@ -146,7 +146,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -162,9 +161,7 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_user_view a WHERE
a.sts = 'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)

5
service/src/main/java/com/hzya/frame/mdm/mdmModuleView/entity/MdmModuleViewEntity.xml
View File

@ -150,7 +150,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -167,9 +166,7 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_view a WHERE a.sts
= 'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)

5
service/src/main/java/com/hzya/frame/mdm/mdmModuleViewDetail/entity/MdmModuleViewDetailEntity.xml
View File

@ -151,7 +151,6 @@
<if test="modify_time != null">modify_time ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="org_id != null and org_id != ''">org_id ,</if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -168,9 +167,7 @@
<if test="modify_time != null">#{modify_time} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_view_detail a
WHERE a.sts = 'Y' ),
</if>
<if test="sts == null ">'Y',</if>
</trim>
)

2
service/src/main/java/com/hzya/frame/mdm/mdmTableCodeRule/entity/MdmTableCodeRuleEntity.xml
View File

@ -155,7 +155,6 @@
<if test="sts != null and sts != ''"> sts , </if>
<if test="org_id != null and org_id != ''"> org_id , </if>
<if test="dbValue != null and dbValue != ''"> db_value , </if>
<if test="sorts == null ">sorts,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@ -174,7 +173,6 @@
<if test="sts != null and sts != ''"> #{sts} ,</if>
<if test="org_id != null and org_id != ''"> #{org_id} ,</if>
<if test="dbValue != null and dbValue != ''"> #{dbValue} ,</if>
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_table_code_rule a WHERE a.sts = 'Y' ),</if>
<if test="sts == null ">'Y',</if>
</trim>
)

6
service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
View File

@ -67,7 +67,7 @@ public interface IMdmService {
* @param jsonObject
* @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 主数据设置查询数据源的服务
* @Description 主数据设置查询数据源字段的服务
* @Date 9:40 上午 2023/10/18
**/
JsonResultEntity queryMdmModuleServerFiled(JSONObject jsonObject);
@ -164,7 +164,7 @@ public interface IMdmService {
JsonResultEntity queryMdmShowAll(JSONObject jsonObject);
/**
* @Author lvleigang
* @Description 查询数据（list 或者 分页）
* @Description 查询模版数据（list 或者 分页）
* @Date 1:33 下午 2023/7/12
* @param jsonObject
* @return com.hzya.frame.web.entity.JsonResultEntity
@ -183,7 +183,7 @@ public interface IMdmService {
* @param jsonObject
* @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 主数据列表显示 业务数据
* @Description 主数据业务数据
* @Date 9:40 上午 2023/10/18
**/
JsonResultEntity queryMdmShowDistribute(JSONObject jsonObject);

8
service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/IIntegrationTaskLivingService.java
View File

@ -23,4 +23,12 @@ public interface IIntegrationTaskLivingService extends IBaseService<IntegrationT
JsonResultEntity queryEntityPage(JSONObject jsonObject);
/**
* @param jsonObject
* @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 获取任务
* @Date 2:36 下午 2024/3/27
**/
JsonResultEntity getEntity(JSONObject jsonObject);
}

26
service/src/main/java/com/hzya/frame/sysnew/integtationTaskLiving/service/impl/IntegrationTaskLivingServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.hzya.frame.sysnew.integtationTaskLiving.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.sysnew.integtationTask.IIntegrationTaskCacheableService;
import com.hzya.frame.sysnew.integtationTask.entity.IntegrationTaskEntity;
import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingEntity;
import com.hzya.frame.sysnew.integtationTaskLiving.dao.IIntegrationTaskLivingDao;
@ -27,6 +28,8 @@ public class IntegrationTaskLivingServiceImpl extends BaseService<IntegrationTas
private IIntegrationTaskLivingDao integrationTaskLivingDao;
@Resource
private IIntegrationTaskCacheableService iIntegrationTaskCacheableService;
@Autowired
public void setIntegrationTaskLivingDao(IIntegrationTaskLivingDao dao) {
this.integrationTaskLivingDao = dao;
@ -52,4 +55,27 @@ public class IntegrationTaskLivingServiceImpl extends BaseService<IntegrationTas
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 getEntity(JSONObject jsonObject) {
IntegrationTaskLivingEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLivingEntity.class);
if (entity == null) {
return BaseResult.getFailureMessageEntity("参数不允许为空");
}
if (entity.getId() == null || "".equals(entity.getId())) {
return BaseResult.getFailureMessageEntity("系统错误");
}
entity = iIntegrationTaskCacheableService.getIntegrationTaskLivingEntity(entity.getId());
if (entity == null) {
return BaseResult.getFailureMessageEntity("获取任务实例失败");
}
return BaseResult.getSuccessMessageEntity("获取任务实例成功", entity);
}
}

8
service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/IIntegrationTaskLivingDetailsService.java
View File

@ -22,4 +22,12 @@ public interface IIntegrationTaskLivingDetailsService extends IBaseService<Integ
JsonResultEntity queryEntityPage(JSONObject jsonObject);
/**
* @param jsonObject
* @return com.hzya.frame.web.entity.JsonResultEntity
* @Author lvleigang
* @Description 获取任务
* @Date 2:36 下午 2024/3/27
**/
JsonResultEntity getEntity(JSONObject jsonObject);
}

24
service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/service/impl/IntegrationTaskLivingDetailsServiceImpl.java
View File

@ -52,4 +52,28 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
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 getEntity(JSONObject jsonObject) {
IntegrationTaskLivingDetailsEntity entity = getData("jsonStr", jsonObject, IntegrationTaskLivingDetailsEntity.class);
if (entity == null) {
return BaseResult.getFailureMessageEntity("参数不允许为空");
}
if (entity.getId() == null || "".equals(entity.getId())) {
return BaseResult.getFailureMessageEntity("系统错误");
}
entity = integrationTaskLivingDetailsDao.get(entity.getId());
if (entity == null) {
return BaseResult.getFailureMessageEntity("获取任务日志失败");
}
return BaseResult.getSuccessMessageEntity("获取任务日志成功", entity);
}
}

9
service/src/main/java/com/hzya/frame/u8c/ax/entity/Voucher.java
View File

@ -9,6 +9,7 @@ public class Voucher {
private String pk_glorgbook;
private String pk_prepared;
private String pk_vouchertype;
private String pk_voucher;
public List<VoucherDetails> getDetails() {
return details;
@ -57,4 +58,12 @@ public class Voucher {
public void setPk_vouchertype(String pk_vouchertype) {
this.pk_vouchertype = pk_vouchertype;
}
public String getPk_voucher() {
return pk_voucher;
}
public void setPk_voucher(String pk_voucher) {
this.pk_voucher = pk_voucher;
}
}

76
service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java
View File

@ -1,5 +1,6 @@
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;
@ -51,7 +52,10 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
private final String publicKey = "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj";
private final String secretKey = "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=";
private final String appId = "800016";
private final String pzApiCode = "8000160014";//凭证新增
private final String pzApiCodexz = "8000160014";//凭证新增
private final String pzApiCodexg = "8000160031";//凭证修改
private final String pzApiCodesc = "8000160033";//凭证删除
private final String pzApiCodezf = "8000160032";//凭证作废
private final String ryApiCodexz = "8000160029";//人员对照新增
private final String ryApiCodexg = "8000160029";//人员对照修改
@ -104,6 +108,9 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
if(jsonObject == null ){
return BaseResult.getFailureMessageEntity("数据为空，请先传递数据");
}
if(!checkStr(jsonObject.getString("voucherType"))){
return BaseResult.getFailureMessageEntity("voucherType为空");
}
if(!checkStr(jsonObject.getString("usercode"))){
return BaseResult.getFailureMessageEntity("usercode为空");
}
@ -119,11 +126,46 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
if(!checkStr(jsonObject.getString("data"))){
return BaseResult.getFailureMessageEntity("data为空");
}
String bodys = jsonObject.getString("data");
List<String> fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"});
switch (jsonObject.getString("voucherType")){
case "add"://新增
VoucherRoot entity1 = getData("data", jsonObject, VoucherRoot.class);
if(entity1 == null || entity1.getVoucher() == null || entity1.getVoucher().size() == 0){
return BaseResult.getFailureMessageEntity("data为空");
}
for (int i = 0; i < entity1.getVoucher().size(); i++) {
Voucher voucher = entity1.getVoucher().get(i);
if(voucher.getDetails() != null && voucher.getDetails().size() > 0){
for (int a = 0; a < voucher.getDetails().size(); a++) {
VoucherDetails voucherDetails = voucher.getDetails().get(a);
if(voucherDetails.getAss() != null && voucherDetails.getAss().size() > 0){
for (int b = 0; b < voucherDetails.getAss().size(); b++) {
Ass ass = voucherDetails.getAss().get(b);
if(ass.getChecktypecode() != null && !"".equals(ass.getChecktypecode())){
//存在需要转换的
if(fzhs.contains(ass.getChecktypecode())){
ArchivesEntity archivesEntity = new ArchivesEntity();
archivesEntity.setArchivesType(ass.getChecktypecode());
archivesEntity.setLeftCode(ass.getCheckvaluecode());
//List<ArchivesEntity> archivesEntities = axDao.queryArchivesData(archivesEntity);
//if(archivesEntities != null && archivesEntities.size() > 0){
// ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
//}
}
}
}
}
}
}
}
bodys = JSON.toJSONString(entity1);
break;
case "update"://修改
VoucherRoot entity = getData("data", jsonObject, VoucherRoot.class);
if(entity == null || entity.getVoucher() == null || entity.getVoucher().size() == 0){
return BaseResult.getFailureMessageEntity("data为空");
}
List<String> fzhs = Arrays.asList(new String[]{"1", "2", "6", "73", "D01" , "jobass" , "93" , "96", "22"});
for (int i = 0; i < entity.getVoucher().size(); i++) {
Voucher voucher = entity.getVoucher().get(i);
if(voucher.getDetails() != null && voucher.getDetails().size() > 0){
@ -149,7 +191,15 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
}
}
}
bodys = JSON.toJSONString(entity);
break;
case "delete"://删除
break;
case "cancellation"://作废
break;
default:
break;
}
HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
// HttpClient
CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
@ -165,9 +215,23 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
post.setHeader("publicKey", publicKey);
post.setHeader("secretKey", secretKey);
post.setHeader("appId", appId);
post.setHeader("apiCode", pzApiCode);
switch (jsonObject.getString("voucherType")){
case "add"://新增
post.setHeader("apiCode", pzApiCodexz);
break;
case "update"://修改
post.setHeader("apiCode", pzApiCodexg);
break;
case "delete"://删除
post.setHeader("apiCode", pzApiCodesc);
break;
case "cancellation"://作废
post.setHeader("apiCode", pzApiCodezf);
break;
default:
break;
}
StringBuilder body = new StringBuilder();
String bodys = JSON.toJSONString(entity);
try {
if (bodys != null && !"".equals(bodys)) {
ByteArrayEntity byteArrayEntity = new ByteArrayEntity(bodys.getBytes("UTF-8"));
@ -182,8 +246,6 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
logger.info("返回结果：" + body);
JsonResultEntity resultEntity = JSON.parseObject(body.toString(),JsonResultEntity.class);
return resultEntity;
//return resultEntity.getAttribute();
} catch (Exception e) {
logger.error("请求错误：" + e.getMessage());
body.append(e.getMessage());

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

@ -75,15 +75,11 @@ 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("当前service:" + service + "serviceMethod = " + serviceMethod+"未找到");
return BaseResult.getFailureMessageEntity(service + "未找到" + serviceMethod + "方法");
} else {
logger.error("当前methods1:" + methods + "methodsLength = " + methods.length);
}
for (Method m : methods) {
//logger.info("当前mnAME:" + m.getName() + " :serviceMethod = " + serviceMethod.trim());
if (null != m) {
if (m.getName().equals(serviceMethod.trim())) {
if (m.getName().startsWith("thirdInterface")) {//TODO 后续可能要加强校验规则
@ -131,15 +127,13 @@ public class EntranceServiceImpl implements IEntranceService {
return BaseResult.getFailureMessageEntity("token无效");
}
}
logger.info("m.getNameEquals成功");
JSONObject jsonObject = new JSONObject();
if (!ObjectUtils.isEmpty(body)) {
jsonObject.put("jsonStr", body);
}
JsonResultEntity jsonResultEntity;
try {
logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
logger.info("请求的参数：jsonObject：" + jsonObject.toJSONString());
logger.info("invoke开始>>>>>>>>>>>>>>>>>>>>>>>>>>>>请求的参数：jsonObject：" + jsonObject.toJSONString());
jsonResultEntity = (JsonResultEntity) m.invoke(object, jsonObject);
logger.info("invoke结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
return jsonResultEntity;
@ -243,7 +237,7 @@ public class EntranceServiceImpl implements IEntranceService {
//tailuo 要访问的Bean名称
String service = request.getHeader("tl");
//bean方法
String serviceMethod = request.getHeader("dj");
String serviceMethod = request.getHeader("ya-dj");
String body = ServletUtil.getBody(servletRequest);
//获取类
Object object = null;

6
webapp/src/main/java/com/hzya/frame/webapp/web/aop/AopDynamicRoutingDataSourceInit.java
View File

@ -43,7 +43,7 @@ public class AopDynamicRoutingDataSourceInit {
@Before("@annotation(dsAnnotation)")
public void beforeDynamicRoutingDataSourceInitMethod(JoinPoint joinPoint, DS dsAnnotation) {
logger.info("beforeDynamicRoutingDataSourceInitMethod:拦截所有使用ds注解的方法，根据ds的value值初始化数据源！");
//logger.info("beforeDynamicRoutingDataSourceInitMethod:拦截所有使用ds注解的方法，根据ds的value值初始化数据源！");
String dsValue = dsAnnotation.value();
if (dsValue != null && !"".equals(dsValue) && dsValue.contains("#")) {
Object[] args = joinPoint.getArgs();
@ -63,13 +63,13 @@ public class AopDynamicRoutingDataSourceInit {
try {
dsDatasource = ds.getDataSource(dsValue);
} catch (CannotFindDataSourceException exception) {
logger.info("beforeDynamicRoutingDataSourceInitMethod:根据ds获取dsDatasource失败！异常信息：" + "exception.getMessage()" + " 执行初始化数据源：" + dsValue);
//logger.info("beforeDynamicRoutingDataSourceInitMethod:根据ds获取dsDatasource失败！异常信息：" + "exception.getMessage()" + " 执行初始化数据源：" + dsValue);
SysDataSourceEntity entity = new SysDataSourceEntity();
entity.setSts("Y");
entity.setUseState(1);
entity.setSourceCode(dsValue);
List<SysDataSourceVo> sysDataSourceEntities = sysDataSourceDao.queryDSBase(entity);
logger.info("beforeDynamicRoutingDataSourceInitMethod:根据dsValue获取数据源信息查询结果 sysDataSourceEntities.size:" + sysDataSourceEntities.size());
//logger.info("beforeDynamicRoutingDataSourceInitMethod:根据dsValue获取数据源信息查询结果 sysDataSourceEntities.size:" + sysDataSourceEntities.size());
if (sysDataSourceEntities != null && sysDataSourceEntities.size() > 0) {
for (int i = 0; i < sysDataSourceEntities.size(); i++) {
JSONObject defaultDataSourceProperties = new JSONObject();

2
webapp/src/main/java/com/hzya/frame/webapp/web/filter/BaseFilter.java
View File

@ -42,7 +42,7 @@ public class BaseFilter implements Filter {
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
logger.info("第二过滤器：验证权限");
//logger.info("第二过滤器：验证权限");
HttpServletResponseWrapper wrapper = new HttpServletResponseWrapper((HttpServletResponse) servletResponse);
HttpServletRequest request = (HttpServletRequest) servletRequest;
String requestURI = request.getRequestURI();

2
webapp/src/main/java/com/hzya/frame/webapp/web/filter/ExceptionOptionFilter.java
View File

@ -24,7 +24,7 @@ public class ExceptionOptionFilter implements Filter {
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
try {
LOGGER.info("第一过滤器：处理异常Filter");
//LOGGER.info("第一过滤器：处理异常Filter");
filterChain.doFilter(request, response);
} catch (Exception e) {
e.printStackTrace();