From 128ea0c5c3b8c0d8e1a1c94b44af7846087f1862 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Fri, 23 May 2025 14:50:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E8=84=89=EF=BC=9A1=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=9A=E5=8A=A1=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E5=9B=A0=E7=B4=A0=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InfluenceFactorController.java | 94 ++++ .../factor/dao/IAeConfInfluenceFactorDao.java | 20 + .../impl/AeConfInfluenceFactorDaoImpl.java | 34 ++ .../entity/AeConfInfluenceFactorEntity.java | 66 +++ .../entity/AeConfInfluenceFactorEntity.xml | 451 ++++++++++++++++++ .../IAeConfInfluenceFactorService.java | 21 + .../AeConfInfluenceFactorServiceImpl.java | 105 ++++ .../controller/BusinessModuleController.java | 91 ++++ .../module/dao/IAeConfBusinessModuleDao.java | 15 + .../dao/impl/AeConfBusinessModuleDaoImpl.java | 17 + .../entity/AeConfBusinessModuleEntity.java | 136 ++++++ .../entity/AeConfBusinessModuleEntity.xml | 305 ++++++++++++ .../service/IAeConfBusinessModuleService.java | 15 + .../impl/AeConfBusinessModuleServiceImpl.java | 54 +++ .../src/main/resources/application-gmdev.yml | 88 ++++ .../src/main/resources/application-gmtest.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../frame/web/action/DefaultController.java | 22 +- 18 files changed, 1521 insertions(+), 17 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorController.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/dao/IAeConfInfluenceFactorDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/dao/impl/AeConfInfluenceFactorDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/IAeConfInfluenceFactorService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleController.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/dao/IAeConfBusinessModuleDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/dao/impl/AeConfBusinessModuleDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/IAeConfBusinessModuleService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/AeConfBusinessModuleServiceImpl.java create mode 100644 base-buildpackage/src/main/resources/application-gmdev.yml diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorController.java new file mode 100644 index 00000000..f5387ef0 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorController.java @@ -0,0 +1,94 @@ +package com.hzya.frame.voucher.ae.comf.factor.controller; + +import com.github.pagehelper.PageInfo; +import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorEntity; +import com.hzya.frame.voucher.ae.comf.factor.service.IAeConfInfluenceFactorService; +import com.hzya.frame.web.action.DefaultController; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Created by zydd on 2025-05-23 09:53 + * 会计事项(accounting_event)-配置-影响因素设置，存在关联ncc的自定义档案 + */ +@RestController +@RequestMapping("/ae/conf/influenceFactor") +public class InfluenceFactorController extends DefaultController { + + @Autowired + private IAeConfInfluenceFactorService iAeConfInfluenceFactorService; + + @RequestMapping(value = "/queryPaged", method = RequestMethod.POST) + public JsonResultEntity queryPaged(@RequestBody AeConfInfluenceFactorEntity entity) { + try { + PageInfo pageInfo = iAeConfInfluenceFactorService.queryEntityPaged(entity); + return getSuccessMessageEntity("请求成功",pageInfo); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/queryAll", method = RequestMethod.POST) + public JsonResultEntity queryAll(@RequestBody AeConfInfluenceFactorEntity entity) { + try { + List all = iAeConfInfluenceFactorService.queryAll(entity); + return getSuccessMessageEntity("请求成功",all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/queryById", method = RequestMethod.POST) + public JsonResultEntity queryById(@RequestBody AeConfInfluenceFactorEntity entity) { + try { + AeConfInfluenceFactorEntity aeConfInfluenceFactorEntity = iAeConfInfluenceFactorService.queryById(entity); + return getSuccessMessageEntity("请求成功",aeConfInfluenceFactorEntity); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/save", method = RequestMethod.POST) + public JsonResultEntity save(@RequestBody AeConfInfluenceFactorEntity entity) { + try { + AeConfInfluenceFactorEntity aeConfInfluenceFactorEntity = iAeConfInfluenceFactorService.save(entity); + return getSuccessMessageEntity("请求成功",aeConfInfluenceFactorEntity); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/update", method = RequestMethod.POST) + public JsonResultEntity update(@RequestBody AeConfInfluenceFactorEntity entity) { + try { + AeConfInfluenceFactorEntity aeConfInfluenceFactorEntity = iAeConfInfluenceFactorService.updateById(entity); + return getSuccessMessageEntity("请求成功",aeConfInfluenceFactorEntity); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/delete", method = RequestMethod.POST) + public JsonResultEntity delete(@RequestBody AeConfInfluenceFactorEntity entity) { + try { + iAeConfInfluenceFactorService.logicRemove(entity); + return getSuccessMessageEntity("请求成功",null); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/dao/IAeConfInfluenceFactorDao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/dao/IAeConfInfluenceFactorDao.java new file mode 100644 index 00000000..df5e7d8b --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/dao/IAeConfInfluenceFactorDao.java @@ -0,0 +1,20 @@ +package com.hzya.frame.voucher.ae.comf.factor.dao; + +import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * 会计事项(accounting_event)-配置-影响因素设置(ae_conf_influence_factor: table)表数据库访问层 + * + * @author zydd + * @since 2025-05-23 09:44:40 + */ +public interface IAeConfInfluenceFactorDao extends IBaseDao { + + public List queryAll(AeConfInfluenceFactorEntity entity); + + AeConfInfluenceFactorEntity queryById(AeConfInfluenceFactorEntity entity); +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/dao/impl/AeConfInfluenceFactorDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/dao/impl/AeConfInfluenceFactorDaoImpl.java new file mode 100644 index 00000000..c0f945f4 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/dao/impl/AeConfInfluenceFactorDaoImpl.java @@ -0,0 +1,34 @@ +package com.hzya.frame.voucher.ae.comf.factor.dao.impl; + +import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorEntity; +import com.hzya.frame.voucher.ae.comf.factor.dao.IAeConfInfluenceFactorDao; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 会计事项(accounting_event)-配置-影响因素设置(AeConfInfluenceFactor)表数据库访问层 + * + * @author zydd + * @since 2025-05-23 09:44:40 + */ +@Repository +public class AeConfInfluenceFactorDaoImpl extends MybatisGenericDao implements IAeConfInfluenceFactorDao{ + + @Override + public AeConfInfluenceFactorEntity queryById(AeConfInfluenceFactorEntity entity) { + List aeConfInfluenceFactorEntities = this.queryList(entity, "com.hzya.frame.voucher.ae.comf.factor.dao.impl.AeConfInfluenceFactorDaoImpl.queryById"); + if(aeConfInfluenceFactorEntities.size()!=0){ + return aeConfInfluenceFactorEntities.get(0); + } + return null; + } + + @Override + public List queryAll(AeConfInfluenceFactorEntity entity) { + List aeConfInfluenceFactorEntities = this.queryList(entity, "com.hzya.frame.voucher.ae.comf.factor.dao.impl.AeConfInfluenceFactorDaoImpl.queryAll"); + return aeConfInfluenceFactorEntities; + } +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.java new file mode 100644 index 00000000..f990a09d --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.java @@ -0,0 +1,66 @@ +package com.hzya.frame.voucher.ae.comf.factor.entity; + +import java.util.Date; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * 会计事项(accounting_event)-配置-影响因素设置(AeConfInfluenceFactor)实体类 + * + * @author zydd + * @since 2025-05-23 09:44:40 + */ +@Data +public class AeConfInfluenceFactorEntity extends BaseEntity { + + /** + * 业务模块id + */ + private Long aeConfModuleId; + /** + * 业务模块name + */ + private String aeConfModuleName; + /** + * 影响因素名称 + */ + private String factorName; + /** + * 映射档案id + */ + private String mappingFileId; + /** + * 映射档案code + */ + private String mappingFileCode; + /** + * 映射档案名称 + */ + private String mappingFileName; + /** + * 备注 + */ + private String remark; + private String def1; + private String def2; + private String def3; + private String def4; + private String def5; + private String def6; + private String def7; + private String def8; + private String def9; + private String def10; + /** + * 创建人 + */ + private String createUser; + /** + * 修改人 + */ + private String modifyUser; + + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.xml new file mode 100644 index 00000000..b48da03f --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/entity/AeConfInfluenceFactorEntity.xml @@ -0,0 +1,451 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,ae_conf_module_id + ,ae_conf_module_name + ,factor_name + ,mapping_file_id + ,mapping_file_code + ,mapping_file_name + ,remark + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 + ,def6 + ,def7 + ,def8 + ,def9 + ,def10 + ,create_time + ,create_user + ,modify_time + ,modify_user + ,sts + + + + + + + + + + + + + + + + insert into ae_conf_influence_factor( + + id , + ae_conf_module_id , + ae_conf_module_name , + factor_name , + mapping_file_id , + mapping_file_code , + mapping_file_name , + remark , + def1 , + def2 , + def3 , + def4 , + def5 , + def6 , + def7 , + def8 , + def9 , + def10 , + create_time , + create_user , + modify_time , + modify_user , + sts , + sts, + + )values( + + #{id} , + #{aeConfModuleId} , + #{aeConfModuleName} , + #{factorName} , + #{mappingFileId} , + #{mappingFileCode} , + #{mappingFileName} , + #{remark} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + #{def6} , + #{def7} , + #{def8} , + #{def9} , + #{def10} , + now(), + #{createUser} , + now(), + #{modifyUser} , + #{sts} , + 'Y', + + ) + + + + insert into ae_conf_influence_factor(ae_conf_module_id, ae_conf_module_name, factor_name, mapping_file_id, + mapping_file_code, mapping_file_name, remark, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, + create_time, create_user, modify_time, modify_user, sts, sts) + values + + (#{entity.aeConfModuleId},#{entity.aeConfModuleName},#{entity.factorName},#{entity.mappingFileId},#{entity.mappingFileCode},#{entity.mappingFileName},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},now(),#{entity.createUser},now(),#{entity.modifyUser},#{entity.sts}, + 'Y') + + + + + insert into ae_conf_influence_factor(ae_conf_module_id, ae_conf_module_name, factor_name, mapping_file_id, + mapping_file_code, mapping_file_name, remark, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, + create_time, create_user, modify_time, modify_user, sts) + values + + (#{entity.aeConfModuleId},#{entity.aeConfModuleName},#{entity.factorName},#{entity.mappingFileId},#{entity.mappingFileCode},#{entity.mappingFileName},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},now(),#{entity.modifyUser},#{entity.sts}) + + on duplicate key update + ae_conf_module_id = values(ae_conf_module_id), + ae_conf_module_name = values(ae_conf_module_name), + factor_name = values(factor_name), + mapping_file_id = values(mapping_file_id), + mapping_file_code = values(mapping_file_code), + mapping_file_name = values(mapping_file_name), + remark = values(remark), + def1 = values(def1), + def2 = values(def2), + def3 = values(def3), + def4 = values(def4), + def5 = values(def5), + def6 = values(def6), + def7 = values(def7), + def8 = values(def8), + def9 = values(def9), + def10 = values(def10), + create_time = values(create_time), + create_user = values(create_user), + modify_time = values(modify_time), + modify_user = values(modify_user), + sts = values(sts) + + + + update ae_conf_influence_factor set + + ae_conf_module_id = #{aeConfModuleId}, + ae_conf_module_name = #{aeConfModuleName}, + + factor_name = #{factorName}, + mapping_file_id = #{mappingFileId}, + mapping_file_code = #{mappingFileCode}, + mapping_file_name = #{mappingFileName}, + remark = #{remark}, + def1 = #{def1}, + def2 = #{def2}, + def3 = #{def3}, + def4 = #{def4}, + def5 = #{def5}, + def6 = #{def6}, + def7 = #{def7}, + def8 = #{def8}, + def9 = #{def9}, + def10 = #{def10}, + create_time = #{create_time}, + create_user = #{createUser}, + modify_time = now(), + modify_user = #{modifyUser}, + sts = #{sts}, + + where id = #{id} + + + + update ae_conf_influence_factor + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update ae_conf_influence_factor set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and ae_conf_module_id = #{aeConfModuleId} + and ae_conf_module_name = + #{aeConfModuleName} + + and factor_name = #{factorName} + and mapping_file_id = #{mappingFileId} + and mapping_file_code = #{mappingFileCode} + and mapping_file_name = #{mappingFileName} + and remark = #{remark} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and create_user = #{createUser} + and modify_user = #{modifyUser} + and sts = #{sts} + and sts='Y' + + + + + delete + from ae_conf_influence_factor + where id = #{id} + + + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/IAeConfInfluenceFactorService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/IAeConfInfluenceFactorService.java new file mode 100644 index 00000000..633e32de --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/IAeConfInfluenceFactorService.java @@ -0,0 +1,21 @@ +package com.hzya.frame.voucher.ae.comf.factor.service; + +import com.github.pagehelper.PageInfo; +import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorEntity; +import com.hzya.frame.basedao.service.IBaseService; + +import java.util.List; + +/** + * 会计事项(accounting_event)-配置-影响因素设置(AeConfInfluenceFactor)表服务接口 + * + * @author zydd + * @since 2025-05-23 09:44:40 + */ +public interface IAeConfInfluenceFactorService extends IBaseService { + + PageInfo queryEntityPaged(AeConfInfluenceFactorEntity entity); + List queryAll(AeConfInfluenceFactorEntity entity); + AeConfInfluenceFactorEntity queryById(AeConfInfluenceFactorEntity entity); + AeConfInfluenceFactorEntity updateById(AeConfInfluenceFactorEntity entity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java new file mode 100644 index 00000000..129ddb64 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorServiceImpl.java @@ -0,0 +1,105 @@ +package com.hzya.frame.voucher.ae.comf.factor.service.impl; + +import cn.hutool.core.lang.Assert; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorEntity; +import com.hzya.frame.voucher.ae.comf.factor.dao.IAeConfInfluenceFactorDao; +import com.hzya.frame.voucher.ae.comf.factor.service.IAeConfInfluenceFactorService; +import com.hzya.frame.voucher.ae.comf.module.dao.IAeConfBusinessModuleDao; +import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity; +import com.hzya.frame.voucher.ae.comf.module.service.IAeConfBusinessModuleService; +import org.springframework.beans.factory.annotation.Autowired; +import com.hzya.frame.basedao.service.impl.BaseService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 会计事项(accounting_event)-配置-影响因素设置(AeConfInfluenceFactor)表服务实现类 + * + * @author zydd + * @since 2025-05-23 09:44:40 + */ +@Service +public class AeConfInfluenceFactorServiceImpl extends BaseService implements IAeConfInfluenceFactorService { + private IAeConfInfluenceFactorDao aeConfInfluenceFactorDao; + + @Autowired + public void setAeConfInfluenceFactorDao(IAeConfInfluenceFactorDao dao) { + this.aeConfInfluenceFactorDao = dao; + this.dao = dao; + } + + @Autowired + private IAeConfBusinessModuleDao aeConfBusinessModuleDao; + @Autowired + private IAeConfBusinessModuleService aeConfBusinessModuleService; + + @Override + public PageInfo queryEntityPaged(AeConfInfluenceFactorEntity entity) { + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = aeConfInfluenceFactorDao.queryAll(entity); + PageInfo pageInfo = new PageInfo(list); + return pageInfo; + } + + @Override + public List queryAll(AeConfInfluenceFactorEntity entity) { + List all = new ArrayList<>(); + all = aeConfInfluenceFactorDao.queryAll(entity); + return all; + } + + @Override + public AeConfInfluenceFactorEntity queryById(AeConfInfluenceFactorEntity entity) { + Assert.notNull(entity.getId(), "根据id查询影响因素设置时，id不能为空！！！"); + List all = dao.query(entity); + if (all.size() == 0) { + return null; + } + return all.get(0); + } + + @Override + public AeConfInfluenceFactorEntity save(AeConfInfluenceFactorEntity entity) throws Exception { + Assert.notNull(entity.getAeConfModuleId(), "保存影响因素设置时，业务模块id不能为空"); + Assert.notNull(entity.getFactorName(), "保存影响因素设置时，影响因素名称不能为空"); + + updateModuleName(entity); + return super.save(entity); + } + + @Override + public AeConfInfluenceFactorEntity updateById(AeConfInfluenceFactorEntity entity) { + Assert.notNull(entity.getAeConfModuleId(), "修改影响因素设置时，业务模块id不能为空"); + + AeConfInfluenceFactorEntity aeConfInfluenceFactorEntity = aeConfInfluenceFactorDao.queryById(entity); + if (aeConfInfluenceFactorEntity == null) { + Assert.state(false,"根据影响因素id：{}，未查询到影响因素，修改失败！",entity.getId()); + } + //如有模块更改，需要更新此表的ae_conf_module_name模块名称 + updateModuleName(entity); + + AeConfInfluenceFactorEntity save = this.dao.save(entity); + return save; + } + + + /** + * 根据AeConfInfluenceFactorEntity entity中的aeConfModuleId查询业务模块名称,并将名称赋值给aeConfModuleName + * + * @param entity + */ + public void updateModuleName(AeConfInfluenceFactorEntity entity) { + if (entity.getAeConfModuleId() != null || !"".equals(entity.getAeConfModuleId())) { + AeConfBusinessModuleEntity aeConfBusinessModuleEntity = new AeConfBusinessModuleEntity(); + aeConfBusinessModuleEntity.setId(String.valueOf(entity.getAeConfModuleId())); + AeConfBusinessModuleEntity aeConfBusinessModule = aeConfBusinessModuleService.queryById(aeConfBusinessModuleEntity); + if (aeConfBusinessModule != null) { + entity.setAeConfModuleName(aeConfBusinessModule.getModuleName()); + } + } + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleController.java new file mode 100644 index 00000000..be8ecfae --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleController.java @@ -0,0 +1,91 @@ +package com.hzya.frame.voucher.ae.comf.module.controller; + +import cn.hutool.core.lang.Assert; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.page.PageAttribute; +import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity; +import com.hzya.frame.voucher.ae.comf.module.service.IAeConfBusinessModuleService; +import com.hzya.frame.web.action.DefaultController; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Created by zydd on 2025-05-22 14:49 + */ +@RestController +@RequestMapping("/ae/conf/businessModule") +public class BusinessModuleController extends DefaultController { + + @Autowired + private IAeConfBusinessModuleService aeConfBusinessModuleService; + + @RequestMapping(value = "/queryPaged", method = RequestMethod.POST) + public JsonResultEntity queryPaged(@RequestBody AeConfBusinessModuleEntity entity) { + try { + PageInfo pageInfo = aeConfBusinessModuleService.queryEntityPaged(entity); + return getSuccessMessageEntity("请求成功",pageInfo); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + @RequestMapping(value = "/queryAll", method = RequestMethod.POST) + public JsonResultEntity queryAll() { + try { + List all = aeConfBusinessModuleService.getAll(); + return getSuccessMessageEntity("请求成功",all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/queryById", method = RequestMethod.POST) + public JsonResultEntity queryById(@RequestBody AeConfBusinessModuleEntity entity) { + try { + AeConfBusinessModuleEntity aeConfBusinessModuleEntity = aeConfBusinessModuleService.queryById(entity); + return getSuccessMessageEntity("请求成功",aeConfBusinessModuleEntity); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + @RequestMapping(value = "/save", method = RequestMethod.POST) + public JsonResultEntity save(@RequestBody AeConfBusinessModuleEntity entity) { + try { + AeConfBusinessModuleEntity save = aeConfBusinessModuleService.save(entity); + return getSuccessMessageEntity("请求成功",save); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + @RequestMapping(value = "/update", method = RequestMethod.POST) + public JsonResultEntity update(@RequestBody AeConfBusinessModuleEntity entity) { + try { + Assert.notNull(entity.getId(),"更新时，id不能为空"); + AeConfBusinessModuleEntity save = aeConfBusinessModuleService.update(entity); + return getSuccessMessageEntity("请求成功",save); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + @RequestMapping(value = "/delete", method = RequestMethod.POST) + public JsonResultEntity delete(@RequestBody AeConfBusinessModuleEntity entity) { + try { + Assert.notNull(entity.getId(),"删除时，id不能为空"); + int i = aeConfBusinessModuleService.logicRemove(entity); + return getSuccessMessageEntity("请求成功",null); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败",e.getMessage()); + } + } + + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/dao/IAeConfBusinessModuleDao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/dao/IAeConfBusinessModuleDao.java new file mode 100644 index 00000000..9d9b4480 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/dao/IAeConfBusinessModuleDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.voucher.ae.comf.module.dao; + +import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 会计事项(accounting_event)-配置-业务模块(ae_conf_business_module: table)表数据库访问层 + * + * @author zydd + * @since 2025-05-22 14:48:27 + */ +public interface IAeConfBusinessModuleDao extends IBaseDao { + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/dao/impl/AeConfBusinessModuleDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/dao/impl/AeConfBusinessModuleDaoImpl.java new file mode 100644 index 00000000..3ae6fc09 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/dao/impl/AeConfBusinessModuleDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.voucher.ae.comf.module.dao.impl; + +import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity; +import com.hzya.frame.voucher.ae.comf.module.dao.IAeConfBusinessModuleDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 会计事项(accounting_event)-配置-业务模块(AeConfBusinessModule)表数据库访问层 + * + * @author zydd + * @since 2025-05-22 14:48:27 + */ +@Repository +public class AeConfBusinessModuleDaoImpl extends MybatisGenericDao implements IAeConfBusinessModuleDao{ + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.java new file mode 100644 index 00000000..1a2dd5b7 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.java @@ -0,0 +1,136 @@ +package com.hzya.frame.voucher.ae.comf.module.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 会计事项(accounting_event)-配置-业务模块(AeConfBusinessModule)实体类 + * + * @author zydd + * @since 2025-05-22 14:48:28 + */ +public class AeConfBusinessModuleEntity extends BaseEntity { + + /** 模块名称 */ + private String moduleName; + private String def1; + private String def2; + private String def3; + private String def4; + private String def5; + private String def6; + private String def7; + private String def8; + private String def9; + private String def10; + /** 创建人 */ + private String createUser; + /** 修改人 */ + private String modifyUser; + + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + public String getDef1() { + return def1; + } + + public void setDef1(String def1) { + this.def1 = def1; + } + + public String getDef2() { + return def2; + } + + public void setDef2(String def2) { + this.def2 = def2; + } + + public String getDef3() { + return def3; + } + + public void setDef3(String def3) { + this.def3 = def3; + } + + public String getDef4() { + return def4; + } + + public void setDef4(String def4) { + this.def4 = def4; + } + + public String getDef5() { + return def5; + } + + public void setDef5(String def5) { + this.def5 = def5; + } + + public String getDef6() { + return def6; + } + + public void setDef6(String def6) { + this.def6 = def6; + } + + public String getDef7() { + return def7; + } + + public void setDef7(String def7) { + this.def7 = def7; + } + + public String getDef8() { + return def8; + } + + public void setDef8(String def8) { + this.def8 = def8; + } + + public String getDef9() { + return def9; + } + + public void setDef9(String def9) { + this.def9 = def9; + } + + public String getDef10() { + return def10; + } + + public void setDef10(String def10) { + this.def10 = def10; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getModifyUser() { + return modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.xml new file mode 100644 index 00000000..0fc15a61 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/entity/AeConfBusinessModuleEntity.xml @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,module_name + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 + ,def6 + ,def7 + ,def8 + ,def9 + ,def10 + ,create_time + ,create_user + ,modify_time + ,modify_user + ,sts + + + + + + + + + + + + + + + + insert into ae_conf_business_module( + + id , + module_name , + def1 , + def2 , + def3 , + def4 , + def5 , + def6 , + def7 , + def8 , + def9 , + def10 , + create_time , + create_time , + create_user , + modify_time , + modify_time , + modify_user , + sts , + sts, + + )values( + + #{id} , + #{moduleName} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + #{def6} , + #{def7} , + #{def8} , + #{def9} , + #{def10} , + #{create_time} , + now() , + #{createUser} , + #{modify_time} , + now() , + #{modifyUser} , + #{sts} , + 'Y', + + ) + + + + insert into ae_conf_business_module(module_name, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, + create_time, create_user, modify_time, modify_user, sts, sts) + values + + (#{entity.moduleName},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts}, + 'Y') + + + + + insert into ae_conf_business_module(module_name, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, + create_time, create_user, modify_time, modify_user, sts) + values + + (#{entity.moduleName},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts}) + + on duplicate key update + module_name = values(module_name), + def1 = values(def1), + def2 = values(def2), + def3 = values(def3), + def4 = values(def4), + def5 = values(def5), + def6 = values(def6), + def7 = values(def7), + def8 = values(def8), + def9 = values(def9), + def10 = values(def10), + create_time = values(create_time), + create_user = values(create_user), + modify_time = values(modify_time), + modify_user = values(modify_user), + sts = values(sts) + + + + update ae_conf_business_module set + + module_name = #{moduleName}, + def1 = #{def1}, + def2 = #{def2}, + def3 = #{def3}, + def4 = #{def4}, + def5 = #{def5}, + def6 = #{def6}, + def7 = #{def7}, + def8 = #{def8}, + def9 = #{def9}, + def10 = #{def10}, + create_time = #{create_time}, + create_time = now(), + create_user = #{createUser}, + modify_time = #{modify_time}, + modify_time = now(), + modify_user = #{modifyUser}, + sts = #{sts}, + + where id = #{id} + + + + update ae_conf_business_module set sts= 'N' ,modify_time = now() + ,modify_user_id = #{modify_user_id} + where id = #{id} + + + + update ae_conf_business_module set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and module_name = #{moduleName} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and create_user = #{createUser} + and modify_user = #{modifyUser} + and sts = #{sts} + and sts='Y' + + + + + delete + from ae_conf_business_module + where id = #{id} + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/IAeConfBusinessModuleService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/IAeConfBusinessModuleService.java new file mode 100644 index 00000000..d3d99d49 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/IAeConfBusinessModuleService.java @@ -0,0 +1,15 @@ +package com.hzya.frame.voucher.ae.comf.module.service; + +import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity; +import com.hzya.frame.basedao.service.IBaseService; +import com.github.pagehelper.PageInfo; +/** + * 会计事项(accounting_event)-配置-业务模块(AeConfBusinessModule)表服务接口 + * + * @author zydd + * @since 2025-05-22 14:48:28 + */ +public interface IAeConfBusinessModuleService extends IBaseService{ + PageInfo queryEntityPaged(AeConfBusinessModuleEntity entity); + public AeConfBusinessModuleEntity queryById(AeConfBusinessModuleEntity entity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/AeConfBusinessModuleServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/AeConfBusinessModuleServiceImpl.java new file mode 100644 index 00000000..25df193d --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/AeConfBusinessModuleServiceImpl.java @@ -0,0 +1,54 @@ +package com.hzya.frame.voucher.ae.comf.module.service.impl; + +import cn.hutool.core.lang.Assert; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.page.PageAttribute; +import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity; +import com.hzya.frame.voucher.ae.comf.module.dao.IAeConfBusinessModuleDao; +import com.hzya.frame.voucher.ae.comf.module.service.IAeConfBusinessModuleService; +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.ArrayList; +import java.util.List; + +/** + * 会计事项(accounting_event)-配置-业务模块(AeConfBusinessModule)表服务实现类 + * + * @author zydd + * @since 2025-05-22 14:48:28 + */ +@Service("AeConfBusinessModuleServiceImpl") +public class AeConfBusinessModuleServiceImpl extends BaseService implements IAeConfBusinessModuleService { + + private IAeConfBusinessModuleDao aeConfBusinessModuleDao; + + @Autowired + public void setAeConfBusinessModuleDao(IAeConfBusinessModuleDao dao) { + this.aeConfBusinessModuleDao = dao; + this.dao = dao; + } + + @Override + public PageInfo queryEntityPaged(AeConfBusinessModuleEntity entity) { + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = aeConfBusinessModuleDao.query(entity); + PageInfo pageInfo = new PageInfo(list); + return pageInfo; + } + + @Override + public AeConfBusinessModuleEntity queryById(AeConfBusinessModuleEntity entity) { + Assert.notNull(entity.getId(), "根据id查询业务模块时，id不能为空！！！"); + List all = dao.query(entity); + if(all.size()==0) { + return null; + } + return all.get(0); + } +} diff --git a/base-buildpackage/src/main/resources/application-gmdev.yml b/base-buildpackage/src/main/resources/application-gmdev.yml new file mode 100644 index 00000000..dd33b0fb --- /dev/null +++ b/base-buildpackage/src/main/resources/application-gmdev.yml @@ -0,0 +1,88 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: + # 日志保存路径 + path: F:\01zjya\10Log\kangarooDataCenterV3\voucher-gm\log +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://127.0.0.1:3306/bussinesscenter_voucher_gm?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true + username: root + password: 9b1b3fca9719736fe4210f4e0a6df338 + driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: /Users/liuyang/workspaces/hzya/kangarooDataCenterV3/file + pluginpath: xxx + tomcatpath: D:\server\apache-tomcat-9.0.91 +zt: + url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface +cbs8: + appId: 1P4AGrpz + appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a + url: https://cbs8-openapi-reprd.csuat.cmburl.cn + # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 + ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44 + # 这个私钥到时候上传到cbs，和下面到是同一对 + #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 + ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde + cbs_public_key: 0469146F06BF3B01236E84632441E826 + #电子回单下载临时存放位置 + elec_path: /Users/xiangerlin/Downloads/ +OA: + data_source_code: yc_oa + +#O测试 +#letsofs: +# url: http://39.98.58.229/api/edi/u8c/ofs/in +# appKey: 1023142858 +# secret: 382e4a2584027a36ac9431103 + +#O正式 +letsofs: + url: http://39.98.168.188:30002/api/edi/u8c/ofs/in + appKey: 2097046829 + secret: 35282f251476a3af4f00c7b36 + +#report +report: + templatesurl: /Users/liuyang/workspaces/hzya/kangarooDataCenterV3/service/src/main/resources/template/TOCTOB正向流程导出模版.xlsx + tempFile: /Users/liuyang/workspaces/hzya/tempfile + +#钉钉 +DING: + U8C_TEST_AGENTID: 3281181231 + CorpId: dingc5b16c82b7f25e64acaaa37764f94726 + APIToken: c5530fb4faed387593ee17f4e6bb748d + #钉钉回调 + call_back_token: lets123456789lets + call_back_aes_key: MDlmYTY2ODUzMTliNDhmZjg3ZTViNzc3MzYyZWI4MWM + call_back_appkey: ding5qfifcktfqfjlem0 + #Client ID (原 AppKey 和 SuiteKey) + APPKEY: ding5qfifcktfqfjlem0 + #Client Secret (原 AppSecret 和 SuiteSecret) + AppSecret: BVuLOy_K0F8f5np69VuBeKdb1zfwqhuPsAV49lNbYVbx5TnfSTHjwEcad9Vwzfq1 + #钉盘审批空间 + SPACEID: 20852670637 + #审批模板code + APPROVE_CODE: + #特殊业务处理(新) + SPECIAL_SERVICE_PROCESSING: PROC-AC33FC85-FB44-49FC-B926-1D966AE3BBD2 + #采购付款申请(新) + PURCHASE_PAYMENT_REQUEST_NEW: PROC-EC6B5BD2-DE3C-456E-9591-6F7B377E39E4 + #采购付款申请(店群专用) + PURCHASE_PAYMENT_REQUEST_SHOP: PROC-285CCF2B-524F-4055-BE62-FC31F490C654 + #审批表单空间 + APPROVE_FOLDER_SPACE: + #特殊业务处理(新) + SPECIAL_SERVICE_PROCESSING: 157791788097 + #采购付款申请(新) + PURCHASE_PAYMENT_REQUEST_NEW: 157828688115 + #采购付款申请(店群专用) + PURCHASE_PAYMENT_REQUEST_SHOP: 157828627012 \ No newline at end of file diff --git a/base-buildpackage/src/main/resources/application-gmtest.yml b/base-buildpackage/src/main/resources/application-gmtest.yml index d94b8d0b..fa62993a 100644 --- a/base-buildpackage/src/main/resources/application-gmtest.yml +++ b/base-buildpackage/src/main/resources/application-gmtest.yml @@ -14,7 +14,7 @@ spring: master: url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true username: root - password: 89c3c88d08a913294c52f4f4599c4507 + password: bd993088e8a7c3dc5f44441617f9b4bf driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 savefile: # 文件保存路径 diff --git a/base-buildpackage/src/main/resources/application.yml b/base-buildpackage/src/main/resources/application.yml index e64ffc48..40445f28 100644 --- a/base-buildpackage/src/main/resources/application.yml +++ b/base-buildpackage/src/main/resources/application.yml @@ -36,7 +36,7 @@ spring: # use-suffix-pattern: true profiles: # active: @profileActive@ - active: gmprod + active: gmdev # active: dev servlet: multipart: diff --git a/base-common/src/main/java/com/hzya/frame/web/action/DefaultController.java b/base-common/src/main/java/com/hzya/frame/web/action/DefaultController.java index 7eeef491..e83085de 100644 --- a/base-common/src/main/java/com/hzya/frame/web/action/DefaultController.java +++ b/base-common/src/main/java/com/hzya/frame/web/action/DefaultController.java @@ -7,7 +7,6 @@ import org.slf4j.LoggerFactory; import org.springframework.context.support.ApplicationObjectSupport; - /** * @author 郭军辉 *

@@ -26,7 +25,7 @@ public class DefaultController extends ApplicationObjectSupport { * @return */ public JsonResultEntity getFailureMessageEntity(String message) { - return new JsonResultEntity(message, false); + return new JsonResultEntity(message, false, "500"); } /** @@ -35,8 +34,8 @@ public class DefaultController extends ApplicationObjectSupport { * @param message 提示信息 * @return */ - public JsonResultEntity getFailureMessageEntity(String message, Object mo) { - return new JsonResultEntity(message, false, mo); + public JsonResultEntity getFailureMessageEntity(String message, Object mo) { + return new JsonResultEntity(message, false, "500", mo); } /** @@ -46,8 +45,8 @@ public class DefaultController extends ApplicationObjectSupport { * @param mo 返回对象 * @return */ - public JsonResultEntity getSuccessMessageEntity(String message, Object mo) { - return new JsonResultEntity(message, true, mo); + public JsonResultEntity getSuccessMessageEntity(String message, Object mo) { + return new JsonResultEntity(message, true, "200", mo); } /** @@ -56,18 +55,11 @@ public class DefaultController extends ApplicationObjectSupport { * @param message 提示消息 * @return */ - public JsonResultEntity getSuccessMessageEntity(String message ) { - return new JsonResultEntity(message, true); + public JsonResultEntity getSuccessMessageEntity(String message) { + return new JsonResultEntity(message, true, "200"); } - - - - - - - /** * //绑定org_id *