From 31692354e8191b583250c213152bfd0068ffe0fc Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 13 十一月 2023 10:43:05 +0800
Subject: [PATCH] 整理代码
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 30 ++-
consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 4
consum-model-pojo/src/main/java/com/consum/model/po/SDictData.java | 38 ++--
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 4
consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java | 236 ++++++++++++++++++++++++++
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 6
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 8
consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java | 7
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 15
consum-model-pojo/src/main/java/com/consum/model/po/SDictData_mapper.java | 133 +++++++-------
11 files changed, 362 insertions(+), 121 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index a9747e1..ee3ee21 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -5,7 +5,7 @@
import com.consum.base.service.BaseGoodsTemplateServiceImpl;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.S_dict_data;
+import com.consum.model.po.SDictData;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -151,7 +151,7 @@
*/
@GetMapping("/select/classificationCode")
public ResponseValue queryClassificationCode() {
- List<S_dict_data> list = this.baseGoodsTemplateService.queryClassificationCode();
+ List<SDictData> list = this.baseGoodsTemplateService.queryClassificationCode();
return ResponseValue.success(list);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index da7ea2e..425a67f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -4,6 +4,8 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.LWhFormProcureGoodsParams;
import com.consum.base.pojo.LWhFormProcureParam;
@@ -23,7 +25,6 @@
import com.consum.base.service.LWhFormProcureService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.core.utils.MapUtils;
import com.consum.model.po.BaseGoodsTemplate;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
@@ -377,13 +378,14 @@
@ApiOperation(value = "閲囪喘鍗曟槑缁嗘煡璇�", notes = "閲囪喘鍗曟槑缁嗘煡璇�")
@ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鍗曟槑缁嗘煡璇�", required = true, dataType = "FormProcureQryDto", paramType = "query")})
@GetMapping("detail/list")
- public ResponseValue queryFormProcureDetailList(FormProcureQryDto param) {
+ public ResponseValue queryFormProcureDetailList() {
+ FormProcureQryDto formProcureQryDto = CommonUtil.getObjFromReq(FormProcureQryDto.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(param);
+ GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQryDto);
return ResponseValue.success(genericPager);
}
}
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java
new file mode 100644
index 0000000..71ad5ec
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java
@@ -0,0 +1,236 @@
+package com.consum.base.core.utils;
+// @formatter:off
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+/**
+ * .-~~~~~~~~~-._ _.-~~~~~~~~~-.
+ * __.' @Author ~. .~ 浠ｇ爜鏃燘ug `.__
+ * .'// liu.q \./ (绉樼睄) \\`.
+ * .'// [916000612@qq.com] | 娆茬粌绁炲姛 寮曞垁鑷 \\`.
+ * .'// .-~"""""""~~~~-._ | _,-~~~~"""""""~-. \\`.
+ * .'//.-" 2019-04-09 `-. | .-' 10:48 "-.\\`.
+ * .'//______.============-.. \ | / ..-============.______\\`.
+ * .'______________________________\|/______________________________`.
+ *
+ * @Description :
+ */
+// @formatter:on
+public class CommonUtil {
+
+ /**
+ * @Author : liuq
+ * @Date : Create in 2018/7/1 涓婂崍1:20
+ * @Description : 椹煎嘲杞笅鍒掔嚎
+ */
+ public static String camel2Underline(String line) {
+ if (line == null || "".equals(line)) {
+ return "";
+ }
+ line = String.valueOf(line.charAt(0)).toUpperCase().concat(line.substring(1));
+ StringBuffer sb = new StringBuffer(512);
+ Pattern pattern = Pattern.compile("[A-Z]([a-z\\d]+)?");
+ Matcher matcher = pattern.matcher(line);
+ while (matcher.find()) {
+ String word = matcher.group();
+ sb.append(word.toUpperCase());
+ sb.append(matcher.end() == line.length() ? "" : "_");
+ }
+ return sb.toString();
+ }
+
+ /*
+ * @Author : liu.q [916000612@qq.com]
+ *
+ * @Date : 2019-04-29 16:45
+ *
+ * @Description : 涓嬪垝绾胯浆椹煎嘲
+ */
+ public static String Underline2camel(String para) {
+ StringBuilder result = new StringBuilder();
+ String a[] = para.split("_");
+ for (String s : a) {
+ if (!para.contains("_")) {
+ result.append(s);
+ continue;
+ }
+ if (result.length() == 0) {
+ result.append(s.toLowerCase());
+ } else {
+ result.append(s.substring(0, 1).toUpperCase());
+ result.append(s.substring(1).toLowerCase());
+ }
+ }
+ return result.toString();
+ }
+
+ /**
+ * @Author : liu.q
+ * @Date : 2019-03-01 09:49
+ * @Description : 鑾峰彇request
+ */
+ public static HttpServletRequest getRequest() {
+ ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ HttpServletRequest request = requestAttributes.getRequest();
+ return request;
+ }
+
+ /**
+ * @Author : liu.q
+ * @Date : 2019-03-01 09:49
+ * @Description : response
+ */
+ public static HttpServletResponse getResponse() {
+ ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ HttpServletResponse response = requestAttributes.getResponse();
+ return response;
+ }
+
+
+ // /**
+// * 鑾峰彇璇锋眰鍙傛暟
+// *
+// * @return
+// */
+ public static Map getParameterMap() {
+ // 鍙傛暟Map
+ Map properties = CommonUtil.getRequest().getParameterMap();
+ // 杩斿洖鍊糓ap
+ Map returnMap = new HashMap();
+ Iterator entries = properties.entrySet().iterator();
+ Map.Entry entry;
+ String name = "";
+ String value = "";
+ while (entries.hasNext()) {
+ entry = (Map.Entry) entries.next();
+ name = (String) entry.getKey();
+ Object valueObj = entry.getValue();
+ if (null == valueObj) {
+ continue;
+ } else if (valueObj instanceof String[]) {
+ String[] values = (String[]) valueObj;
+ for (int i = 0; i < values.length; i++) {
+ value = values[i] + ",";
+ }
+ value = value.substring(0, value.length() - 1);
+ } else {
+ value = valueObj.toString();
+ }
+ if ("".equals(value)) {
+ continue;
+ }
+ returnMap.put(name, value);
+ }
+
+ // 鍒ゆ柇鎺掑簭asc鍜宒esc
+ if (returnMap.containsKey("sortOrder") && returnMap.get("sortOrder") != null && returnMap.get("sortOrder") != "") {
+ if (!"DESC".equals(convert2Str(returnMap.get("sortOrder")).toUpperCase()) && !"ASC".equals(convert2Str(returnMap.get("sortOrder")).toUpperCase())) {
+ returnMap.put("sortOrder", "");
+ }
+ }
+ return returnMap;
+ }
+
+ private static String convert2Str(Object object) {
+ if (object == null) {
+ return "";
+ }
+ if (object instanceof String) {
+ return (String) object;
+ } else {
+ return object.toString();
+ }
+
+ }
+
+
+ private static ObjectMapper mapper = null;
+
+ static {
+ mapper = new ObjectMapper();
+ mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ }
+
+
+ public static <T> T getObjFromReq(Class<T> clazz) {
+ T t = null;
+ try {
+ Map parameterMap = getParameterMap();
+ String jsonStr = mapper.writeValueAsString(parameterMap);
+ t = mapper.readValue(jsonStr, clazz);
+ if (t == null) {
+ t = clazz.newInstance();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return t;
+ }
+
+ public static <T> T getObjFromReqBody(Class<T> clazz) {
+ T t = null;
+ try {
+ String jsonStr = getRequestBody();
+ t = mapper.readValue(jsonStr, clazz);
+ if (t == null) {
+ return clazz.newInstance();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return t;
+ }
+
+ public static String getStringFromInputStream(ServletInputStream stream) throws IOException {
+ StringBuilder sb = new StringBuilder();
+ BufferedReader reader = null;
+ try {
+ reader = new BufferedReader(new InputStreamReader(stream, "UTF-8"));
+ char[] ch = new char[1024];
+ int bytesRead;
+ while ((bytesRead = reader.read(ch)) != -1) {
+ sb.append(ch, 0, bytesRead);
+ }
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 鑾峰彇request body鍊�
+ *
+ * @param
+ * @return
+ */
+ private static String getRequestBody() {
+ HttpServletRequest request = getRequest();
+ try {
+ return getStringFromInputStream(request.getInputStream());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java b/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java
index f866681..6044a9b 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/FormProcureQryDto.java
@@ -64,7 +64,7 @@
* 瑙勬牸鍨嬪彿id
*/
@ApiModelProperty(value = "瑙勬牸鍨嬪彿id")
- private Long baseGoodsTemplateId;
+ private Long baseGoodsModelsId;
@ApiModelProperty(value = "姣忛〉鏄剧ず鏉℃暟")
private Integer pageSize = 10;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
index 24fa924..0625991 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
@@ -7,7 +7,7 @@
import com.consum.model.po.BaseCategory;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.S_dict_data;
+import com.consum.model.po.SDictData;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -284,9 +284,9 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public List<S_dict_data> queryClassificationCode() {
+ public List<SDictData> queryClassificationCode() {
StringBuilder sql = new StringBuilder("SELECT * FROM s_dict_data WHERE dict_type = 'CLASSIFICATION_CODE' order by dict_sort");
- return this.select(sql.toString(), new Object[]{}, new S_dict_data());
+ return this.select(sql.toString(), new Object[]{}, new SDictData());
}
/**
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
index 62d7e43..253d995 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
@@ -47,16 +47,16 @@
baseWarehouse.setId(IdUtil.generateId());
baseWarehouse.setWarehouseType(Constants.WAREHOUSE_TYPE_TENANT);
baseWarehouse.setWarehouseCode(codeGeneratorService.createWarehouseCode());
-// //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
-// FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
-// if (finSysTenant != null) {
-// baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
-// baseWarehouse.setAgencyName(finSysTenant.getName());
-// }
+ //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+ FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
+ if (finSysTenant != null) {
+ baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
+ baseWarehouse.setAgencyName(finSysTenant.getName());
+ }
//鏍规嵁CLASSIFICATION_CODE鏌ヨCLASSIFICATION_NAME
- S_dict_data s_dict_data = this.sDictDataService.get(new S_dict_data(Long.valueOf(param.getClassificationCode())));
- if (s_dict_data != null) {
- baseWarehouse.setClassificationName(s_dict_data.getDict_label());
+ SDictData dictData = this.sDictDataService.get(new SDictData(Long.valueOf(param.getClassificationCode())));
+ if (dictData != null) {
+ baseWarehouse.setClassificationName(dictData.getDict_label());
}
baseWarehouse.setIsDefault(Constants.IS_DEFAULT_YES);
@@ -108,9 +108,15 @@
* @Date 2023/10/26
*/
public int updateBaseWarehouse(BaseWarehouse baseWarehouse) {
- S_dict_data s_dict_data = this.sDictDataService.get(new S_dict_data(Long.valueOf(baseWarehouse.getClassificationCode())));
- if (s_dict_data != null) {
- baseWarehouse.setClassificationName(s_dict_data.getDict_label());
+ SDictData SDictData = this.sDictDataService.get(new SDictData(Long.valueOf(baseWarehouse.getClassificationCode())));
+ if (SDictData != null) {
+ baseWarehouse.setClassificationName(SDictData.getDict_label());
+ }
+ //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+ FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
+ if (finSysTenant != null) {
+ baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
+ baseWarehouse.setAgencyName(finSysTenant.getName());
}
return this.update(baseWarehouse);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index d354ab1..0b7c3dd 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -66,11 +66,10 @@
public GenericPager<Map<String, Object>> queryFormProcureDetailList(FormProcureQryDto param) {
HashMap<String, Object> paramts = new HashMap<>();
- StringBuilder sql = new StringBuilder(
- "SELECT pm.id,fp.BUSINESS_FORM_CODE,fpg.GOODS_TEMPLATE_NAME,pm.PRICE,pm.COUNTS, "
- + "( pm.PRICE * pm.COUNTS ) amount,fp.AGENCY_NAME,fp.BUYER_NAME,fp.PROCURE_TIME,pm.BUSINESS_ID,pm.BASE_GOODS_MODELS_NAME FROM l_wh_procure_model pm "
- + "LEFT JOIN l_wh_form_procure fp ON pm.BUSINESS_ID = fp.id "
- + "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID WHERE pm.BUSINESS_TYPE = 1 ");
+ StringBuilder sql = new StringBuilder("SELECT pm.id,fp.BUSINESS_FORM_CODE,fpg.GOODS_TEMPLATE_NAME,pm.PRICE,pm.COUNTS, "
+ + "( pm.PRICE * pm.COUNTS ) amount,fp.AGENCY_NAME,fp.BUYER_NAME,fp.PROCURE_TIME,pm.BUSINESS_ID,pm.BASE_GOODS_MODELS_NAME FROM l_wh_procure_model pm "
+ + "LEFT JOIN l_wh_form_procure fp ON pm.BUSINESS_ID = fp.id "
+ + "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID WHERE pm.BUSINESS_TYPE = 1 ");
//鍏ュ簱鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
sql.append("and BUSINESS_FORM_CODE = :businessFormCode ");
@@ -101,9 +100,9 @@
paramts.put("incomeTimeEnd", param.getIncomeTimeEnd() * 1000000 + 240000);
}
//瑙勬牸鍨嬪彿
- if (param.getBaseGoodsTemplateId() != null) {
- sql.append("and fpg.BASE_GOODS_TEMPLATE_ID =:baseGoodsTemplateId ");
- paramts.put("baseGoodsTemplateId",param.getBaseGoodsTemplateId());
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append("and pm.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
}
sql.append("ORDER BY PROCURE_TIME DESC");
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index d7b2604..d8c4a0c 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
@@ -125,8 +125,8 @@
//鑾峰彇鎶ュ簾鍘熷洜code
List<String> scrappedCodeList = scrappedGoodsParamList.stream().map(params -> params.getScrappedCode()).collect(Collectors.toList());
//鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
- List<S_dict_data> s_dict_dataList = this.sDictDataService.selectByScrappedCodeList(scrappedCodeList);
- Map<Long, String> scrappedNameMap = s_dict_dataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
+ List<SDictData> SDictDataList = this.sDictDataService.selectByScrappedCodeList(scrappedCodeList);
+ Map<Long, String> scrappedNameMap = SDictDataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
List<LWhFormScrappedGoods> scrappedGoodsList = new ArrayList<>();
for (LWhFormScrappedGoodsParams params : scrappedGoodsParamList) {
diff --git a/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java
index f895602..4488427 100644
--- a/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/SDictDataServiceImpl.java
@@ -1,7 +1,6 @@
package com.consum.base.service;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.S_dict_data;
+import com.consum.model.po.SDictData;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -17,7 +16,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
- public List<S_dict_data> selectByScrappedCodeList(List<String> scrappedCodeList) {
+ public List<SDictData> selectByScrappedCodeList(List<String> scrappedCodeList) {
if (CollectionUtils.isEmpty(scrappedCodeList)) {
log.error("鍙傛暟閿欒");
return null;
@@ -34,6 +33,6 @@
}
sql.append(" ) ");
- return this.select(sql.toString(), paramts, new S_dict_data());
+ return this.select(sql.toString(), paramts, new SDictData());
}
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/S_dict_data.java b/consum-model-pojo/src/main/java/com/consum/model/po/SDictData.java
similarity index 88%
rename from consum-model-pojo/src/main/java/com/consum/model/po/S_dict_data.java
rename to consum-model-pojo/src/main/java/com/consum/model/po/SDictData.java
index e0dfee0..7f7c0e6 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/S_dict_data.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/SDictData.java
@@ -11,7 +11,7 @@
* @author genrator
*/
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
-public class S_dict_data extends BasePo<S_dict_data> {
+public class SDictData extends BasePo<SDictData> {
// 搴忓垪鍖栫増鏈彿
private static final long serialVersionUID = 1L;
@@ -72,13 +72,13 @@
/**
* 榛樿鏋勯�犲嚱鏁�
*/
- public S_dict_data() {
+ public SDictData() {
}
/**
* 鏍规嵁涓婚敭鏋勯�犲璞�
*/
- public S_dict_data(Long dict_code) {
+ public SDictData(Long dict_code) {
this.setDict_code(dict_code);
}
@@ -284,53 +284,53 @@
/**
* 鍏嬮殕
*/
- public S_dict_data $clone() {
- S_dict_data s_dict_data = new S_dict_data();
+ public SDictData $clone() {
+ SDictData SDictData = new SDictData();
// 鏁版嵁搴撳悕绉�
//s_dict_data.setDatabaseName_(this.getDatabaseName_());
// 涓婚敭
if (this.isset_dict_code) {
- s_dict_data.setDict_code(this.getDict_code());
+ SDictData.setDict_code(this.getDict_code());
}
// 鏅�氬睘鎬�
if (this.isset_parent_id) {
- s_dict_data.setParent_id(this.getParent_id());
+ SDictData.setParent_id(this.getParent_id());
}
if (this.isset_dict_sort) {
- s_dict_data.setDict_sort(this.getDict_sort());
+ SDictData.setDict_sort(this.getDict_sort());
}
if (this.isset_dict_label) {
- s_dict_data.setDict_label(this.getDict_label());
+ SDictData.setDict_label(this.getDict_label());
}
if (this.isset_dict_value) {
- s_dict_data.setDict_value(this.getDict_value());
+ SDictData.setDict_value(this.getDict_value());
}
if (this.isset_dict_type) {
- s_dict_data.setDict_type(this.getDict_type());
+ SDictData.setDict_type(this.getDict_type());
}
if (this.isset_css_class) {
- s_dict_data.setCss_class(this.getCss_class());
+ SDictData.setCss_class(this.getCss_class());
}
if (this.isset_list_class) {
- s_dict_data.setList_class(this.getList_class());
+ SDictData.setList_class(this.getList_class());
}
if (this.isset_is_default) {
- s_dict_data.setIs_default(this.getIs_default());
+ SDictData.setIs_default(this.getIs_default());
}
if (this.isset_status) {
- s_dict_data.setStatus(this.getStatus());
+ SDictData.setStatus(this.getStatus());
}
if (this.isset_create_by) {
- s_dict_data.setCreate_by(this.getCreate_by());
+ SDictData.setCreate_by(this.getCreate_by());
}
if (this.isset_create_time) {
- s_dict_data.setCreate_time(this.getCreate_time());
+ SDictData.setCreate_time(this.getCreate_time());
}
if (this.isset_remark) {
- s_dict_data.setRemark(this.getRemark());
+ SDictData.setRemark(this.getRemark());
}
- return s_dict_data;
+ return SDictData;
}
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/S_dict_data_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/SDictData_mapper.java
similarity index 71%
rename from consum-model-pojo/src/main/java/com/consum/model/po/S_dict_data_mapper.java
rename to consum-model-pojo/src/main/java/com/consum/model/po/SDictData_mapper.java
index 8a5dbde..0aad8b3 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/S_dict_data_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/SDictData_mapper.java
@@ -7,7 +7,6 @@
import com.walker.jdbc.sqlgen.InsertBuilder;
import com.walker.jdbc.sqlgen.SelectBuilder;
import com.walker.jdbc.sqlgen.UpdateBuilder;
-import com.walker.jdbc.util.StringUtils;
import org.springframework.jdbc.core.RowMapper;
@@ -19,11 +18,11 @@
* 琛ㄥ悕:S_DICT_DATA *
* @author genrator
*/
-public class S_dict_data_mapper extends S_dict_data implements BaseMapper<S_dict_data> {
+public class SDictData_mapper extends SDictData implements BaseMapper<SDictData> {
// 搴忓垪鍖栫増鏈彿
private static final long serialVersionUID = 1L;
- public static final RowMapper<S_dict_data> ROW_MAPPER = new S_dict_dataRowMapper();
+ public static final RowMapper<SDictData> ROW_MAPPER = new S_dict_dataRowMapper();
// 涓婚敭
public static final String DICT_CODE = "dict_code";
@@ -44,50 +43,50 @@
/**
* 榛樿鏋勯�犲嚱鏁�
*/
- public S_dict_data_mapper(S_dict_data s_dict_data) {
- if (s_dict_data == null) {
+ public SDictData_mapper(SDictData SDictData) {
+ if (SDictData == null) {
throw new IllegalArgumentException("po鍙傛暟涓嶅厑璁镐负绌猴紒");
}
//涓婚敭
- if (s_dict_data.isset_dict_code) {
- this.setDict_code(s_dict_data.getDict_code());
+ if (SDictData.isset_dict_code) {
+ this.setDict_code(SDictData.getDict_code());
}
//鏅�氬睘鎬�
- if (s_dict_data.isset_parent_id) {
- this.setParent_id(s_dict_data.getParent_id());
+ if (SDictData.isset_parent_id) {
+ this.setParent_id(SDictData.getParent_id());
}
- if (s_dict_data.isset_dict_sort) {
- this.setDict_sort(s_dict_data.getDict_sort());
+ if (SDictData.isset_dict_sort) {
+ this.setDict_sort(SDictData.getDict_sort());
}
- if (s_dict_data.isset_dict_label) {
- this.setDict_label(s_dict_data.getDict_label());
+ if (SDictData.isset_dict_label) {
+ this.setDict_label(SDictData.getDict_label());
}
- if (s_dict_data.isset_dict_value) {
- this.setDict_value(s_dict_data.getDict_value());
+ if (SDictData.isset_dict_value) {
+ this.setDict_value(SDictData.getDict_value());
}
- if (s_dict_data.isset_dict_type) {
- this.setDict_type(s_dict_data.getDict_type());
+ if (SDictData.isset_dict_type) {
+ this.setDict_type(SDictData.getDict_type());
}
- if (s_dict_data.isset_css_class) {
- this.setCss_class(s_dict_data.getCss_class());
+ if (SDictData.isset_css_class) {
+ this.setCss_class(SDictData.getCss_class());
}
- if (s_dict_data.isset_list_class) {
- this.setList_class(s_dict_data.getList_class());
+ if (SDictData.isset_list_class) {
+ this.setList_class(SDictData.getList_class());
}
- if (s_dict_data.isset_is_default) {
- this.setIs_default(s_dict_data.getIs_default());
+ if (SDictData.isset_is_default) {
+ this.setIs_default(SDictData.getIs_default());
}
- if (s_dict_data.isset_status) {
- this.setStatus(s_dict_data.getStatus());
+ if (SDictData.isset_status) {
+ this.setStatus(SDictData.getStatus());
}
- if (s_dict_data.isset_create_by) {
- this.setCreate_by(s_dict_data.getCreate_by());
+ if (SDictData.isset_create_by) {
+ this.setCreate_by(SDictData.getCreate_by());
}
- if (s_dict_data.isset_create_time) {
- this.setCreate_time(s_dict_data.getCreate_time());
+ if (SDictData.isset_create_time) {
+ this.setCreate_time(SDictData.getCreate_time());
}
- if (s_dict_data.isset_remark) {
- this.setRemark(s_dict_data.getRemark());
+ if (SDictData.isset_remark) {
+ this.setRemark(SDictData.getRemark());
}
// 鍘绘帀锛�2022-09-07
// this.setDatabaseName_(s_dict_data.getDatabaseName_());
@@ -272,14 +271,14 @@
* 灏唕esultset鐨勪竴琛岃浆鍖栦负po
*/
@Override
- public S_dict_data mapRow(ResultSet rs, int i) throws SQLException {
+ public SDictData mapRow(ResultSet rs, int i) throws SQLException {
return ROW_MAPPER.mapRow(rs, i);
}
/**
* 鍏嬮殕
*/
- public S_dict_data toS_dict_data() {
+ public SDictData toS_dict_data() {
return super.$clone();
}
}
@@ -289,83 +288,83 @@
*
* @author genrator
*/
-class S_dict_dataRowMapper implements RowMapper<S_dict_data> {
+class S_dict_dataRowMapper implements RowMapper<SDictData> {
@Override
- public S_dict_data mapRow(ResultSet rs, int i) throws SQLException {
+ public SDictData mapRow(ResultSet rs, int i) throws SQLException {
ResultSetUtils resultSetUtils = new ResultSetUtils();
- S_dict_data s_dict_data = new S_dict_data();
+ SDictData SDictData = new SDictData();
Integer columnIndex;
//涓婚敭
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.DICT_CODE);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.DICT_CODE);
if (columnIndex > 0) {
- s_dict_data.setDict_code(rs.getLong(columnIndex));
+ SDictData.setDict_code(rs.getLong(columnIndex));
}
//鏅�氬睘鎬�
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.PARENT_ID);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.PARENT_ID);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- s_dict_data.setParent_id(null);
+ SDictData.setParent_id(null);
} else {
- s_dict_data.setParent_id(rs.getLong(columnIndex));
+ SDictData.setParent_id(rs.getLong(columnIndex));
}
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.DICT_SORT);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.DICT_SORT);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- s_dict_data.setDict_sort(null);
+ SDictData.setDict_sort(null);
} else {
- s_dict_data.setDict_sort(rs.getInt(columnIndex));
+ SDictData.setDict_sort(rs.getInt(columnIndex));
}
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.DICT_LABEL);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.DICT_LABEL);
if (columnIndex > 0) {
- s_dict_data.setDict_label(rs.getString(columnIndex));
+ SDictData.setDict_label(rs.getString(columnIndex));
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.DICT_VALUE);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.DICT_VALUE);
if (columnIndex > 0) {
- s_dict_data.setDict_value(rs.getString(columnIndex));
+ SDictData.setDict_value(rs.getString(columnIndex));
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.DICT_TYPE);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.DICT_TYPE);
if (columnIndex > 0) {
- s_dict_data.setDict_type(rs.getString(columnIndex));
+ SDictData.setDict_type(rs.getString(columnIndex));
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.CSS_CLASS);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.CSS_CLASS);
if (columnIndex > 0) {
- s_dict_data.setCss_class(rs.getString(columnIndex));
+ SDictData.setCss_class(rs.getString(columnIndex));
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.LIST_CLASS);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.LIST_CLASS);
if (columnIndex > 0) {
- s_dict_data.setList_class(rs.getString(columnIndex));
+ SDictData.setList_class(rs.getString(columnIndex));
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.IS_DEFAULT);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.IS_DEFAULT);
if (columnIndex > 0) {
- s_dict_data.setIs_default(rs.getString(columnIndex));
+ SDictData.setIs_default(rs.getString(columnIndex));
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.STATUS);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.STATUS);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- s_dict_data.setStatus(null);
+ SDictData.setStatus(null);
} else {
- s_dict_data.setStatus(rs.getInt(columnIndex));
+ SDictData.setStatus(rs.getInt(columnIndex));
}
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.CREATE_BY);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.CREATE_BY);
if (columnIndex > 0) {
- s_dict_data.setCreate_by(rs.getString(columnIndex));
+ SDictData.setCreate_by(rs.getString(columnIndex));
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.CREATE_TIME);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.CREATE_TIME);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- s_dict_data.setCreate_time(null);
+ SDictData.setCreate_time(null);
} else {
- s_dict_data.setCreate_time(rs.getLong(columnIndex));
+ SDictData.setCreate_time(rs.getLong(columnIndex));
}
}
- columnIndex = resultSetUtils.findColumn(rs, S_dict_data_mapper.REMARK);
+ columnIndex = resultSetUtils.findColumn(rs, SDictData_mapper.REMARK);
if (columnIndex > 0) {
- s_dict_data.setRemark(rs.getString(columnIndex));
+ SDictData.setRemark(rs.getString(columnIndex));
}
- return s_dict_data;
+ return SDictData;
}
}
--
Gitblit v1.9.1