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

Merge pull request 'lvleigang' (#8) from lvleigang into dev 

Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/8
This commit is contained in:
13758950345 2024-04-18 16:53:40 +08:00
parent 373c6994b2 07edf76a7c
commit c8ac2a6092
146 changed files with 677 additions and 785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,6 +7,7 @@
# Icon must end with two \r
Icon
# Thumbnails
._*
@ -52,3 +53,4 @@ $RECYCLE.BIN/
# Windows shortcuts
*.lnk
/buildpackage/src/main/resources/banner.txt

2
buildpackage/src/main/resources/application-dev.yml
View File

@ -14,3 +14,5 @@ spring:
username: root
password: bd993088e8a7c3dc5f44441617f9b4bf
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
savefile:
path: /Users/apple/Desktop/log/dev

4
buildpackage/src/main/resources/application-local.yml
View File

@ -4,6 +4,7 @@ logging:
level:
root: info
file:
# 日志保存路径
path: /Users/apple/Desktop/log/local
spring:
datasource:
@ -14,3 +15,6 @@ spring:
username: root
password: bd993088e8a7c3dc5f44441617f9b4bf
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
savefile:
# 文件保存路径
path: /Users/apple/Desktop/log/local

2
buildpackage/src/main/resources/logback-spring.xml
View File

@ -20,7 +20,7 @@
<!--定义日志文档的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="${logPath}"/>
<property name="MAX_HISTORY" value="50"/>
<property name="MAX_FILE_SIZE" value="1MB"/>
<property name="MAX_FILE_SIZE" value="50MB"/>
<!-- 控制台输出 -->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>

14
core/src/main/java/com/hzya/frame/fileutil/ConstantClassField.java
View File

@ -1,14 +0,0 @@
package com.hzya.frame.fileutil;
/**
* @Content 定义针对文件的常量类
* @Author gjh
* @Date 2019/3/14 16:11
* @Version 1.0
*/
public class ConstantClassField {
//public static final String DSK = "/Users/apple/myself/file";
public static final String DSK = "/home/webservice/zt/file";
}

4
service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
View File

@ -6,12 +6,8 @@ import com.hzya.frame.mdm.entity.MdmQuery;
import com.hzya.frame.mdm.entity.MdmVo;
import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiDto;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo;
import com.hzya.frame.sys.entity.FormmainDeleteDto;
import com.hzya.frame.sys.entity.FormmainDto;
import com.hzya.frame.sys.entity.ModuleDto;
import com.hzya.frame.sys.entity.TemplateQuery;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;

8
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
View File

@ -49,25 +49,17 @@ import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity;
import com.hzya.frame.mdm.mdmTableCodeRule.dao.IMdmTableCodeRuleDao;
import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity;
import com.hzya.frame.mdm.service.IMdmService;
import com.hzya.frame.sys.application.entity.SysApplicationDto;
import com.hzya.frame.sys.application.entity.SysApplicationVo;
import com.hzya.frame.sys.entity.FormmainDeleteDto;
import com.hzya.frame.sys.entity.ModuleDto;
import com.hzya.frame.sys.entity.TemplateKeyValue;
import com.hzya.frame.sys.entity.TemplateQuery;
import com.hzya.frame.sys.module.dao.IModuleMapper;
import com.hzya.frame.sys.module.entity.Module;
import com.hzya.frame.sys.roleModule.dao.IRoleModuleMapper;
import com.hzya.frame.sys.roleModule.entity.RoleModule;
import com.hzya.frame.sys.template.entity.Template;
import com.hzya.frame.sys.testReturn.entity.TestReturn;
import com.hzya.frame.sys.userRole.dao.IUserRoleMapper;
import com.hzya.frame.sys.userRole.entity.UserRole;
import com.hzya.frame.sys.userTemplateView.entity.UserTemplateView;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

2
service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
View File

@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
import com.baomidou.dynamic.datasource.exception.CannotFindDataSourceException;
import com.hzya.frame.datasource.DataSourceUtilProperties;
import com.hzya.frame.sys.application.entity.SysApplicationDatasourceDto;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
import com.hzya.frame.sysnew.application.entity.SysApplicationDatasourceDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

2
service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java
View File

@ -4,8 +4,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
import com.hzya.frame.sys.dataSource.dao.ISysDataSourceDao;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo;
import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;

6
service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java
View File

@ -5,19 +5,13 @@ import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.serviceUtil.DsDataSourceUtil;
import com.hzya.frame.sys.appApi.entity.AppApi;
import com.hzya.frame.sys.appApi.entity.AppApiDto;
import com.hzya.frame.sys.appApi.entity.AppApiListVo;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
import com.hzya.frame.sys.dataSource.dao.ISysDataSourceDao;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo;
import com.hzya.frame.sys.dataSource.service.ISysDataSourceService;
import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import com.hzya.frame.web.exception.BaseSystemException;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;

12
service/src/main/java/com/hzya/frame/sys/file/upload/service/impl/FileUploadServiceImpl.java
View File

@ -4,7 +4,6 @@ import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.dateutil.DateUtil;
import com.hzya.frame.fileutil.ConstantClassField;
import com.hzya.frame.fileutil.FileUtils;
import com.hzya.frame.sys.businessFile.dao.IBusinessFileDao;
import com.hzya.frame.sys.businessFile.entity.BusinessFileEntity;
@ -17,6 +16,7 @@ import com.hzya.frame.uuid.UUIDLong;
import com.hzya.frame.web.action.SessionContext;
import com.hzya.frame.web.exception.BaseSystemException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@ -36,6 +36,8 @@ import java.util.List;
*/
@Service(value = "sys_fileUploadService")
public class FileUploadServiceImpl extends BaseService<FileUploadEntity, Long> implements IFileUploadService {
@Value("${savefile.path}")
public String DSK;
protected IFileUploadDao fileUploadDao;
@ -54,7 +56,7 @@ public class FileUploadServiceImpl extends BaseService<FileUploadEntity, Long> i
/** 获取系统设置文件存放的盘符*/
StringBuffer stringBuffer = new StringBuffer();
/** 获取根目录*/
stringBuffer.append(ConstantClassField.DSK);
stringBuffer.append(DSK);
/** 根据当前日期创建文件目录*/
String nowDateString = DateUtil.dateToString(new Date(), "yyyy-MM-dd");
@ -89,7 +91,7 @@ public class FileUploadServiceImpl extends BaseService<FileUploadEntity, Long> i
/** 获取系统设置文件存放的盘符*/
StringBuffer stringBuffer = new StringBuffer();
/** 获取根目录*/
stringBuffer.append(ConstantClassField.DSK);
stringBuffer.append(DSK);
/** 获取当前人所在的公司，用ID和公司名称拼接*/
// stringBuffer.append("/" + userEntity.getOrg_name() + "_" + userEntity.getOrg_id());
/** 根据当前日期创建文件目录*/
@ -143,7 +145,7 @@ public class FileUploadServiceImpl extends BaseService<FileUploadEntity, Long> i
/** 获取系统设置文件存放的盘符*/
StringBuffer stringBuffer = new StringBuffer();
/** 获取根目录*/
stringBuffer.append(ConstantClassField.DSK);
stringBuffer.append(DSK);
/** 获取当前人所在的公司，用ID和公司名称拼接*/
// stringBuffer.append("/" + userEntity.getOrg_name() + "_" + userEntity.getOrg_id());
/** 获取单票ID，判断单票ID是否存在*/
@ -215,7 +217,7 @@ public class FileUploadServiceImpl extends BaseService<FileUploadEntity, Long> i
/** 获取系统设置文件存放的盘符*/
StringBuffer stringBuffer = new StringBuffer();
/** 获取根目录*/
stringBuffer.append(ConstantClassField.DSK);
stringBuffer.append(DSK);
/** 获取当前人所在的公司，用ID和公司名称拼接*/
// stringBuffer.append("/" + userEntity.getOrg_name() + "_" + userEntity.getOrg_id());
/** 根据当前日期创建文件目录*/

9
service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java
View File

@ -1,8 +1,5 @@
package com.hzya.frame.sys.integrationtask.living.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.sys.appApi.entity.AppApi;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo;
import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsEntity;
import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsVo;
import org.springframework.stereotype.Repository;
@ -37,9 +34,5 @@ public class IntegrationTaskLivingDetailsDaoImpl extends MybatisGenericDao<Integ
return (List<IntegrationTaskLivingDetailsEntity>) super.selectList(getSqlIdPrifx() + "queryFastIntegrationTaskLivingDetails", integrationTaskLivingDetailsEntity);
}
// @DS("sowow_sqlserver_test")
// @Override
// public List queryErrorDetailsId(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) throws Exception {
// return super.selectList(getSqlIdPrifx() + "queryErrorDetailsId", integrationTaskLivingDetailsEntity);
// }
}

3
service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java
View File

@ -1,13 +1,10 @@
package com.hzya.frame.sys.integrationtask.monitoring.dao.impl;
import com.hzya.frame.sys.application.entity.SysApplicationDto;
import com.hzya.frame.sys.application.entity.SysApplicationVo;
import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.sys.integrationtask.monitoring.dao.IIntegrationTaskMonitoringDao;
import java.util.List;
/**
* @description: 集成任务任务监控 dao

2
service/src/main/java/com/hzya/frame/sys/service/IEsbService.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.service;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity;
import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity;
import com.hzya.frame.web.entity.JsonResultEntity;
import java.util.List;

17
service/src/main/java/com/hzya/frame/sys/service/impl/EsbServiceImpl.java
View File

@ -10,31 +10,26 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.serviceUtil.ServiceUtil;
import com.hzya.frame.sys.appApi.entity.AppApi;
import com.hzya.frame.sys.appApi.entity.AppApiDto;
import com.hzya.frame.sys.appApi.service.IAppApiService;
import com.hzya.frame.sys.entity.EsbReturnEntity;
import com.hzya.frame.sys.entity.EsbSendEntity;
import com.hzya.frame.sys.messageManage.dao.ISysMessageManageDao;
import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao;
import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.sys.messageManageDetail.service.impl.SysMessageManageDetailServiceImpl;
import com.hzya.frame.sys.messageManageLog.dao.ISysMessageManageLogDao;
import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity;
import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao;
import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.sysnew.messageManageLog.dao.ISysMessageManageLogDao;
import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity;
import com.hzya.frame.sys.service.IEsbService;
import com.hzya.frame.sys.sysenum.SysEnum;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import com.hzya.frame.web.exception.BaseSystemException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.crypto.MacSpi;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;

8
service/src/main/java/com/hzya/frame/sys/application/api/dao/ISysApplicationApiDao.java → service/src/main/java/com/hzya/frame/sysnew/application/api/dao/ISysApplicationApiDao.java
View File

@ -1,9 +1,9 @@
package com.hzya.frame.sys.application.api.dao;
package com.hzya.frame.sysnew.application.api.dao;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiDto;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiDto;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo;
import java.util.List;

13
service/src/main/java/com/hzya/frame/sys/application/api/dao/impl/SysApplicationApiDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/api/dao/impl/SysApplicationApiDaoImpl.java
View File

@ -1,12 +1,9 @@
package com.hzya.frame.sys.application.api.dao.impl;
package com.hzya.frame.sysnew.application.api.dao.impl;
import com.hzya.frame.sys.appApi.entity.AppApi;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiDto;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sys.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiDto;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;

2
service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiDto.java → service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiDto.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.api.entity;
package com.hzya.frame.sysnew.application.api.entity;
import com.hzya.frame.web.entity.BaseEntity;

2
service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiEntity.java → service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.api.entity;
package com.hzya.frame.sysnew.application.api.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;

32
service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiEntity.xml → service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.application.api.dao.impl.SysApplicationApiDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.application.api.dao.impl.SysApplicationApiDaoImpl">
<resultMap id="get-SysApplicationApiEntity-result"
type="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
type="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="apiStatus" column="api_status" jdbcType="VARCHAR"/>
<result property="apiCode" column="api_code"/>
@ -111,7 +111,7 @@ WHERE
</select>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysApplicationApiEntity-result"
parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
select
<include refid="SysApplicationApiEntity_Base_Column_List"/>
from sys_application_api
@ -158,7 +158,7 @@ WHERE
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer"
parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
select count(1) from sys_application_api
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>
@ -203,7 +203,7 @@ WHERE
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationApiEntity-result"
parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
select
<include refid="SysApplicationApiEntity_Base_Column_List"/>
from sys_application_api
@ -263,7 +263,7 @@ WHERE
<!-- 查询列表 字段采用or格式 -->
<select id="SysApplicationApientity_list_or" resultMap="get-SysApplicationApiEntity-result"
parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
select
<include refid="SysApplicationApiEntity_Base_Column_List"/>
from sys_application_api
@ -309,7 +309,7 @@ WHERE
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity"
<insert id="entity_insert" parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity"
keyProperty="id" useGeneratedKeys="true">
insert into sys_application_api(
<trim suffix="" suffixOverrides=",">
@ -437,7 +437,7 @@ WHERE
org_id = values(org_id)
</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
<update id="entity_update" parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
update sys_application_api set
<trim suffix="" suffixOverrides=",">
<if test="apiStatus != null and apiStatus != ''">api_status = #{apiStatus},</if>
@ -477,13 +477,13 @@ WHERE
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
<update id="entity_logicDelete" parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
update sys_application_api set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition"
parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
update sys_application_api set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>
@ -523,8 +523,8 @@ where id = #{id}
delete from sys_application_api where id = #{id}
</delete>
<select id="queryVoList11" databaseId="dm" resultType="com.hzya.frame.sys.application.api.entity.SysApplicationApiVo"
parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
<select id="queryVoList11" databaseId="dm" resultType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo"
parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
select
a.id,
a.catalogue_id AS catalogueId,
@ -577,7 +577,7 @@ where id = #{id}
</trim>
order by a.sorts asc
</select>
<!-- <select id="queryVoList" resultType="com.hzya.frame.sys.application.api.entity.SysApplicationApiVo" parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">-->
<!-- <select id="queryVoList" resultType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo" parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">-->
<!-- select-->
<!-- a.id,-->
<!-- a.catalogue_id AS catalogueId,-->
@ -630,7 +630,7 @@ where id = #{id}
<!-- </trim>-->
<!-- order by a.sorts asc-->
<!-- </select>-->
<select id="queryVoList" resultType="com.hzya.frame.sys.application.api.entity.SysApplicationApiVo" parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
<select id="queryVoList" resultType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo" parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
select
a.id,
a.catalogue_id AS catalogueId,
@ -675,7 +675,7 @@ where id = #{id}
<!-- 查询符合条件的数量 -->
<select id="entity_count_not_id" resultType="Integer"
parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
select count(1) from sys_application_api
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id != #{id}</if>
@ -717,7 +717,7 @@ where id = #{id}
</select>
<!-- 查询符合条件的数量 -->
<select id="checkCatalogue" resultType="Integer"
parameterType="com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity">
parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
SELECT count(*) from

2
service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiVo.java → service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiVo.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.api.entity;
package com.hzya.frame.sysnew.application.api.entity;
import com.hzya.frame.web.entity.BaseEntity;

4
service/src/main/java/com/hzya/frame/sys/application/api/service/ISysApplicationApiService.java → service/src/main/java/com/hzya/frame/sysnew/application/api/service/ISysApplicationApiService.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.api.service;
package com.hzya.frame.sysnew.application.api.service;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* 应用api(SysApplicationApi)表服务接口

8
service/src/main/java/com/hzya/frame/sys/application/api/service/impl/SysApplicationApiServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/api/service/impl/SysApplicationApiServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.api.service.impl;
package com.hzya.frame.sysnew.application.api.service.impl;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sys.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sys.application.api.service.ISysApplicationApiService;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sysnew.application.api.service.ISysApplicationApiService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;

4
service/src/main/java/com/hzya/frame/sys/application/apiAuth/dao/ISysApplicationApiAuthDao.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/dao/ISysApplicationApiAuthDao.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.apiAuth.dao;
package com.hzya.frame.sysnew.application.apiAuth.dao;
import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
/**

6
service/src/main/java/com/hzya/frame/sys/application/apiAuth/dao/impl/SysApplicationApiAuthDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/dao/impl/SysApplicationApiAuthDaoImpl.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.application.apiAuth.dao.impl;
package com.hzya.frame.sysnew.application.apiAuth.dao.impl;
import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sys.application.apiAuth.dao.ISysApplicationApiAuthDao;
import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sysnew.application.apiAuth.dao.ISysApplicationApiAuthDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
/**

2
service/src/main/java/com/hzya/frame/sys/application/apiAuth/entity/SysApplicationApiAuthDto.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/entity/SysApplicationApiAuthDto.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.apiAuth.entity;
package com.hzya.frame.sysnew.application.apiAuth.entity;
import com.hzya.frame.web.entity.BaseEntity;

2
service/src/main/java/com/hzya/frame/sys/application/apiAuth/entity/SysApplicationApiAuthEntity.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/entity/SysApplicationApiAuthEntity.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.apiAuth.entity;
package com.hzya.frame.sysnew.application.apiAuth.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;

20
service/src/main/java/com/hzya/frame/sys/application/apiAuth/entity/SysApplicationApiAuthEntity.xml → service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/entity/SysApplicationApiAuthEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.application.apiAuth.dao.impl.SysApplicationApiAuthDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.application.apiAuth.dao.impl.SysApplicationApiAuthDaoImpl">
<resultMap id="get-SysApplicationApiAuthEntity-result" type="com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity" >
<resultMap id="get-SysApplicationApiAuthEntity-result" type="com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="appId" column="app_id" jdbcType="VARCHAR"/>
<result property="systemStatus" column="system_status" jdbcType="VARCHAR"/>
@ -38,7 +38,7 @@
from sys_application_api_auth where sts = 'Y' and id = #{id}
</select>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysApplicationApiAuthEntity-result" parameterType = "com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity">
<select id="entity_list_base" resultMap="get-SysApplicationApiAuthEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity">
select
<include refid="SysApplicationApiAuthEntity_Base_Column_List" />
from sys_application_api_auth
@ -62,7 +62,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity">
select count(1) from sys_application_api_auth
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -84,7 +84,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationApiAuthEntity-result" parameterType = "com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity">
<select id="entity_list_like" resultMap="get-SysApplicationApiAuthEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity">
select
<include refid="SysApplicationApiAuthEntity_Base_Column_List" />
from sys_application_api_auth
@ -108,7 +108,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysApplicationApiAuthentity_list_or" resultMap="get-SysApplicationApiAuthEntity-result" parameterType = "com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity">
<select id="SysApplicationApiAuthentity_list_or" resultMap="get-SysApplicationApiAuthEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity">
select
<include refid="SysApplicationApiAuthEntity_Base_Column_List" />
from sys_application_api_auth
@ -132,7 +132,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_application_api_auth(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -197,7 +197,7 @@
sts = values(sts),
org_id = values(org_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity" >
update sys_application_api_auth set
<trim suffix="" suffixOverrides=",">
<if test="appId != null and appId != ''"> app_id = #{appId},</if>
@ -215,12 +215,12 @@ update sys_application_api_auth set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity" >
update sys_application_api_auth set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity" >
update sys_application_api_auth set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>

4
service/src/main/java/com/hzya/frame/sys/application/apiAuth/service/ISysApplicationApiAuthService.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/service/ISysApplicationApiAuthService.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.apiAuth.service;
package com.hzya.frame.sysnew.application.apiAuth.service;
import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* 三方调用系统表(SysApplicationApiAuth)表服务接口

8
service/src/main/java/com/hzya/frame/sys/application/apiAuth/service/impl/SysApplicationApiAuthServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/service/impl/SysApplicationApiAuthServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.apiAuth.service.impl;
package com.hzya.frame.sysnew.application.apiAuth.service.impl;
import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sys.application.apiAuth.dao.ISysApplicationApiAuthDao;
import com.hzya.frame.sys.application.apiAuth.service.ISysApplicationApiAuthService;
import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sysnew.application.apiAuth.dao.ISysApplicationApiAuthDao;
import com.hzya.frame.sysnew.application.apiAuth.service.ISysApplicationApiAuthService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;

4
service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/dao/ISysApplicationApiAuthDetailDao.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/dao/ISysApplicationApiAuthDetailDao.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.apiAythDetail.dao;
package com.hzya.frame.sysnew.application.apiAythDetail.dao;
import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
/**

6
service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/dao/impl/SysApplicationApiAuthDetailDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/dao/impl/SysApplicationApiAuthDetailDaoImpl.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.application.apiAythDetail.dao.impl;
package com.hzya.frame.sysnew.application.apiAythDetail.dao.impl;
import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao;
import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
/**

2
service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.apiAythDetail.entity;
package com.hzya.frame.sysnew.application.apiAythDetail.entity;
import java.util.Date;
import java.util.List;

22
service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.xml → service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.application.apiAythDetail.dao.impl.SysApplicationApiAuthDetailDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.application.apiAythDetail.dao.impl.SysApplicationApiAuthDetailDaoImpl">
<resultMap id="get-SysApplicationApiAuthDetailEntity-result" type="com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
<resultMap id="get-SysApplicationApiAuthDetailEntity-result" type="com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="appId" column="app_id" jdbcType="VARCHAR"/>
<result property="catalogueId" column="catalogue_id" jdbcType="VARCHAR"/>
@ -38,7 +38,7 @@
<include refid="SysApplicationApiAuthDetailEntity_Base_Column_List" />
from sys_application_api_auth_detail where sts = 'Y' and id = #{id}
</select>
<select id="entity_list_base" resultMap="get-SysApplicationApiAuthDetailEntity-result" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity">
<select id="entity_list_base" resultMap="get-SysApplicationApiAuthDetailEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity">
select
<include refid="SysApplicationApiAuthDetailEntity_Base_Column_List" />
from sys_application_api_auth_detail
@ -62,7 +62,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity">
select count(1) from sys_application_api_auth_detail
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -84,7 +84,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationApiAuthDetailEntity-result" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity">
<select id="entity_list_like" resultMap="get-SysApplicationApiAuthDetailEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity">
select
<include refid="SysApplicationApiAuthDetailEntity_Base_Column_List" />
from sys_application_api_auth_detail
@ -108,7 +108,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysApplicationApiAuthDetailentity_list_or" resultMap="get-SysApplicationApiAuthDetailEntity-result" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity">
<select id="SysApplicationApiAuthDetailentity_list_or" resultMap="get-SysApplicationApiAuthDetailEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity">
select
<include refid="SysApplicationApiAuthDetailEntity_Base_Column_List" />
from sys_application_api_auth_detail
@ -132,7 +132,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_application_api_auth_detail(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -197,7 +197,7 @@
sts = values(sts),
org_id = values(org_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
update sys_application_api_auth_detail set
<trim suffix="" suffixOverrides=",">
<if test="appId != null and appId != ''"> app_id = #{appId},</if>
@ -215,12 +215,12 @@ update sys_application_api_auth_detail set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
update sys_application_api_auth_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
update sys_application_api_auth_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -237,7 +237,7 @@ update sys_application_api_auth_detail set sts= 'N' ,modify_time = #{modify_tim
<delete id="entity_delete">
delete from sys_application_api_auth_detail where id = #{id}
</delete>
<update id="updateDeleteTripartiteSystem" parameterType = "com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
<update id="updateDeleteTripartiteSystem" parameterType = "com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity" >
update sys_application_api_auth_detail set sts = 'N'
where sts = 'Y' and app_id = #{appId}
<if test="tripartiteSystemIds != null and tripartiteSystemIds.size>0">

4
service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/service/ISysApplicationApiAuthDetailService.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/service/ISysApplicationApiAuthDetailService.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.apiAythDetail.service;
package com.hzya.frame.sysnew.application.apiAythDetail.service;
import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* 应用api关联三方调用系统表(SysApplicationApiAuthDetail)表服务接口

8
service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/service/impl/SysApplicationApiAuthDetailServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/service/impl/SysApplicationApiAuthDetailServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.apiAythDetail.service.impl;
package com.hzya.frame.sysnew.application.apiAythDetail.service.impl;
import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao;
import com.hzya.frame.sys.application.apiAythDetail.service.ISysApplicationApiAuthDetailService;
import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao;
import com.hzya.frame.sysnew.application.apiAythDetail.service.ISysApplicationApiAuthDetailService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;

4
service/src/main/java/com/hzya/frame/sys/application/apiPara/dao/ISysApplicationApiParaDao.java → service/src/main/java/com/hzya/frame/sysnew/application/apiPara/dao/ISysApplicationApiParaDao.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.apiPara.dao;
package com.hzya.frame.sysnew.application.apiPara.dao;
import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
/**

6
service/src/main/java/com/hzya/frame/sys/application/apiPara/dao/impl/SysApplicationApiParaDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/apiPara/dao/impl/SysApplicationApiParaDaoImpl.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.application.apiPara.dao.impl;
package com.hzya.frame.sysnew.application.apiPara.dao.impl;
import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sys.application.apiPara.dao.ISysApplicationApiParaDao;
import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sysnew.application.apiPara.dao.ISysApplicationApiParaDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
/**

7
service/src/main/java/com/hzya/frame/sys/application/apiPara/entity/SysApplicationApiParaEntity.java → service/src/main/java/com/hzya/frame/sysnew/application/apiPara/entity/SysApplicationApiParaEntity.java
View File

@ -1,10 +1,5 @@
package com.hzya.frame.sys.application.apiPara.entity;
package com.hzya.frame.sysnew.application.apiPara.entity;
import java.util.Date;
import cn.dev33.satoken.stp.StpUtil;
import com.hzya.frame.sys.org.entity.Org;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseEntity;
/**
* 接口环境参数表(SysApplicationApiPara)实体类

20
service/src/main/java/com/hzya/frame/sys/application/apiPara/entity/SysApplicationApiParaEntity.xml → service/src/main/java/com/hzya/frame/sysnew/application/apiPara/entity/SysApplicationApiParaEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.application.apiPara.dao.impl.SysApplicationApiParaDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.application.apiPara.dao.impl.SysApplicationApiParaDaoImpl">
<resultMap id="get-SysApplicationApiParaEntity-result" type="com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity" >
<resultMap id="get-SysApplicationApiParaEntity-result" type="com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="appId" column="app_id" jdbcType="VARCHAR"/>
<result property="interfaceKey" column="interface_key" jdbcType="VARCHAR"/>
@ -38,7 +38,7 @@
from sys_application_api_para where sts = 'Y' and id = #{id}
</select>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysApplicationApiParaEntity-result" parameterType = "com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity">
<select id="entity_list_base" resultMap="get-SysApplicationApiParaEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity">
select
<include refid="SysApplicationApiParaEntity_Base_Column_List" />
from sys_application_api_para
@ -62,7 +62,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity">
select count(1) from sys_application_api_para
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -84,7 +84,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationApiParaEntity-result" parameterType = "com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity">
<select id="entity_list_like" resultMap="get-SysApplicationApiParaEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity">
select
<include refid="SysApplicationApiParaEntity_Base_Column_List" />
from sys_application_api_para
@ -108,7 +108,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysApplicationApiParaentity_list_or" resultMap="get-SysApplicationApiParaEntity-result" parameterType = "com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity">
<select id="SysApplicationApiParaentity_list_or" resultMap="get-SysApplicationApiParaEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity">
select
<include refid="SysApplicationApiParaEntity_Base_Column_List" />
from sys_application_api_para
@ -132,7 +132,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_application_api_para(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -197,7 +197,7 @@
modify_time = values(modify_time),
modify_user_id = values(modify_user_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity" >
update sys_application_api_para set
<trim suffix="" suffixOverrides=",">
<if test="appId != null and appId != ''"> app_id = #{appId},</if>
@ -215,12 +215,12 @@ update sys_application_api_para set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity" >
update sys_application_api_para set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity" >
update sys_application_api_para set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>

4
service/src/main/java/com/hzya/frame/sys/application/apiPara/service/ISysApplicationApiParaService.java → service/src/main/java/com/hzya/frame/sysnew/application/apiPara/service/ISysApplicationApiParaService.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.apiPara.service;
package com.hzya.frame.sysnew.application.apiPara.service;
import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* 接口环境参数表(SysApplicationApiPara)表服务接口

8
service/src/main/java/com/hzya/frame/sys/application/apiPara/service/impl/SysApplicationApiParaServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/apiPara/service/impl/SysApplicationApiParaServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.apiPara.service.impl;
package com.hzya.frame.sysnew.application.apiPara.service.impl;
import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sys.application.apiPara.dao.ISysApplicationApiParaDao;
import com.hzya.frame.sys.application.apiPara.service.ISysApplicationApiParaService;
import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sysnew.application.apiPara.dao.ISysApplicationApiParaDao;
import com.hzya.frame.sysnew.application.apiPara.service.ISysApplicationApiParaService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;

4
service/src/main/java/com/hzya/frame/sys/application/apiType/dao/ISysApplicationApiTypeDao.java → service/src/main/java/com/hzya/frame/sysnew/application/apiType/dao/ISysApplicationApiTypeDao.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.apiType.dao;
package com.hzya.frame.sysnew.application.apiType.dao;
import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
/**

6
service/src/main/java/com/hzya/frame/sys/application/apiType/dao/impl/SysApplicationApiTypeDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/apiType/dao/impl/SysApplicationApiTypeDaoImpl.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.application.apiType.dao.impl;
package com.hzya.frame.sysnew.application.apiType.dao.impl;
import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.sys.application.apiType.dao.ISysApplicationApiTypeDao;
import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.sysnew.application.apiType.dao.ISysApplicationApiTypeDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
/**

2
service/src/main/java/com/hzya/frame/sys/application/apiType/entity/SysApplicationApiTypeEntity.java → service/src/main/java/com/hzya/frame/sysnew/application/apiType/entity/SysApplicationApiTypeEntity.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.apiType.entity;
package com.hzya.frame.sysnew.application.apiType.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;

22
service/src/main/java/com/hzya/frame/sys/application/apiType/entity/SysApplicationApiTypeEntity.xml → service/src/main/java/com/hzya/frame/sysnew/application/apiType/entity/SysApplicationApiTypeEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.application.apiType.dao.impl.SysApplicationApiTypeDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.application.apiType.dao.impl.SysApplicationApiTypeDaoImpl">
<resultMap id="get-SysApplicationApiTypeEntity-result" type="com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity" >
<resultMap id="get-SysApplicationApiTypeEntity-result" type="com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="appId" column="app_id" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
@ -34,7 +34,7 @@
from sys_application_api_type where sts = 'Y' and id = #{id}
</select>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysApplicationApiTypeEntity-result" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity">
<select id="entity_list_base" resultMap="get-SysApplicationApiTypeEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity">
select
<include refid="SysApplicationApiTypeEntity_Base_Column_List" />
from sys_application_api_type
@ -56,7 +56,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity">
select count(1) from sys_application_api_type
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -76,7 +76,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count_not_id" resultType="Integer" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity">
<select id="entity_count_not_id" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity">
select count(1) from sys_application_api_type
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id != #{id} </if>
@ -94,7 +94,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationApiTypeEntity-result" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity">
<select id="entity_list_like" resultMap="get-SysApplicationApiTypeEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity">
select
<include refid="SysApplicationApiTypeEntity_Base_Column_List" />
from sys_application_api_type
@ -116,7 +116,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysApplicationApiTypeentity_list_or" resultMap="get-SysApplicationApiTypeEntity-result" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity">
<select id="SysApplicationApiTypeentity_list_or" resultMap="get-SysApplicationApiTypeEntity-result" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity">
select
<include refid="SysApplicationApiTypeEntity_Base_Column_List" />
from sys_application_api_type
@ -138,7 +138,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_application_api_type(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -197,7 +197,7 @@
modify_time = values(modify_time),
modify_user_id = values(modify_user_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity" >
update sys_application_api_type set
<trim suffix="" suffixOverrides=",">
<if test="appId != null and appId != ''"> app_id = #{appId},</if>
@ -213,12 +213,12 @@ update sys_application_api_type set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity" >
update sys_application_api_type set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity" >
update sys_application_api_type set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>

4
service/src/main/java/com/hzya/frame/sys/application/apiType/service/ISysApplicationApiTypeService.java → service/src/main/java/com/hzya/frame/sysnew/application/apiType/service/ISysApplicationApiTypeService.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.apiType.service;
package com.hzya.frame.sysnew.application.apiType.service;
import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* 目录表(SysApplicationApiType)表服务接口

8
service/src/main/java/com/hzya/frame/sys/application/apiType/service/impl/SysApplicationApiTypeServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/apiType/service/impl/SysApplicationApiTypeServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.apiType.service.impl;
package com.hzya.frame.sysnew.application.apiType.service.impl;
import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.sys.application.apiType.dao.ISysApplicationApiTypeDao;
import com.hzya.frame.sys.application.apiType.service.ISysApplicationApiTypeService;
import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.sysnew.application.apiType.dao.ISysApplicationApiTypeDao;
import com.hzya.frame.sysnew.application.apiType.service.ISysApplicationApiTypeService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;

8
service/src/main/java/com/hzya/frame/sys/application/dao/ISysApplicationDao.java → service/src/main/java/com/hzya/frame/sysnew/application/dao/ISysApplicationDao.java
View File

@ -1,9 +1,9 @@
package com.hzya.frame.sys.application.dao;
package com.hzya.frame.sysnew.application.dao;
import com.hzya.frame.sys.application.entity.SysApplicationDto;
import com.hzya.frame.sys.application.entity.SysApplicationEntity;
import com.hzya.frame.sysnew.application.entity.SysApplicationDto;
import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.sys.application.entity.SysApplicationVo;
import com.hzya.frame.sysnew.application.entity.SysApplicationVo;
import java.util.List;

12
service/src/main/java/com/hzya/frame/sys/application/dao/impl/SysApplicationDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/dao/impl/SysApplicationDaoImpl.java
View File

@ -1,11 +1,9 @@
package com.hzya.frame.sys.application.dao.impl;
package com.hzya.frame.sysnew.application.dao.impl;
import com.hzya.frame.sys.appApi.entity.AppApiDto;
import com.hzya.frame.sys.appApi.entity.AppApiListVo;
import com.hzya.frame.sys.application.entity.SysApplicationDto;
import com.hzya.frame.sys.application.entity.SysApplicationEntity;
import com.hzya.frame.sys.application.dao.ISysApplicationDao;
import com.hzya.frame.sys.application.entity.SysApplicationVo;
import com.hzya.frame.sysnew.application.entity.SysApplicationDto;
import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
import com.hzya.frame.sysnew.application.dao.ISysApplicationDao;
import com.hzya.frame.sysnew.application.entity.SysApplicationVo;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;

4
service/src/main/java/com/hzya/frame/sys/application/database/dao/ISysApplicationDatabaseDao.java → service/src/main/java/com/hzya/frame/sysnew/application/database/dao/ISysApplicationDatabaseDao.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.database.dao;
package com.hzya.frame.sysnew.application.database.dao;
import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
/**

6
service/src/main/java/com/hzya/frame/sys/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.application.database.dao.impl;
package com.hzya.frame.sysnew.application.database.dao.impl;
import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sys.application.database.dao.ISysApplicationDatabaseDao;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
/**

2
service/src/main/java/com/hzya/frame/sys/application/database/entity/SysApplicationDatabaseEntity.java → service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.database.entity;
package com.hzya.frame.sysnew.application.database.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;

20
service/src/main/java/com/hzya/frame/sys/application/database/entity/SysApplicationDatabaseEntity.xml → service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.application.database.dao.impl.SysApplicationDatabaseDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.application.database.dao.impl.SysApplicationDatabaseDaoImpl">
<resultMap id="get-SysApplicationDatabaseEntity-result" type="com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity" >
<resultMap id="get-SysApplicationDatabaseEntity-result" type="com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="appId" column="app_id" jdbcType="VARCHAR"/>
<result property="sourceType" column="source_type" jdbcType="VARCHAR"/>
@ -44,7 +44,7 @@
from sys_application_database where sts = 'Y' and id = #{id}
</select>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysApplicationDatabaseEntity-result" parameterType = "com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity">
<select id="entity_list_base" resultMap="get-SysApplicationDatabaseEntity-result" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity">
select
<include refid="SysApplicationDatabaseEntity_Base_Column_List" />
from sys_application_database
@ -71,7 +71,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity">
select count(1) from sys_application_database
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -96,7 +96,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationDatabaseEntity-result" parameterType = "com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity">
<select id="entity_list_like" resultMap="get-SysApplicationDatabaseEntity-result" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity">
select
<include refid="SysApplicationDatabaseEntity_Base_Column_List" />
from sys_application_database
@ -123,7 +123,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysApplicationDatabaseentity_list_or" resultMap="get-SysApplicationDatabaseEntity-result" parameterType = "com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity">
<select id="SysApplicationDatabaseentity_list_or" resultMap="get-SysApplicationDatabaseEntity-result" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity">
select
<include refid="SysApplicationDatabaseEntity_Base_Column_List" />
from sys_application_database
@ -150,7 +150,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_application_database(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -224,7 +224,7 @@
modify_time = values(modify_time),
modify_user_id = values(modify_user_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity" >
update sys_application_database set
<trim suffix="" suffixOverrides=",">
<if test="appId != null and appId != ''"> app_id = #{appId},</if>
@ -245,12 +245,12 @@ update sys_application_database set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity" >
update sys_application_database set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity" >
update sys_application_database set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>

4
service/src/main/java/com/hzya/frame/sys/application/database/service/ISysApplicationDatabaseService.java → service/src/main/java/com/hzya/frame/sysnew/application/database/service/ISysApplicationDatabaseService.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.database.service;
package com.hzya.frame.sysnew.application.database.service;
import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* 数据源表(SysApplicationDatabase)表服务接口

8
service/src/main/java/com/hzya/frame/sys/application/database/service/impl/SysApplicationDatabaseServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/database/service/impl/SysApplicationDatabaseServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.database.service.impl;
package com.hzya.frame.sysnew.application.database.service.impl;
import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sys.application.database.dao.ISysApplicationDatabaseDao;
import com.hzya.frame.sys.application.database.service.ISysApplicationDatabaseService;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
import com.hzya.frame.sysnew.application.database.service.ISysApplicationDatabaseService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;

6
service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationDatasourceDto.java → service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDatasourceDto.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.entity;
package com.hzya.frame.sysnew.application.entity;
import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import java.util.List;

6
service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationDto.java → service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.entity;
package com.hzya.frame.sysnew.application.entity;
import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import java.util.List;

2
service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationEntity.java → service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.entity;
package com.hzya.frame.sysnew.application.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;

22
service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationEntity.xml → service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.application.dao.impl.SysApplicationDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.application.dao.impl.SysApplicationDaoImpl">
<resultMap id="get-SysApplicationEntity-result" type="com.hzya.frame.sys.application.entity.SysApplicationEntity" >
<resultMap id="get-SysApplicationEntity-result" type="com.hzya.frame.sysnew.application.entity.SysApplicationEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="appLogo" column="app_logo" jdbcType="VARCHAR"/>
<result property="appStatus" column="app_status" jdbcType="VARCHAR"/>
@ -66,7 +66,7 @@
from sys_application where sts = 'Y' and id = #{id}
</select>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysApplicationEntity-result" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationEntity">
<select id="entity_list_base" resultMap="get-SysApplicationEntity-result" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationEntity">
select
<include refid="SysApplicationEntity_Base_Column_List" />
from sys_application
@ -104,7 +104,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationEntity">
select count(1) from sys_application
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -140,7 +140,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationEntity-result" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationEntity">
<select id="entity_list_like" resultMap="get-SysApplicationEntity-result" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationEntity">
select
<include refid="SysApplicationEntity_Base_Column_List" />
from sys_application
@ -178,7 +178,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysApplicationentity_list_or" resultMap="get-SysApplicationEntity-result" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationEntity">
<select id="SysApplicationentity_list_or" resultMap="get-SysApplicationEntity-result" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationEntity">
select
<include refid="SysApplicationEntity_Base_Column_List" />
from sys_application
@ -216,7 +216,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_application(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -325,7 +325,7 @@
modify_time = values(modify_time),
modify_user_id = values(modify_user_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationEntity" >
update sys_application set
<trim suffix="" suffixOverrides=",">
<if test="appLogo != null and appLogo != ''"> app_logo = #{appLogo},</if>
@ -357,12 +357,12 @@ update sys_application set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationEntity" >
update sys_application set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationEntity" >
update sys_application set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -394,7 +394,7 @@ update sys_application set sts= 'N' ,modify_time = #{modify_time},modify_user_i
delete from sys_application where id = #{id}
</delete>
<!-- 分页查询列表 采用like格式 -->
<select id="queryApp" resultType="com.hzya.frame.sys.application.entity.SysApplicationVo" parameterType = "com.hzya.frame.sys.application.entity.SysApplicationDto">
<select id="queryApp" resultType="com.hzya.frame.sysnew.application.entity.SysApplicationVo" parameterType = "com.hzya.frame.sysnew.application.entity.SysApplicationDto">
select
a.id as id
,a.app_logo as appLogo

2
service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationVo.java → service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationVo.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.entity;
package com.hzya.frame.sysnew.application.entity;
/**

6
service/src/main/java/com/hzya/frame/sys/application/plugin/dao/ISysApplicationPluginDao.java → service/src/main/java/com/hzya/frame/sysnew/application/plugin/dao/ISysApplicationPluginDao.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.application.plugin.dao;
package com.hzya.frame.sysnew.application.plugin.dao;
import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginDto;
import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import java.util.List;

10
service/src/main/java/com/hzya/frame/sys/application/plugin/dao/impl/SysApplicationPluginDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/plugin/dao/impl/SysApplicationPluginDaoImpl.java
View File

@ -1,9 +1,9 @@
package com.hzya.frame.sys.application.plugin.dao.impl;
package com.hzya.frame.sysnew.application.plugin.dao.impl;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo;
import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginDto;
import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sys.application.plugin.dao.ISysApplicationPluginDao;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;

2
service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginDto.java → service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.plugin.entity;
package com.hzya.frame.sysnew.application.plugin.entity;
import com.hzya.frame.web.entity.BaseEntity;

2
service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginEntity.java → service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.plugin.entity;
package com.hzya.frame.sysnew.application.plugin.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;

22
service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginEntity.xml → service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.application.plugin.dao.impl.SysApplicationPluginDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.application.plugin.dao.impl.SysApplicationPluginDaoImpl">
<resultMap id="get-SysApplicationPluginEntity-result" type="com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity" >
<resultMap id="get-SysApplicationPluginEntity-result" type="com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="appId" column="app_id" jdbcType="VARCHAR"/>
<result property="pluginName" column="plugin_name" jdbcType="VARCHAR"/>
@ -44,7 +44,7 @@
from sys_application_plugin where sts = 'Y' and id = #{id}
</select>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity">
<select id="entity_list_base" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity">
select
<include refid="SysApplicationPluginEntity_Base_Column_List" />
from sys_application_plugin
@ -71,7 +71,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity">
select count(1) from sys_application_plugin
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -96,7 +96,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity">
<select id="entity_list_like" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity">
select
<include refid="SysApplicationPluginEntity_Base_Column_List" />
from sys_application_plugin
@ -123,7 +123,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysApplicationPluginentity_list_or" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity">
<select id="SysApplicationPluginentity_list_or" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity">
select
<include refid="SysApplicationPluginEntity_Base_Column_List" />
from sys_application_plugin
@ -150,7 +150,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_application_plugin(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -224,7 +224,7 @@
sts = values(sts),
org_id = values(org_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity" >
update sys_application_plugin set
<trim suffix="" suffixOverrides=",">
<if test="appId != null and appId != ''"> app_id = #{appId},</if>
@ -245,12 +245,12 @@ update sys_application_plugin set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity" >
update sys_application_plugin set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity" >
update sys_application_plugin set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -274,7 +274,7 @@ update sys_application_plugin set sts= 'N' ,modify_time = #{modify_time},modify
<!-- 分页查询列表 采用like格式 -->
<select id="queryListlike" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginDto">
<select id="queryListlike" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto">
select
<include refid="SysApplicationPluginEntity_Base_Column_List" />
from sys_application_plugin

4
service/src/main/java/com/hzya/frame/sys/application/plugin/service/ISysApplicationPluginService.java → service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/ISysApplicationPluginService.java
View File

@ -1,6 +1,6 @@
package com.hzya.frame.sys.application.plugin.service;
package com.hzya.frame.sysnew.application.plugin.service;
import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.basedao.service.IBaseService;
/**
* 插件表(SysApplicationPlugin)表服务接口

8
service/src/main/java/com/hzya/frame/sys/application/plugin/service/impl/SysApplicationPluginServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/impl/SysApplicationPluginServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.application.plugin.service.impl;
package com.hzya.frame.sysnew.application.plugin.service.impl;
import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sys.application.plugin.dao.ISysApplicationPluginDao;
import com.hzya.frame.sys.application.plugin.service.ISysApplicationPluginService;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao;
import com.hzya.frame.sysnew.application.plugin.service.ISysApplicationPluginService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;

4
service/src/main/java/com/hzya/frame/sys/application/service/ISysApplicationService.java → service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.application.service;
package com.hzya.frame.sysnew.application.service;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.sys.application.entity.SysApplicationEntity;
import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.web.entity.JsonResultEntity;

18
service/src/main/java/com/hzya/frame/sys/application/service/impl/ApplicationCache.java → service/src/main/java/com/hzya/frame/sysnew/application/service/impl/ApplicationCache.java
View File

@ -1,13 +1,13 @@
package com.hzya.frame.sys.application.service.impl;
package com.hzya.frame.sysnew.application.service.impl;
import com.hzya.frame.sys.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sys.application.apiAuth.dao.ISysApplicationApiAuthDao;
import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao;
import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sys.application.dao.ISysApplicationDao;
import com.hzya.frame.sys.application.entity.SysApplicationEntity;
import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sysnew.application.apiAuth.dao.ISysApplicationApiAuthDao;
import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao;
import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sysnew.application.dao.ISysApplicationDao;
import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

124
service/src/main/java/com/hzya/frame/sys/application/service/impl/SysApplicationServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.hzya.frame.sys.application.service.impl;
package com.hzya.frame.sysnew.application.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.extra.servlet.ServletUtil;
@ -7,48 +7,43 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.serviceUtil.DsDataSourceUtil;
import com.hzya.frame.sys.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiDto;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo;
import com.hzya.frame.sys.application.apiAuth.dao.ISysApplicationApiAuthDao;
import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthDto;
import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao;
import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sys.application.apiPara.dao.ISysApplicationApiParaDao;
import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sys.application.apiType.dao.ISysApplicationApiTypeDao;
import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.sys.application.database.dao.ISysApplicationDatabaseDao;
import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sys.application.entity.SysApplicationDatasourceDto;
import com.hzya.frame.sys.application.entity.SysApplicationDto;
import com.hzya.frame.sys.application.entity.SysApplicationEntity;
import com.hzya.frame.sys.application.dao.ISysApplicationDao;
import com.hzya.frame.sys.application.entity.SysApplicationVo;
import com.hzya.frame.sys.application.plugin.dao.ISysApplicationPluginDao;
import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginDto;
import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sys.application.service.ISysApplicationService;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity;
import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo;
import com.hzya.frame.sys.messageManage.dao.ISysMessageManageDao;
import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo;
import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao;
import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.sys.messageManageLog.dao.ISysMessageManageLogDao;
import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity;
import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogPageVo;
import com.hzya.frame.sys.messageManageLogDetail.service.ISysMessageManageLogDetailService;
import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiDto;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo;
import com.hzya.frame.sysnew.application.apiAuth.dao.ISysApplicationApiAuthDao;
import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthDto;
import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity;
import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao;
import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity;
import com.hzya.frame.sysnew.application.apiPara.dao.ISysApplicationApiParaDao;
import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
import com.hzya.frame.sysnew.application.apiType.dao.ISysApplicationApiTypeDao;
import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity;
import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao;
import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
import com.hzya.frame.sysnew.application.entity.SysApplicationDatasourceDto;
import com.hzya.frame.sysnew.application.entity.SysApplicationDto;
import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
import com.hzya.frame.sysnew.application.dao.ISysApplicationDao;
import com.hzya.frame.sysnew.application.entity.SysApplicationVo;
import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto;
import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity;
import com.hzya.frame.sysnew.application.service.ISysApplicationService;
import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao;
import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.sysnew.messageManageLog.dao.ISysMessageManageLogDao;
import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity;
import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogPageVo;
import com.hzya.frame.util.AESUtil;
import com.hzya.frame.util.IPHelper;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@ -109,14 +104,11 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
@Resource
private ISysMessageManageDetailDao sysMessageManageDetailDao; //明细表
@Resource
private ISysMessageManageLogDetailService sysMessageManageLogDetailService;
@Resource
private TaskExecutor taskExecutor;
//
@Resource
private ApplicationCache applicationCache;
private com.hzya.frame.sysnew.application.service.impl.ApplicationCache applicationCache;
//多线程请求加锁 HttpRequest 构造方法是静态的
private final Object lock = new Object();
@ -525,6 +517,25 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
return BaseResult.getSuccessMessageEntity("修改应用成功");
}
/**
* @param object
* @return
* @Author lvleigang
* @Description 数据源测试接口 测试当前页面数据源是否配置正确
* @Date 2:08 下午 2023/9/23
**/
@Override
public JsonResultEntity testDatabase(JSONObject object) {
SysApplicationDatasourceDto entity = getData("jsonStr", object, SysApplicationDatasourceDto.class);
if (entity == null) {
return BaseResult.getFailureMessageEntity("系统错误");
}
if (dsDataSourceUtil.testConnection(entity)) {
return BaseResult.getSuccessMessageEntity("测试连接数据源成功");
} else {
return BaseResult.getFailureMessageEntity("测试连接数据源失败,请检查数据源配置是否正确");
}
}
//修改数据源
private void doUpdateDatabase(SysApplicationDto entity) {
//先删除明细再修改
@ -631,25 +642,6 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
return sysApplicationEntity;
}
/**
* @param object
* @return
* @Author lvleigang
* @Description 数据源测试接口 测试当前页面数据源是否配置正确
* @Date 2:08 下午 2023/9/23
**/
@Override
public JsonResultEntity testDatabase(JSONObject object) {
SysApplicationDatasourceDto entity = getData("jsonStr", object, SysApplicationDatasourceDto.class);
if (entity == null) {
return BaseResult.getFailureMessageEntity("系统错误");
}
if (dsDataSourceUtil.testConnection(entity)) {
return BaseResult.getSuccessMessageEntity("测试连接数据源成功");
} else {
return BaseResult.getFailureMessageEntity("测试连接数据源失败,请检查数据源配置是否正确");
}
}
/**
* @param object
@ -1962,8 +1954,6 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
long s1 = jrff - fsqsj;
long s2 = fsqsj - fshsj;
sysMessageManageLogEntity.setRemark("转发成功,发送前时间：" + s1 + "ms，发送时间：" + s2 + "ms");//返回信息
//returnType 返回解析类型
//errorStatus 失败状态（1、需要重新发送 2、不需要重新发送）
sysMessageManageLogEntity.setErrorStatus("2");//返回信息
sysMessageManageLogEntity.setId(UUIDUtils.getUUID());
sysMessageManageLogEntity.setCreate_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443");
@ -1971,12 +1961,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
sysMessageManageLogEntity.setCreate_time(new Date());
sysMessageManageLogEntity.setModify_time(new Date());
sysMessageManageLogEntity.setSts("Y");
//JSONObject jsonObject1 = (JSONObject) JSONObject.toJSON(sysMessageManageLogEntity);
//logger.info("esb转发请求参数：[ "+ jsonObject1.toJSONString()+" ]");
taskExecutor.execute(() -> doEsbTask(sysMessageManageLogEntity));
//sysMessageManageLogDao.save(sysMessageManageLogEntity);
//doEsbTask(sysMessageManageLogEntity);
}
/**
@ -1987,11 +1972,6 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
* @Date 11:43 上午 2023/8/30
**/
private void doEsbTask(SysMessageManageLogEntity manageLogEntities) {
//sysMessageManageLogDetailService.saveSysMessageManageLogDetail(manageLogEntities);
//manageLogEntities.setSourceData(null);
//manageLogEntities.setTargetData(null);
//manageLogEntities.setReturnData(null);
sysMessageManageLogDao.save(manageLogEntities);
}

4
service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/dao/ISysIntegratedForegroundTaskDao.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/dao/ISysIntegratedForegroundTaskDao.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.integratedForegroundTask.dao;
package com.hzya.frame.sysnew.integratedForegroundTask.dao;
import com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity;
/**
* 集成前台任务主表(sys_integrated_foreground_task: table)表数据库访问层

9
service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/dao/impl/SysIntegratedForegroundTaskDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/dao/impl/SysIntegratedForegroundTaskDaoImpl.java
View File

@ -1,9 +1,10 @@
package com.hzya.frame.sys.integratedForegroundTask.dao.impl;
package com.hzya.frame.sysnew.integratedForegroundTask.dao.impl;
import com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity;
import com.hzya.frame.sys.integratedForegroundTask.dao.ISysIntegratedForegroundTaskDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.sysnew.integratedForegroundTask.dao.ISysIntegratedForegroundTaskDao;
import com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity;
import org.springframework.stereotype.Repository;
/**
* 集成前台任务主表(SysIntegratedForegroundTask)表数据库访问层
*

13
service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.java
View File

@ -1,13 +1,14 @@
package com.hzya.frame.sys.integratedForegroundTask.entity;
package com.hzya.frame.sysnew.integratedForegroundTask.entity;
import cn.dev33.satoken.stp.StpUtil;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseEntity;
import java.util.Date;
import java.util.List;
import cn.dev33.satoken.stp.StpUtil;
import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseEntity;
/**
* 集成前台任务主表(SysIntegratedForegroundTask)实体类
*

20
service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.integratedForegroundTask.dao.impl.SysIntegratedForegroundTaskDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.integratedForegroundTask.dao.impl.SysIntegratedForegroundTaskDaoImpl">
<resultMap id="get-SysIntegratedForegroundTaskEntity-result" type="com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
<resultMap id="get-SysIntegratedForegroundTaskEntity-result" type="com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="workshopName" column="workshop_name" jdbcType="VARCHAR"/>
<result property="plugId" column="plug_id" jdbcType="VARCHAR"/>
@ -32,7 +32,7 @@
,org_id
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysIntegratedForegroundTaskEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
<select id="entity_list_base" resultMap="get-SysIntegratedForegroundTaskEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
select
<include refid="SysIntegratedForegroundTaskEntity_Base_Column_List" />
from sys_integrated_foreground_task
@ -56,7 +56,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
select count(1) from sys_integrated_foreground_task
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -78,7 +78,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysIntegratedForegroundTaskEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
<select id="entity_list_like" resultMap="get-SysIntegratedForegroundTaskEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
select
<include refid="SysIntegratedForegroundTaskEntity_Base_Column_List" />
from sys_integrated_foreground_task
@ -102,7 +102,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysIntegratedForegroundTaskentity_list_or" resultMap="get-SysIntegratedForegroundTaskEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
<select id="SysIntegratedForegroundTaskentity_list_or" resultMap="get-SysIntegratedForegroundTaskEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
select
<include refid="SysIntegratedForegroundTaskEntity_Base_Column_List" />
from sys_integrated_foreground_task
@ -131,7 +131,7 @@
from sys_integrated_foreground_task where id = #{ id } and sts='Y'
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_integrated_foreground_task(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -196,7 +196,7 @@
sts = values(sts),
org_id = values(org_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
update sys_integrated_foreground_task set
<trim suffix="" suffixOverrides=",">
<if test="workshopName != null and workshopName != ''"> workshop_name = #{workshopName},</if>
@ -214,12 +214,12 @@ update sys_integrated_foreground_task set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
update sys_integrated_foreground_task set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
update sys_integrated_foreground_task set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>

4
service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/service/ISysIntegratedForegroundTaskService.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/ISysIntegratedForegroundTaskService.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.integratedForegroundTask.service;
package com.hzya.frame.sysnew.integratedForegroundTask.service;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity;
import com.hzya.frame.web.entity.JsonResultEntity;
/**

24
service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java
View File

@ -1,28 +1,26 @@
package com.hzya.frame.sys.integratedForegroundTask.service.impl;
package com.hzya.frame.sysnew.integratedForegroundTask.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.base.PluginBaseEntity;
import com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity;
import com.hzya.frame.sys.integratedForegroundTask.dao.ISysIntegratedForegroundTaskDao;
import com.hzya.frame.sys.integratedForegroundTask.service.ISysIntegratedForegroundTaskService;
import com.hzya.frame.sys.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao;
import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.sys.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao;
import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.sys.plugArg.entity.SysPlugArgEntity;
import com.hzya.frame.sys.plugArgDeatil.entity.SysPlugArgDetailEntity;
import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.sysnew.integratedForegroundTask.dao.ISysIntegratedForegroundTaskDao;
import com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity;
import com.hzya.frame.sysnew.integratedForegroundTask.service.ISysIntegratedForegroundTaskService;
import com.hzya.frame.util.PluginUtils;
import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.task.TaskExecutor;
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 javax.annotation.Resource;
import java.util.Date;
import java.util.List;

4
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/dao/ISysIntegratedForegroundTaskDetailDao.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/dao/ISysIntegratedForegroundTaskDetailDao.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.integratedForegroundTaskDetail.dao;
package com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao;
import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
/**
* 集成前台任务明细表(sys_integrated_foreground_task_detail: table)表数据库访问层

9
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/dao/impl/SysIntegratedForegroundTaskDetailDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/dao/impl/SysIntegratedForegroundTaskDetailDaoImpl.java
View File

@ -1,9 +1,10 @@
package com.hzya.frame.sys.integratedForegroundTaskDetail.dao.impl;
package com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.impl;
import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.sys.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import org.springframework.stereotype.Repository;
/**
* 集成前台任务明细表(SysIntegratedForegroundTaskDetail)表数据库访问层
*

7
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.java
View File

@ -1,10 +1,11 @@
package com.hzya.frame.sys.integratedForegroundTaskDetail.entity;
import java.util.Date;
package com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity;
import cn.dev33.satoken.stp.StpUtil;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseEntity;
import java.util.Date;
/**
* 集成前台任务明细表(SysIntegratedForegroundTaskDetail)实体类
*

20
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.xml → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.integratedForegroundTaskDetail.dao.impl.SysIntegratedForegroundTaskDetailDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.impl.SysIntegratedForegroundTaskDetailDaoImpl">
<resultMap id="get-SysIntegratedForegroundTaskDetailEntity-result" type="com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" >
<resultMap id="get-SysIntegratedForegroundTaskDetailEntity-result" type="com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="formmainId" column="formmain_id" jdbcType="VARCHAR"/>
<result property="argCode" column="arg_code" jdbcType="VARCHAR"/>
@ -36,7 +36,7 @@
,org_id
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysIntegratedForegroundTaskDetailEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity">
<select id="entity_list_base" resultMap="get-SysIntegratedForegroundTaskDetailEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity">
select
<include refid="SysIntegratedForegroundTaskDetailEntity_Base_Column_List" />
from sys_integrated_foreground_task_detail
@ -62,7 +62,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity">
select count(1) from sys_integrated_foreground_task_detail
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -86,7 +86,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysIntegratedForegroundTaskDetailEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity">
<select id="entity_list_like" resultMap="get-SysIntegratedForegroundTaskDetailEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity">
select
<include refid="SysIntegratedForegroundTaskDetailEntity_Base_Column_List" />
from sys_integrated_foreground_task_detail
@ -112,7 +112,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysIntegratedForegroundTaskDetailentity_list_or" resultMap="get-SysIntegratedForegroundTaskDetailEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity">
<select id="SysIntegratedForegroundTaskDetailentity_list_or" resultMap="get-SysIntegratedForegroundTaskDetailEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity">
select
<include refid="SysIntegratedForegroundTaskDetailEntity_Base_Column_List" />
from sys_integrated_foreground_task_detail
@ -138,7 +138,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_integrated_foreground_task_detail(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -209,7 +209,7 @@
sts = values(sts),
org_id = values(org_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" >
update sys_integrated_foreground_task_detail set
<trim suffix="" suffixOverrides=",">
<if test="formmainId != null and formmainId != ''"> formmain_id = #{formmainId},</if>
@ -229,12 +229,12 @@ update sys_integrated_foreground_task_detail set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" >
update sys_integrated_foreground_task_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity" >
update sys_integrated_foreground_task_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>

5
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/service/ISysIntegratedForegroundTaskDetailService.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/service/ISysIntegratedForegroundTaskDetailService.java
View File

@ -1,7 +1,8 @@
package com.hzya.frame.sys.integratedForegroundTaskDetail.service;
package com.hzya.frame.sysnew.integratedForegroundTaskDetail.service;
import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
/**
* 集成前台任务明细表(SysIntegratedForegroundTaskDetail)表服务接口
*

14
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/service/impl/SysIntegratedForegroundTaskDetailServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/service/impl/SysIntegratedForegroundTaskDetailServiceImpl.java
View File

@ -1,12 +1,12 @@
package com.hzya.frame.sys.integratedForegroundTaskDetail.service.impl;
package com.hzya.frame.sysnew.integratedForegroundTaskDetail.service.impl;
import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.sys.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao;
import com.hzya.frame.sys.integratedForegroundTaskDetail.service.ISysIntegratedForegroundTaskDetailService;
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 com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity;
import com.hzya.frame.sysnew.integratedForegroundTaskDetail.service.ISysIntegratedForegroundTaskDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 集成前台任务明细表(SysIntegratedForegroundTaskDetail)表服务实现类
*

4
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/dao/ISysIntegratedForegroundTaskParameterDao.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/dao/ISysIntegratedForegroundTaskParameterDao.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.integratedForegroundTaskParameter.dao;
package com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao;
import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import java.util.List;

9
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/dao/impl/SysIntegratedForegroundTaskParameterDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/dao/impl/SysIntegratedForegroundTaskParameterDaoImpl.java
View File

@ -1,10 +1,9 @@
package com.hzya.frame.sys.integratedForegroundTaskParameter.dao.impl;
package com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.impl;
import com.hzya.frame.sys.application.entity.SysApplicationVo;
import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.sys.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import org.springframework.stereotype.Repository;
import java.util.List;

7
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java
View File

@ -1,10 +1,11 @@
package com.hzya.frame.sys.integratedForegroundTaskParameter.entity;
import java.util.Date;
package com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity;
import cn.dev33.satoken.stp.StpUtil;
import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseEntity;
import java.util.Date;
/**
* 集成前台任务参数表(SysIntegratedForegroundTaskParameter)实体类
*

25
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.integratedForegroundTaskParameter.dao.impl.SysIntegratedForegroundTaskParameterDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.impl.SysIntegratedForegroundTaskParameterDaoImpl">
<resultMap id="get-SysIntegratedForegroundTaskParameterEntity-result" type="com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" >
<resultMap id="get-SysIntegratedForegroundTaskParameterEntity-result" type="com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="formmainId" column="formmain_id" jdbcType="VARCHAR"/>
<result property="inParameter" column="in_parameter" jdbcType="VARCHAR"/>
@ -30,7 +30,7 @@
,org_id
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysIntegratedForegroundTaskParameterEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
<select id="entity_list_base" resultMap="get-SysIntegratedForegroundTaskParameterEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
select
<include refid="SysIntegratedForegroundTaskParameterEntity_Base_Column_List" />
from sys_integrated_foreground_task_parameter
@ -53,7 +53,7 @@
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
select count(1) from sys_integrated_foreground_task_parameter
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -74,7 +74,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysIntegratedForegroundTaskParameterEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
<select id="entity_list_like" resultMap="get-SysIntegratedForegroundTaskParameterEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
select
<include refid="SysIntegratedForegroundTaskParameterEntity_Base_Column_List" />
from sys_integrated_foreground_task_parameter
@ -97,7 +97,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="SysIntegratedForegroundTaskParameterentity_list_or" resultMap="get-SysIntegratedForegroundTaskParameterEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
<select id="SysIntegratedForegroundTaskParameterentity_list_or" resultMap="get-SysIntegratedForegroundTaskParameterEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
select
<include refid="SysIntegratedForegroundTaskParameterEntity_Base_Column_List" />
from sys_integrated_foreground_task_parameter
@ -120,7 +120,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" keyProperty="id" useGeneratedKeys="true">
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" keyProperty="id" useGeneratedKeys="true">
insert into sys_integrated_foreground_task_parameter(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@ -182,7 +182,7 @@
sts = values(sts),
org_id = values(org_id)</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" >
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" >
update sys_integrated_foreground_task_parameter set
<trim suffix="" suffixOverrides=",">
<if test="formmainId != null and formmainId != ''"> formmain_id = #{formmainId},</if>
@ -199,12 +199,12 @@ update sys_integrated_foreground_task_parameter set
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" >
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" >
update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" >
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity" >
update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@ -222,14 +222,14 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m
</delete>
<!-- 查询 采用==查询 -->
<select id="entity_list_base_by_create" resultMap="get-SysIntegratedForegroundTaskParameterEntity-result" parameterType = "com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
<select id="entity_list_base_by_create" resultMap="get-SysIntegratedForegroundTaskParameterEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity">
select
a.id
,a.formmain_id
,a.in_parameter
,a.remark
,a.sorts
,b.login_code as create_user_id
,p.person_name as create_user_id
,a.create_time
,a.modify_user_id
,a.modify_time
@ -237,6 +237,7 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m
,a.org_id
from sys_integrated_foreground_task_parameter a
LEFT JOIN sys_user b on b.id = a.create_user_id and b.sts = 'Y'
LEFT JOIN sys_person p on p.id = b.person_id and p.sts = 'Y'
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and a.id = #{id} </if>
<if test="formmainId != null and formmainId != ''"> and a.formmain_id = #{formmainId} </if>

5
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/service/ISysIntegratedForegroundTaskParameterService.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/service/ISysIntegratedForegroundTaskParameterService.java
View File

@ -1,7 +1,8 @@
package com.hzya.frame.sys.integratedForegroundTaskParameter.service;
package com.hzya.frame.sysnew.integratedForegroundTaskParameter.service;
import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
/**
* 集成前台任务参数表(SysIntegratedForegroundTaskParameter)表服务接口
*

14
service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/service/impl/SysIntegratedForegroundTaskParameterServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/service/impl/SysIntegratedForegroundTaskParameterServiceImpl.java
View File

@ -1,12 +1,12 @@
package com.hzya.frame.sys.integratedForegroundTaskParameter.service.impl;
package com.hzya.frame.sysnew.integratedForegroundTaskParameter.service.impl;
import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.sys.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao;
import com.hzya.frame.sys.integratedForegroundTaskParameter.service.ISysIntegratedForegroundTaskParameterService;
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 com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity;
import com.hzya.frame.sysnew.integratedForegroundTaskParameter.service.ISysIntegratedForegroundTaskParameterService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 集成前台任务参数表(SysIntegratedForegroundTaskParameter)表服务实现类
*

8
service/src/main/java/com/hzya/frame/sys/messageManage/dao/ISysMessageManageDao.java → service/src/main/java/com/hzya/frame/sysnew/messageManage/dao/ISysMessageManageDao.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.messageManage.dao;
package com.hzya.frame.sysnew.messageManage.dao;
import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManagePageVo;
import java.util.List;
@ -19,7 +19,7 @@ public interface ISysMessageManageDao extends IBaseDao<SysMessageManageEntity, S
* @Description 返回pageVo对象
* @Date 9:56 上午 2023/8/29
* @param entity
* @return java.util.List<com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo>
* @return java.util.List<com.hzya.frame.sysnew.messageManage.entity.SysMessageManagePageVo>
**/
List<SysMessageManagePageVo> queryListByPageVo(SysMessageManageEntity entity);

11
service/src/main/java/com/hzya/frame/sys/messageManage/dao/impl/SysMessageManageDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/messageManage/dao/impl/SysMessageManageDaoImpl.java
View File

@ -1,11 +1,10 @@
package com.hzya.frame.sys.messageManage.dao.impl;
package com.hzya.frame.sysnew.messageManage.dao.impl;
import com.hzya.frame.sys.appApi.entity.AppApi;
import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sys.messageManage.dao.ISysMessageManageDao;
import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManagePageVo;
import org.springframework.stereotype.Repository;
import java.util.List;

8
service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManageEntity.java → service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManageEntity.java
View File

@ -1,10 +1,10 @@
package com.hzya.frame.sys.messageManage.entity;
package com.hzya.frame.sysnew.messageManage.entity;
import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.web.entity.BaseEntity;
import java.util.Date;
import java.util.List;
import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.web.entity.BaseEntity;
/**
* 消息管理主表(SysMessageManage)实体类
*

26
service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManageEntity.xml → service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManageEntity.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.messageManage.dao.impl.SysMessageManageDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.messageManage.dao.impl.SysMessageManageDaoImpl">
<resultMap id="get-SysMessageManageEntity-result"
type="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
type="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="theme" column="theme" jdbcType="VARCHAR"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
@ -38,7 +38,7 @@
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysMessageManageEntity-result"
parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
select
<include refid="SysMessageManageEntity_Base_Column_List"/>
from sys_message_manage
@ -65,7 +65,7 @@
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer"
parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
select count(1) from sys_message_manage
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>
@ -91,7 +91,7 @@
<!-- 查询符合条件的数量 -->
<select id="entity_count_not_id" resultType="Integer"
parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
select count(1) from sys_message_manage
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id != #{id}</if>
@ -114,7 +114,7 @@
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysMessageManageEntity-result"
parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
select
<include refid="SysMessageManageEntity_Base_Column_List"/>
from sys_message_manage
@ -145,7 +145,7 @@
<!-- 查询列表 字段采用or格式 -->
<select id="SysMessageManageentity_list_or" resultMap="get-SysMessageManageEntity-result"
parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
select
<include refid="SysMessageManageEntity_Base_Column_List"/>
from sys_message_manage
@ -171,7 +171,7 @@
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity"
<insert id="entity_insert" parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity"
keyProperty="id" useGeneratedKeys="true">
insert into sys_message_manage(
<trim suffix="" suffixOverrides=",">
@ -249,7 +249,7 @@
org_id = values(org_id)
</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
<update id="entity_update" parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
update sys_message_manage set
<trim suffix="" suffixOverrides=",">
<if test="theme != null and theme != ''">theme = #{theme},</if>
@ -269,13 +269,13 @@
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
<update id="entity_logicDelete" parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
update sys_message_manage set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition"
parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
update sys_message_manage set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>
@ -300,8 +300,8 @@ where id = #{id}
<!-- 分页查询列表 采用like格式 -->
<select id="queryListByPageVo" resultType="com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo"
parameterType="com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity">
<select id="queryListByPageVo" resultType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManagePageVo"
parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity">
SELECT
a.id AS id,
a.theme AS theme,

4
service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManagePageVo.java → service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManagePageVo.java
View File

@ -1,6 +1,4 @@
package com.hzya.frame.sys.messageManage.entity;
import com.hzya.frame.web.entity.BaseEntity;
package com.hzya.frame.sysnew.messageManage.entity;
/**
* @Author lvleigang

4
service/src/main/java/com/hzya/frame/sys/messageManage/service/ISysMessageManageService.java → service/src/main/java/com/hzya/frame/sysnew/messageManage/service/ISysMessageManageService.java
View File

@ -1,8 +1,8 @@
package com.hzya.frame.sys.messageManage.service;
package com.hzya.frame.sysnew.messageManage.service;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.basedao.service.IBaseService;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.web.entity.JsonResultEntity;
/**

26
service/src/main/java/com/hzya/frame/sys/messageManage/service/impl/SysMessageManageServiceImpl.java → service/src/main/java/com/hzya/frame/sysnew/messageManage/service/impl/SysMessageManageServiceImpl.java
View File

@ -1,35 +1,27 @@
package com.hzya.frame.sys.messageManage.service.impl;
package com.hzya.frame.sysnew.messageManage.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hzya.frame.sys.appApi.entity.AppApi;
import com.hzya.frame.sys.appApi.entity.AppApiDto;
import com.hzya.frame.sys.appApi.entity.AppApiListVo;
import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sys.messageManage.dao.ISysMessageManageDao;
import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo;
import com.hzya.frame.sys.messageManage.service.ISysMessageManageService;
import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao;
import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.sys.templateView.entity.TemplateView;
import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao;
import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity;
import com.hzya.frame.sysnew.messageManage.entity.SysMessageManagePageVo;
import com.hzya.frame.sysnew.messageManage.service.ISysMessageManageService;
import com.hzya.frame.uuid.UUIDUtils;
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 org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.hzya.frame.basedao.service.impl.BaseService;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 消息管理主表(SysMessageManage)表服务实现类

4
service/src/main/java/com/hzya/frame/sys/messageManageDetail/dao/ISysMessageManageDetailDao.java → service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/dao/ISysMessageManageDetailDao.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.messageManageDetail.dao;
package com.hzya.frame.sysnew.messageManageDetail.dao;
import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity;
/**
* 消息管理明细表(sys_message_manage_detail: table)表数据库访问层

8
service/src/main/java/com/hzya/frame/sys/messageManageDetail/dao/impl/SysMessageManageDetailDaoImpl.java → service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/dao/impl/SysMessageManageDetailDaoImpl.java
View File

@ -1,9 +1,9 @@
package com.hzya.frame.sys.messageManageDetail.dao.impl;
package com.hzya.frame.sysnew.messageManageDetail.dao.impl;
import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity;
import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao;
import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity;
import org.springframework.stereotype.Repository;
/**
* 消息管理明细表(SysMessageManageDetail)表数据库访问层

4
service/src/main/java/com/hzya/frame/sys/messageManageDetail/entity/SysMessageManageDetailEntity.java → service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/entity/SysMessageManageDetailEntity.java
View File

@ -1,7 +1,7 @@
package com.hzya.frame.sys.messageManageDetail.entity;
package com.hzya.frame.sysnew.messageManageDetail.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;
/**
* 消息管理明细表(SysMessageManageDetail)实体类
*

20
service/src/main/java/com/hzya/frame/sys/messageManageDetail/entity/SysMessageManageDetailEntity.xml → service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/entity/SysMessageManageDetailEntity.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sys.messageManageDetail.dao.impl.SysMessageManageDetailDaoImpl">
<mapper namespace="com.hzya.frame.sysnew.messageManageDetail.dao.impl.SysMessageManageDetailDaoImpl">
<resultMap id="get-SysMessageManageDetailEntity-result"
type="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity">
type="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity">
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="formmainId" column="formmain_id" jdbcType="VARCHAR"/>
<result property="receiveName" column="receive_name" jdbcType="VARCHAR"/>
@ -42,7 +42,7 @@
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-SysMessageManageDetailEntity-result"
parameterType="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity">
parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity">
select
<include refid="SysMessageManageDetailEntity_Base_Column_List"/>
from sys_message_manage_detail
@ -71,7 +71,7 @@
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer"
parameterType="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity">
parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity">
select count(1) from sys_message_manage_detail
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>
@ -98,7 +98,7 @@
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysMessageManageDetailEntity-result"
parameterType="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity">
parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity">
select
<include refid="SysMessageManageDetailEntity_Base_Column_List"/>
from sys_message_manage_detail
@ -133,7 +133,7 @@
<!-- 查询列表 字段采用or格式 -->
<select id="SysMessageManageDetailentity_list_or" resultMap="get-SysMessageManageDetailEntity-result"
parameterType="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity">
parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity">
select
<include refid="SysMessageManageDetailEntity_Base_Column_List"/>
from sys_message_manage_detail
@ -162,7 +162,7 @@
<!--新增所有列-->
<insert id="entity_insert"
parameterType="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity" keyProperty="id"
parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity" keyProperty="id"
useGeneratedKeys="true">
insert into sys_message_manage_detail(
<trim suffix="" suffixOverrides=",">
@ -247,7 +247,7 @@
</insert>
<!--通过主键修改方法-->
<update id="entity_update"
parameterType="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity">
parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity">
update sys_message_manage_detail set
<trim suffix="" suffixOverrides=",">
<if test="formmainId != null and formmainId != ''">formmain_id = #{formmainId},</if>
@ -270,13 +270,13 @@
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete"
parameterType="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity">
parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity">
update sys_message_manage_detail set sts= 'N',modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition"
parameterType="com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity">
parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity">
update sys_message_manage_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''">and id = #{id}</if>

Some files were not shown because too many files have changed in this diff Show More