diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java index ab5c123..9fc6323 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java @@ -5,6 +5,7 @@ import com.hisense.hiatmp.server_api.service.IConfigService; import com.hisense.hiatmp.common.controller.HiatmpController; import com.hisense.hiatmp.model.common.ServerResponse; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -16,8 +17,35 @@ import java.util.List; public class ConfigController extends HiatmpController { @Autowired private IConfigService configService; + @RequestMapping(value = "/getModuleCustomConfigList", method = RequestMethod.POST) public ServerResponse> getModuleCustomConfigList() { return ServerResponse.ok(configService.getModuleCustomConfigList()); } + + /* + 基础信息预留展示接口 + */ + @GetMapping("/showDangerBaseData") + public ServerResponse showBaseData(){ + + + + + return ServerResponse.ok(); + } + + + /* + 统计数据预留展示接口 + */ + @GetMapping("/showDangerStatisticsData") + public ServerResponse showStatisticsData(){ + + + + + return ServerResponse.ok(); + } + } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java index 02293ff..c75f64b 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java @@ -724,7 +724,9 @@ public class HighDangerController { } } - // 保存 & 暂存人工排查 + /* + 保存 & 暂存人工排查 + */ @Transactional @PostMapping("/saveManualInvestigation") public ServerResponse saveManualInvestigation(@RequestBody ManualInvestigation manualInvestigation, HttpServletRequest request) { diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml index a11c35d..f9c5d29 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml @@ -269,11 +269,21 @@ select r.rolename from role_operation_relation ror LEFT JOIN "public"."role" r on ror.roleid = r.roleid - where ror.operationid = 'ld0001' + where ror.operationid = #{nuserid}