diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDosingRecController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDosingRecController.java index 476ff162..f3b7dc47 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDosingRecController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDosingRecController.java @@ -180,7 +180,7 @@ public class BsDosingRecController extends BladeController { @PostMapping("/importExcel") @ApiOperationSupport(order = 11) @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { + public R importExcel(@RequestParam String dorType,@RequestParam("file") MultipartFile file) { R checkR = ExcelExtUtil.importExcelCheck(file); if (checkR != null) { return checkR; @@ -188,6 +188,9 @@ public class BsDosingRecController extends BladeController { List importList = ExcelUtil.read( file, 0, 1, BsDosingRecEntity.class ); + importList.forEach(x->{ + x.setDorType(dorType); + }); return R.status(bsDosingRecService.saveBatch(importList)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java index 78a12180..35a1e47b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java @@ -221,11 +221,8 @@ public class BsSafeInspectionPointController { if (reportId == null) { reportId = "safety_inspectionPoint"; } - Map map=new HashMap(); - map.put("companyName","客户公司的名称"); - map.put("companySN","客户公司的简称"); //ipIdList.forEach(id -> list.add(safeInspectionPointService.getByKey(id))); - exportUtil.export(reportId, exportType, "安全巡检点", list, map,request, response); + exportUtil.export(reportId, exportType, "安全巡检点", list, null,request, response); } /** * 巡检点配置表 导出pdf diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java index b5363fee..2bb767b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java @@ -54,11 +54,6 @@ public class BsDosingRecEntity extends BaseEntity { @Serial private static final long serialVersionUID = 1L; - /** - * 酸雾塔 - */ - @Schema(description = "酸雾塔") - private BigDecimal btId; /** * 设施 */ @@ -78,8 +73,8 @@ public class BsDosingRecEntity extends BaseEntity { * 加药时间 */ @Schema(description = "加药时间") - @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) - @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATE) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) private Date dosingTime; /** * 加药人 @@ -102,4 +97,10 @@ public class BsDosingRecEntity extends BaseEntity { @Schema(description = "类型：1、废气加药；2、废水加药") private String dorType; + /** + * 酸雾塔 + */ + @Schema(description = "酸雾塔") + private Long btId; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/Configer.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/Configer.java new file mode 100644 index 00000000..fcd5e584 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/Configer.java @@ -0,0 +1,85 @@ +package org.springblade.desk.energy.util; + +import com.alibaba.fastjson.JSONObject; +import com.videasoft.configs.EnumConfiger; +import com.videasoft.configs.XmlConfigReader; +import jakarta.annotation.PostConstruct; +import org.springframework.stereotype.Component; + +import java.text.MessageFormat; +import java.util.LinkedHashMap; +import java.util.Map; +@Component +public class Configer { + private static final Map configerMap = new LinkedHashMap(); + private static final Map enumConfigerMap = new LinkedHashMap(); + + public Configer() { + } + + public static String getValue(String code) { + return (String)configerMap.get(code); + } + + public static String getValue(String code, String defaultValue) { + String v = getValue(code); + return v == null ? defaultValue : v; + } + + public static String getValue(String id, String[] args) { + String value = getValue(id); + if (value != null) { + value = MessageFormat.format(value, (Object[])args); + } + + return value; + } + + public static EnumConfiger getEnumConfiger(String id) { + return (EnumConfiger)enumConfigerMap.get(id); + } + + public static String getEnumValue(String id, String code) { + String enumValue = null; + EnumConfiger enumConfiger = getEnumConfiger(id); + if (enumConfiger != null) { + enumValue = enumConfiger.getEnumValue(code); + } + + return enumValue; + } + + public static String getEnumValue(String id, String code, String[] args) { + String enumValue = getEnumValue(id, code); + if (enumValue != null) { + enumValue = MessageFormat.format(enumValue, (Object[])args); + } + + return enumValue; + } + + public static JSONObject getJsonEnum(String id) { + JSONObject json = new JSONObject(); + EnumConfiger enumConfiger = getEnumConfiger(id); + if (enumConfiger != null) { + json.putAll(enumConfiger.getOption()); + } + + return json; + } + @PostConstruct + public static void init() { + XmlConfigReader loader = new XmlConfigReader(); + configerMap.clear(); + configerMap.putAll(loader.loadKeyValues()); + enumConfigerMap.clear(); + enumConfigerMap.putAll(loader.loadEnumConfigs()); + } + + public static void appendLoad(XmlConfigReader reader) { + if (reader != null) { + configerMap.putAll(reader.loadKeyValues()); + enumConfigerMap.putAll(reader.loadEnumConfigs()); + } + } +} \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java index 755c4fb7..6816a3aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java @@ -1,6 +1,5 @@ package org.springblade.desk.energy.util; -import com.videasoft.configs.Configers; import com.videasoft.utils.other.Function; import com.videasoft.utils.reader.PathReader; import com.videasoft.webframework.common.web.report.JasperReportUtils; @@ -64,7 +63,7 @@ public class JasperReportUtil { ((Map)params).putAll(rm.getExtParam()); } - // ((Map)params).put("companyInfo", Configers.getEnumConfiger("company").getOption()); + ((Map)params).put("companyInfo", Configer.getEnumConfiger("company").getOption()); SubReportModel subReport = null; JasperReport subJS = null; ReportModel subRM = null; diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/废水化验记录导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/废水化验记录导入模板.xls index 9b676fc1..cd906dd5 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/QA/废水化验记录导入模板.xls and b/blade-service/blade-desk/src/main/resources/Excel/QA/废水化验记录导入模板.xls differ diff --git a/blade-service/blade-desk/src/main/resources/configs/jasperReport/safety/safety_inspectionPoint.jasper b/blade-service/blade-desk/src/main/resources/configs/jasperReport/safety/safety_inspectionPoint.jasper index c3728827..2bc65a35 100644 Binary files a/blade-service/blade-desk/src/main/resources/configs/jasperReport/safety/safety_inspectionPoint.jasper and b/blade-service/blade-desk/src/main/resources/configs/jasperReport/safety/safety_inspectionPoint.jasper differ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml index c63db15b..e41e8eff 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml @@ -39,7 +39,7 @@ and account = #{user.account} - and role_id = #{user.roleId} + and role_id like '%' || #{user.roleId} || '%' and real_name = #{user.realName}