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

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

This commit is contained in:
xiang2lin 2024-05-15 14:34:56 +08:00
parent 34a736dce3 74b7005879
commit de0e98f55f
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.impl.IntegrationTaskLivingDetailsDaoImpl"> <mapper namespace="com.hzya.frame.sysnew.integtationTaskLog.dao.impl.IntegrationTaskLogDaoImpl">
<resultMap id="get-IntegrationTaskLivingDetailsEntity-result" type="com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" > <resultMap id="get-IntegrationTaskLogEntity-result" type="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/> <result property="id" column="id" jdbcType="VARCHAR"/>
<result property="taskLinvingId" column="task_linving_id" jdbcType="VARCHAR"/> <result property="taskLinvingId" column="task_linving_id" jdbcType="VARCHAR"/>
<result property="result" column="result" jdbcType="VARCHAR"/> <result property="result" column="result" jdbcType="VARCHAR"/>
@ -37,7 +37,7 @@
<result property="def5" column="def5" jdbcType="VARCHAR"/> <result property="def5" column="def5" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<!-- 查询的字段--> <!-- 查询的字段-->
<sql id = "IntegrationTaskLivingDetailsEntity_Base_Column_List"> <sql id = "IntegrationTaskLogEntity_Base_Column_List">
id id
,task_linving_id ,task_linving_id
,result ,result
@ -72,9 +72,9 @@
,def5 ,def5
</sql> </sql>
<!-- 查询 采用==查询 --> <!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-IntegrationTaskLivingDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity"> <select id="entity_list_base" resultMap="get-IntegrationTaskLogEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
select select
<include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" /> <include refid="IntegrationTaskLogEntity_Base_Column_List" />
from integration_task_living_details from integration_task_living_details
<trim prefix="where" prefixOverrides="and"> <trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if> <if test="id != null and id != ''"> and id = #{id} </if>
@ -116,7 +116,7 @@
</select> </select>
<!-- 查询符合条件的数量 --> <!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity"> <select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
select count(1) from integration_task_living_details select count(1) from integration_task_living_details
<trim prefix="where" prefixOverrides="and"> <trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if> <if test="id != null and id != ''"> and id = #{id} </if>
@ -158,9 +158,9 @@
</select> </select>
<!-- 分页查询列表 采用like格式 --> <!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-IntegrationTaskLivingDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity"> <select id="entity_list_like" resultMap="get-IntegrationTaskLogEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
select select
<include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" /> <include refid="IntegrationTaskLogEntity_Base_Column_List" />
from integration_task_living_details from integration_task_living_details
<trim prefix="where" prefixOverrides="and"> <trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if> <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
@ -202,9 +202,9 @@
</select> </select>
<!-- 查询列表 字段采用or格式 --> <!-- 查询列表 字段采用or格式 -->
<select id="IntegrationTaskLivingDetailsentity_list_or" resultMap="get-IntegrationTaskLivingDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity"> <select id="IntegrationTaskLogentity_list_or" resultMap="get-IntegrationTaskLogEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
select select
<include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" /> <include refid="IntegrationTaskLogEntity_Base_Column_List" />
from integration_task_living_details from integration_task_living_details
<trim prefix="where" prefixOverrides="and"> <trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> or id = #{id} </if> <if test="id != null and id != ''"> or id = #{id} </if>
@ -246,7 +246,7 @@
</select> </select>
<!--新增所有列--> <!--新增所有列-->
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" > <insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
insert into integration_task_living_details( insert into integration_task_living_details(
<trim suffix="" suffixOverrides=","> <trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if> <if test="id != null and id != ''"> id , </if>
@ -370,7 +370,7 @@
def4 = values(def4), def4 = values(def4),
def5 = values(def5)</insert> def5 = values(def5)</insert>
<!--通过主键修改方法--> <!--通过主键修改方法-->
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" > <update id="entity_update" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
update integration_task_living_details set update integration_task_living_details set
<trim suffix="" suffixOverrides=","> <trim suffix="" suffixOverrides=",">
<if test="taskLinvingId != null and taskLinvingId != ''"> task_linving_id = #{taskLinvingId},</if> <if test="taskLinvingId != null and taskLinvingId != ''"> task_linving_id = #{taskLinvingId},</if>
@ -407,12 +407,12 @@ update integration_task_living_details set
where id = #{id} where id = #{id}
</update> </update>
<!-- 逻辑删除 --> <!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" > <update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id} where id = #{id}
</update> </update>
<!-- 多条件逻辑删除 --> <!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" > <update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity" >
update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and"> <trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if> <if test="id != null and id != ''"> and id = #{id} </if>

8
service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java
View File

@ -1,12 +1,12 @@
package com.hzya.frame.sysnew.integtationTaskLivingDetails.service; package com.hzya.frame.sysnew.integtationTaskLog.service;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity;
import com.hzya.frame.basedao.service.IBaseService; import com.hzya.frame.basedao.service.IBaseService;
/** /**
* 集成任务-实例详情(IntegrationTaskLivingDetails)表服务接口 * 集成任务-实例详情(IntegrationTaskLog)表服务接口
* *
* @author makejava * @author makejava
* @since 2024-05-15 14:06:43 * @since 2024-05-15 14:06:43
*/ */
public interface IIntegrationTaskLivingDetailsService extends IBaseService<IntegrationTaskLivingDetailsEntity, String>{ public interface IIntegrationTaskLogService extends IBaseService<IntegrationTaskLogEntity, String>{
} }

20
service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java
View File

@ -1,26 +1,26 @@
package com.hzya.frame.sysnew.integtationTaskLivingDetails.service.impl; package com.hzya.frame.sysnew.integtationTaskLog.service.impl;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; import com.hzya.frame.sysnew.integtationTaskLog.dao.IIntegrationTaskLogDao;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; import com.hzya.frame.sysnew.integtationTaskLog.service.IIntegrationTaskLogService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource; import javax.annotation.Resource;
import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.basedao.service.impl.BaseService;
/** /**
* 集成任务-实例详情(IntegrationTaskLivingDetails)表服务实现类 * 集成任务-实例详情(IntegrationTaskLog)表服务实现类
* *
* @author makejava * @author makejava
* @since 2024-05-15 14:06:46 * @since 2024-05-15 14:06:46
*/ */
@Service(value = "integrationTaskLivingDetailsService") @Service(value = "integrationTaskLogService")
public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<IntegrationTaskLivingDetailsEntity, String> implements IIntegrationTaskLivingDetailsService { public class IntegrationTaskLogServiceImpl extends BaseService<IntegrationTaskLogEntity, String> implements IIntegrationTaskLogService {
private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao; private IIntegrationTaskLogDao integrationTaskLogDao;
@Autowired @Autowired
public void setIntegrationTaskLivingDetailsDao(IIntegrationTaskLivingDetailsDao dao) { public void setIntegrationTaskLogDao(IIntegrationTaskLogDao dao) {
this.integrationTaskLivingDetailsDao = dao; this.integrationTaskLogDao = dao;
this.dao = dao; this.dao = dao;
} }
} }