root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:主从同步配置修改；opt:任务查询页面优化

Browse Source
This commit is contained in:
zhangzq
2025-02-12 10:56:29 +08:00
parent 1b7eab6a5e
commit 0bc445e869
5 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
View File

@@ -2,9 +2,11 @@ package org.nl.config.mybatis;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.github.pagehelper.PageInterceptor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -37,11 +39,9 @@ public class MybatisPlusConfig {
return interceptor;
}
@Bean
ConfigurationCustomizer mybatisConfigurationCustomizer() {
return configuration -> configuration.addInterceptor(new PageInterceptor());
}
// @PostConstruct
// public void datainnit() {
// String url = ((DruidDataSource) dataSource).getUrl();
// System.out.println("项目数据库地址：" + url);
// log.debug("项目数据库地址：{}", url);
// }
}

12
lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java
View File

@@ -7,7 +7,7 @@
*
* 创 建 者 ：yumeng
* 创建时间：2014-07-01 14:25:35
* 文件版本：v1.0
* 文件版本：v1.0
*
*******************************************************/
package org.nl.modules.wql.core.bean;
@@ -20,6 +20,7 @@ import org.apache.commons.beanutils.BasicDynaBean;
import org.apache.commons.beanutils.BasicDynaClass;
import org.apache.commons.beanutils.DynaProperty;
import org.apache.commons.beanutils.RowSetDynaClass;
import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
import org.nl.modules.wql.util.WqlUtil;
import java.beans.IntrospectionException;
@@ -110,7 +111,7 @@ public class ResultBean implements Serializable, Cloneable {
// */
// public WQLData getWQLData(WQLObject wo,int value){
// if (value < rslist.size()) {
//
//
// ArrayList list = getResultSet(value);
// try{
// WQLData wd = null;
@@ -127,7 +128,7 @@ public class ResultBean implements Serializable, Cloneable {
// }
// return null;
// }
//
//
// /**
// * 返回普通dataset
// * @param value
@@ -342,6 +343,11 @@ public class ResultBean implements Serializable, Cloneable {
}
try {
//支持别名的设置
if (sqlResultSet instanceof ShardingSphereResultSet){
ShardingSphereResultSet resultSet = (ShardingSphereResultSet) sqlResultSet;
sqlResultSet = resultSet.getResultSets().get(0);
}
WQLRowSetDynaClass rs = new WQLRowSetDynaClass(sqlResultSet, true, -1);
rslist.add(rs);
ResultCount = rslist.size();

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java
View File

@@ -19,7 +19,7 @@ public interface TaskService {
* @param page 分页参数
* @return Map<String, Object>
*/
TableDataInfo queryAll(Map whereJson, Pageable page);
Map queryAll(Map whereJson, Pageable page);
/**
* 任务操作

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -55,7 +55,7 @@ public class TaskServiceImpl implements TaskService {
private final RedissonClient redissonClient;
@Override
public TableDataInfo queryAll(Map form, Pageable page) {
public Map queryAll(Map form, Pageable page) {
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
@@ -107,12 +107,8 @@ public class TaskServiceImpl implements TaskService {
if (ObjectUtil.isNotEmpty(in_area_id)) {
map.put("in_area_id", in_area_id);
}
Page<Object> startPage = PageHelper.startPage(page.getPageNumber(), page.getPageSize());
PageHelper.orderBy("update_time desc");
JSONArray content = WQL.getWO("QSCH_TASK_01").addParamMap(map).process().getResultJSONArray(0);
TableDataInfo<Object> build = TableDataInfo.build(content);
build.setTotalElements(startPage.getTotal());
return build;
JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task_id desc");
return json;
}
@Override

19
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
View File

@@ -50,18 +50,15 @@
##########################################
IF 输入.flag = "1"
QUERY
SELECT * FROM (
PAGEQUERY
SELECT
task.*,
md.class_name task_type_name,
user.person_name AS create_name1,
dict.label task_status_name
user.person_name AS create_name1
FROM
sch_base_task task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
LEFT JOIN sys_user user ON user.username = task.create_name
LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
WHERE
1=1
OPTION 输入.is_delete <> ""
@@ -83,7 +80,7 @@
task.task_status <> '07'
ENDOPTION
OPTION 输入.task_status <> ""
find_in_set( task.task_status, 输入.task_status)
task.task_status = '07'
ENDOPTION
OPTION 输入.vehicle_code <> ""
(task.vehicle_code like 输入.vehicle_code OR task.material_code like 输入.vehicle_code OR task.vehicle_code2 like 输入.vehicle_code)
@@ -100,11 +97,9 @@
OPTION 输入.end_time <> ""
task.create_time <= 输入.end_time
ENDOPTION
) a
WHERE 1=1
OPTION 输入.in_area_id <> ""
a.product_area IN 输入.in_area_id
ENDOPTION
OPTION 输入.in_area_id <> ""
task.product_area IN 输入.in_area_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDPAGEQUERY
ENDIF