diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java new file mode 100644 index 00000000..b69adb80 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.plugin.masterData.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.masterData.entity.MdmEntity; + +/** + * 客户档案(mdm_customer: table)表数据库访问层 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public interface IMdmDao extends IBaseDao { + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java new file mode 100644 index 00000000..05e95b1e --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.plugin.masterData.dao.impl; + +import com.hzya.frame.plugin.masterData.entity.MdmEntity; +import com.hzya.frame.plugin.masterData.dao.IMdmDao; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 客户档案(MdmCustomer)表数据库访问层 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class MdmDaoImpl extends MybatisGenericDao implements IMdmDao { + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java new file mode 100644 index 00000000..e8d7f6f9 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java @@ -0,0 +1,186 @@ +package com.hzya.frame.plugin.masterData.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 客户档案(MdmCustomer)实体类 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class MdmEntity extends BaseEntity { + + /** 单据规则 */ + private String documentRule; + /** 单据规则流水号 */ + private Long documentRuleNum; + /** 数据状态 Y正常 N删除 F修改 */ + private String dataStatus; + /** 新增数据状态 0待下发 1已下发 */ + private String addStatus; + /** 修改数据状态 0待下发 1已下发 */ + private String updateStatus; + /** 删除数据状态 0待下发 1已下发 */ + private String deleteStatus; + /** 公司id */ + private String companyId; + /** 客户编码 */ + private String code; + /** 客户类型 */ + private String custprop; + /** 客户状态 */ + private String custstate; + /** 启用状态 */ + private String enablestate; + /** 客户名称 */ + private String name; + /** 国家/地区 */ + private String pkCountry; + /** 客户基本分类 */ + private String pkCustclass; + /** 所属集团 */ + private String pkGroup; + /** 所属组织 */ + private String pkOrg; + /** 纳税人登记号 */ + private String taxpayerid; + + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getDataStatus() { + return dataStatus; + } + + public void setDataStatus(String dataStatus) { + this.dataStatus = dataStatus; + } + + public String getAddStatus() { + return addStatus; + } + + public void setAddStatus(String addStatus) { + this.addStatus = addStatus; + } + + public String getUpdateStatus() { + return updateStatus; + } + + public void setUpdateStatus(String updateStatus) { + this.updateStatus = updateStatus; + } + + public String getDeleteStatus() { + return deleteStatus; + } + + public void setDeleteStatus(String deleteStatus) { + this.deleteStatus = deleteStatus; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getCustprop() { + return custprop; + } + + public void setCustprop(String custprop) { + this.custprop = custprop; + } + + public String getCuststate() { + return custstate; + } + + public void setCuststate(String custstate) { + this.custstate = custstate; + } + + public String getEnablestate() { + return enablestate; + } + + public void setEnablestate(String enablestate) { + this.enablestate = enablestate; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPkCountry() { + return pkCountry; + } + + public void setPkCountry(String pkCountry) { + this.pkCountry = pkCountry; + } + + public String getPkCustclass() { + return pkCustclass; + } + + public void setPkCustclass(String pkCustclass) { + this.pkCustclass = pkCustclass; + } + + public String getPkGroup() { + return pkGroup; + } + + public void setPkGroup(String pkGroup) { + this.pkGroup = pkGroup; + } + + public String getPkOrg() { + return pkOrg; + } + + public void setPkOrg(String pkOrg) { + this.pkOrg = pkOrg; + } + + public String getTaxpayerid() { + return taxpayerid; + } + + public void setTaxpayerid(String taxpayerid) { + this.taxpayerid = taxpayerid; + } + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml new file mode 100644 index 00000000..46d5962b --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml @@ -0,0 +1,375 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,document_rule + ,document_rule_num + ,data_status + ,add_status + ,update_status + ,delete_status + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + ,code + ,custprop + ,custstate + ,enablestate + ,name + ,pk_country + ,pk_custclass + ,pk_group + ,pk_org + ,taxpayerid + + + + + + + + + + + + + + + + insert into mdm_customer( + + id , + document_rule , + document_rule_num , + data_status , + add_status , + update_status , + delete_status , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + code , + custprop , + custstate , + enablestate , + name , + pk_country , + pk_custclass , + pk_group , + pk_org , + taxpayerid , + sts, + + )values( + + #{id} , + #{documentRule} , + #{documentRuleNum} , + #{dataStatus} , + #{addStatus} , + #{updateStatus} , + #{deleteStatus} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + #{code} , + #{custprop} , + #{custstate} , + #{enablestate} , + #{name} , + #{pkCountry} , + #{pkCustclass} , + #{pkGroup} , + #{pkOrg} , + #{taxpayerid} , + 'Y', + + ) + + + + insert into mdm_customer(document_rule, document_rule_num, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, code, custprop, custstate, enablestate, name, pk_country, pk_custclass, pk_group, pk_org, taxpayerid, sts) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.code},#{entity.custprop},#{entity.custstate},#{entity.enablestate},#{entity.name},#{entity.pkCountry},#{entity.pkCustclass},#{entity.pkGroup},#{entity.pkOrg},#{entity.taxpayerid}, 'Y') + + + + + insert into mdm_customer(document_rule, document_rule_num, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, code, custprop, custstate, enablestate, name, pk_country, pk_custclass, pk_group, pk_org, taxpayerid) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.code},#{entity.custprop},#{entity.custstate},#{entity.enablestate},#{entity.name},#{entity.pkCountry},#{entity.pkCustclass},#{entity.pkGroup},#{entity.pkOrg},#{entity.taxpayerid}) + + on duplicate key update + document_rule = values(document_rule), + document_rule_num = values(document_rule_num), + data_status = values(data_status), + add_status = values(add_status), + update_status = values(update_status), + delete_status = values(delete_status), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id), + code = values(code), + custprop = values(custprop), + custstate = values(custstate), + enablestate = values(enablestate), + name = values(name), + pk_country = values(pk_country), + pk_custclass = values(pk_custclass), + pk_group = values(pk_group), + pk_org = values(pk_org), + taxpayerid = values(taxpayerid) + + +update mdm_customer set + + document_rule = #{documentRule}, + document_rule_num = #{documentRuleNum}, + data_status = #{dataStatus}, + add_status = #{addStatus}, + update_status = #{updateStatus}, + delete_status = #{deleteStatus}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + code = #{code}, + custprop = #{custprop}, + custstate = #{custstate}, + enablestate = #{enablestate}, + name = #{name}, + pk_country = #{pkCountry}, + pk_custclass = #{pkCustclass}, + pk_group = #{pkGroup}, + pk_org = #{pkOrg}, + taxpayerid = #{taxpayerid}, + +where id = #{id} + + + +update mdm_customer set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + +update mdm_customer set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and document_rule = #{documentRule} + and document_rule_num = #{documentRuleNum} + and data_status = #{dataStatus} + and add_status = #{addStatus} + and update_status = #{updateStatus} + and delete_status = #{deleteStatus} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and code = #{code} + and custprop = #{custprop} + and custstate = #{custstate} + and enablestate = #{enablestate} + and name = #{name} + and pk_country = #{pkCountry} + and pk_custclass = #{pkCustclass} + and pk_group = #{pkGroup} + and pk_org = #{pkOrg} + and taxpayerid = #{taxpayerid} + and sts='Y' + + + + + delete from mdm_customer where id = #{id} + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java new file mode 100644 index 00000000..02577f11 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java @@ -0,0 +1,61 @@ +package com.hzya.frame.plugin.masterData.plugin; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 主数据同步 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class MdmPluginInitializer extends PluginBaseEntity{ + Logger logger = LoggerFactory.getLogger(MdmPluginInitializer.class); + @Autowired + private IMasterDataService masterDataService; + + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "MdmCustomerPlugin"; + } + + @Override + public String getPluginName() { + return "MdmCustomerPlugin插件"; + } + + @Override + public String getPluginLabel() { + return "MdmCustomerPlugin"; + } + + @Override + public String getPluginType() { + return "1"; + } + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) { + try { + logger.info("======开始执行主数据信息同步========"); + return masterDataService.queryArchives(requestJson); + }catch (Exception e){ + logger.info("======执行主数据同步失败:{}========",e.getMessage()); + e.printStackTrace(); + } + return null; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java new file mode 100644 index 00000000..175d0616 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.plugin.masterData.service; + +import com.hzya.frame.plugin.masterData.entity.MdmEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 客户档案(MdmCustomer)表服务接口 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public interface IMdmService extends IBaseService{ +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java new file mode 100644 index 00000000..e1016019 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java @@ -0,0 +1,24 @@ +package com.hzya.frame.plugin.masterData.service.impl; + +import com.hzya.frame.plugin.masterData.entity.MdmEntity; +import com.hzya.frame.plugin.masterData.dao.IMdmDao; +import com.hzya.frame.plugin.masterData.service.IMdmService; +import com.hzya.frame.plugin.masterData.service.IMdmService; +import org.springframework.beans.factory.annotation.Autowired; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 客户档案(MdmCustomer)表服务实现类 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class MdmServiceImpl extends BaseService implements IMdmService { + + private IMdmDao mdmCustomerDao; + + @Autowired + public void setMdmCustomerDao(IMdmDao dao) { + this.mdmCustomerDao = dao; + this.dao = dao; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java index f4f571f2..ebff9dc2 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java @@ -32,8 +32,6 @@ import com.hzya.frame.sysnew.application.script.entity.SysApplicationScriptEntit import com.hzya.frame.sysnew.grovy.service.IGroovyIntegrationService; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; -import com.hzya.frame.testCbs.service.ITsetCbsService; -import com.hzya.frame.testU8c.service.ITsetU8cService; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; @@ -119,10 +117,6 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { public String getPluginType() { return "1"; } - @Resource - private ITsetCbsService tsetCbsService; - @Resource - private ITsetU8cService tsetU8cService; @Override public JsonResultEntity executeBusiness(JSONObject requestJson) { @@ -1490,7 +1484,4 @@ public class MdmModulePluginInitializer extends PluginBaseEntity { } return jsonObjects; } - - - } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/entity/SysESBMessageManageLogEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/entity/SysESBMessageManageLogEntity.java new file mode 100644 index 00000000..1d39e5c6 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/entity/SysESBMessageManageLogEntity.java @@ -0,0 +1,12 @@ +package com.hzya.frame.plugin.sysMessageManageLogBack.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +public class SysESBMessageManageLogEntity extends BaseEntity { + + private String name; + + + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/plugin/SysMessageManageLogPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/plugin/SysMessageManageLogPluginInitializer.java new file mode 100644 index 00000000..ed6f5231 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/plugin/SysMessageManageLogPluginInitializer.java @@ -0,0 +1,59 @@ +package com.hzya.frame.plugin.sysMessageManageLogBack.plugin; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 消息管理日志(SysMessageManageLog)表服务接口 + * + * @author makejava + * @since 2024-03-08 10:22:00 + */ +public class SysMessageManageLogPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(SysMessageManageLogPluginInitializer.class); + + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "SysMessageManageLogPlugin"; + } + + @Override + public String getPluginName() { + return "ESB消息日志备份"; + } + + @Override + public String getPluginLabel() { + return "ESB消息日志备份"; + } + @Override + public String getPluginType() { + return "1"; + } + + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + try { + logger.info("执行成功"); + return BaseResult.getSuccessMessageEntity("执行成功"); + }catch (Exception e){ + e.printStackTrace(); + } + return BaseResult.getSuccessMessageEntity("执行成功"); + } + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/service/ISysESBMessageManageLogService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/service/ISysESBMessageManageLogService.java new file mode 100644 index 00000000..b30d5da9 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/service/ISysESBMessageManageLogService.java @@ -0,0 +1,13 @@ +package com.hzya.frame.plugin.sysMessageManageLogBack.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.sysMessageManageLogBack.entity.SysESBMessageManageLogEntity; + +/** + * 消息管理日志(SysMessageManageLog)表服务接口 + * + * @author makejava + * @since 2024-03-08 10:22:00 + */ +public interface ISysESBMessageManageLogService extends IBaseService { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/service/impl/SysESBMessageManageLogServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/service/impl/SysESBMessageManageLogServiceImpl.java new file mode 100644 index 00000000..a1494624 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sysMessageManageLogBack/service/impl/SysESBMessageManageLogServiceImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.plugin.sysMessageManageLogBack.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.plugin.sysMessageManageLogBack.entity.SysESBMessageManageLogEntity; +import com.hzya.frame.plugin.sysMessageManageLogBack.service.ISysESBMessageManageLogService; + +/** + * 消息管理日志(SysMessageManageLog)表服务实现类 + * + * @author makejava + * @since 2024-03-08 10:22:00 + */ +public class SysESBMessageManageLogServiceImpl extends BaseService implements ISysESBMessageManageLogService { + +} diff --git a/base-buildpackage/src/main/resources/application-ax.yml b/base-buildpackage/src/main/resources/application-ax.yml new file mode 100644 index 00000000..fda31564 --- /dev/null +++ b/base-buildpackage/src/main/resources/application-ax.yml @@ -0,0 +1,23 @@ +#######################澳星环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: GBK + file: +# 日志保存路径 + path: E:\yongansystem\log +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://127.0.0.1:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: E:\yongansystem\file +zt: + url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/base-buildpackage/src/main/resources/application-hclocal.yml b/base-buildpackage/src/main/resources/application-hclocal.yml new file mode 100644 index 00000000..1ec327da --- /dev/null +++ b/base-buildpackage/src/main/resources/application-hclocal.yml @@ -0,0 +1,27 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: +# 日志保存路径 + path: D:\yongansystem\kangarooDataCenter\v3\logs +spring: + datasource: + dynamic: + datasource: + master: +# url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true +# username: root +# password: bd993088e8a7c3dc5f44441617f9b4bf +# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: D:\yongansystem\kangarooDataCenter\v3\logs +zt: + url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface diff --git a/base-buildpackage/src/main/resources/application-local.yml b/base-buildpackage/src/main/resources/application-local.yml new file mode 100644 index 00000000..66d151f2 --- /dev/null +++ b/base-buildpackage/src/main/resources/application-local.yml @@ -0,0 +1,23 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: +# 日志保存路径 + path: /Users/apple/Desktop/log/local +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: /Users/apple/Desktop/log/local +zt: + url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface diff --git a/base-buildpackage/src/main/resources/application-xel.yml b/base-buildpackage/src/main/resources/application-xel.yml new file mode 100644 index 00000000..e53ca4c4 --- /dev/null +++ b/base-buildpackage/src/main/resources/application-xel.yml @@ -0,0 +1,35 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: +# 日志保存路径 + path: /Users/xiangerlin/work/app/logs/dev +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: /Users/xiangerlin/work/app/file/dev +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: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185 + #电子回单下载临时存放位置 + elec_path: /Users/xiangerlin/Downloads/ +OA: + data_source_code: yc-test diff --git a/base-buildpackage/src/main/resources/application-yc.yml b/base-buildpackage/src/main/resources/application-yc.yml new file mode 100644 index 00000000..b2e3e2cf --- /dev/null +++ b/base-buildpackage/src/main/resources/application-yc.yml @@ -0,0 +1,90 @@ +#logging: +# #日志级别 指定目录级别 +# level: +# root: info +# encodings: UTF-8 +# file: +# # 日志保存路径 +# path: /zt/log +#spring: +# flyway: +# # 启动flyway migration, 默认为true +# enabled: false +# datasource: +# dynamic: +# druid: +# filters: stat,log4j2 +# datasource: +# master: +# url: jdbc:dm://10.75.51.82:5238?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle +# username: businesscenter +# password: 6842568689469adad597d144ee104063 +# driver-class-name: dm.jdbc.driver.DmDriver +#savefile: +# # 文件保存路径 +# path: /zt/file +#公司mysql +#ax: +# url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface +#logging: +# #日志级别 指定目录级别warn +# level: +# root: info +# encodings: UTF-8 +# file: +# # 日志保存路径 +# path: /home/webservice/zt/log +#spring: +# datasource: +# dynamic: +# datasource: +# master: +# url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true +# username: root +# password: 62e4295b615a30dbf3b8ee96f41c820b +# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +#savefile: +# # 文件保存路径 +# path: /home/webservice/zt/file + + +#公司服务器达梦 +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: + # 日志保存路径 + path: /zt/log +spring: + flyway: + # 启动flyway migration, 默认为true + enabled: false + datasource: + dynamic: + druid: + filters: stat,log4j2 + datasource: + master: + url: jdbc:dm://ufidahz.com.cn:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle + username: hzyazt + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: dm.jdbc.driver.DmDriver +savefile: + # 文件保存路径 + path: /zt/file +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: /zt/elecfile +OA: + data_source_code: yc_oa diff --git a/base-buildpackage/src/main/resources/application-ydc.yml b/base-buildpackage/src/main/resources/application-ydc.yml new file mode 100644 index 00000000..3038dda0 --- /dev/null +++ b/base-buildpackage/src/main/resources/application-ydc.yml @@ -0,0 +1,21 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: +# 日志保存路径 + path: /Users/xiangerlin/work/app/logs/ydc +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: bd993088e8a7c3dc5f44441617f9b4bf + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: /Users/xiangerlin/work/app/logs/ydc diff --git a/base-buildpackage/src/main/resources/application-yuecheng.yml b/base-buildpackage/src/main/resources/application-yuecheng.yml new file mode 100644 index 00000000..7e081ecb --- /dev/null +++ b/base-buildpackage/src/main/resources/application-yuecheng.yml @@ -0,0 +1,31 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: +# 日志保存路径 + path: /Users/xiangerlin/work/app/logs/yuecheng +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: /Users/xiangerlin/work/app/logs/yuecheng +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: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185 diff --git a/base-buildpackage/src/main/resources/application-yuqh.yml b/base-buildpackage/src/main/resources/application-yuqh.yml new file mode 100644 index 00000000..d114d224 --- /dev/null +++ b/base-buildpackage/src/main/resources/application-yuqh.yml @@ -0,0 +1,23 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: +# 日志保存路径 + path: E:\yongansystem\log +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: bd993088e8a7c3dc5f44441617f9b4bf + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: E:\yongansystem\log +zt: + url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface diff --git a/base-buildpackage/src/main/resources/application-zqtlocal.yml b/base-buildpackage/src/main/resources/application-zqtlocal.yml new file mode 100644 index 00000000..ffff00a3 --- /dev/null +++ b/base-buildpackage/src/main/resources/application-zqtlocal.yml @@ -0,0 +1,39 @@ +#######################zqtlocal环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + encodings: UTF-8 + file: + # 日志保存路径 + path: D:/local/logs/ +spring: + datasource: + dynamic: + datasource: + master: + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: 62e4295b615a30dbf3b8ee96f41c820b + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +savefile: + # 文件保存路径 + path: D:/local/upload/ + pluginpath : D:/local/plugin/ + tomcatpath: E:\apache-tomcat-9.0.27\webapps\kangarooDataCenterV3\WEB-INF\classes\ +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 +zt: + url: http://127.0.0.1:9082/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml new file mode 100644 index 00000000..e9adf11a --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml @@ -0,0 +1,6 @@ + + +MdmPlugin +MdmPlugin插件 +90000001 + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml new file mode 100644 index 00000000..471dd4a6 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..6943ad23 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml new file mode 100644 index 00000000..c642948f --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/pluginCfg.xml new file mode 100644 index 00000000..00d5dc0b --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/pluginCfg.xml @@ -0,0 +1,6 @@ + + +SysMessageManageLogPlugin +SysMessageManageLogPlugin插件 +202403080010 + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-dao.xml new file mode 100644 index 00000000..f857d7fc --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-dao.xml @@ -0,0 +1,4 @@ + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..2ca55124 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-service.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-service.xml new file mode 100644 index 00000000..4f0c39ab --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-service.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/webapp/WEB-INF/lib/openapi-sdk-1.0.0.jar b/base-buildpackage/src/main/webapp/WEB-INF/lib/openapi-sdk-1.0.0.jar new file mode 100644 index 00000000..eac564c0 Binary files /dev/null and b/base-buildpackage/src/main/webapp/WEB-INF/lib/openapi-sdk-1.0.0.jar differ diff --git a/base-buildpackage/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto-1.1.jar b/base-buildpackage/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto-1.1.jar new file mode 100644 index 00000000..e8fb256e Binary files /dev/null and b/base-buildpackage/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto-1.1.jar differ diff --git a/base-service/src/main/java/com/hzya/frame/report/reportAccredit/dao/IReportAccreditDao.java b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/dao/IReportAccreditDao.java new file mode 100644 index 00000000..f5e31363 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/dao/IReportAccreditDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.report.reportAccredit.dao; + +import com.hzya.frame.report.reportAccredit.entity.ReportAccreditEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 报表授权表(report_accredit: table)表数据库访问层 + * + * @author makejava + * @since 2024-05-21 15:02:11 + */ +public interface IReportAccreditDao extends IBaseDao { + +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportAccredit/dao/impl/ReportAccreditDaoImpl.java b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/dao/impl/ReportAccreditDaoImpl.java new file mode 100644 index 00000000..62bb8b33 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/dao/impl/ReportAccreditDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.report.reportAccredit.dao.impl; + +import com.hzya.frame.report.reportAccredit.entity.ReportAccreditEntity; +import com.hzya.frame.report.reportAccredit.dao.IReportAccreditDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 报表授权表(ReportAccredit)表数据库访问层 + * + * @author makejava + * @since 2024-05-21 15:02:11 + */ +@Repository(value = "ReportAccreditDaoImpl") +public class ReportAccreditDaoImpl extends MybatisGenericDao implements IReportAccreditDao{ + +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportAccredit/entity/ReportAccreditEntity.java b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/entity/ReportAccreditEntity.java new file mode 100644 index 00000000..4f987973 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/entity/ReportAccreditEntity.java @@ -0,0 +1,55 @@ +package com.hzya.frame.report.reportAccredit.entity; + +import com.hzya.frame.web.entity.BaseEntity; +/** + * 报表授权表(ReportAccredit)实体类 + * + * @author makejava + * @since 2024-05-21 15:02:12 + */ +public class ReportAccreditEntity extends BaseEntity { + + /** 权限赋予对象id */ + private String objectId; + /** 报表ID */ + private String reportId; + /** 权限类型（1、应用2、人员） */ + private String kindId; + /** 公司id */ + private String companyId; + + + public String getObjectId() { + return objectId; + } + + public void setObjectId(String objectId) { + this.objectId = objectId; + } + + public String getReportId() { + return reportId; + } + + public void setReportId(String reportId) { + this.reportId = reportId; + } + + public String getKindId() { + return kindId; + } + + public void setKindId(String kindId) { + this.kindId = kindId; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportAccredit/entity/ReportAccreditEntity.xml b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/entity/ReportAccreditEntity.xml new file mode 100644 index 00000000..6167bee9 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/entity/ReportAccreditEntity.xml @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + id + ,object_id + ,report_id + ,kind_id + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + + + insert into report_accredit( + + id , + object_id , + report_id , + kind_id , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{objectId} , + #{reportId} , + #{kindId} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into report_accredit(id, object_id, report_id, kind_id, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.id},#{entity.objectId},#{entity.reportId},#{entity.kindId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into report_accredit(id, object_id, report_id, kind_id, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.id},#{entity.objectId},#{entity.reportId},#{entity.kindId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + id = values(id), + object_id = values(object_id), + report_id = values(report_id), + kind_id = values(kind_id), + sorts = values(sorts), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update report_accredit set + + id = #{id}, + object_id = #{objectId}, + report_id = #{reportId}, + kind_id = #{kindId}, + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where = #{id} + + + +update report_accredit set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where = #{id} + + + +update report_accredit set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and object_id = #{objectId} + and report_id = #{reportId} + and kind_id = #{kindId} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from report_accredit where = #{id} + + + + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportAccredit/service/IReportAccreditService.java b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/service/IReportAccreditService.java new file mode 100644 index 00000000..be6686de --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/service/IReportAccreditService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.report.reportAccredit.service; + +import com.hzya.frame.report.reportAccredit.entity.ReportAccreditEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 报表授权表(ReportAccredit)表服务接口 + * + * @author makejava + * @since 2024-05-21 15:02:12 + */ +public interface IReportAccreditService extends IBaseService{ +} diff --git a/base-service/src/main/java/com/hzya/frame/report/reportAccredit/service/impl/ReportAccreditServiceImpl.java b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/service/impl/ReportAccreditServiceImpl.java new file mode 100644 index 00000000..066659be --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportAccredit/service/impl/ReportAccreditServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.report.reportAccredit.service.impl; + +import com.hzya.frame.report.reportAccredit.entity.ReportAccreditEntity; +import com.hzya.frame.report.reportAccredit.dao.IReportAccreditDao; +import com.hzya.frame.report.reportAccredit.service.IReportAccreditService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 报表授权表(ReportAccredit)表服务实现类 + * + * @author makejava + * @since 2024-05-21 15:02:12 + */ +@Service(value = "reportAccreditService") +public class ReportAccreditServiceImpl extends BaseService implements IReportAccreditService { + + private IReportAccreditDao reportAccreditDao; + + @Autowired + public void setReportAccreditDao(IReportAccreditDao dao) { + this.reportAccreditDao = dao; + this.dao = dao; + } +} diff --git a/base-service/src/main/java/com/hzya/frame/report/reportClassify/dao/IReportClassifyDao.java b/base-service/src/main/java/com/hzya/frame/report/reportClassify/dao/IReportClassifyDao.java new file mode 100644 index 00000000..c861046c --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportClassify/dao/IReportClassifyDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.report.reportClassify.dao; + +import com.hzya.frame.report.reportClassify.entity.ReportClassifyEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 报表分类表(report_classify: table)表数据库访问层 + * + * @author makejava + * @since 2024-05-21 15:03:14 + */ +public interface IReportClassifyDao extends IBaseDao { + +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportClassify/dao/impl/ReportClassifyDaoImpl.java b/base-service/src/main/java/com/hzya/frame/report/reportClassify/dao/impl/ReportClassifyDaoImpl.java new file mode 100644 index 00000000..48fa3d1a --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportClassify/dao/impl/ReportClassifyDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.report.reportClassify.dao.impl; + +import com.hzya.frame.report.reportClassify.entity.ReportClassifyEntity; +import com.hzya.frame.report.reportClassify.dao.IReportClassifyDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 报表分类表(ReportClassify)表数据库访问层 + * + * @author makejava + * @since 2024-05-21 15:03:14 + */ +@Repository(value = "ReportClassifyDaoImpl") +public class ReportClassifyDaoImpl extends MybatisGenericDao implements IReportClassifyDao{ + +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportClassify/entity/ReportClassifyEntity.java b/base-service/src/main/java/com/hzya/frame/report/reportClassify/entity/ReportClassifyEntity.java new file mode 100644 index 00000000..4fa0e714 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportClassify/entity/ReportClassifyEntity.java @@ -0,0 +1,84 @@ +package com.hzya.frame.report.reportClassify.entity; + +import java.util.Date; +import java.util.List; + +import com.hzya.frame.sysnew.organ.entity.SysOrganEntity; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 报表分类表(ReportClassify)实体类 + * + * @author makejava + * @since 2024-05-21 15:03:14 + */ +public class ReportClassifyEntity extends BaseEntity { + + /** 编码 */ + private String code; + /** 名称 */ + private String name; + /** 上级id */ + private String parentId; + private String parentName; + /** 公司id */ + private String companyId; + private List children; + + private String label; + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public String getParentName() { + return parentName; + } + + public void setParentName(String parentName) { + this.parentName = parentName; + } +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportClassify/entity/ReportClassifyEntity.xml b/base-service/src/main/java/com/hzya/frame/report/reportClassify/entity/ReportClassifyEntity.xml new file mode 100644 index 00000000..cfb9b530 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportClassify/entity/ReportClassifyEntity.xml @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + id + ,code + ,name + ,parent_id + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + + insert into report_classify( + + id , + code , + name , + parent_id , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{code} , + #{name} , + #{parentId} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into report_classify(id, code, name, parent_id, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.id},#{entity.code},#{entity.name},#{entity.parentId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') + + + + + insert into report_classify(id, code, name, parent_id, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.id},#{entity.code},#{entity.name},#{entity.parentId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + id = values(id), + code = values(code), + name = values(name), + parent_id = values(parent_id), + sorts = values(sorts), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + +update report_classify set + + id = #{id}, + code = #{code}, + name = #{name}, + parent_id = #{parentId}, + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + +where = #{id} + + + +update report_classify set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where = #{id} + + + +update report_classify set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and code = #{code} + and name = #{name} + and parent_id = #{parentId} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from report_classify where = #{id} + + + + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportClassify/service/IReportClassifyService.java b/base-service/src/main/java/com/hzya/frame/report/reportClassify/service/IReportClassifyService.java new file mode 100644 index 00000000..3c3b645a --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportClassify/service/IReportClassifyService.java @@ -0,0 +1,65 @@ +package com.hzya.frame.report.reportClassify.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.report.reportClassify.entity.ReportClassifyEntity; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; + +/** + * 报表分类表(ReportClassify)表服务接口 + * + * @author makejava + * @since 2024-05-21 15:03:14 + */ +public interface IReportClassifyService extends IBaseService{ + + /** + * @Author lvleigang + * @Description 查询分类树 + * @Date 3:14 下午 2024/5/21 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + JsonResultEntity queryEntityTree(JSONObject jsonObject); + + + /** + * @Author lvleigang + * @Description 保存分类 + * @Date 3:16 下午 2024/5/21 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + + /** + * @Author lvleigang + * @Description 获取分类 + * @Date 3:16 下午 2024/5/21 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + JsonResultEntity getEntity(JSONObject jsonObject); + + + /** + * @Author lvleigang + * @Description 修改分类 + * @Date 3:16 下午 2024/5/21 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + + /** + * @Author lvleigang + * @Description 删除分类 + * @Date 3:16 下午 2024/5/21 + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); + +} diff --git a/base-service/src/main/java/com/hzya/frame/report/reportClassify/service/impl/ReportClassifyServiceImpl.java b/base-service/src/main/java/com/hzya/frame/report/reportClassify/service/impl/ReportClassifyServiceImpl.java new file mode 100644 index 00000000..aa57d7c2 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportClassify/service/impl/ReportClassifyServiceImpl.java @@ -0,0 +1,230 @@ +package com.hzya.frame.report.reportClassify.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.report.reportClassify.entity.ReportClassifyEntity; +import com.hzya.frame.report.reportClassify.dao.IReportClassifyDao; +import com.hzya.frame.report.reportClassify.service.IReportClassifyService; +import com.hzya.frame.report.reportManage.dao.IReportManageDao; +import com.hzya.frame.report.reportManage.entity.ReportManageEntity; +import com.hzya.frame.sysnew.organ.entity.SysOrganEntity; +import com.hzya.frame.sysnew.person.entity.SysPersonEntity; +import com.hzya.frame.sysnew.userCompany.entity.SysUserCompanyEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +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; + +/** + * 报表分类表(ReportClassify)表服务实现类 + * + * @author makejava + * @since 2024-05-21 15:03:14 + */ +@Service(value = "reportClassifyService") +public class ReportClassifyServiceImpl extends BaseService implements IReportClassifyService { + + private IReportClassifyDao reportClassifyDao; + + @Resource + private IReportManageDao reportManageDao; + @Autowired + public void setReportClassifyDao(IReportClassifyDao dao) { + this.reportClassifyDao = dao; + this.dao = dao; + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询分类树 + * @Date 3:14 下午 2024/5/21 + **/ + @Override + public JsonResultEntity queryEntityTree(JSONObject jsonObject) { + ReportClassifyEntity entity = getData("jsonStr", jsonObject, ReportClassifyEntity.class); + if (entity == null) { + entity = new ReportClassifyEntity(); + } + List returnEntity = new ArrayList<>(); + //查询符合条件的组织数据 + List reportClassifyEntities = reportClassifyDao.queryByLike(entity); + if (reportClassifyEntities == null || reportClassifyEntities.size() == 0) { + ReportClassifyEntity first = new ReportClassifyEntity(); + first.setCode("1"); + first.setName("系统"); + first.setParentId("0"); + first.setCreate(); + reportClassifyDao.save(first); + reportClassifyEntities = new ArrayList<>(); + reportClassifyEntities.add(first); + } + if (reportClassifyEntities != null && reportClassifyEntities.size() > 0) { + for (int i = 0; i < reportClassifyEntities.size(); i++) { + if ("0".equals(reportClassifyEntities.get(i).getParentId())) { + recursiveSetTree(reportClassifyEntities.get(i), reportClassifyEntities); + reportClassifyEntities.get(i).setLabel("(" + reportClassifyEntities.get(i).getCode() + ")" + reportClassifyEntities.get(i).getName()); + returnEntity.add(reportClassifyEntities.get(i)); + } + } + } + return BaseResult.getSuccessMessageEntity("查询组织树成功", returnEntity); + } + + /** + * @param reportClassifyEntity + * @param reportClassifyEntityList + * @return void + * @Author lvleigang + * @Description 递归设置树 + * @Date 9:19 上午 2024/3/28 + **/ + private void recursiveSetTree(ReportClassifyEntity reportClassifyEntity, List reportClassifyEntityList) { + List children = new ArrayList<>(); + for (int i = 0; i < reportClassifyEntityList.size(); i++) { + if (reportClassifyEntityList.get(i).getParentId() != null && !"".equals(reportClassifyEntityList.get(i).getParentId())) { + if (reportClassifyEntity.getId().equals(reportClassifyEntityList.get(i).getParentId())) { + reportClassifyEntityList.get(i).setLabel("(" + reportClassifyEntityList.get(i).getCode() + ")" + reportClassifyEntityList.get(i).getName()); + children.add(reportClassifyEntityList.get(i)); + recursiveSetTree(reportClassifyEntityList.get(i), reportClassifyEntityList); + } + } + } + reportClassifyEntity.setChildren(children); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存分类 + * @Date 3:16 下午 2024/5/21 + **/ + @Override + public JsonResultEntity saveEntity(JSONObject jsonObject) { + ReportClassifyEntity entity = getData("jsonStr", jsonObject, ReportClassifyEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getCode() == null || "".equals(entity.getCode())) { + return BaseResult.getFailureMessageEntity("请先输入编码"); + } + if (entity.getName() == null || "".equals(entity.getName())) { + return BaseResult.getFailureMessageEntity("请先输入名称"); + } + if (entity.getParentId() == null || "".equals(entity.getParentId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setCreate(); + //保存 + reportClassifyDao.save(entity); + return BaseResult.getSuccessMessageEntity("保存分类成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取分类 + * @Date 3:16 下午 2024/5/21 + **/ + @Override + public JsonResultEntity getEntity(JSONObject jsonObject) { + ReportClassifyEntity entity = getData("jsonStr", jsonObject, ReportClassifyEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = reportClassifyDao.get(entity.getId()); + if (entity == null) { + return BaseResult.getFailureMessageEntity("获取组织失败"); + } + if (entity.getParentId() != null && !"0".equals(entity.getParentId())) { + ReportClassifyEntity parentEntity = reportClassifyDao.get(entity.getParentId()); + if (entity != null) { + entity.setParentName(parentEntity.getName()); + } + } + return BaseResult.getSuccessMessageEntity("获取分类成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改分类 + * @Date 3:16 下午 2024/5/21 + **/ + @Override + public JsonResultEntity updateEntity(JSONObject jsonObject) { + ReportClassifyEntity entity = getData("jsonStr", jsonObject, ReportClassifyEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getName() == null || "".equals(entity.getName())) { + return BaseResult.getFailureMessageEntity("请先输入名称"); + } + if (entity.getCode() == null || "".equals(entity.getCode())) { + return BaseResult.getFailureMessageEntity("请先输入编码"); + } + if (entity.getParentId() == null || "".equals(entity.getParentId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + //保存 + reportClassifyDao.update(entity); + return BaseResult.getSuccessMessageEntity("修改分类成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除分类 + * @Date 3:16 下午 2024/5/21 + **/ + @Override + public JsonResultEntity deleteEntity(JSONObject jsonObject) { + ReportClassifyEntity entity = getData("jsonStr", jsonObject, ReportClassifyEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (!checkUse(entity)) { + return BaseResult.getFailureMessageEntity("当前组织已经使用，不允许删除"); + } + entity.setUpdate(); + reportClassifyDao.logicRemove(entity); + return BaseResult.getSuccessMessageEntity("删除分类成功"); + } + + /** + * @Author lvleigang + * @Description 校验分类下面是否有配置报表 + * @Date 3:27 下午 2024/3/27 + * @param entity + * @return boolean + **/ + private boolean checkUse(ReportClassifyEntity entity) { + ReportManageEntity reportManageEntity = new ReportManageEntity(); + reportManageEntity.setClassifyId(entity.getId()); + if(reportManageDao.getCount(reportManageEntity) > 0){ + return false; + } + return true; + } +} diff --git a/base-service/src/main/java/com/hzya/frame/report/reportManage/dao/IReportManageDao.java b/base-service/src/main/java/com/hzya/frame/report/reportManage/dao/IReportManageDao.java new file mode 100644 index 00000000..f341d8b6 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportManage/dao/IReportManageDao.java @@ -0,0 +1,23 @@ +package com.hzya.frame.report.reportManage.dao; + +import com.hzya.frame.report.reportManage.entity.JimuReportEntity; +import com.hzya.frame.report.reportManage.entity.ReportManageEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; + +/** + * 报表管理表(report_manage: table)表数据库访问层 + * + * @author makejava + * @since 2024-05-21 15:04:12 + */ +public interface IReportManageDao extends IBaseDao { + + List queryByLikeClassify(ReportManageEntity entity); + + List queryReportNotUse(JimuReportEntity entity); + + JimuReportEntity queryReportEntity(JimuReportEntity entity); +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportManage/dao/impl/ReportManageDaoImpl.java b/base-service/src/main/java/com/hzya/frame/report/reportManage/dao/impl/ReportManageDaoImpl.java new file mode 100644 index 00000000..e29d77af --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportManage/dao/impl/ReportManageDaoImpl.java @@ -0,0 +1,39 @@ +package com.hzya.frame.report.reportManage.dao.impl; + +import com.hzya.frame.report.reportManage.entity.JimuReportEntity; +import com.hzya.frame.report.reportManage.entity.ReportManageEntity; +import com.hzya.frame.report.reportManage.dao.IReportManageDao; +import com.hzya.frame.sysnew.user.entity.SysUserEntity; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + +/** + * 报表管理表(ReportManage)表数据库访问层 + * + * @author makejava + * @since 2024-05-21 15:04:12 + */ +@Repository(value = "ReportManageDaoImpl") +public class ReportManageDaoImpl extends MybatisGenericDao implements IReportManageDao{ + + @Override + public List queryByLikeClassify(ReportManageEntity entity) { + List o = super.query(getSqlIdPrifx() + "queryByLikeClassify", entity); + return o; + } + + @Override + public List queryReportNotUse(JimuReportEntity entity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryReportNotUse", entity); + return o; + } + + @Override + public JimuReportEntity queryReportEntity(JimuReportEntity entity) { + JimuReportEntity o = (JimuReportEntity) super.selectOne(getSqlIdPrifx() + "queryReportEntity", entity); + return o; + } +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/JimuReportEntity.java b/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/JimuReportEntity.java new file mode 100644 index 00000000..0be36031 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/JimuReportEntity.java @@ -0,0 +1,45 @@ +package com.hzya.frame.report.reportManage.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * 积木报表jimu_report 实体类 + * + * @author makejava + * @since 2024-05-21 15:04:12 + */ +public class JimuReportEntity extends BaseEntity { + + /** 编码 */ + private String code; + /** 名称 */ + private String name; + /** 删除标识0-正常,1-已删除 */ + private String delFlag; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/ReportManageEntity.java b/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/ReportManageEntity.java new file mode 100644 index 00000000..ac8ea700 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/ReportManageEntity.java @@ -0,0 +1,85 @@ +package com.hzya.frame.report.reportManage.entity; + +import java.util.Date; +import com.hzya.frame.web.entity.BaseEntity; +/** + * 报表管理表(ReportManage)实体类 + * + * @author makejava + * @since 2024-05-21 15:04:12 + */ +public class ReportManageEntity extends BaseEntity { + + /** 报表ID */ + private String reportId; + /** 报表名称 */ + private String reportName; + /** 类别id */ + private String classifyId; + /** 类别名称 */ + private String classifyName; + /** 预览地址 */ + private String previewAddress; + /** 状态: 0启用 1 停用 */ + private String state; + /** 公司id */ + private String companyId; + + + public String getReportId() { + return reportId; + } + + public void setReportId(String reportId) { + this.reportId = reportId; + } + + public String getReportName() { + return reportName; + } + + public void setReportName(String reportName) { + this.reportName = reportName; + } + + public String getClassifyId() { + return classifyId; + } + + public void setClassifyId(String classifyId) { + this.classifyId = classifyId; + } + + public String getPreviewAddress() { + return previewAddress; + } + + public void setPreviewAddress(String previewAddress) { + this.previewAddress = previewAddress; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getClassifyName() { + return classifyName; + } + + public void setClassifyName(String classifyName) { + this.classifyName = classifyName; + } +} + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/ReportManageEntity.xml b/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/ReportManageEntity.xml new file mode 100644 index 00000000..05ad5f7f --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportManage/entity/ReportManageEntity.xml @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + id + ,report_id + ,report_name + ,classify_id + ,preview_address + ,state + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + + + + + + + + + + + + + + + + + + insert into report_manage( + + id , + report_id , + report_name , + classify_id , + preview_address , + state , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + sts, + + )values( + + #{id} , + #{reportId} , + #{reportName} , + #{classifyId} , + #{previewAddress} , + #{state} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + 'Y', + + ) + + + + insert into report_manage(id, report_id, report_name, classify_id, preview_address, state, sorts, + create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) + values + + (#{entity.id},#{entity.reportId},#{entity.reportName},#{entity.classifyId},#{entity.previewAddress},#{entity.state},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, + 'Y') + + + + + insert into report_manage(id, report_id, report_name, classify_id, preview_address, state, sorts, + create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) + values + + (#{entity.id},#{entity.reportId},#{entity.reportName},#{entity.classifyId},#{entity.previewAddress},#{entity.state},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + + on duplicate key update + id = values(id), + report_id = values(report_id), + report_name = values(report_name), + classify_id = values(classify_id), + preview_address = values(preview_address), + state = values(state), + sorts = values(sorts), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id) + + + + update report_manage set + + id = #{id}, + report_id = #{reportId}, + report_name = #{reportName}, + classify_id = #{classifyId}, + preview_address = #{previewAddress}, + state = #{state}, + sorts = #{sorts}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + + where = #{id} + + + +update report_manage set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where = #{id} + + + + update report_manage set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and report_id = #{reportId} + and report_name = #{reportName} + and classify_id = #{classifyId} + and preview_address = #{previewAddress} + and state = #{state} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and sts='Y' + + + + + delete from report_manage where = #{id} + + + + + + + + + + + + diff --git a/base-service/src/main/java/com/hzya/frame/report/reportManage/service/IReportManageService.java b/base-service/src/main/java/com/hzya/frame/report/reportManage/service/IReportManageService.java new file mode 100644 index 00000000..2341a294 --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportManage/service/IReportManageService.java @@ -0,0 +1,116 @@ +package com.hzya.frame.report.reportManage.service; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.report.reportManage.entity.ReportManageEntity; +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; + +/** + * 报表管理表(ReportManage)表服务接口 + * + * @author makejava + * @since 2024-05-21 15:04:12 + */ +public interface IReportManageService extends IBaseService{ + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表管理列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntityPage(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表管理列表 + * @Date 11:52 上午 2024/3/27 + **/ + JsonResultEntity queryEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存报表管理 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity saveEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询未配置的报表 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity queryReport(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询单个报表 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity queryReportEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取报表管理 + * @Date 2:36 下午 2024/3/27 + **/ + JsonResultEntity getEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改报表管理 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity updateEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除报表管理 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity deleteEntity(JSONObject jsonObject); + + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用报表管理 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity enableDisableEntity(JSONObject jsonObject); + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 报表管理权限查询 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity jurisdiction(JSONObject jsonObject); + + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存报表管理权限查询 + * @Date 2:37 下午 2024/3/27 + **/ + JsonResultEntity saveJurisdiction(JSONObject jsonObject); +} diff --git a/base-service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java b/base-service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java new file mode 100644 index 00000000..eccc4f7a --- /dev/null +++ b/base-service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java @@ -0,0 +1,291 @@ +package com.hzya.frame.report.reportManage.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.report.reportManage.dao.IReportManageDao; +import com.hzya.frame.report.reportManage.entity.JimuReportEntity; +import com.hzya.frame.report.reportManage.entity.ReportManageEntity; +import com.hzya.frame.report.reportManage.service.IReportManageService; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 报表管理表(ReportManage)表服务实现类 + * + * @author makejava + * @since 2024-05-21 15:04:12 + */ +@Service(value = "reportManageService") +public class ReportManageServiceImpl extends BaseService implements IReportManageService { + + private IReportManageDao reportManageDao; + + @Autowired + public void setReportManageDao(IReportManageDao dao) { + this.reportManageDao = dao; + this.dao = dao; + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表列表分页 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntityPage(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = reportManageDao.queryByLikeClassify(entity); + PageInfo pageInfo = new PageInfo(list); + return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表列表 + * @Date 11:52 上午 2024/3/27 + **/ + @Override + public JsonResultEntity queryEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + entity = new ReportManageEntity(); + } + List list = reportManageDao.queryByLike(entity); + return BaseResult.getSuccessMessageEntity("查询数据成功", list); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存报表 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity saveEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getReportId() == null || "".equals(entity.getReportId())) { + return BaseResult.getFailureMessageEntity("请先选择报表"); + } + if (entity.getReportName() == null || "".equals(entity.getReportName())) { + return BaseResult.getFailureMessageEntity("请先输入报表名称"); + } + if (entity.getClassifyId() == null || "".equals(entity.getClassifyId())) { + return BaseResult.getFailureMessageEntity("请先选择分类"); + } + if (entity.getPreviewAddress() == null || "".equals(entity.getPreviewAddress())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setState("0"); + if (!checkIsUse(entity)) { + return BaseResult.getFailureMessageEntity("当前报表已经配置，请勿重复配置"); + } + entity.setCreate(); + //保存 + reportManageDao.save(entity); + return BaseResult.getSuccessMessageEntity("保存报表成功", entity); + } + + + private boolean checkIsUse(ReportManageEntity entity) { + ReportManageEntity checkUse = new ReportManageEntity(); + checkUse.setReportId(entity.getReportId()); + return reportManageDao.getCount(checkUse) <= 0; + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 获取报表 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity getEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = reportManageDao.get(entity.getId()); + if (entity == null) { + return BaseResult.getFailureMessageEntity("获取报表失败"); + } + return BaseResult.getSuccessMessageEntity("获取报表成功", entity); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 修改报表 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity updateEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getReportId() == null || "".equals(entity.getReportId())) { + return BaseResult.getFailureMessageEntity("请先选择报表"); + } + if (entity.getReportName() == null || "".equals(entity.getReportName())) { + return BaseResult.getFailureMessageEntity("请先输入报表名称"); + } + if (entity.getClassifyId() == null || "".equals(entity.getClassifyId())) { + return BaseResult.getFailureMessageEntity("请先选择分类"); + } + if (entity.getPreviewAddress() == null || "".equals(entity.getPreviewAddress())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + //保存 + reportManageDao.update(entity); + return BaseResult.getSuccessMessageEntity("修改报表成功"); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 删除报表 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity deleteEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + reportManageDao.logicRemove(entity); + return BaseResult.getSuccessMessageEntity("删除报表成功"); + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 启用停用报表 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity enableDisableEntity(JSONObject jsonObject) { + ReportManageEntity entity = getData("jsonStr", jsonObject, ReportManageEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + if (entity.getState() == null || "".equals(entity.getState())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity.setUpdate(); + reportManageDao.update(entity); + //0启用 1 停用 + if ("0".equals(entity.getState())) { + return BaseResult.getSuccessMessageEntity("启用用户成功"); + } else { + return BaseResult.getSuccessMessageEntity("停用用户成功"); + } + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 查询报表 + * @Date 2:36 下午 2024/3/27 + **/ + @Override + public JsonResultEntity queryReport(JSONObject jsonObject) { + JimuReportEntity entity = getData("jsonStr", jsonObject, JimuReportEntity.class); + //判断分页 + if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) { + return BaseResult.getFailureMessageEntity("分页查询参数不存在"); + } + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List list = reportManageDao.queryReportNotUse(entity); + 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 queryReportEntity(JSONObject jsonObject) { + JimuReportEntity entity = getData("jsonStr", jsonObject, JimuReportEntity.class); + if (entity == null) { + return BaseResult.getFailureMessageEntity("参数不允许为空"); + } + if (entity.getId() == null || "".equals(entity.getId())) { + return BaseResult.getFailureMessageEntity("系统错误"); + } + entity = reportManageDao.queryReportEntity(entity); + if (entity == null) { + return BaseResult.getFailureMessageEntity("获取报表失败"); + } + return BaseResult.getSuccessMessageEntity("获取报表成功", entity); + + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 权限查询 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity jurisdiction(JSONObject jsonObject) { + + + return null; + } + + /** + * @param jsonObject + * @return com.hzya.frame.web.entity.JsonResultEntity + * @Author lvleigang + * @Description 保存权限查询 + * @Date 2:37 下午 2024/3/27 + **/ + @Override + public JsonResultEntity saveJurisdiction(JSONObject jsonObject) { + + return null; + } +} diff --git a/base-webapp/pom.xml b/base-webapp/pom.xml index 701dcbd9..79bd4cf9 100644 --- a/base-webapp/pom.xml +++ b/base-webapp/pom.xml @@ -18,16 +18,66 @@ base-service ${revision} - - com.hzya.frame - fw-cbs - ${revision} - - - com.hzya.frame - fw-u8c - ${revision} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fw-cbs/pom.xml b/fw-cbs/pom.xml deleted file mode 100644 index 4bdeaccc..00000000 --- a/fw-cbs/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - kangarooDataCenterV3 - com.hzya.frame - ${revision} - - 4.0.0 - fw-cbs - jar - ${revision} - - - - com.hzya.frame - base-service - ${revision} - - - mysql - mysql-connector-java - ${mysql-connector-java} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - none - execute - true - - - - - repackage - - - - - - - diff --git a/fw-cbs/src/main/java/com/hzya/frame/testCbs/dao/ITestCbsDao.java b/fw-cbs/src/main/java/com/hzya/frame/testCbs/dao/ITestCbsDao.java deleted file mode 100644 index 0289ed1d..00000000 --- a/fw-cbs/src/main/java/com/hzya/frame/testCbs/dao/ITestCbsDao.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hzya.frame.testCbs.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.testCbs.entity.TestCbsEntity; - - -public interface ITestCbsDao extends IBaseDao { - - - -} - diff --git a/fw-cbs/src/main/java/com/hzya/frame/testCbs/dao/impl/TestCbsDaoImpl.java b/fw-cbs/src/main/java/com/hzya/frame/testCbs/dao/impl/TestCbsDaoImpl.java deleted file mode 100644 index d71cdb0e..00000000 --- a/fw-cbs/src/main/java/com/hzya/frame/testCbs/dao/impl/TestCbsDaoImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.testCbs.dao.impl; - -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.testCbs.dao.ITestCbsDao; -import com.hzya.frame.testCbs.entity.TestCbsEntity; -import org.springframework.stereotype.Repository; - -@Repository(value = "TestCbsDaoImpl") -public class TestCbsDaoImpl extends MybatisGenericDao implements ITestCbsDao { - - -} - diff --git a/fw-cbs/src/main/java/com/hzya/frame/testCbs/entity/TestCbsEntity.java b/fw-cbs/src/main/java/com/hzya/frame/testCbs/entity/TestCbsEntity.java deleted file mode 100644 index 3594c295..00000000 --- a/fw-cbs/src/main/java/com/hzya/frame/testCbs/entity/TestCbsEntity.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzya.frame.testCbs.entity; - -import com.hzya.frame.web.entity.BaseEntity; - - -public class TestCbsEntity extends BaseEntity { - private String name; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} - diff --git a/fw-cbs/src/main/java/com/hzya/frame/testCbs/entity/TestCbsEntity.xml b/fw-cbs/src/main/java/com/hzya/frame/testCbs/entity/TestCbsEntity.xml deleted file mode 100644 index 28c9be12..00000000 --- a/fw-cbs/src/main/java/com/hzya/frame/testCbs/entity/TestCbsEntity.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/fw-cbs/src/main/java/com/hzya/frame/testCbs/service/ITsetCbsService.java b/fw-cbs/src/main/java/com/hzya/frame/testCbs/service/ITsetCbsService.java deleted file mode 100644 index 71688e4e..00000000 --- a/fw-cbs/src/main/java/com/hzya/frame/testCbs/service/ITsetCbsService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.hzya.frame.testCbs.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.testCbs.entity.TestCbsEntity; -import com.hzya.frame.web.entity.JsonResultEntity; - -public interface ITsetCbsService extends IBaseService { - JsonResultEntity testCbs(JSONObject jsonObject); -} diff --git a/fw-cbs/src/main/java/com/hzya/frame/testCbs/service/impl/TestCbsServiceImpl.java b/fw-cbs/src/main/java/com/hzya/frame/testCbs/service/impl/TestCbsServiceImpl.java deleted file mode 100644 index 2b5f832f..00000000 --- a/fw-cbs/src/main/java/com/hzya/frame/testCbs/service/impl/TestCbsServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzya.frame.testCbs.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; -import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; -import com.hzya.frame.testCbs.dao.ITestCbsDao; -import com.hzya.frame.testCbs.entity.TestCbsEntity; -import com.hzya.frame.testCbs.service.ITsetCbsService; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service(value = "testCbsService") -public class TestCbsServiceImpl extends BaseService implements ITsetCbsService { - - private ITestCbsDao testCbsDao; - @Autowired - private ISysApplicationDao sysApplicationDao; - @Autowired - public void setTestCbsDao(ITestCbsDao testCbsDao) { - this.testCbsDao = testCbsDao; - this.dao = testCbsDao; - } - - @Override - public JsonResultEntity testCbs(JSONObject jsonObject) { - TestCbsEntity testCbsEntity = new TestCbsEntity(); - List testCbsEntities = testCbsDao.queryBase(testCbsEntity); - SysApplicationEntity sysApplicationEntity = new SysApplicationEntity(); - List sysApplicationEntities = sysApplicationDao.queryBase(sysApplicationEntity); - return BaseResult.getSuccessMessageEntity("cg"); - } -} diff --git a/fw-cbs/src/main/webapp/WEB-INF/web.xml b/fw-cbs/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index d80081d1..00000000 --- a/fw-cbs/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/fw-u8c/pom.xml b/fw-u8c/pom.xml deleted file mode 100644 index cfb6c532..00000000 --- a/fw-u8c/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - kangarooDataCenterV3 - com.hzya.frame - ${revision} - - 4.0.0 - fw-u8c - jar - ${revision} - - - - com.hzya.frame - base-service - ${revision} - - - mysql - mysql-connector-java - ${mysql-connector-java} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - none - execute - true - - - - - repackage - - - - - - - diff --git a/fw-u8c/src/main/java/com/hzya/frame/testU8c/dao/ITestU8cDao.java b/fw-u8c/src/main/java/com/hzya/frame/testU8c/dao/ITestU8cDao.java deleted file mode 100644 index ea40a754..00000000 --- a/fw-u8c/src/main/java/com/hzya/frame/testU8c/dao/ITestU8cDao.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hzya.frame.testU8c.dao; - -import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.testU8c.entity.TestU8cEntity; - - -public interface ITestU8cDao extends IBaseDao { - - - -} - diff --git a/fw-u8c/src/main/java/com/hzya/frame/testU8c/dao/impl/TestU8cDaoImpl.java b/fw-u8c/src/main/java/com/hzya/frame/testU8c/dao/impl/TestU8cDaoImpl.java deleted file mode 100644 index 851ac15a..00000000 --- a/fw-u8c/src/main/java/com/hzya/frame/testU8c/dao/impl/TestU8cDaoImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzya.frame.testU8c.dao.impl; - -import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.testU8c.dao.ITestU8cDao; -import com.hzya.frame.testU8c.entity.TestU8cEntity; -import org.springframework.stereotype.Repository; - -@Repository(value = "TestU8cDaoImpl") -public class TestU8cDaoImpl extends MybatisGenericDao implements ITestU8cDao { - - -} - diff --git a/fw-u8c/src/main/java/com/hzya/frame/testU8c/entity/TestU8cEntity.java b/fw-u8c/src/main/java/com/hzya/frame/testU8c/entity/TestU8cEntity.java deleted file mode 100644 index 817d0ed5..00000000 --- a/fw-u8c/src/main/java/com/hzya/frame/testU8c/entity/TestU8cEntity.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzya.frame.testU8c.entity; - -import com.hzya.frame.web.entity.BaseEntity; - - -public class TestU8cEntity extends BaseEntity { - private String name; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} - diff --git a/fw-u8c/src/main/java/com/hzya/frame/testU8c/entity/TestU8cEntity.xml b/fw-u8c/src/main/java/com/hzya/frame/testU8c/entity/TestU8cEntity.xml deleted file mode 100644 index 75909947..00000000 --- a/fw-u8c/src/main/java/com/hzya/frame/testU8c/entity/TestU8cEntity.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/fw-u8c/src/main/java/com/hzya/frame/testU8c/service/ITsetU8cService.java b/fw-u8c/src/main/java/com/hzya/frame/testU8c/service/ITsetU8cService.java deleted file mode 100644 index 5559b0fa..00000000 --- a/fw-u8c/src/main/java/com/hzya/frame/testU8c/service/ITsetU8cService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.hzya.frame.testU8c.service; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.testU8c.entity.TestU8cEntity; -import com.hzya.frame.web.entity.JsonResultEntity; - -public interface ITsetU8cService extends IBaseService { - JsonResultEntity testU8c(JSONObject jsonObject); -} diff --git a/fw-u8c/src/main/java/com/hzya/frame/testU8c/service/impl/TestU8cServiceImpl.java b/fw-u8c/src/main/java/com/hzya/frame/testU8c/service/impl/TestU8cServiceImpl.java deleted file mode 100644 index 8244515e..00000000 --- a/fw-u8c/src/main/java/com/hzya/frame/testU8c/service/impl/TestU8cServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzya.frame.testU8c.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; -import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; -import com.hzya.frame.testU8c.dao.ITestU8cDao; -import com.hzya.frame.testU8c.entity.TestU8cEntity; -import com.hzya.frame.testU8c.service.ITsetU8cService; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service(value = "testU8cService") -public class TestU8cServiceImpl extends BaseService implements ITsetU8cService { - - private ITestU8cDao testU8cDao; - @Autowired - private ISysApplicationDao sysApplicationDao; - @Autowired - public void setTestU8cDao(ITestU8cDao testU8cDao) { - this.testU8cDao = testU8cDao; - this.dao = testU8cDao; - } - - @Override - public JsonResultEntity testU8c(JSONObject jsonObject) { - TestU8cEntity testU8cEntity = new TestU8cEntity(); - List testU8cEntities = testU8cDao.queryBase(testU8cEntity); - SysApplicationEntity sysApplicationEntity = new SysApplicationEntity(); - List sysApplicationEntities = sysApplicationDao.queryBase(sysApplicationEntity); - return BaseResult.getSuccessMessageEntity("cg"); - } -} diff --git a/fw-u8c/src/main/webapp/WEB-INF/web.xml b/fw-u8c/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index d80081d1..00000000 --- a/fw-u8c/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2a1182a2..fc53bd54 100644 --- a/pom.xml +++ b/pom.xml @@ -7,8 +7,17 @@ base-common base-webapp base-core - fw-cbs - fw-u8c + + + + + + + + + + + com.hzya.frame kangarooDataCenterV3