预警管理

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProgressCorrectionMapper.xml

@@ -43,11 +43,12 @@
         from tb_gx_plan tgp
         left join tb_project tp on tp.bid_code = tgp.bid_code and tp.del_flag = 0
         left join t_pro_gt tpg on tgp.gx_id = tpg.gt_id
-        where tgp.del_flag = 0 and tp.pro_type='线路'  and tpg.del_flag = 0
+        where tgp.del_flag = 0 and tp.pro_type='线路' and tpg.del_flag = 0
         <if test="keyWord !=null and keyWord!=''">
             AND (INSTR(tpg.gt_name,#{keyWord}) > 0 OR
-             INSTR(tp.pro_name,#{keyWord}) > 0)
+            INSTR(tp.pro_name,#{keyWord}) > 0)
         </if>
+        order by proType,proName
     </select>
 
     <!--工序计划详情-->

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AlarmMgeController.java

@@ -59,7 +59,13 @@ public class AlarmMgeController extends BaseController {
     }
 
 
+    @ApiOperation(value = "告警推送")
+    @PostMapping("warnUpload")
+    @Log(title = "告警管理", menu = "告警管理->告警推送", grade = OperationType.QUERY_BUSINESS, details = "告警推送", type = "业务日志")
+    public Result<String> warnUpload(@RequestBody AlarmMgeDto dto) {
+        return  service.warnUpload(dto);
 
+    }
 
 
 }

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/AlarmMgeService.java

@@ -26,4 +26,11 @@ public interface AlarmMgeService {
      * @return
      */
     Result<String> warnProcess(AlarmMgeDto dto);
+
+    /**
+     * 告警推送
+     * @param dto
+     * @return
+     */
+    Result<String> warnUpload(AlarmMgeDto dto);
 }

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java

@@ -65,4 +65,22 @@ public class AlarmMgeServiceImpl implements AlarmMgeService {
         }
         return  Result.fail("操作失败");
     }
+
+    /**
+     * 告警推送
+     * @param dto
+     * @return
+     */
+    @Override
+    public Result<String> warnUpload(AlarmMgeDto dto) {
+        try{
+            if(!dto.getWarnId().isEmpty()){
+                return  Result.ok("推送成功","推送成功");
+            }
+            return  Result.fail("推送失败");
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return  Result.fail("推送失败");
+    }
 }