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

Merge pull request '旧代码合并，页面报错修改' (#5) from lvleigang into dev 

Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/5
This commit is contained in:
13758950345 2024-04-09 15:27:45 +08:00
parent ff20ddb4dd 88abe0f406
commit e458b4e3cf
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/com/hzya/frame/sys/appApi/entity/AppApiMapper.xml
View File

@ -119,7 +119,7 @@
a.sts, a.sts,
a.org_id, a.org_id,
b.name as app_name, b.name as app_name,
c.view_name as create_user c.login_code as create_user
</sql> </sql>
<sql id="Base_Column_List_join_dictionaryshop"> <sql id="Base_Column_List_join_dictionaryshop">
a.id, a.id,

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

@ -229,7 +229,7 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m
,a.in_parameter ,a.in_parameter
,a.remark ,a.remark
,a.sorts ,a.sorts
,b.view_name as create_user_id ,b.login_code as create_user_id
,a.create_time ,a.create_time
,a.modify_user_id ,a.modify_user_id
,a.modify_time ,a.modify_time

4
service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/entity/IntegrationTaskMonitoringEntity.xml
View File

@ -60,7 +60,7 @@ monitoring.id as id,
task.task_code as task_code, task.task_code as task_code,
task.task_name as task_name, task.task_name as task_name,
task.task_tag as task_tag, task.task_tag as task_tag,
org.org_name, org.organ_name as org_name,
monitoring.server_name as server_name, monitoring.server_name as server_name,
monitoring.run_num, monitoring.run_num,
monitoring.sts, monitoring.sts,
@ -160,7 +160,7 @@ monitoring.diff_time
from integration_task task from integration_task task
left join integration_task_monitoring monitoring on task.id=monitoring.task_id left join integration_task_monitoring monitoring on task.id=monitoring.task_id
left join sys_user u on u.id=monitoring.create_user_id left join sys_user u on u.id=monitoring.create_user_id
left join sys_org org on org.id=u.org_id left join sys_organ org on org.id=u.org_id
<trim prefix="where" prefixOverrides="and"> <trim prefix="where" prefixOverrides="and">
<if test="task_name != null and task_name !='' "> and task.task_name like concat('%',#{task_name},'%') </if> <if test="task_name != null and task_name !='' "> and task.task_name like concat('%',#{task_name},'%') </if>
and monitoring.sts='Y' and monitoring.sts='Y'

4
service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/service/impl/IntegrationTaskMonitoringServiceImpl.java
View File

@ -157,14 +157,14 @@ public class IntegrationTaskMonitoringServiceImpl extends BaseService<Integratio
//执行 定时器继续执行 //执行 定时器继续执行
case "1": case "1":
integrationTaskMonitoringEntity.setType("1"); integrationTaskMonitoringEntity.setType("1");
integrationtaskmonitoringDao.update("entity_update",integrationTaskMonitoringEntity); integrationtaskmonitoringDao.update(integrationTaskMonitoringEntity);
QuartzJobFactoryUtils.pauseTrigger(jsonObjectStr); QuartzJobFactoryUtils.pauseTrigger(jsonObjectStr);
QuartzJobFactoryUtils.resumeTrigger(jsonObjectStr); QuartzJobFactoryUtils.resumeTrigger(jsonObjectStr);
break; break;
//挂起 定时器关闭 //挂起 定时器关闭
case "2": case "2":
integrationTaskMonitoringEntity.setType("2"); integrationTaskMonitoringEntity.setType("2");
integrationtaskmonitoringDao.update("entity_update",integrationTaskMonitoringEntity); integrationtaskmonitoringDao.update(integrationTaskMonitoringEntity);
QuartzJobFactoryUtils.pauseTrigger(jsonObjectStr); QuartzJobFactoryUtils.pauseTrigger(jsonObjectStr);
break; break;
} }

2
service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java
View File

@ -398,7 +398,7 @@ public class SysUserServiceImpl extends BaseService<SysUserEntity, String> imple
} }
//1、查询所有菜单和按钮，以及选中的菜单和按钮 //1、查询所有菜单和按钮，以及选中的菜单和按钮
SysMenuConfigEntity sysMenuConfigEntity = new SysMenuConfigEntity(); SysMenuConfigEntity sysMenuConfigEntity = new SysMenuConfigEntity();
sysMenuConfigEntity.setVisibles("0"); //sysMenuConfigEntity.setVisibles("0");
List<SysMenuConfigEntity> allMenu = sysMenuConfigDao.queryBase(sysMenuConfigEntity); List<SysMenuConfigEntity> allMenu = sysMenuConfigDao.queryBase(sysMenuConfigEntity);
SysButtonConfigEntity sysButtonConfigEntity = new SysButtonConfigEntity(); SysButtonConfigEntity sysButtonConfigEntity = new SysButtonConfigEntity();