fix:bug修改

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/basic/MonitorPointController.java

@@ -1,65 +0,0 @@
-package com.zksy.web.controller.basic;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zksy.base.domain.MonitorPoint;
-import com.zksy.base.dto.MonitorPointPageInDTO;
-import com.zksy.base.service.MonitorPointService;
-import com.zksy.common.annotation.Anonymous;
-import com.zksy.common.annotation.Log;
-import com.zksy.common.core.domain.AjaxResult;
-import com.zksy.common.enums.BusinessType;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/monitor-point")
-@Api(tags = "监测点管理")
-public class MonitorPointController {
-
-    @Autowired
-    private MonitorPointService service;
-
-    @GetMapping("/findByPage")
-    @ApiOperation("监测点分页查询")
-    @Anonymous
-    public AjaxResult findByPage(MonitorPointPageInDTO dto) {
-        Page<MonitorPoint> page = service.queryByPage(dto);
-        return AjaxResult.success(page);
-    }
-
-    @GetMapping("/getById/{id}")
-    @ApiOperation("根据ID查询监测点")
-    @Anonymous
-    public AjaxResult getById(@PathVariable String id) {
-        MonitorPoint entity = service.getById(id);
-        return entity != null ? AjaxResult.success(entity) : AjaxResult.error("监测点信息不存在");
-    }
-
-    @PostMapping("/save")
-    @ApiOperation("新增监测点")
-    @Log(title = "新增监测点", businessType = BusinessType.INSERT)
-    public AjaxResult save(@RequestBody MonitorPoint entity) {
-        boolean saved = service.save(entity);
-        return saved ? AjaxResult.success("新增成功", saved) : AjaxResult.error("新增失败");
-    }
-
-    @PutMapping("/updateById")
-    @ApiOperation("修改监测点")
-    @Log(title = "修改监测点", businessType = BusinessType.UPDATE)
-    public AjaxResult updateById(@RequestBody MonitorPoint entity) {
-        boolean updated = service.updateById(entity);
-        return updated ? AjaxResult.success("修改成功", updated) : AjaxResult.error("修改失败");
-    }
-
-    @DeleteMapping("/deleteById")
-    @ApiOperation("删除监测点")
-    @Log(title = "删除监测点", businessType = BusinessType.DELETE)
-    public AjaxResult deleteById(@RequestParam String id) {
-        boolean deleted = service.removeById(id);
-        return deleted ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
-    }
-}

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/basic/PipeNetworkController.java

@@ -1,81 +0,0 @@
-package com.zksy.web.controller.basic;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zksy.base.domain.PipeNetworkBase;
-import com.zksy.base.dto.PipeNetworkPageInDTO;
-import com.zksy.base.service.PipeNetworkBaseService;
-import com.zksy.common.annotation.Anonymous;
-import com.zksy.common.annotation.Log;
-import com.zksy.common.core.domain.AjaxResult;
-import com.zksy.common.enums.BusinessType;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/pipe-network")
-@Api(tags = "燃气管网基础数据")
-public class PipeNetworkController {
-
-    @Autowired
-    private PipeNetworkBaseService service;
-
-    @GetMapping("/findByPage")
-    @ApiOperation("管网分页查询")
-    @Anonymous
-    public AjaxResult findByPage(PipeNetworkPageInDTO dto) {
-        Page<PipeNetworkBase> page = service.queryByPage(dto);
-        return AjaxResult.success(page);
-    }
-
-    @GetMapping("/getById/{id}")
-    @ApiOperation("根据ID查询管网")
-    @Anonymous
-    public AjaxResult getById(@PathVariable String id) {
-        PipeNetworkBase entity = service.getById(id);
-        return entity != null ? AjaxResult.success(entity) : AjaxResult.error("管网信息不存在");
-    }
-
-    @GetMapping("/options")
-    @ApiOperation("管网下拉选项")
-    @Anonymous
-    public AjaxResult options() {
-        return AjaxResult.success(service.getOptions());
-    }
-
-    @PostMapping("/save")
-    @ApiOperation("新增管网")
-    @Log(title = "新增管网基础数据", businessType = BusinessType.INSERT)
-    public AjaxResult save(@RequestBody PipeNetworkBase entity) {
-        boolean saved = service.save(entity);
-        return saved ? AjaxResult.success("新增成功", saved) : AjaxResult.error("新增失败");
-    }
-
-    @PutMapping("/updateById")
-    @ApiOperation("修改管网")
-    @Log(title = "修改管网基础数据", businessType = BusinessType.UPDATE)
-    public AjaxResult updateById(@RequestBody PipeNetworkBase entity) {
-        boolean updated = service.updateById(entity);
-        return updated ? AjaxResult.success("修改成功", updated) : AjaxResult.error("修改失败");
-    }
-
-    @DeleteMapping("/deleteById")
-    @ApiOperation("删除管网")
-    @Log(title = "删除管网基础数据", businessType = BusinessType.DELETE)
-    public AjaxResult deleteById(@RequestParam String id) {
-        boolean deleted = service.removeById(id);
-        return deleted ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
-    }
-
-    @GetMapping("/export")
-    @ApiOperation("导出Excel")
-    @Anonymous
-    public AjaxResult exportData(@RequestParam(required = false) String networkName,
-                                  @RequestParam(required = false) String status) {
-        // TODO: 实现Excel导出
-        return AjaxResult.success("导出功能待实现");
-    }
-}

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/system/SysLoginController.java

@@ -76,6 +76,21 @@ public class SysLoginController
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }
+    /**
+     * 退出登录
+     * 
+     * @return 结果
+     */
+    @PostMapping("/logout")
+    public AjaxResult logout()
+    {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (StringUtils.isNotNull(loginUser))
+        {
+            tokenService.delLoginUser(loginUser.getToken());
+        }
+        return AjaxResult.success("退出成功");
+    }
     /**
      * 获取用户信息
      * 

pipe-network-service/zksy-system/src/main/java/com/zksy/base/drill/service/DrillAlarmSyncService.java

@@ -25,7 +25,7 @@ import java.util.Random;
  * 演练告警同步创建案件/工单 — 从 zk-api-service 的 AlarmDataServiceImpl.syncCreateCaseAndWorkOrder 复制
  */
 @Slf4j
-@Service
+@Service("drillAlarmSyncServiceDrill")
 public class DrillAlarmSyncService {
 
     @Autowired

pipe-network-service/zksy-system/src/main/java/com/zksy/base/drill/service/impl/DrillSimulationServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
-@Service
+@Service("drillSimulationServiceImplDrill")
 public class DrillSimulationServiceImpl implements DrillSimulationService {
 
     @Autowired