修改安环加药导入

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<BsDosingRecEntity> importList = ExcelUtil.read(
 				file, 0, 1, BsDosingRecEntity.class
 		);
+		importList.forEach(x->{
+			x.setDorType(dorType);
+		});
 		return R.status(bsDosingRecService.saveBatch(importList));
 	}
 	/**

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

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)
+	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
-	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
+	@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;
+
 }

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<String, String> configerMap = new LinkedHashMap();
+    private static final Map<String, EnumConfiger> 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());
+        }
+    }
+}

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;

blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml

@@ -39,7 +39,7 @@
             and account = #{user.account}
         </if>
         <if test="user.roleId!=null and user.roleId != ''">
-            and role_id = #{user.roleId}
+            and role_id like '%' || #{user.roleId} || '%'
         </if>
         <if test="user.realName!=null and user.realName != ''">
             and real_name = #{user.realName}