ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【codeReview】标准法规审计

Browse Source
This commit is contained in:
liao
2023-08-25 15:27:53 +08:00
parent 1a509f6e63
commit 95b0736c1e
4 changed files with 25 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
+4
View File
@@ -31,4 +31,8 @@ public class FieldCommon {
LawsFieldTypeEnum.OPTION_MANY.getValue() // 下拉多选
);
public static final String MODULE = "module"; // 表名标识
public static final String ORDER_BY = "orderBy";
public static final String ORDER_BY_FIELD = "orderByField";
}
jero-boot-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class LawsCommonController {
@AutoLog(value = "通用操作-获取查询条件")
@ApiOperation(value="通用操作-获取查询条件", notes="通用操作-获取查询条件")
@GetMapping(value = "getQueryCondition")
public Result<List<Map<String,Object>>> getQueryCondition(@RequestParam(name="module") String module) {
public Result<List<LawsTag>> getQueryCondition(@RequestParam(name="module") String module) {
return Result.OK(lawsCommonService.getQueryCondition(module));
}
jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java
+1 -1
View File
@@ -46,7 +46,7 @@ public interface ILawsCommonService {
* @Date: 2023/8/24 10:41
* @Description: 获取查询条件
**/
List<Map<String, Object>> getQueryCondition(String module);
List<LawsTag> getQueryCondition(String module);
/**
* @Author: liao
jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+19 -46
View File
@@ -48,7 +48,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
@Override
public IPage<Map<String, Object>> getCommonPage(Map<String, Object> parameterMap) {
// 获取操作模块
String module = parameterMap.get("module").toString();
String module = parameterMap.get(FieldCommon.MODULE).toString();
// 获取要操作的表名
String tableName = TableNameEnum.getTableName(module);
@@ -144,7 +144,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
@Override
public String commonAdd(Map<String, Object> parameterMap) {
// 获取操作模块
String module = parameterMap.get("module").toString();
String module = parameterMap.get(FieldCommon.MODULE).toString();
// 获取要操作的表名
String tableName = TableNameEnum.getTableName(module);
// 获取全部字段
@@ -186,8 +186,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
@Override
public String commonEdit(Map<String, Object> parameterMap) {
// 获取操作模块
String module = parameterMap.get("module").toString();
parameterMap.remove("module");
String module = parameterMap.get(FieldCommon.MODULE).toString();
parameterMap.remove(FieldCommon.MODULE);
// 获取id
String id = parameterMap.get("id").toString();
parameterMap.remove("id");
@@ -231,7 +231,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
* @Description: 获取查询条件
**/
@Override
public List<Map<String, Object>> getQueryCondition(String module) {
public List<LawsTag> getQueryCondition(String module) {
// 获取操作语言
LanguageEnum language = MessageUtils.getLanguage();
// 获取要操作的表名
@@ -240,20 +240,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(tableName);
fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getInteger()
.equals(lawsTag.getIsQuery())).collect(Collectors.toList());
List<Map<String, Object>> resultList = new java.util.ArrayList<>();
for (LawsTag lawsTag : fieldList) {
Map<String, Object> map = new HashMap<>();
map.put("field_show_type", lawsTag.getFieldShowType());// 字段类型
map.put("dict_field", lawsTag.getDictField());
map.put("db_field_name", lawsTag.getDbFieldName()); // 字段名
if (LanguageEnum.CN.equals(language)) {
map.put("db_field_txt", lawsTag.getDbFieldTxt());//字段中文名
} else {
map.put("db_field_txt", lawsTag.getDbFieldEnName());//字段英文名
if (LanguageEnum.EN.equals(language)) {
lawsTag.setDbFieldTxt(lawsTag.getDbFieldEnName());
}
resultList.add(map);
}
return resultList;
return fieldList;
}
/**
@@ -288,32 +280,13 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
if (LanguageEnum.EN.equals(language)) {
areaName = area.getEnName();
}
// 字段的列表
List<Map<String, Object>> fieldMapList = new java.util.ArrayList<>();
// 对字段进行遍历处理
for (LawsTag lawsTag : areaFieldList) {
// 每个区域下面字段的集合
Map<String, Object> fieldMap = new HashMap<>();
// 对返回的字段做处理
fieldMap.put("dbFieldName", lawsTag.getDbFieldName()); // 字段名
// 字段中英文显示
if (LanguageEnum.CN.equals(language)) {
fieldMap.put("db_field_txt", lawsTag.getDbFieldTxt());//字段中文名
} else {
fieldMap.put("db_field_txt", lawsTag.getDbFieldEnName());//字段英文名
if (LanguageEnum.EN.equals(language)) {
lawsTag.setDbFieldTxt(lawsTag.getDbFieldEnName());
}
fieldMap.put("field_show_type", lawsTag.getFieldShowType()); // 字段类型
fieldMap.put("dict_field", ""); // 字典编码
if (StringUtils.isNotBlank(lawsTag.getDictField())) {
fieldMap.put("dict_field", lawsTag.getDictField()); // 字典编码
}
fieldMap.put("show_area", lawsTag.getShowArea()); // 显示区域
fieldMap.put("field_must_input", lawsTag.getFieldMustInput()); // 是否必填
fieldMap.put("db_length", lawsTag.getDbLength()); // 字段长度
fieldMap.put("isReadOnly", lawsTag.getIsReadOnly()); // 是否只读
fieldMapList.add(fieldMap);
}
areaMap.put(areaName, fieldMapList);
areaMap.put(areaName, areaFieldList);
}
return areaMap;
}
@@ -519,7 +492,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
}
}
//处理列表表头排序
String orderByField = (String) parameterMap.get("orderByField");
String orderByField = (String) parameterMap.get(FieldCommon.ORDER_BY_FIELD);
if (StringUtils.isNotBlank(orderByField)) {
// 排序字段的类型
String fieldShowType = fieldList.stream().filter(lawsTag -> orderByField
@@ -528,7 +501,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
// 多日期的排序逻辑不一样
orderBySortDateMany(parameterMap, selectCondition);
} else {
selectCondition.append(" order by " + parameterMap.get("orderByField"));
selectCondition.append(" order by " + parameterMap.get(FieldCommon.ORDER_BY_FIELD));
orderBySort(parameterMap, selectCondition);
}
} else {
@@ -543,9 +516,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
* @Description: 给拼装的查询条件排序
**/
private void orderBySort(Map<String, Object> parameterMap, StringBuilder selectCondition) {
if ("1".equals(parameterMap.get("orderBy"))) {
if ("1".equals(parameterMap.get(FieldCommon.ORDER_BY))) {
selectCondition.append(" asc"); //正序
} else if ("2".equals(parameterMap.get("orderBy"))) {
} else if ("2".equals(parameterMap.get(FieldCommon.ORDER_BY))) {
selectCondition.append(" desc"); //倒序
}
}
@@ -556,13 +529,13 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
* @Description: 给拼装的查询条件排序（多日期）
**/
private void orderBySortDateMany(Map<String, Object> parameterMap, StringBuilder selectCondition) {
if ("1".equals(parameterMap.get("orderBy"))) {
if ("1".equals(parameterMap.get(FieldCommon.ORDER_BY))) {
selectCondition.append(" order by STR_TO_DATE(SUBSTRING_INDEX(" +
parameterMap.get("orderByField") + ", ',', 1), '%Y-%m-%d')");
parameterMap.get(FieldCommon.ORDER_BY_FIELD) + ", ',', 1), '%Y-%m-%d')");
selectCondition.append(" asc"); //正序
} else if ("2".equals(parameterMap.get("orderBy"))) {
} else if ("2".equals(parameterMap.get(FieldCommon.ORDER_BY))) {
selectCondition.append(" order by STR_TO_DATE(SUBSTRING_INDEX(" +
parameterMap.get("orderByField") + ", ',', -1), '%Y-%m-%d')");
parameterMap.get(FieldCommon.ORDER_BY_FIELD) + ", ',', -1), '%Y-%m-%d')");
selectCondition.append(" desc"); //倒序
}
}