diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/apis/clientexception/ClientExceptionController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/apis/clientexception/ClientExceptionController.java index 812eeb0..1f09cd9 100644 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/apis/clientexception/ClientExceptionController.java +++ b/cloud-central-control/src/main/java/com/cm/central/control/controller/apis/clientexception/ClientExceptionController.java @@ -110,4 +110,11 @@ public class ClientExceptionController extends AbstractController { return securityComponent.getCurrentUserIdInfo(); } + @ApiOperation(value = "标记处理成功", notes = "标记处理成功接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("updateishandlerbyclientexceptionid/{clientExceptionId}") + public SuccessResult updateIsHandlerByClientExceptionId(@PathVariable("clientExceptionId") String clientExceptionId) { + return clientExceptionService.updateIsHandlerByClientExceptionId(clientExceptionId); + } + } \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/client/ClientAppController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/client/ClientAppController.java deleted file mode 100644 index 6b80856..0000000 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/client/ClientAppController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.cm.central.control.controller.app.apis.client; - -import com.cm.common.annotation.CheckRequestBodyAnnotation; -import com.cm.common.base.AbstractController; -import com.cm.common.constants.ISystemConstant; -import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SearchException; -import com.cm.common.pojo.ListPage; -import com.cm.common.result.ErrorResult; -import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.result.SuccessResultList; -import com.cm.central.control.pojo.dtos.client.ClientDTO; -import com.cm.central.control.pojo.vos.client.ClientVO; -import com.cm.central.control.service.client.IClientService; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: ClientAppController - * @Description: 客户端 - * @Author: WenG - * @Date: 2020-07-30 19:12 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "客户端接口") -@RestController -@RequestMapping(ISystemConstant.APP_PREFIX + "/client") -public class ClientAppController extends AbstractController { - - @Autowired - private IClientService clientService; - - @ApiOperation(value = "新增客户端", notes = "新增客户端接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("saveclient") - @CheckRequestBodyAnnotation - public SuccessResult saveClient(@RequestHeader("token") String token, @RequestBody ClientVO clientVO) throws Exception { - return clientService.saveClientByToken(token, clientVO); - } - - @ApiOperation(value = "删除客户端(id列表)", notes = "删除客户端(id列表)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removeclient/{ids}") - public SuccessResult removeClient(@RequestHeader("token") String token, @PathVariable("ids") String ids) throws RemoveException { - return clientService.removeClientByToken(token, ids); - } - - @ApiOperation(value = "修改客户端", notes = "修改客户端接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "clientId", value = "客户端ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updateclient/{clientId}") - @CheckRequestBodyAnnotation - public SuccessResult updateClient(@RequestHeader("token") String token, @PathVariable("clientId") String clientId, @RequestBody ClientVO clientVO) throws Exception { - return clientService.updateClientByToken(token, clientId, clientVO); - } - - @ApiOperation(value = "客户端详情(通过ID)", notes = "客户端详情(通过ID)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "clientId", value = "客户端ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getclientbyid/{clientId}") - public ClientDTO getClientById(@RequestHeader("token") String token, @PathVariable("clientId") String clientId) throws SearchException { - return clientService.getClientById(clientId); - } - - @ApiOperation(value = "客户端列表", notes = "客户端列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listclient") - public List listClient(@RequestHeader("token") String token) throws SearchException { - Map params = requestParams(); - return clientService.listClient(params); - } - - @ApiOperation(value = "客户端分页列表", notes = "客户端分页列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpageclient") - public SuccessResultList> listPageClient(@RequestHeader("token") String token, ListPage page) throws SearchException { - Map params = requestParams(); - page.setParams(params); - return clientService.listPageClient(page); - } - - @ApiOperation(value = "客户端统计", notes = "客户端统计接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countclient") - SuccessResultData countClient() throws SearchException { - Map params = requestParams(); - return clientService.countClient(params); - } - -} \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/clientexception/ClientExceptionAppController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/clientexception/ClientExceptionAppController.java deleted file mode 100644 index bb59e81..0000000 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/clientexception/ClientExceptionAppController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.cm.central.control.controller.app.apis.clientexception; - -import com.cm.common.annotation.CheckRequestBodyAnnotation; -import com.cm.common.base.AbstractController; -import com.cm.common.constants.ISystemConstant; -import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SearchException; -import com.cm.common.pojo.ListPage; -import com.cm.common.result.ErrorResult; -import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.result.SuccessResultList; -import com.cm.central.control.pojo.dtos.clientexception.ClientExceptionDTO; -import com.cm.central.control.pojo.vos.clientexception.ClientExceptionVO; -import com.cm.central.control.service.clientexception.IClientExceptionService; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: ClientExceptionAppController - * @Description: 客户端异常 - * @Author: WenG - * @Date: 2020-07-30 19:13 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "客户端异常接口") -@RestController -@RequestMapping(ISystemConstant.APP_PREFIX + "/clientexception") -public class ClientExceptionAppController extends AbstractController { - - @Autowired - private IClientExceptionService clientExceptionService; - - @ApiOperation(value = "删除客户端异常(id列表)", notes = "删除客户端异常(id列表)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removeclientexception/{ids}") - public SuccessResult removeClientException(@RequestHeader("token") String token, @PathVariable("ids") String ids) throws RemoveException { - return clientExceptionService.removeClientExceptionByToken(token, ids); - } - - @ApiOperation(value = "修改客户端异常", notes = "修改客户端异常接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "clientExceptionId", value = "客户端异常ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updateclientexception/{clientExceptionId}") - @CheckRequestBodyAnnotation - public SuccessResult updateClientException(@RequestHeader("token") String token, @PathVariable("clientExceptionId") String clientExceptionId, @RequestBody ClientExceptionVO clientExceptionVO) throws Exception { - return clientExceptionService.updateClientExceptionByToken(token, clientExceptionId, clientExceptionVO); - } - - @ApiOperation(value = "客户端异常详情(通过ID)", notes = "客户端异常详情(通过ID)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "clientExceptionId", value = "客户端异常ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getclientexceptionbyid/{clientExceptionId}") - public ClientExceptionDTO getClientExceptionById(@RequestHeader("token") String token, @PathVariable("clientExceptionId") String clientExceptionId) throws SearchException { - return clientExceptionService.getClientExceptionById(clientExceptionId); - } - - @ApiOperation(value = "客户端异常列表", notes = "客户端异常列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listclientexception") - public List listClientException(@RequestHeader("token") String token) throws SearchException { - Map params = requestParams(); - return clientExceptionService.listClientException(params); - } - - @ApiOperation(value = "客户端异常分页列表", notes = "客户端异常分页列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpageclientexception") - public SuccessResultList> listPageClientException(@RequestHeader("token") String token, ListPage page) throws SearchException { - Map params = requestParams(); - page.setParams(params); - return clientExceptionService.listPageClientException(page); - } - - @ApiOperation(value = "客户端异常统计", notes = "客户端异常统计接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countclientexception") - SuccessResultData countClientException() throws SearchException { - Map params = requestParams(); - return clientExceptionService.countClientException(params); - } - -} \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/customer/CustomerAppController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/customer/CustomerAppController.java deleted file mode 100644 index ddcf3c6..0000000 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/customer/CustomerAppController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.cm.central.control.controller.app.apis.customer; - -import com.cm.common.annotation.CheckRequestBodyAnnotation; -import com.cm.common.base.AbstractController; -import com.cm.common.constants.ISystemConstant; -import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SearchException; -import com.cm.common.pojo.ListPage; -import com.cm.common.result.ErrorResult; -import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.result.SuccessResultList; -import com.cm.central.control.pojo.dtos.customer.CustomerDTO; -import com.cm.central.control.pojo.vos.customer.CustomerVO; -import com.cm.central.control.service.customer.ICustomerService; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: CustomerAppController - * @Description: 客户管理 - * @Author: WenG - * @Date: 2020-07-30 19:00 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "客户管理接口") -@RestController -@RequestMapping(ISystemConstant.APP_PREFIX + "/customer") -public class CustomerAppController extends AbstractController { - - @Autowired - private ICustomerService customerService; - - @ApiOperation(value = "新增客户管理", notes = "新增客户管理接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("savecustomer") - @CheckRequestBodyAnnotation - public SuccessResult saveCustomer(@RequestHeader("token") String token, @RequestBody CustomerVO customerVO) throws Exception { - return customerService.saveCustomerByToken(token, customerVO); - } - - @ApiOperation(value = "删除客户管理(id列表)", notes = "删除客户管理(id列表)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removecustomer/{ids}") - public SuccessResult removeCustomer(@RequestHeader("token") String token, @PathVariable("ids") String ids) throws RemoveException { - return customerService.removeCustomerByToken(token, ids); - } - - @ApiOperation(value = "修改客户管理", notes = "修改客户管理接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "customerId", value = "客户管理ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updatecustomer/{customerId}") - @CheckRequestBodyAnnotation - public SuccessResult updateCustomer(@RequestHeader("token") String token, @PathVariable("customerId") String customerId, @RequestBody CustomerVO customerVO) throws Exception { - return customerService.updateCustomerByToken(token, customerId, customerVO); - } - - @ApiOperation(value = "客户管理详情(通过ID)", notes = "客户管理详情(通过ID)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "customerId", value = "客户管理ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getcustomerbyid/{customerId}") - public CustomerDTO getCustomerById(@RequestHeader("token") String token, @PathVariable("customerId") String customerId) throws SearchException { - return customerService.getCustomerById(customerId); - } - - @ApiOperation(value = "客户管理列表", notes = "客户管理列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listcustomer") - public List listCustomer(@RequestHeader("token") String token) throws SearchException { - Map params = requestParams(); - return customerService.listCustomer(params); - } - - @ApiOperation(value = "客户管理分页列表", notes = "客户管理分页列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpagecustomer") - public SuccessResultList> listPageCustomer(@RequestHeader("token") String token, ListPage page) throws SearchException { - Map params = requestParams(); - page.setParams(params); - return customerService.listPageCustomer(page); - } - - @ApiOperation(value = "客户管理统计", notes = "客户管理统计接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countcustomer") - SuccessResultData countCustomer() throws SearchException { - Map params = requestParams(); - return customerService.countCustomer(params); - } - -} \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/projectleader/ProjectLeaderAppController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/projectleader/ProjectLeaderAppController.java deleted file mode 100644 index 0406055..0000000 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/app/apis/projectleader/ProjectLeaderAppController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.cm.central.control.controller.app.apis.projectleader; - -import com.cm.common.annotation.CheckRequestBodyAnnotation; -import com.cm.common.base.AbstractController; -import com.cm.common.constants.ISystemConstant; -import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SearchException; -import com.cm.common.pojo.ListPage; -import com.cm.common.result.ErrorResult; -import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.result.SuccessResultList; -import com.cm.central.control.pojo.dtos.projectleader.ProjectLeaderDTO; -import com.cm.central.control.pojo.vos.projectleader.ProjectLeaderVO; -import com.cm.central.control.service.projectleader.IProjectLeaderService; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: ProjectLeaderAppController - * @Description: 项目负责人 - * @Author: WenG - * @Date: 2020-07-30 19:04 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "项目负责人接口") -@RestController -@RequestMapping(ISystemConstant.APP_PREFIX + "/projectleader") -public class ProjectLeaderAppController extends AbstractController { - - @Autowired - private IProjectLeaderService projectLeaderService; - - @ApiOperation(value = "新增项目负责人", notes = "新增项目负责人接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("saveprojectleader") - @CheckRequestBodyAnnotation - public SuccessResult saveProjectLeader(@RequestHeader("token") String token, @RequestBody ProjectLeaderVO projectLeaderVO) throws Exception { - return projectLeaderService.saveProjectLeaderByToken(token, projectLeaderVO); - } - - @ApiOperation(value = "删除项目负责人(id列表)", notes = "删除项目负责人(id列表)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removeprojectleader/{ids}") - public SuccessResult removeProjectLeader(@RequestHeader("token") String token, @PathVariable("ids") String ids) throws RemoveException { - return projectLeaderService.removeProjectLeaderByToken(token, ids); - } - - @ApiOperation(value = "修改项目负责人", notes = "修改项目负责人接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "projectLeaderId", value = "项目负责人ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updateprojectleader/{projectLeaderId}") - @CheckRequestBodyAnnotation - public SuccessResult updateProjectLeader(@RequestHeader("token") String token, @PathVariable("projectLeaderId") String projectLeaderId, @RequestBody ProjectLeaderVO projectLeaderVO) throws Exception { - return projectLeaderService.updateProjectLeaderByToken(token, projectLeaderId, projectLeaderVO); - } - - @ApiOperation(value = "项目负责人详情(通过ID)", notes = "项目负责人详情(通过ID)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "projectLeaderId", value = "项目负责人ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getprojectleaderbyid/{projectLeaderId}") - public ProjectLeaderDTO getProjectLeaderById(@RequestHeader("token") String token, @PathVariable("projectLeaderId") String projectLeaderId) throws SearchException { - return projectLeaderService.getProjectLeaderById(projectLeaderId); - } - - @ApiOperation(value = "项目负责人列表", notes = "项目负责人列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listprojectleader") - public List listProjectLeader(@RequestHeader("token") String token) throws SearchException { - Map params = requestParams(); - return projectLeaderService.listProjectLeader(params); - } - - @ApiOperation(value = "项目负责人分页列表", notes = "项目负责人分页列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpageprojectleader") - public SuccessResultList> listPageProjectLeader(@RequestHeader("token") String token, ListPage page) throws SearchException { - Map params = requestParams(); - page.setParams(params); - return projectLeaderService.listPageProjectLeader(page); - } - - @ApiOperation(value = "项目负责人统计", notes = "项目负责人统计接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countprojectleader") - SuccessResultData countProjectLeader() throws SearchException { - Map params = requestParams(); - return projectLeaderService.countProjectLeader(params); - } - -} \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/client/ClientResourceController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/client/ClientResourceController.java deleted file mode 100644 index 8768a2f..0000000 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/client/ClientResourceController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.cm.central.control.controller.resources.client; - -import com.cm.common.annotation.CheckRequestBodyAnnotation; -import com.cm.common.base.AbstractController; -import com.cm.common.constants.ISystemConstant; -import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SearchException; -import com.cm.common.pojo.ListPage; -import com.cm.common.result.ErrorResult; -import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.result.SuccessResultList; -import com.cm.central.control.pojo.dtos.client.ClientDTO; -import com.cm.central.control.pojo.vos.client.ClientVO; -import com.cm.central.control.service.client.IClientService; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: ClientResourceController - * @Description: 客户端 - * @Author: WenG - * @Date: 2020-07-30 19:12 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "客户端接口") -@RestController -@RequestMapping(ISystemConstant.RESOURCE_PREFIX + "/client") -public class ClientResourceController extends AbstractController { - - @Autowired - private IClientService clientService; - - @ApiOperation(value = "新增客户端", notes = "新增客户端接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("saveclient") - @CheckRequestBodyAnnotation - public SuccessResult saveClient(@RequestBody ClientVO clientVO) throws Exception { - return clientService.saveClient(clientVO); - } - - @ApiOperation(value = "删除客户端(id列表)", notes = "删除客户端(id列表)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removeclient/{ids}") - public SuccessResult removeClient(@PathVariable("ids") String ids) throws RemoveException { - return clientService.removeClient(ids); - } - - @ApiOperation(value = "修改客户端", notes = "修改客户端接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "clientId", value = "客户端ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updateclient/{clientId}") - @CheckRequestBodyAnnotation - public SuccessResult updateClient(@PathVariable("clientId") String clientId, @RequestBody ClientVO clientVO) throws Exception { - return clientService.updateClient(clientId, clientVO); - } - - @ApiOperation(value = "客户端详情(通过ID)", notes = "客户端详情(通过ID)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "clientId", value = "客户端ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getclientbyid/{clientId}") - public ClientDTO getClientById(@PathVariable("clientId") String clientId) throws SearchException { - return clientService.getClientById(clientId); - } - - @ApiOperation(value = "客户端列表", notes = "客户端列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listclient") - public List listClient() throws SearchException { - Map params = requestParams(); - return clientService.listClient(params); - } - - @ApiOperation(value = "客户端分页列表", notes = "客户端分页列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpageclient") - public SuccessResultList> listPageClient(ListPage page) throws SearchException { - Map params = requestParams(); - page.setParams(params); - return clientService.listPageClient(page); - } - - @ApiOperation(value = "客户端统计", notes = "客户端统计接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countclient") - SuccessResultData countClient() throws SearchException { - Map params = requestParams(); - return clientService.countClient(params); - } - -} \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/clientexception/ClientExceptionResourceController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/clientexception/ClientExceptionResourceController.java deleted file mode 100644 index a08cf0d..0000000 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/clientexception/ClientExceptionResourceController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.cm.central.control.controller.resources.clientexception; - -import com.cm.common.annotation.CheckRequestBodyAnnotation; -import com.cm.common.base.AbstractController; -import com.cm.common.constants.ISystemConstant; -import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SearchException; -import com.cm.common.pojo.ListPage; -import com.cm.common.result.ErrorResult; -import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.result.SuccessResultList; -import com.cm.central.control.pojo.dtos.clientexception.ClientExceptionDTO; -import com.cm.central.control.pojo.vos.clientexception.ClientExceptionVO; -import com.cm.central.control.service.clientexception.IClientExceptionService; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: ClientExceptionResourceController - * @Description: 客户端异常 - * @Author: WenG - * @Date: 2020-07-30 19:13 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "客户端异常接口") -@RestController -@RequestMapping(ISystemConstant.RESOURCE_PREFIX + "/clientexception") -public class ClientExceptionResourceController extends AbstractController { - - @Autowired - private IClientExceptionService clientExceptionService; - - @ApiOperation(value = "删除客户端异常(id列表)", notes = "删除客户端异常(id列表)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removeclientexception/{ids}") - public SuccessResult removeClientException(@PathVariable("ids") String ids) throws RemoveException { - return clientExceptionService.removeClientException(ids); - } - - @ApiOperation(value = "修改客户端异常", notes = "修改客户端异常接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "clientExceptionId", value = "客户端异常ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updateclientexception/{clientExceptionId}") - @CheckRequestBodyAnnotation - public SuccessResult updateClientException(@PathVariable("clientExceptionId") String clientExceptionId, @RequestBody ClientExceptionVO clientExceptionVO) throws Exception { - return clientExceptionService.updateClientException(clientExceptionId, clientExceptionVO); - } - - @ApiOperation(value = "客户端异常详情(通过ID)", notes = "客户端异常详情(通过ID)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "clientExceptionId", value = "客户端异常ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getclientexceptionbyid/{clientExceptionId}") - public ClientExceptionDTO getClientExceptionById(@PathVariable("clientExceptionId") String clientExceptionId) throws SearchException { - return clientExceptionService.getClientExceptionById(clientExceptionId); - } - - @ApiOperation(value = "客户端异常列表", notes = "客户端异常列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listclientexception") - public List listClientException() throws SearchException { - Map params = requestParams(); - return clientExceptionService.listClientException(params); - } - - @ApiOperation(value = "客户端异常分页列表", notes = "客户端异常分页列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpageclientexception") - public SuccessResultList> listPageClientException(ListPage page) throws SearchException { - Map params = requestParams(); - page.setParams(params); - return clientExceptionService.listPageClientException(page); - } - - @ApiOperation(value = "客户端异常统计", notes = "客户端异常统计接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countclientexception") - SuccessResultData countClientException() throws SearchException { - Map params = requestParams(); - return clientExceptionService.countClientException(params); - } - -} \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/customer/CustomerResourceController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/customer/CustomerResourceController.java deleted file mode 100644 index 23bbb71..0000000 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/customer/CustomerResourceController.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.cm.central.control.controller.resources.customer; - -import com.cm.central.control.pojo.dtos.customer.CustomerDTO; -import com.cm.central.control.pojo.vos.customer.CustomerVO; -import com.cm.central.control.service.customer.ICustomerService; -import com.cm.common.annotation.CheckRequestBodyAnnotation; -import com.cm.common.base.AbstractController; -import com.cm.common.constants.ISystemConstant; -import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SearchException; -import com.cm.common.pojo.ListPage; -import com.cm.common.result.ErrorResult; -import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.result.SuccessResultList; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName: CustomerResourceController - * @Description: 客户管理 - * @Author: WenG - * @Date: 2020-07-30 19:00 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "客户管理接口") -@RestController -@RequestMapping(ISystemConstant.RESOURCE_PREFIX + "/customer") -public class CustomerResourceController extends AbstractController { - - @Autowired - private ICustomerService customerService; - - @ApiOperation(value = "新增客户管理", notes = "新增客户管理接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("savecustomer") - @CheckRequestBodyAnnotation - public SuccessResult saveCustomer(@RequestBody CustomerVO customerVO) throws Exception { - return customerService.saveCustomer(customerVO); - } - - @ApiOperation(value = "删除客户管理(id列表)", notes = "删除客户管理(id列表)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removecustomer/{ids}") - public SuccessResult removeCustomer(@PathVariable("ids") String ids) throws RemoveException { - return customerService.removeCustomer(ids); - } - - @ApiOperation(value = "修改客户管理", notes = "修改客户管理接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "customerId", value = "客户管理ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updatecustomer/{customerId}") - @CheckRequestBodyAnnotation - public SuccessResult updateCustomer(@PathVariable("customerId") String customerId, @RequestBody CustomerVO customerVO) throws Exception { - return customerService.updateCustomer(customerId, customerVO); - } - - @ApiOperation(value = "客户管理详情(通过ID)", notes = "客户管理详情(通过ID)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "customerId", value = "客户管理ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getcustomerbyid/{customerId}") - public CustomerDTO getCustomerById(@PathVariable("customerId") String customerId) throws SearchException { - return customerService.getCustomerById(customerId); - } - - @ApiOperation(value = "客户管理列表", notes = "客户管理列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listcustomer") - public List listCustomer() throws SearchException { - Map params = requestParams(); - return customerService.listCustomer(params); - } - - @ApiOperation(value = "客户管理分页列表", notes = "客户管理分页列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpagecustomer") - public SuccessResultList> listPageCustomer(ListPage page) throws SearchException { - Map params = requestParams(); - page.setParams(params); - return customerService.listPageCustomer(page); - } - - @ApiOperation(value = "客户管理统计", notes = "客户管理统计接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countcustomer") - SuccessResultData countCustomer() throws SearchException { - Map params = requestParams(); - return customerService.countCustomer(params); - } - -} \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/projectleader/ProjectLeaderResourceController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/projectleader/ProjectLeaderResourceController.java deleted file mode 100644 index aabfc09..0000000 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/resources/projectleader/ProjectLeaderResourceController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.cm.central.control.controller.resources.projectleader; - -import com.cm.common.annotation.CheckRequestBodyAnnotation; -import com.cm.common.base.AbstractController; -import com.cm.common.constants.ISystemConstant; -import com.cm.common.exception.RemoveException; -import com.cm.common.exception.SearchException; -import com.cm.common.pojo.ListPage; -import com.cm.common.result.ErrorResult; -import com.cm.common.result.SuccessResult; -import com.cm.common.result.SuccessResultData; -import com.cm.common.result.SuccessResultList; -import com.cm.central.control.pojo.dtos.projectleader.ProjectLeaderDTO; -import com.cm.central.control.pojo.vos.projectleader.ProjectLeaderVO; -import com.cm.central.control.service.projectleader.IProjectLeaderService; -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: ProjectLeaderResourceController - * @Description: 项目负责人 - * @Author: WenG - * @Date: 2020-07-30 19:04 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "项目负责人接口") -@RestController -@RequestMapping(ISystemConstant.RESOURCE_PREFIX + "/projectleader") -public class ProjectLeaderResourceController extends AbstractController { - - @Autowired - private IProjectLeaderService projectLeaderService; - - @ApiOperation(value = "新增项目负责人", notes = "新增项目负责人接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("saveprojectleader") - @CheckRequestBodyAnnotation - public SuccessResult saveProjectLeader(@RequestBody ProjectLeaderVO projectLeaderVO) throws Exception { - return projectLeaderService.saveProjectLeader(projectLeaderVO); - } - - @ApiOperation(value = "删除项目负责人(id列表)", notes = "删除项目负责人(id列表)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removeprojectleader/{ids}") - public SuccessResult removeProjectLeader(@PathVariable("ids") String ids) throws RemoveException { - return projectLeaderService.removeProjectLeader(ids); - } - - @ApiOperation(value = "修改项目负责人", notes = "修改项目负责人接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "projectLeaderId", value = "项目负责人ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updateprojectleader/{projectLeaderId}") - @CheckRequestBodyAnnotation - public SuccessResult updateProjectLeader(@PathVariable("projectLeaderId") String projectLeaderId, @RequestBody ProjectLeaderVO projectLeaderVO) throws Exception { - return projectLeaderService.updateProjectLeader(projectLeaderId, projectLeaderVO); - } - - @ApiOperation(value = "项目负责人详情(通过ID)", notes = "项目负责人详情(通过ID)接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "projectLeaderId", value = "项目负责人ID", paramType = "path") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getprojectleaderbyid/{projectLeaderId}") - public ProjectLeaderDTO getProjectLeaderById(@PathVariable("projectLeaderId") String projectLeaderId) throws SearchException { - return projectLeaderService.getProjectLeaderById(projectLeaderId); - } - - @ApiOperation(value = "项目负责人列表", notes = "项目负责人列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listprojectleader") - public List listProjectLeader() throws SearchException { - Map params = requestParams(); - return projectLeaderService.listProjectLeader(params); - } - - @ApiOperation(value = "项目负责人分页列表", notes = "项目负责人分页列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") - }) - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpageprojectleader") - public SuccessResultList> listPageProjectLeader(ListPage page) throws SearchException { - Map params = requestParams(); - page.setParams(params); - return projectLeaderService.listPageProjectLeader(page); - } - - @ApiOperation(value = "项目负责人统计", notes = "项目负责人统计接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countprojectleader") - SuccessResultData countProjectLeader() throws SearchException { - Map params = requestParams(); - return projectLeaderService.countProjectLeader(params); - } - -} \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/routes/clientexception/ClientExceptionRouteController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/routes/clientexception/ClientExceptionRouteController.java index 7a42fbc..214379d 100644 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/routes/clientexception/ClientExceptionRouteController.java +++ b/cloud-central-control/src/main/java/com/cm/central/control/controller/routes/clientexception/ClientExceptionRouteController.java @@ -29,16 +29,10 @@ public class ClientExceptionRouteController { return new ModelAndView("clientexception/list-clientexception"); } - @ApiOperation(value = "客户端异常新增") - @GetMapping("saveclientexception") - public ModelAndView saveClientexception() { - return new ModelAndView("clientexception/save-clientexception"); - } - @ApiOperation(value = "客户端异常编辑") - @GetMapping("updateclientexception") - public ModelAndView updateClientexception() { - return new ModelAndView("clientexception/update-clientexception"); + @GetMapping("getclientexception") + public ModelAndView getClientexception() { + return new ModelAndView("clientexception/get-clientexception"); } } diff --git a/cloud-central-control/src/main/java/com/cm/central/control/controller/routes/projectleader/ProjectLeaderRouteController.java b/cloud-central-control/src/main/java/com/cm/central/control/controller/routes/projectleader/ProjectLeaderRouteController.java index 29b5a07..77a42b1 100644 --- a/cloud-central-control/src/main/java/com/cm/central/control/controller/routes/projectleader/ProjectLeaderRouteController.java +++ b/cloud-central-control/src/main/java/com/cm/central/control/controller/routes/projectleader/ProjectLeaderRouteController.java @@ -41,4 +41,6 @@ public class ProjectLeaderRouteController { return new ModelAndView("projectleader/update-projectleader"); } + + } diff --git a/cloud-central-control/src/main/java/com/cm/central/control/pojo/dtos/clientexception/ClientExceptionDTO.java b/cloud-central-control/src/main/java/com/cm/central/control/pojo/dtos/clientexception/ClientExceptionDTO.java index 31db155..3e60ca0 100644 --- a/cloud-central-control/src/main/java/com/cm/central/control/pojo/dtos/clientexception/ClientExceptionDTO.java +++ b/cloud-central-control/src/main/java/com/cm/central/control/pojo/dtos/clientexception/ClientExceptionDTO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** - * * @ClassName: ClientExceptionDTO * @Description: 客户端异常 * @Author: WenG @@ -20,34 +19,10 @@ public class ClientExceptionDTO { private String clientId; @ApiModelProperty(name = "clientClientName", value = "名称") private String clientClientName; - @ApiModelProperty(name = "clientClientSummary", value = "描述") - private String clientClientSummary; @ApiModelProperty(name = "clientClientVersion", value = "客户端版本") private String clientClientVersion; - @ApiModelProperty(name = "clientDatabaseType", value = "数据库类型") - private String clientDatabaseType; - @ApiModelProperty(name = "clientDatabaseVersion", value = "数据库版本") - private String clientDatabaseVersion; - @ApiModelProperty(name = "clientDatabaseName", value = "数据库名称") - private String clientDatabaseName; - @ApiModelProperty(name = "clientCustomerId", value = "客户ID") - private String clientCustomerId; @ApiModelProperty(name = "clientServerIp", value = "服务器地址") private String clientServerIp; - @ApiModelProperty(name = "clientIsUsercenter", value = "是否") - private String clientIsUsercenter; - @ApiModelProperty(name = "clientIsOnlyAuthorization", value = "是否在线授权") - private String clientIsOnlyAuthorization; - @ApiModelProperty(name = "clientMacAddress", value = "mac地址") - private String clientMacAddress; - @ApiModelProperty(name = "clientLicenseStartTime", value = "秘钥开始时间") - private String clientLicenseStartTime; - @ApiModelProperty(name = "clientLicenseEffectiveDays", value = "秘钥有效天数") - private String clientLicenseEffectiveDays; - @ApiModelProperty(name = "clientLicenseExpirationDate", value = "秘钥到期时间") - private String clientLicenseExpirationDate; - @ApiModelProperty(name = "clientAuthorizationCount", value = "授权次数") - private String clientAuthorizationCount; @ApiModelProperty(name = "exceptionType", value = "异常类型") private String exceptionType; @ApiModelProperty(name = "exceptionName", value = "异常名称") @@ -58,6 +33,8 @@ public class ClientExceptionDTO { private Integer isNoticeProjectLeader; @ApiModelProperty(name = "isHandle", value = "是否处理") private Integer isHandle; + @ApiModelProperty(name = "gmtCreate", value = "上报时间") + private String gmtCreate; public String getClientExceptionId() { return clientExceptionId == null ? "" : clientExceptionId.trim(); @@ -83,14 +60,6 @@ public class ClientExceptionDTO { this.clientClientName = clientClientName; } - public String getClientClientSummary() { - return clientClientSummary == null ? "" : clientClientSummary.trim(); - } - - public void setClientClientSummary(String clientClientSummary) { - this.clientClientSummary = clientClientSummary; - } - public String getClientClientVersion() { return clientClientVersion == null ? "" : clientClientVersion.trim(); } @@ -99,38 +68,6 @@ public class ClientExceptionDTO { this.clientClientVersion = clientClientVersion; } - public String getClientDatabaseType() { - return clientDatabaseType == null ? "" : clientDatabaseType.trim(); - } - - public void setClientDatabaseType(String clientDatabaseType) { - this.clientDatabaseType = clientDatabaseType; - } - - public String getClientDatabaseVersion() { - return clientDatabaseVersion == null ? "" : clientDatabaseVersion.trim(); - } - - public void setClientDatabaseVersion(String clientDatabaseVersion) { - this.clientDatabaseVersion = clientDatabaseVersion; - } - - public String getClientDatabaseName() { - return clientDatabaseName == null ? "" : clientDatabaseName.trim(); - } - - public void setClientDatabaseName(String clientDatabaseName) { - this.clientDatabaseName = clientDatabaseName; - } - - public String getClientCustomerId() { - return clientCustomerId == null ? "" : clientCustomerId.trim(); - } - - public void setClientCustomerId(String clientCustomerId) { - this.clientCustomerId = clientCustomerId; - } - public String getClientServerIp() { return clientServerIp == null ? "" : clientServerIp.trim(); } @@ -139,62 +76,6 @@ public class ClientExceptionDTO { this.clientServerIp = clientServerIp; } - public String getClientIsUsercenter() { - return clientIsUsercenter == null ? "" : clientIsUsercenter.trim(); - } - - public void setClientIsUsercenter(String clientIsUsercenter) { - this.clientIsUsercenter = clientIsUsercenter; - } - - public String getClientIsOnlyAuthorization() { - return clientIsOnlyAuthorization == null ? "" : clientIsOnlyAuthorization.trim(); - } - - public void setClientIsOnlyAuthorization(String clientIsOnlyAuthorization) { - this.clientIsOnlyAuthorization = clientIsOnlyAuthorization; - } - - public String getClientMacAddress() { - return clientMacAddress == null ? "" : clientMacAddress.trim(); - } - - public void setClientMacAddress(String clientMacAddress) { - this.clientMacAddress = clientMacAddress; - } - - public String getClientLicenseStartTime() { - return clientLicenseStartTime == null ? "" : clientLicenseStartTime.trim(); - } - - public void setClientLicenseStartTime(String clientLicenseStartTime) { - this.clientLicenseStartTime = clientLicenseStartTime; - } - - public String getClientLicenseEffectiveDays() { - return clientLicenseEffectiveDays == null ? "" : clientLicenseEffectiveDays.trim(); - } - - public void setClientLicenseEffectiveDays(String clientLicenseEffectiveDays) { - this.clientLicenseEffectiveDays = clientLicenseEffectiveDays; - } - - public String getClientLicenseExpirationDate() { - return clientLicenseExpirationDate == null ? "" : clientLicenseExpirationDate.trim(); - } - - public void setClientLicenseExpirationDate(String clientLicenseExpirationDate) { - this.clientLicenseExpirationDate = clientLicenseExpirationDate; - } - - public String getClientAuthorizationCount() { - return clientAuthorizationCount == null ? "" : clientAuthorizationCount.trim(); - } - - public void setClientAuthorizationCount(String clientAuthorizationCount) { - this.clientAuthorizationCount = clientAuthorizationCount; - } - public String getExceptionType() { return exceptionType == null ? "" : exceptionType.trim(); } @@ -220,7 +101,7 @@ public class ClientExceptionDTO { } public Integer getIsNoticeProjectLeader() { - return isNoticeProjectLeader == null ? 0 : isNoticeProjectLeader; + return isNoticeProjectLeader; } public void setIsNoticeProjectLeader(Integer isNoticeProjectLeader) { @@ -228,12 +109,47 @@ public class ClientExceptionDTO { } public Integer getIsHandle() { - return isHandle == null ? 0 : isHandle; + return isHandle; } public void setIsHandle(Integer isHandle) { this.isHandle = isHandle; } + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"clientExceptionId\":") + .append("\"").append(clientExceptionId).append("\""); + sb.append(",\"clientId\":") + .append("\"").append(clientId).append("\""); + sb.append(",\"clientClientName\":") + .append("\"").append(clientClientName).append("\""); + sb.append(",\"clientClientVersion\":") + .append("\"").append(clientClientVersion).append("\""); + sb.append(",\"clientServerIp\":") + .append("\"").append(clientServerIp).append("\""); + sb.append(",\"exceptionType\":") + .append("\"").append(exceptionType).append("\""); + sb.append(",\"exceptionName\":") + .append("\"").append(exceptionName).append("\""); + sb.append(",\"exceptionSummary\":") + .append("\"").append(exceptionSummary).append("\""); + sb.append(",\"isNoticeProjectLeader\":") + .append(isNoticeProjectLeader); + sb.append(",\"isHandle\":") + .append(isHandle); + sb.append(",\"gmtCreate\":") + .append("\"").append(gmtCreate).append("\""); + sb.append('}'); + return sb.toString(); + } } diff --git a/cloud-central-control/src/main/java/com/cm/central/control/pojo/dtos/projectleader/ProjectLeaderDTO.java b/cloud-central-control/src/main/java/com/cm/central/control/pojo/dtos/projectleader/ProjectLeaderDTO.java index 598cb4f..c760847 100644 --- a/cloud-central-control/src/main/java/com/cm/central/control/pojo/dtos/projectleader/ProjectLeaderDTO.java +++ b/cloud-central-control/src/main/java/com/cm/central/control/pojo/dtos/projectleader/ProjectLeaderDTO.java @@ -18,6 +18,10 @@ public class ProjectLeaderDTO { private String projectLeaderId; @ApiModelProperty(name = "leaderName", value = "姓名") private String leaderName; + @ApiModelProperty(name = "leaderUserId", value = "用户ID") + private String leaderUserId; + @ApiModelProperty(name = "leaderUserName", value = "用户昵称") + private String leaderUserName; @ApiModelProperty(name = "leaderPhone", value = "手机") private String leaderPhone; @ApiModelProperty(name = "leaderEmail", value = "邮箱") @@ -39,6 +43,22 @@ public class ProjectLeaderDTO { this.leaderName = leaderName; } + public String getLeaderUserId() { + return leaderUserId == null ? "" : leaderUserId.trim(); + } + + public void setLeaderUserId(String leaderUserId) { + this.leaderUserId = leaderUserId; + } + + public String getLeaderUserName() { + return leaderUserName == null ? "" : leaderUserName.trim(); + } + + public void setLeaderUserName(String leaderUserName) { + this.leaderUserName = leaderUserName; + } + public String getLeaderPhone() { return leaderPhone == null ? "" : leaderPhone.trim(); } @@ -55,5 +75,22 @@ public class ProjectLeaderDTO { this.leaderEmail = leaderEmail; } - + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"projectLeaderId\":") + .append("\"").append(projectLeaderId).append("\""); + sb.append(",\"leaderName\":") + .append("\"").append(leaderName).append("\""); + sb.append(",\"leaderUserId\":") + .append("\"").append(leaderUserId).append("\""); + sb.append(",\"leaderUserName\":") + .append("\"").append(leaderUserName).append("\""); + sb.append(",\"leaderPhone\":") + .append("\"").append(leaderPhone).append("\""); + sb.append(",\"leaderEmail\":") + .append("\"").append(leaderEmail).append("\""); + sb.append('}'); + return sb.toString(); + } } diff --git a/cloud-central-control/src/main/java/com/cm/central/control/pojo/vos/projectleader/ProjectLeaderVO.java b/cloud-central-control/src/main/java/com/cm/central/control/pojo/vos/projectleader/ProjectLeaderVO.java index 01728e2..6cfb3d0 100644 --- a/cloud-central-control/src/main/java/com/cm/central/control/pojo/vos/projectleader/ProjectLeaderVO.java +++ b/cloud-central-control/src/main/java/com/cm/central/control/pojo/vos/projectleader/ProjectLeaderVO.java @@ -18,6 +18,12 @@ import java.io.Serializable; @ApiModel public class ProjectLeaderVO { + @ApiModelProperty(name = "leaderUserId", value = "用户ID") + @CheckEmptyAnnotation(name = "用户ID") + private String leaderUserId; + @ApiModelProperty(name = "leaderUserName", value = "用户昵称") + @CheckEmptyAnnotation(name = "用户昵称") + private String leaderUserName; @ApiModelProperty(name = "leaderName", value = "姓名") @CheckEmptyAnnotation(name = "姓名") private String leaderName; @@ -28,6 +34,22 @@ public class ProjectLeaderVO { @CheckEmptyAnnotation(name = "邮箱", verifyType = "email") private String leaderEmail; + public String getLeaderUserId() { + return leaderUserId == null ? "" : leaderUserId.trim(); + } + + public void setLeaderUserId(String leaderUserId) { + this.leaderUserId = leaderUserId; + } + + public String getLeaderUserName() { + return leaderUserName == null ? "" : leaderUserName.trim(); + } + + public void setLeaderUserName(String leaderUserName) { + this.leaderUserName = leaderUserName; + } + public String getLeaderName() { return leaderName == null ? "" : leaderName.trim(); } @@ -52,6 +74,20 @@ public class ProjectLeaderVO { this.leaderEmail = leaderEmail; } - - + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"leaderUserId\":") + .append("\"").append(leaderUserId).append("\""); + sb.append(",\"leaderUserName\":") + .append("\"").append(leaderUserName).append("\""); + sb.append(",\"leaderName\":") + .append("\"").append(leaderName).append("\""); + sb.append(",\"leaderPhone\":") + .append("\"").append(leaderPhone).append("\""); + sb.append(",\"leaderEmail\":") + .append("\"").append(leaderEmail).append("\""); + sb.append('}'); + return sb.toString(); + } } diff --git a/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/IClientExceptionService.java b/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/IClientExceptionService.java index d01748e..8764564 100644 --- a/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/IClientExceptionService.java +++ b/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/IClientExceptionService.java @@ -3,6 +3,7 @@ package com.cm.central.control.service.clientexception; import com.cm.common.exception.RemoveException; import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; +import com.cm.common.exception.UpdateException; import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; @@ -124,4 +125,12 @@ public interface IClientExceptionService { */ SuccessResultData countClientException(Map params) throws SearchException; + /** + * 标记处理成功 + * + * @param clientExceptionId + * @return + * @throws UpdateException + */ + SuccessResult updateIsHandlerByClientExceptionId(String clientExceptionId) throws UpdateException; } \ No newline at end of file diff --git a/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/impl/ClientExceptionServiceImpl.java b/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/impl/ClientExceptionServiceImpl.java index 2898622..d89ecc9 100644 --- a/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/impl/ClientExceptionServiceImpl.java +++ b/cloud-central-control/src/main/java/com/cm/central/control/service/clientexception/impl/ClientExceptionServiceImpl.java @@ -4,6 +4,7 @@ import com.cm.common.base.AbstractService; import com.cm.common.exception.RemoveException; import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; +import com.cm.common.exception.UpdateException; import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; @@ -141,4 +142,15 @@ public class ClientExceptionServiceImpl extends AbstractService implements IClie return new SuccessResultData<>(countNumberClientException(params)); } + @Override + public SuccessResult updateIsHandlerByClientExceptionId(String clientExceptionId) throws UpdateException { + Map params = getHashMap(2); + params.put("clientExceptionId", clientExceptionId); + params.put("isHandle", 1); + params.put("isNoticeProjectLeader", 1); + setUpdateInfo(params); + clientExceptionDao.updateClientException(params); + return new SuccessResult(); + } + } \ No newline at end of file diff --git a/cloud-central-control/src/main/resources/mybatis/mapper/client/client-mapper.xml b/cloud-central-control/src/main/resources/mybatis/mapper/client/client-mapper.xml index 18f2d69..85717ef 100644 --- a/cloud-central-control/src/main/resources/mybatis/mapper/client/client-mapper.xml +++ b/cloud-central-control/src/main/resources/mybatis/mapper/client/client-mapper.xml @@ -282,10 +282,7 @@ t1.is_delete = 0 AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') - OR - t1.client_id LIKE CONCAT('%', #{keywords}, '%') - + t1.client_name LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/cloud-central-control/src/main/resources/mybatis/mapper/clientexception/clientexception-mapper.xml b/cloud-central-control/src/main/resources/mybatis/mapper/clientexception/clientexception-mapper.xml index 7fe0c73..cf6353c 100644 --- a/cloud-central-control/src/main/resources/mybatis/mapper/clientexception/clientexception-mapper.xml +++ b/cloud-central-control/src/main/resources/mybatis/mapper/clientexception/clientexception-mapper.xml @@ -6,25 +6,14 @@ - - - - - - - - - - - - + @@ -61,13 +50,13 @@ UPDATE - central_client_exception + central_client_exception SET - is_delete = 1, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + is_delete = 1, + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE - client_exception_id IN + client_exception_id IN #{clientExceptionIds[${index}]} @@ -76,9 +65,9 @@ DELETE FROM - central_client_exception + central_client_exception WHERE - client_exception_id IN + client_exception_id IN #{clientExceptionIds[${index}]} @@ -87,7 +76,7 @@ UPDATE - central_client_exception + central_client_exception SET client_id = #{clientId}, @@ -107,8 +96,8 @@ is_handle = #{isHandle}, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE client_exception_id = #{clientExceptionId} @@ -116,17 +105,18 @@ SELECT - jt1.client_name client_client_name, - jt1.client_summary client_client_summary, - jt1.client_version client_client_version, - jt1.database_type client_database_type, - jt1.database_version client_database_version, - jt1.database_name client_database_name, - jt1.customer_id client_customer_id, - jt1.server_ip client_server_ip, - jt1.is_usercenter client_is_usercenter, - jt1.is_only_authorization client_is_only_authorization, - jt1.mac_address client_mac_address, - jt1.license_start_time client_license_start_time, - jt1.license_effective_days client_license_effective_days, - jt1.license_expiration_date client_license_expiration_date, - jt1.authorization_count client_authorization_count, - t1.exception_type, - t1.exception_name, - t1.is_notice_project_leader, - t1.is_handle, - t1.client_exception_id + jt1.client_name client_client_name, + jt1.client_version client_client_version, + jt1.customer_id client_customer_id, + jt1.server_ip client_server_ip, + t1.exception_type, + t1.exception_name, + t1.is_notice_project_leader, + t1.is_handle, + LEFT(t1.gmt_create, 19) gmt_create, + t1.client_exception_id FROM - central_client_exception t1 + central_client_exception t1 LEFT JOIN - central_client jt1 + central_client jt1 ON - t1.client_id = jt1.client_id + t1.client_id = jt1.client_id AND - jt1.is_delete = 0 + jt1.is_delete = 0 WHERE - t1.is_delete = 0 + t1.is_delete = 0 - AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + AND ( + t1.client_name LIKE CONCAT('%', #{keywords}, '%') OR - t1.client_exception_id LIKE CONCAT('%', #{keywords}, '%') - - ) + t1.exception_name LIKE CONCAT('%', #{keywords}, '%') + ) - AND + AND LEFT(t1.gmt_create, 10) = ]]> #{startTime} - AND + AND LEFT(t1.gmt_create, 10) #{endTime} - AND + AND t1.client_exception_id IN #{clientExceptionIds[${index}]} + ORDER BY + t1.gmt_create DESC diff --git a/cloud-central-control/src/main/resources/mybatis/mapper/customer/customer-mapper.xml b/cloud-central-control/src/main/resources/mybatis/mapper/customer/customer-mapper.xml index b92c0de..54759be 100644 --- a/cloud-central-control/src/main/resources/mybatis/mapper/customer/customer-mapper.xml +++ b/cloud-central-control/src/main/resources/mybatis/mapper/customer/customer-mapper.xml @@ -293,10 +293,7 @@ t1.is_delete = 0 AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') - OR - t1.customer_id LIKE CONCAT('%', #{keywords}, '%') - + t1.customer_name LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/cloud-central-control/src/main/resources/mybatis/mapper/projectleader/projectleader-mapper.xml b/cloud-central-control/src/main/resources/mybatis/mapper/projectleader/projectleader-mapper.xml index fee7dc4..542e999 100644 --- a/cloud-central-control/src/main/resources/mybatis/mapper/projectleader/projectleader-mapper.xml +++ b/cloud-central-control/src/main/resources/mybatis/mapper/projectleader/projectleader-mapper.xml @@ -4,6 +4,8 @@ + + @@ -19,6 +21,8 @@ INSERT INTO central_project_leader( project_leader_id, + leader_user_id, + leader_user_name, leader_name, leader_phone, leader_email, @@ -29,6 +33,8 @@ is_delete ) VALUES( #{projectLeaderId}, + #{leaderUserId}, + #{leaderUserName}, #{leaderName}, #{leaderPhone}, #{leaderEmail}, @@ -71,6 +77,12 @@ UPDATE central_project_leader SET + + leader_user_id = #{leaderUserId}, + + + leader_user_name = #{leaderUserName}, + leader_name = #{leaderName}, @@ -89,6 +101,8 @@ SELECT + t1.leader_user_id, + t1.leader_user_name, t1.leader_name, t1.leader_phone, t1.leader_email, @@ -116,10 +132,9 @@ t1.is_delete = 0 AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.leader_user_name LIKE CONCAT('%', #{keywords}, '%') OR - t1.project_leader_id LIKE CONCAT('%', #{keywords}, '%') - + t1.leader_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -154,6 +169,8 @@ SELECT t1.client_name, t1.server_ip, + t2.leader_user_id, + t2.leader_user_name, t2.leader_name, t2.leader_phone, t2.leader_email, diff --git a/cloud-central-control/src/main/resources/templates/clientexception/get-clientexception.html b/cloud-central-control/src/main/resources/templates/clientexception/get-clientexception.html new file mode 100644 index 0000000..7c4382e --- /dev/null +++ b/cloud-central-control/src/main/resources/templates/clientexception/get-clientexception.html @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html b/cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html index e3c3154..cc1b381 100644 --- a/cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html +++ b/cloud-central-control/src/main/resources/templates/clientexception/list-clientexception.html @@ -69,9 +69,8 @@ }, cols: [ [ - {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'clientClientName', width: 150, title: '名称', align:'center', + {field: 'gmtCreate', width: 180, title: '异常时间', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -80,7 +79,7 @@ return rowData; } }, - {field: 'clientClientSummary', width: 150, title: '描述', align:'center', + {field: 'clientClientName', width: 150, title: '名称', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -98,42 +97,6 @@ return rowData; } }, - {field: 'clientDatabaseType', width: 150, title: '数据库类型', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'clientDatabaseVersion', width: 150, title: '数据库版本', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'clientDatabaseName', width: 150, title: '数据库名称', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'clientCustomerId', width: 150, title: '客户ID', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'clientServerIp', width: 150, title: '服务器地址', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -143,7 +106,7 @@ return rowData; } }, - {field: 'clientIsUsercenter', width: 150, title: '是否', align:'center', + {field: 'exceptionType', width: 250, title: '异常类型', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -152,7 +115,7 @@ return rowData; } }, - {field: 'clientIsOnlyAuthorization', width: 150, title: '是否在线授权', align:'center', + {field: 'exceptionName', width: 250, title: '异常名称', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -161,87 +124,39 @@ return rowData; } }, - {field: 'clientMacAddress', width: 150, title: 'mac地址', align:'center', + {field: 'isNoticeProjectLeader', width: 100, title: '通知负责人', fixed:'right', align:'center', templet: function(row) { var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + if(typeof(rowData) === 'undefined' || rowData == null) { return '-'; } + if(rowData == 0) { + return ''; + } else if(rowData == 1) { + return '已通知'; + } + return '错误'; + } + }, + {field: 'isHandle', width: 100, title: '处理状态', fixed:'right', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null) { + return '-'; + } + if(rowData == 0) { + return ''; + } else if(rowData == 1) { + return '已处理'; + } return rowData; } }, - {field: 'clientLicenseStartTime', width: 150, title: '秘钥开始时间', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return common.formatDate('yyyy-MM-dd', new Date(rowData)); + {field:'opition', width:100, title: '操作', fixed:'right', align:'center', + templet: function(item) { + return ''; } }, - {field: 'clientLicenseEffectiveDays', width: 150, title: '秘钥有效天数', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'clientLicenseExpirationDate', width: 150, title: '秘钥到期时间', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return common.formatDate('yyyy-MM-dd', new Date(rowData)); - } - }, - {field: 'clientAuthorizationCount', width: 150, title: '授权次数', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'exceptionType', width: 150, title: '异常类型', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'exceptionName', width: 150, title: '异常名称', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'isNoticeProjectLeader', width: 150, title: '通知负责人', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'isHandle', width: 150, title: '是否处理', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - } ] ], page: true, @@ -282,28 +197,6 @@ format: 'yyyy-MM-dd' }); } - // 删除 - function removeData(ids) { - top.dialog.msg(top.dataMessage.delete, { - time: 0, - btn: [top.dataMessage.button.yes, top.dataMessage.button.no], - shade: 0.3, - yes: function (index) { - top.dialog.close(index); - var layIndex; - top.restAjax.delete(top.restAjax.path('api/clientexception/removeclientexception/{ids}', [ids]), {}, null, function (code, data) { - top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}); - reloadTable(); - }, function (code, data) { - top.dialog.msg(data.msg); - }, function () { - layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3}); - }, function () { - top.dialog.close(layIndex); - }); - } - }); - } initTable(); initDate(); // 事件 - 页面变化 @@ -317,56 +210,28 @@ $(document).on('click', '#search', function() { reloadTable(1); }); - // 事件 - 增删改 - table.on('toolbar(dataTable)', function(obj) { + + table.on('tool(dataTable)', function(obj) { var layEvent = obj.event; - var checkStatus = table.checkStatus('dataTable'); - var checkDatas = checkStatus.data; - if(layEvent === 'saveEvent') { - layer.open({ - type: 2, - title: false, - closeBtn: 0, - area: ['100%', '100%'], - shadeClose: true, - anim: 2, - content: top.restAjax.path('route/clientexception/saveclientexception', []), - end: function() { - reloadTable(); - } + var data = obj.data; + if(layEvent === 'showExceptionEvent') { + top.dialog.open({ + url: top.restAjax.path('route/clientexception/getclientexception?clientExceptionId={clientExceptionId}', [data.clientExceptionId]), + title: '查看异常', + width: '1000px', + height: '500px', + onClose: function() {} }); - } else if(layEvent === 'updateEvent') { - if(checkDatas.length === 0) { - top.dialog.msg(top.dataMessage.table.selectEdit); - } else if(checkDatas.length > 1) { - top.dialog.msg(top.dataMessage.table.selectOneEdit); - } else { - layer.open({ - type: 2, - title: false, - closeBtn: 0, - area: ['100%', '100%'], - shadeClose: true, - anim: 2, - content: top.restAjax.path('route/clientexception/updateclientexception?clientExceptionId={clientExceptionId}', [checkDatas[0].clientExceptionId]), - end: function() { - reloadTable(); - } + } else if(layEvent === 'handleEvent') { + top.dialog.confirm('确定标记处理完成吗？', function(index) { + top.dialog.close(index); + top.restAjax.put(top.restAjax.path('api/clientexception/updateishandlerbyclientexceptionid/{clientExceptionId}', [data.clientExceptionId]), {}, null, function(code, data) { + top.dialog.msg('标记成功'); + reloadTable(); + }, function(code, data) { + top.dialog.msg(data.msg); }); - } - } else if(layEvent === 'removeEvent') { - if(checkDatas.length === 0) { - top.dialog.msg(top.dataMessage.table.selectDelete); - } else { - var ids = ''; - for(var i = 0, item; item = checkDatas[i++];) { - if(i > 1) { - ids += '_'; - } - ids += item['clientExceptionId']; - } - removeData(ids); - } + }) } }); }); diff --git a/cloud-central-control/src/main/resources/templates/clientexception/save-clientexception.html b/cloud-central-control/src/main/resources/templates/clientexception/save-clientexception.html deleted file mode 100644 index f7ae014..0000000 --- a/cloud-central-control/src/main/resources/templates/clientexception/save-clientexception.html +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - -
-
-
- - 上级列表/ - 新增内容 - -
-
-
-
- -
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- - -
-
-
-
-
-
-
- - - - - - - \ No newline at end of file diff --git a/cloud-central-control/src/main/resources/templates/clientexception/update-clientexception.html b/cloud-central-control/src/main/resources/templates/clientexception/update-clientexception.html deleted file mode 100644 index 96682b0..0000000 --- a/cloud-central-control/src/main/resources/templates/clientexception/update-clientexception.html +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - -
-
-
- - 上级列表/ - 编辑内容 - -
-
-
-
- -
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- - -
-
-
-
-
-
-
- - - - - - - \ No newline at end of file diff --git a/cloud-central-control/src/main/resources/templates/projectleader/list-projectleader.html b/cloud-central-control/src/main/resources/templates/projectleader/list-projectleader.html index 0968b12..b578b28 100644 --- a/cloud-central-control/src/main/resources/templates/projectleader/list-projectleader.html +++ b/cloud-central-control/src/main/resources/templates/projectleader/list-projectleader.html @@ -51,7 +51,6 @@ -