Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

+package com.yeejoin.equipmanage.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.equipmanage.common.utils.CommonPageable;
+import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
+import com.yeejoin.equipmanage.common.utils.StringUtil;
+import com.yeejoin.equipmanage.config.PersonIdentify;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+@RestController
+@Api(tags = "监盘总览组态需求 -- API")
+@RequestMapping(value = "/supervisionConfigure", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+public class SupervisionConfigureController extends AbstractBaseController {
+
+}

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -354,7 +354,7 @@
                 wls.biz_org_code like  concat (#{param.bizOrgCode},'%')
             </if>
             <if test="param.alarmLogId != null">
-                and wlesal.id = #{alarmLogId}
+                and wlesal.id = #{param.alarmLogId}
             </if>
             <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
                 and wlesal.location like concat(concat("%",#{param.warehouseStructureName}),"%")