diff --git a/nladmin-common/src/main/java/org/nl/utils/StringUtils.java b/nladmin-common/src/main/java/org/nl/utils/StringUtils.java index 38d0b1a5d..f48f59473 100644 --- a/nladmin-common/src/main/java/org/nl/utils/StringUtils.java +++ b/nladmin-common/src/main/java/org/nl/utils/StringUtils.java @@ -145,6 +145,11 @@ public class StringUtils { * 获取ip地址 */ public static String getIp(HttpServletRequest request) { + // TODO 不解析IP地址 + if(true){ + return "127.0.0.1"; + } + String ip = request.getHeader("x-forwarded-for"); if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); diff --git a/nladmin-system/src/main/java/wql/CodeRuledetailDto.java b/nladmin-system/src/main/java/wql/CodeRuledetailDto.java deleted file mode 100644 index 5c3899aff..000000000 --- a/nladmin-system/src/main/java/wql/CodeRuledetailDto.java +++ /dev/null @@ -1,50 +0,0 @@ -package wql; - -import lombok.Data; - import java.math.BigDecimal; -import java.io.Serializable; - -/** -* @description / -* @author ldjun -* @date 2021-01-13 -**/ -@Data -public class CodeRuledetailDto implements Serializable { - - private String id; - - private String type; - - private String init_value; - - private String current_value; - - private String max_value; - - private String step; - - private String fillchar; - - private String format; - - private int length; - - private BigDecimal sort_num; - - private String remark; - - private String rule_id; - - private String is_active; - - private String is_delete; - - private String create_by; - - private String create_time; - - private String update_by; - - private String update_time; -} diff --git a/nladmin-system/src/main/java/wql/DEVICE_01.wql b/nladmin-system/src/main/java/wql/DEVICE_01.wql deleted file mode 100644 index f1363f5a9..000000000 --- a/nladmin-system/src/main/java/wql/DEVICE_01.wql +++ /dev/null @@ -1,98 +0,0 @@ -[交易说明] -交易名: Device接口 -所属模块: -功能简述: -版权所有: -表引用: -版本经历: - -[数据库] ---指定数据库,为空采用默认值,默认为db.properties中列出的第一个库 - -[IO定义] -################################################# -## 表字段对应输入参数 -################################################# - //sql类型 - 输入.flag TYPEAS s_string - //设备编码(Like模糊) - 输入.code TYPEAS s_string - //设备名称(Like模糊) - 输入.name TYPEAS s_string - //设备类型(=精确) - 输入.type TYPEAS s_string - //是否路由站点(=精确) - 输入.is_route TYPEAS s_string - //设备id(=精确) - 输入.device_id TYPEAS s_string - //设备参数类型(=精确) - 输入.extratype TYPEAS s_string - - -[临时表] ---这边列出来的临时表就会在运行期动态创建 - -[临时变量] ---所有中间过程变量均可在此处定义 - -[业务过程] - -########################################## -# 1、输入输出检查 # -########################################## - - -########################################## -# 2、主过程前处理 # -########################################## - - -########################################## -# 3、业务主过程 # -########################################## - IF 输入.flag = "1" - PAGEQUERY - SELECT - elt.* - FROM - acs_device elt - WHERE - 1=1 and elt.is_delete='0' - OPTION 输入.code <> "" - elt.code like 输入.code - ENDOPTION - OPTION 输入.name <> "" - elt.name like 输入.name - ENDOPTION - OPTION 输入.type <> "" - elt.type = 输入.type - ENDOPTION - OPTION 输入.is_route <> "" - elt.is_route = 输入.is_route - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - PAGEQUERY - SELECT - name AS db, - remark, - code - FROM - acs_device_extra - WHERE - 1=1 - OPTION 输入.device_id <> "" - acs_device_extra.device_id = 输入.device_id - ENDOPTION - OPTION 输入.extratype <> "" - acs_device_extra.type = 输入.extratype - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - - diff --git a/nladmin-system/src/main/java/wql/device.xls b/nladmin-system/src/main/java/wql/device.xls deleted file mode 100644 index 1ad1f5786..000000000 Binary files a/nladmin-system/src/main/java/wql/device.xls and /dev/null differ diff --git a/nladmin-system/src/main/java/wql/sys.xls b/nladmin-system/src/main/java/wql/sys.xls deleted file mode 100644 index 419fe9f02..000000000 Binary files a/nladmin-system/src/main/java/wql/sys.xls and /dev/null differ diff --git a/nladmin-system/src/main/java/wql/tt.wql b/nladmin-system/src/main/java/wql/tt.wql deleted file mode 100644 index 1d67a9de2..000000000 --- a/nladmin-system/src/main/java/wql/tt.wql +++ /dev/null @@ -1,58 +0,0 @@ -[交易说明] - 交易名: 销售订单 - 所属模块: - 功能简述: - 版权所有: - 表引用: - 版本经历: - -[数据库] - --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库 -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - - 输入.order_code_start TYPEAS s_string - - 输入.bill_status TYPEAS s_string - - 输入.biztype_scode TYPEAS s_string - - 输入.date_begin TYPEAS s_string - - 输入.date_end TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - -QUERY - SELECT - point_code as p - FROM - ds_agv_pointcoordinaterelate - WHERE - 1=1 - ENDSELECT -ENDQUERY -