Skip to content

A
amos-boot-biz
Commit e8d929a6 authored by tianbo's avatar tianbo
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 9e463132 05639847
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 417 additions and 396 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CatalogTreeController.java
View file @ e8d929a6
...@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.dao.mapper.CatalogTreeMapper; import com.yeejoin.amos.maintenance.business.dao.mapper.CatalogTreeMapper;
...@@ -22,7 +24,6 @@ import com.yeejoin.amos.maintenance.business.util.CommonResponse; ...@@ -22,7 +24,6 @@ import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.core.common.request.CommonPageable; import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
import com.yeejoin.amos.maintenance.core.common.request.CommonRequest; import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.dao.entity.CatalogTree; import com.yeejoin.amos.maintenance.dao.entity.CatalogTree;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -42,7 +43,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -42,7 +43,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "树结构查询", notes = "树结构查询") @ApiOperation(value = "树结构查询", notes = "树结构查询")
@RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getCatalogTree() { public CommonResponse getCatalogTree() {
...@@ -57,7 +58,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -57,7 +58,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "树结构查询", notes = "树结构查询") @ApiOperation(value = "树结构查询", notes = "树结构查询")
@RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getCatalogList() { public CommonResponse getCatalogList() {
...@@ -72,7 +73,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -72,7 +73,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分类新增", notes = "分类新增") @ApiOperation(value = "分类新增", notes = "分类新增")
@RequestMapping(value = "/addCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/addCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse catalogTreeAdd(@ApiParam(value = "分类", required = true) @RequestBody CatalogTree param) { public CommonResponse catalogTreeAdd(@ApiParam(value = "分类", required = true) @RequestBody CatalogTree param) {
...@@ -124,7 +125,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -124,7 +125,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "删除分类", notes = "删除分类") @ApiOperation(value = "删除分类", notes = "删除分类")
@RequestMapping(value = "/deleteCatalogTreeById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/deleteCatalogTreeById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse deleteCatalogTreeById( public CommonResponse deleteCatalogTreeById(
...@@ -144,7 +145,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -144,7 +145,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分类数据查询", notes = "分类数据查询") @ApiOperation(value = "分类数据查询", notes = "分类数据查询")
@RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
...@@ -164,7 +165,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -164,7 +165,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param id * @param id
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询分类按照id", notes = "查询分类按照id") @ApiOperation(value = "查询分类按照id", notes = "查询分类按照id")
@RequestMapping(value = "/catalogTreeDetById/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/catalogTreeDetById/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryCatalogTreeById(@ApiParam(value = "分类id", required = true) @PathVariable(name = "id") Long id) { public CommonResponse queryCatalogTreeById(@ApiParam(value = "分类id", required = true) @PathVariable(name = "id") Long id) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CommonController.java
View file @ e8d929a6
package com.yeejoin.amos.maintenance.business.controller; package com.yeejoin.amos.maintenance.business.controller;
import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.maintenance.business.service.intfc.IAppService; import com.yeejoin.amos.maintenance.business.service.intfc.IAppService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.common.enums.CheckStatisticsTypeEnum; import com.yeejoin.amos.maintenance.common.enums.CheckStatisticsTypeEnum;
import com.yeejoin.amos.maintenance.common.enums.PlanTaskExecution; import com.yeejoin.amos.maintenance.common.enums.PlanTaskExecution;
import com.yeejoin.amos.maintenance.common.enums.PlanTaskFinishStatusEnum; import com.yeejoin.amos.maintenance.common.enums.PlanTaskFinishStatusEnum;
...@@ -28,35 +29,35 @@ public class CommonController extends AbstractBaseController{ ...@@ -28,35 +29,35 @@ public class CommonController extends AbstractBaseController{
@Autowired @Autowired
private IAppService iAppService; private IAppService iAppService;
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "任务统计口径类型", notes = "任务统计口径类型") @ApiOperation(value = "任务统计口径类型", notes = "任务统计口径类型")
@RequestMapping(value = "/taskgetStatisticsType", method = RequestMethod.GET) @RequestMapping(value = "/taskgetStatisticsType", method = RequestMethod.GET)
public CommonResponse getTaskStatisticsType() { public CommonResponse getTaskStatisticsType() {
return CommonResponseUtil.success(TaskStatisticsTypeEnum.getEnumList()); return CommonResponseUtil.success(TaskStatisticsTypeEnum.getEnumList());
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检统计口径类型", notes = "巡检统计口径类型") @ApiOperation(value = "巡检统计口径类型", notes = "巡检统计口径类型")
@RequestMapping(value = "/checkStatisticsType", method = RequestMethod.GET) @RequestMapping(value = "/checkStatisticsType", method = RequestMethod.GET)
public CommonResponse getCheckStatisticsType() { public CommonResponse getCheckStatisticsType() {
return CommonResponseUtil.success(CheckStatisticsTypeEnum.getEnumList()); return CommonResponseUtil.success(CheckStatisticsTypeEnum.getEnumList());
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "计划任务完成种类", notes = "计划任务完成种类") @ApiOperation(httpMethod = "GET", value = "计划任务完成种类", notes = "计划任务完成种类")
@RequestMapping(value = "/planTaskFinishStatus", method = RequestMethod.GET) @RequestMapping(value = "/planTaskFinishStatus", method = RequestMethod.GET)
public CommonResponse getPlanTaskFinishStatus() { public CommonResponse getPlanTaskFinishStatus() {
return CommonResponseUtil.success(PlanTaskFinishStatusEnum.getEnumList()); return CommonResponseUtil.success(PlanTaskFinishStatusEnum.getEnumList());
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "计划任务执行情况种类", notes = "计划任务执行情况种类") @ApiOperation(value = "计划任务执行情况种类", notes = "计划任务执行情况种类")
@RequestMapping(value = "/planTaskExecution", method = RequestMethod.GET) @RequestMapping(value = "/planTaskExecution", method = RequestMethod.GET)
public CommonResponse getPlanTaskExecution() { public CommonResponse getPlanTaskExecution() {
return CommonResponseUtil.success(PlanTaskExecution.getEnumList()); return CommonResponseUtil.success(PlanTaskExecution.getEnumList());
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取app最新版本信息", notes = "获取app最新版本信息") @ApiOperation(value = "获取app最新版本信息", notes = "获取app最新版本信息")
@RequestMapping(value = "/queryAppVersion", method = RequestMethod.GET) @RequestMapping(value = "/queryAppVersion", method = RequestMethod.GET)
//@Authorization(ingore=true) //@Authorization(ingore=true)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/ConfigController.java
View file @ e8d929a6
...@@ -2,16 +2,18 @@ package com.yeejoin.amos.maintenance.business.controller; ...@@ -2,16 +2,18 @@ package com.yeejoin.amos.maintenance.business.controller;
import java.util.List; import java.util.List;
import com.yeejoin.amos.maintenance.business.dao.repository.IConfigDao;
import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.maintenance.business.dao.repository.IConfigDao;
import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.dao.entity.Config; import com.yeejoin.amos.maintenance.dao.entity.Config;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -42,7 +44,7 @@ public class ConfigController extends AbstractBaseController{ ...@@ -42,7 +44,7 @@ public class ConfigController extends AbstractBaseController{
* @return * @return
*/ */
//@Authorization(ingore = true) //@Authorization(ingore = true)
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取配置接口信息", notes = " 获取配置接口信息") @ApiOperation(value = "获取配置接口信息", notes = " 获取配置接口信息")
@RequestMapping(value = "/getConfigsInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/getConfigsInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getConfigsInfo() { public CommonResponse getConfigsInfo() {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/EquipmentRuleController.java
View file @ e8d929a6
...@@ -10,13 +10,14 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -10,13 +10,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.service.intfc.IEquipmentHandlerService; import com.yeejoin.amos.maintenance.business.service.intfc.IEquipmentHandlerService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.util.Toke; import com.yeejoin.amos.maintenance.business.util.Toke;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.dao.entity.InputItem; import com.yeejoin.amos.maintenance.dao.entity.InputItem;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -41,7 +42,7 @@ public class EquipmentRuleController extends AbstractBaseController { ...@@ -41,7 +42,7 @@ public class EquipmentRuleController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "装备检查项", notes = "装备检查项") @ApiOperation(value = "装备检查项", notes = "装备检查项")
@RequestMapping(value = "/equipmnetInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/equipmnetInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse getPlanTaskList( public CommonResponse getPlanTaskList(
...@@ -62,7 +63,7 @@ public class EquipmentRuleController extends AbstractBaseController { ...@@ -62,7 +63,7 @@ public class EquipmentRuleController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "装备检查项", notes = "装备检查项") @ApiOperation(value = "装备检查项", notes = "装备检查项")
@RequestMapping(value = "/getEquipmnetRules", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/getEquipmnetRules", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getEquipmnetRules( public CommonResponse getEquipmnetRules(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/ExcelExportController.java
View file @ e8d929a6
...@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.param.TaskStatisticsParam; import com.yeejoin.amos.maintenance.business.param.TaskStatisticsParam;
...@@ -26,7 +28,6 @@ import com.yeejoin.amos.maintenance.business.service.impl.TaskReportService; ...@@ -26,7 +28,6 @@ import com.yeejoin.amos.maintenance.business.service.impl.TaskReportService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.util.Toke; import com.yeejoin.amos.maintenance.business.util.Toke;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
...@@ -57,7 +58,7 @@ public class ExcelExportController extends AbstractBaseController{ ...@@ -57,7 +58,7 @@ public class ExcelExportController extends AbstractBaseController{
* *
* 导出格式为：vnd.ms-excel * 导出格式为：vnd.ms-excel
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检完成情况月报表导出excel", notes = " 巡检完成情况月报表导出excel") @ApiOperation(value = "巡检完成情况月报表导出excel", notes = " 巡检完成情况月报表导出excel")
@RequestMapping(value = "/task/{statistical}", produces = "application/vnd.ms-excel;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/task/{statistical}", produces = "application/vnd.ms-excel;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse taskReport( public CommonResponse taskReport(
...@@ -86,7 +87,7 @@ public class ExcelExportController extends AbstractBaseController{ ...@@ -86,7 +87,7 @@ public class ExcelExportController extends AbstractBaseController{
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 人员综合统计分析Excel导出", notes = " 人员综合统计分析Excel导出") @ApiOperation(value = " 人员综合统计分析Excel导出", notes = " 人员综合统计分析Excel导出")
@RequestMapping(value = "/comprehensive/user", produces = "application/vnd.ms-excel;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/comprehensive/user", produces = "application/vnd.ms-excel;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse comprehensiveStatisticalForUser( public CommonResponse comprehensiveStatisticalForUser(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/GroupController.java
View file @ e8d929a6
...@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo; import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
...@@ -23,7 +25,6 @@ import com.yeejoin.amos.maintenance.business.service.intfc.ISafety3DDataSendServ ...@@ -23,7 +25,6 @@ import com.yeejoin.amos.maintenance.business.service.intfc.ISafety3DDataSendServ
import com.yeejoin.amos.maintenance.business.util.CommonResponse; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.core.common.response.TaskInfoRespone; import com.yeejoin.amos.maintenance.core.common.response.TaskInfoRespone;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.email.IEmailService; import com.yeejoin.amos.maintenance.email.IEmailService;
import com.yeejoin.amos.maintenance.feign.RemoteSecurityService; import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
...@@ -51,7 +52,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -51,7 +52,7 @@ public class GroupController extends AbstractBaseController{
* 部门查询 * 部门查询
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取当前用户所属公司的所有部门", notes = "获取当前用户所属公司的所有部门") @ApiOperation(value = "获取当前用户所属公司的所有部门", notes = "获取当前用户所属公司的所有部门")
@RequestMapping(value = "/queryDept", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDept", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryCurrentCompanyDept() { public CommonResponse queryCurrentCompanyDept() {
...@@ -138,7 +139,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -138,7 +139,7 @@ public class GroupController extends AbstractBaseController{
return CommonResponseUtil.success(res); return CommonResponseUtil.success(res);
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取当前用户所属公司的所有部门及人员", notes = "获取当前用户所属公司的所有部门及人员") @ApiOperation(value = "获取当前用户所属公司的所有部门及人员", notes = "获取当前用户所属公司的所有部门及人员")
@RequestMapping(value = "/queryDeptAndUser",produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDeptAndUser",produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryCurrentCompanyDeptAndUser() { public CommonResponse queryCurrentCompanyDeptAndUser() {
...@@ -288,7 +289,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -288,7 +289,7 @@ public class GroupController extends AbstractBaseController{
* @param companyId * @param companyId
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "根据指定公司ID获取公司和所属公司的子公司信息", notes = "根据指定公司ID获取公司和所属公司的子公司信息") @ApiOperation(value = "根据指定公司ID获取公司和所属公司的子公司信息", notes = "根据指定公司ID获取公司和所属公司的子公司信息")
@RequestMapping(value = "/queryCompanyLeaves", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryCompanyLeaves", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryCompanyLeavesById(@ApiParam(value="公司Id") @RequestParam("companyId") String companyId) { public CommonResponse queryCompanyLeavesById(@ApiParam(value="公司Id") @RequestParam("companyId") String companyId) {
...@@ -308,7 +309,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -308,7 +309,7 @@ public class GroupController extends AbstractBaseController{
* 根据用户所有属公司ID，查询所有子公司末端公司信息 * 根据用户所有属公司ID，查询所有子公司末端公司信息
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取用户所属公司和所属公司的子公司信息", notes = "获取用户所属公司和所属公司的子公司信息") @ApiOperation(value = "获取用户所属公司和所属公司的子公司信息", notes = "获取用户所属公司和所属公司的子公司信息")
@RequestMapping(value = "/queryAuthCompanyLeaves", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryAuthCompanyLeaves", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryAuthCompanyLeaves() { public CommonResponse queryAuthCompanyLeaves() {
...@@ -351,7 +352,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -351,7 +352,7 @@ public class GroupController extends AbstractBaseController{
@Autowired @Autowired
private ISafety3DDataSendService safety3DDataSend; private ISafety3DDataSendService safety3DDataSend;
//@Authorization(ingore=true) //@Authorization(ingore=true)
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "检查点状态推送", notes = "检查点状态推送") @ApiOperation(value = "检查点状态推送", notes = "检查点状态推送")
@RequestMapping(value = "/testCheckPushStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/testCheckPushStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse testCheckPushStatus(@ApiParam(value="Id") @RequestParam("checkId") long checkId) { public CommonResponse testCheckPushStatus(@ApiParam(value="Id") @RequestParam("checkId") long checkId) {
...@@ -366,7 +367,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -366,7 +367,7 @@ public class GroupController extends AbstractBaseController{
} }
//@Authorization(ingore=true) //@Authorization(ingore=true)
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "任务状态推送", notes = "任务状态推送") @ApiOperation(value = "任务状态推送", notes = "任务状态推送")
@RequestMapping(value = "/testTaskPushStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/testTaskPushStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse testTaskPushStatus(@ApiParam(value="Id") @RequestParam("checkId") Long taskId) { public CommonResponse testTaskPushStatus(@ApiParam(value="Id") @RequestParam("checkId") Long taskId) {
...@@ -379,7 +380,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -379,7 +380,7 @@ public class GroupController extends AbstractBaseController{
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检点信息", notes = "巡检点信息") @ApiOperation(value = "巡检点信息", notes = "巡检点信息")
@RequestMapping(value = "/pointInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/pointInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getPointInfo(@ApiParam(value="Id") @RequestParam("pointId") Long pointId) { public CommonResponse getPointInfo(@ApiParam(value="Id") @RequestParam("pointId") Long pointId) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/HomeController.java
View file @ e8d929a6
...@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.service.intfc.ICheckService; import com.yeejoin.amos.maintenance.business.service.intfc.ICheckService;
...@@ -19,7 +21,6 @@ import com.yeejoin.amos.maintenance.business.service.intfc.IPointService; ...@@ -19,7 +21,6 @@ import com.yeejoin.amos.maintenance.business.service.intfc.IPointService;
import com.yeejoin.amos.maintenance.business.service.intfc.ITaskService; import com.yeejoin.amos.maintenance.business.service.intfc.ITaskService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.feign.RemoteSecurityService; import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -46,7 +47,7 @@ public class HomeController extends AbstractBaseController{ ...@@ -46,7 +47,7 @@ public class HomeController extends AbstractBaseController{
@Autowired @Autowired
private RemoteSecurityService remoteSecurityService; private RemoteSecurityService remoteSecurityService;
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "首页数据", notes = "首页数据") @ApiOperation(value = "首页数据", notes = "首页数据")
@GetMapping(value="/overviewData") @GetMapping(value="/overviewData")
// @Authorization(ingore = true) // @Authorization(ingore = true)
...@@ -83,7 +84,7 @@ public class HomeController extends AbstractBaseController{ ...@@ -83,7 +84,7 @@ public class HomeController extends AbstractBaseController{
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "首页数据", notes = "首页数据") @ApiOperation(value = "首页数据", notes = "首页数据")
@GetMapping(value="/getCheckData") @GetMapping(value="/getCheckData")
public CommonResponse getCheckData() { public CommonResponse getCheckData() {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/InputItemController.java
View file @ e8d929a6
...@@ -27,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -27,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
...@@ -46,7 +48,6 @@ import com.yeejoin.amos.maintenance.common.enums.DictTypeEnum; ...@@ -46,7 +48,6 @@ import com.yeejoin.amos.maintenance.common.enums.DictTypeEnum;
import com.yeejoin.amos.maintenance.core.common.request.CommonPageable; import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
import com.yeejoin.amos.maintenance.core.common.request.CommonRequest; import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
import com.yeejoin.amos.maintenance.core.enums.QueryOperatorEnum; import com.yeejoin.amos.maintenance.core.enums.QueryOperatorEnum;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.core.util.StringUtil; import com.yeejoin.amos.maintenance.core.util.StringUtil;
import com.yeejoin.amos.maintenance.dao.entity.InputItem; import com.yeejoin.amos.maintenance.dao.entity.InputItem;
...@@ -77,7 +78,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -77,7 +78,7 @@ public class InputItemController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "新增检查项", notes = "新增检查项") @ApiOperation(value = "新增检查项", notes = "新增检查项")
@RequestMapping(value = "/addItem", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/addItem", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse addNewItem(@ApiParam(value = "检查项信息") @RequestBody InputItemParam param) { public CommonResponse addNewItem(@ApiParam(value = "检查项信息") @RequestBody InputItemParam param) {
...@@ -108,7 +109,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -108,7 +109,7 @@ public class InputItemController extends AbstractBaseController {
* @param itemID * @param itemID
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "检查项ID", notes = "检查项详情") @ApiOperation(value = "检查项ID", notes = "检查项详情")
@RequestMapping(value = "/queryItem", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryItem", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryItemDetail(@ApiParam(value = "巡检项ID") @RequestParam(required = true) Long itemID) { public CommonResponse queryItemDetail(@ApiParam(value = "巡检项ID") @RequestParam(required = true) Long itemID) {
...@@ -120,7 +121,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -120,7 +121,7 @@ public class InputItemController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "更新检查项", notes = "更新检查项") @ApiOperation(value = "更新检查项", notes = "更新检查项")
@RequestMapping(value = "/updateItem", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT) @RequestMapping(value = "/updateItem", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
public CommonResponse updateItem(@ApiParam(value = "检查项详情", required = false) @RequestBody InputItemParam param) { public CommonResponse updateItem(@ApiParam(value = "检查项详情", required = false) @RequestBody InputItemParam param) {
...@@ -148,7 +149,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -148,7 +149,7 @@ public class InputItemController extends AbstractBaseController {
* @param * @param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "批量删除检查项", notes = "批量删除检查项") @ApiOperation(value = "批量删除检查项", notes = "批量删除检查项")
@RequestMapping(value = "/batchDelItem", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE) @RequestMapping(value = "/batchDelItem", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
public CommonResponse batchDelItem( public CommonResponse batchDelItem(
...@@ -171,7 +172,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -171,7 +172,7 @@ public class InputItemController extends AbstractBaseController {
* @param itemID * @param itemID
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "删除检查项", notes = "删除检查项") @ApiOperation(value = "删除检查项", notes = "删除检查项")
@RequestMapping(value = "/delItem", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/delItem", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse delItem(@ApiParam(value = "巡检项ID") @RequestParam(required = true) Long itemID) { public CommonResponse delItem(@ApiParam(value = "巡检项ID") @RequestParam(required = true) Long itemID) {
...@@ -189,7 +190,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -189,7 +190,7 @@ public class InputItemController extends AbstractBaseController {
* @param * @param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "检查项另存为", notes = "检查项另存为") @ApiOperation(value = "检查项另存为", notes = "检查项另存为")
@RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse saveAs(@ApiParam(value = "巡检项ID") @RequestParam(required = true) String itemIDs) { public CommonResponse saveAs(@ApiParam(value = "巡检项ID") @RequestParam(required = true) String itemIDs) {
...@@ -216,7 +217,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -216,7 +217,7 @@ public class InputItemController extends AbstractBaseController {
* @param pageable * @param pageable
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分页查询检查项", notes = "分页查询检查项") @ApiOperation(value = "分页查询检查项", notes = "分页查询检查项")
@RequestMapping(value = "/queryItemByPage", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/queryItemByPage", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse queryItemByPage( public CommonResponse queryItemByPage(
...@@ -237,7 +238,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -237,7 +238,7 @@ public class InputItemController extends AbstractBaseController {
* @param queryRequests * @param queryRequests
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/queryItemByCondition", produces = "application/json;charset=UTF-8") @PostMapping(value = "/queryItemByCondition", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项") @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
public CommonResponse queryItemByCondition( public CommonResponse queryItemByCondition(
...@@ -262,7 +263,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -262,7 +263,7 @@ public class InputItemController extends AbstractBaseController {
* @param params * @param params
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/queryCustomInputItem", produces = "application/json;charset=UTF-8") @PostMapping(value = "/queryCustomInputItem", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项") @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
public CommonResponse queryCustomInputItem(@RequestBody HashMap<String, Object> params) { public CommonResponse queryCustomInputItem(@RequestBody HashMap<String, Object> params) {
...@@ -278,7 +279,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -278,7 +279,7 @@ public class InputItemController extends AbstractBaseController {
* @param queryRequests 查询条件 * @param queryRequests 查询条件
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/queryItemByCondition1", produces = "application/json;charset=UTF-8") @PostMapping(value = "/queryItemByCondition1", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项") @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
public CommonResponse queryItemByCondition1( public CommonResponse queryItemByCondition1(
...@@ -320,7 +321,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -320,7 +321,7 @@ public class InputItemController extends AbstractBaseController {
* @param queryRequests 查询条件 * @param queryRequests 查询条件
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检点编号信息", notes = "查询巡检点编号信息") @ApiOperation(value = "查询巡检点编号信息", notes = "查询巡检点编号信息")
@GetMapping(value = "/queryItemNo/{itemId}", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryItemNo/{itemId}", produces = "application/json;charset=UTF-8")
public CommonResponse queryItemNoList( public CommonResponse queryItemNoList(
...@@ -375,7 +376,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -375,7 +376,7 @@ public class InputItemController extends AbstractBaseController {
* @return * @return
* @Since 2021-3-10 * @Since 2021-3-10
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/uploadListByTemplate") @PostMapping(value = "/uploadListByTemplate")
@ApiOperation(httpMethod = "POST", value = "维保项信息导入", notes = "维保项信息导入") @ApiOperation(httpMethod = "POST", value = "维保项信息导入", notes = "维保项信息导入")
public CommonResponse uploadListByTemplate(MultipartFile file) throws Exception { public CommonResponse uploadListByTemplate(MultipartFile file) throws Exception {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/MeasuresController.java
View file @ e8d929a6
...@@ -8,11 +8,12 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -8,11 +8,12 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.maintenance.business.service.intfc.IMeasuresService; import com.yeejoin.amos.maintenance.business.service.intfc.IMeasuresService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.dao.entity.Measure; import com.yeejoin.amos.maintenance.dao.entity.Measure;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -27,7 +28,7 @@ public class MeasuresController extends AbstractBaseController { ...@@ -27,7 +28,7 @@ public class MeasuresController extends AbstractBaseController {
@Autowired @Autowired
IMeasuresService measuresService; IMeasuresService measuresService;
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "add", produces = "application/json;charset=UTF-8") @PostMapping(value = "add", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "新增风险措施", notes = "新增风险措施") @ApiOperation(value = "新增风险措施", notes = "新增风险措施")
public CommonResponse measuresAdd(@ApiParam(value = "风险措施参数", required = false) @RequestBody(required = false) Measure measure) { public CommonResponse measuresAdd(@ApiParam(value = "风险措施参数", required = false) @RequestBody(required = false) Measure measure) {
...@@ -39,7 +40,7 @@ public class MeasuresController extends AbstractBaseController { ...@@ -39,7 +40,7 @@ public class MeasuresController extends AbstractBaseController {
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "update", produces = "application/json;charset=UTF-8") @PostMapping(value = "update", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "修改风险措施", notes = "修改风险措施") @ApiOperation(value = "修改风险措施", notes = "修改风险措施")
public CommonResponse measuresUpdate(@ApiParam(value = "风险措施参数", required = false) @RequestBody(required = false) Measure measure) { public CommonResponse measuresUpdate(@ApiParam(value = "风险措施参数", required = false) @RequestBody(required = false) Measure measure) {
...@@ -53,7 +54,7 @@ public class MeasuresController extends AbstractBaseController { ...@@ -53,7 +54,7 @@ public class MeasuresController extends AbstractBaseController {
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "delete/{id}", produces = "application/json;charset=UTF-8") @PostMapping(value = "delete/{id}", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "删除风险措施", notes = "删除风险措施") @ApiOperation(value = "删除风险措施", notes = "删除风险措施")
public CommonResponse measuresDelete(@ApiParam(value = "风险措施id", required = false) @PathVariable(required = true) Long id) { public CommonResponse measuresDelete(@ApiParam(value = "风险措施id", required = false) @PathVariable(required = true) Long id) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/MsgController.java
View file @ e8d929a6
...@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
...@@ -44,7 +46,6 @@ import com.yeejoin.amos.maintenance.common.enums.CheckTypeEnum; ...@@ -44,7 +46,6 @@ import com.yeejoin.amos.maintenance.common.enums.CheckTypeEnum;
import com.yeejoin.amos.maintenance.common.enums.MsgTypeEnum; import com.yeejoin.amos.maintenance.common.enums.MsgTypeEnum;
import com.yeejoin.amos.maintenance.core.common.request.CommonPageable; import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
import com.yeejoin.amos.maintenance.core.common.request.CommonRequest; import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.dao.entity.Msg; import com.yeejoin.amos.maintenance.dao.entity.Msg;
import com.yeejoin.amos.maintenance.dao.entity.MsgSubscribe; import com.yeejoin.amos.maintenance.dao.entity.MsgSubscribe;
import com.yeejoin.amos.maintenance.quartz.IJobService; import com.yeejoin.amos.maintenance.quartz.IJobService;
...@@ -90,7 +91,7 @@ public class MsgController extends AbstractBaseController { ...@@ -90,7 +91,7 @@ public class MsgController extends AbstractBaseController {
* 获取用户当前所选择公司的消息订阅信息 * 获取用户当前所选择公司的消息订阅信息
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value="获取用户当前所选择公司的消息订阅信息", notes="获取用户当前所选择公司的消息订阅信息") @ApiOperation(value="获取用户当前所选择公司的消息订阅信息", notes="获取用户当前所选择公司的消息订阅信息")
@GetMapping(value="/querySubscribe", produces = "application/json;charset=UTF-8") @GetMapping(value="/querySubscribe", produces = "application/json;charset=UTF-8")
public CommonResponse queryMsgSetting() { public CommonResponse queryMsgSetting() {
...@@ -181,7 +182,7 @@ public class MsgController extends AbstractBaseController { ...@@ -181,7 +182,7 @@ public class MsgController extends AbstractBaseController {
* @param subscribe * @param subscribe
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value="保存用户消息订阅信息", notes="保存用户消息订阅信息") @ApiOperation(value="保存用户消息订阅信息", notes="保存用户消息订阅信息")
@PostMapping(value="/saveSubscribe",produces = "application/json;charset=UTF-8") @PostMapping(value="/saveSubscribe",produces = "application/json;charset=UTF-8")
public CommonResponse saveSubscribe(@ApiParam(value = "消息订阅信息", required = false) @RequestBody(required = true) List<MsgSubscribe> subscribe) { public CommonResponse saveSubscribe(@ApiParam(value = "消息订阅信息", required = false) @RequestBody(required = true) List<MsgSubscribe> subscribe) {
...@@ -252,7 +253,7 @@ public class MsgController extends AbstractBaseController { ...@@ -252,7 +253,7 @@ public class MsgController extends AbstractBaseController {
* 根据登陆用户APP获取未读消息个数 * 根据登陆用户APP获取未读消息个数
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value="APP根据登陆用户获取未读消息个数", notes="APP根据登陆用户获取未读消息个数") @ApiOperation(value="APP根据登陆用户获取未读消息个数", notes="APP根据登陆用户获取未读消息个数")
@GetMapping(value="/unreadCount",produces = "application/json;charset=UTF-8") @GetMapping(value="/unreadCount",produces = "application/json;charset=UTF-8")
public CommonResponse getUnreadCount() { public CommonResponse getUnreadCount() {
...@@ -270,7 +271,7 @@ public class MsgController extends AbstractBaseController { ...@@ -270,7 +271,7 @@ public class MsgController extends AbstractBaseController {
* 获取消息类型 * 获取消息类型
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value="APP获取消息类型", notes="APP获取消息类型") @ApiOperation(value="APP获取消息类型", notes="APP获取消息类型")
@GetMapping(value="/MsgType",produces = "application/json;charset=UTF-8") @GetMapping(value="/MsgType",produces = "application/json;charset=UTF-8")
public CommonResponse getMsgType() { public CommonResponse getMsgType() {
...@@ -288,7 +289,7 @@ public class MsgController extends AbstractBaseController { ...@@ -288,7 +289,7 @@ public class MsgController extends AbstractBaseController {
* @param commonPageable * @param commonPageable
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "APP 根据条件获取消息列表", notes = "APP 根据条件获取消息列表") @ApiOperation(value = "APP 根据条件获取消息列表", notes = "APP 根据条件获取消息列表")
@PostMapping(value = "/msgList", produces = "application/json;charset=UTF-8") @PostMapping(value = "/msgList", produces = "application/json;charset=UTF-8")
public CommonResponse queryMsgList( public CommonResponse queryMsgList(
...@@ -358,7 +359,7 @@ public class MsgController extends AbstractBaseController { ...@@ -358,7 +359,7 @@ public class MsgController extends AbstractBaseController {
* @param commonPageable * @param commonPageable
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "根据条件获取消息列表", notes = "APP 根据条件获取消息列表") @ApiOperation(value = "根据条件获取消息列表", notes = "APP 根据条件获取消息列表")
@PostMapping(value = "/list", produces = "application/json;charset=UTF-8") @PostMapping(value = "/list", produces = "application/json;charset=UTF-8")
public CommonResponse querylist( public CommonResponse querylist(
...@@ -385,7 +386,7 @@ public class MsgController extends AbstractBaseController { ...@@ -385,7 +386,7 @@ public class MsgController extends AbstractBaseController {
* @param msgId * @param msgId
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "修改消失为已读", notes = "修改消失为已读") @ApiOperation(value = "修改消失为已读", notes = "修改消失为已读")
@PostMapping(value = "/isRead", produces = "application/json;charset=UTF-8") @PostMapping(value = "/isRead", produces = "application/json;charset=UTF-8")
public CommonResponse isRead( public CommonResponse isRead(
...@@ -404,7 +405,7 @@ public class MsgController extends AbstractBaseController { ...@@ -404,7 +405,7 @@ public class MsgController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "通知发布", notes = "通知发布") @ApiOperation(value = "通知发布", notes = "通知发布")
@PostMapping(value = "/noticePublish", produces = "application/json;charset=UTF-8") @PostMapping(value = "/noticePublish", produces = "application/json;charset=UTF-8")
public CommonResponse noticePublish(@ApiParam(value = "通知信息", required = true) @RequestBody NoticePublishParam msg) { public CommonResponse noticePublish(@ApiParam(value = "通知信息", required = true) @RequestBody NoticePublishParam msg) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanController.java
View file @ e8d929a6
...@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.param.PlanInfoPageParam; import com.yeejoin.amos.maintenance.business.param.PlanInfoPageParam;
...@@ -21,7 +23,6 @@ import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; ...@@ -21,7 +23,6 @@ import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.util.PlanPageParamUtil; import com.yeejoin.amos.maintenance.business.util.PlanPageParamUtil;
import com.yeejoin.amos.maintenance.core.common.request.CommonPageable; import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
import com.yeejoin.amos.maintenance.core.common.request.CommonRequest; import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.dao.entity.Plan; import com.yeejoin.amos.maintenance.dao.entity.Plan;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -43,7 +44,7 @@ public class PlanController extends AbstractBaseController { ...@@ -43,7 +44,7 @@ public class PlanController extends AbstractBaseController {
* @param * @param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检计划查询", notes = "巡检计划查询") @ApiOperation(value = "巡检计划查询", notes = "巡检计划查询")
@RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
...@@ -64,7 +65,7 @@ public class PlanController extends AbstractBaseController { ...@@ -64,7 +65,7 @@ public class PlanController extends AbstractBaseController {
* @param * @param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "业主单位维保计划查询", notes = "业主单位维保计划查询") @ApiOperation(value = "业主单位维保计划查询", notes = "业主单位维保计划查询")
@RequestMapping(value = "/owner/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/owner/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse queryInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse queryInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
...@@ -82,7 +83,7 @@ public class PlanController extends AbstractBaseController { ...@@ -82,7 +83,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑") @ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑")
@RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) { public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
...@@ -108,7 +109,7 @@ public class PlanController extends AbstractBaseController { ...@@ -108,7 +109,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "删除巡检计划", notes = "删除巡检计划") @ApiOperation(value = "删除巡检计划", notes = "删除巡检计划")
@RequestMapping(value = "/deletePlanById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/deletePlanById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse deletePlanById( public CommonResponse deletePlanById(
...@@ -129,7 +130,7 @@ public class PlanController extends AbstractBaseController { ...@@ -129,7 +130,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "另存巡检计划", notes = "另存巡检计划") @ApiOperation(value = "另存巡检计划", notes = "另存巡检计划")
@RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse planSaveAs(@ApiParam(value = "参数", required = true) @RequestBody String[] param) { public CommonResponse planSaveAs(@ApiParam(value = "参数", required = true) @RequestBody String[] param) {
...@@ -148,7 +149,7 @@ public class PlanController extends AbstractBaseController { ...@@ -148,7 +149,7 @@ public class PlanController extends AbstractBaseController {
* @param id * @param id
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检计划明细", notes = "查询巡检计划明细") @ApiOperation(value = "查询巡检计划明细", notes = "查询巡检计划明细")
@RequestMapping(value = "/detail/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/detail/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) { public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) {
...@@ -165,7 +166,7 @@ public class PlanController extends AbstractBaseController { ...@@ -165,7 +166,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检计划查询", notes = "巡检计划查询") @ApiOperation(value = "巡检计划查询", notes = "巡检计划查询")
@RequestMapping(value = "/queryPlanByOrgCode", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/queryPlanByOrgCode", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) { public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) {
...@@ -177,7 +178,7 @@ public class PlanController extends AbstractBaseController { ...@@ -177,7 +178,7 @@ public class PlanController extends AbstractBaseController {
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询计划列表(<font color='blue'>手机app</font>)", notes = "查询计划列表(<font color='blue'>手机app</font>)") @ApiOperation(value = "查询计划列表(<font color='blue'>手机app</font>)", notes = "查询计划列表(<font color='blue'>手机app</font>)")
@RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPlanList() { public CommonResponse queryPlanList() {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/QueryStatsController.java
View file @ e8d929a6
...@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.param.CheckStatsListPageParam; import com.yeejoin.amos.maintenance.business.param.CheckStatsListPageParam;
...@@ -19,7 +21,6 @@ import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; ...@@ -19,7 +21,6 @@ import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.vo.CheckStatsVo; import com.yeejoin.amos.maintenance.business.vo.CheckStatsVo;
import com.yeejoin.amos.maintenance.core.common.request.CommonPageable; import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
import com.yeejoin.amos.maintenance.core.common.request.CommonRequest; import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -39,7 +40,7 @@ public class QueryStatsController extends AbstractBaseController { ...@@ -39,7 +40,7 @@ public class QueryStatsController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检点信息", notes = "查询巡检点信息") @ApiOperation(value = "查询巡检点信息", notes = "查询巡检点信息")
@PostMapping(value = "/checkStats", produces = "application/json;charset=UTF-8") @PostMapping(value = "/checkStats", produces = "application/json;charset=UTF-8")
public CommonResponse queryCheckStats( public CommonResponse queryCheckStats(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/RouteController.java
View file @ e8d929a6
...@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.param.RoutePageParam; import com.yeejoin.amos.maintenance.business.param.RoutePageParam;
...@@ -30,7 +32,6 @@ import com.yeejoin.amos.maintenance.business.util.RoutePageParamUtil; ...@@ -30,7 +32,6 @@ import com.yeejoin.amos.maintenance.business.util.RoutePageParamUtil;
import com.yeejoin.amos.maintenance.core.common.request.CommonPageable; import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
import com.yeejoin.amos.maintenance.core.common.request.CommonRequest; import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
import com.yeejoin.amos.maintenance.core.common.request.RoutePointInputItemRequest; import com.yeejoin.amos.maintenance.core.common.request.RoutePointInputItemRequest;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.dao.entity.InputItem; import com.yeejoin.amos.maintenance.dao.entity.InputItem;
import com.yeejoin.amos.maintenance.dao.entity.Plan; import com.yeejoin.amos.maintenance.dao.entity.Plan;
import com.yeejoin.amos.maintenance.dao.entity.Route; import com.yeejoin.amos.maintenance.dao.entity.Route;
...@@ -56,7 +57,7 @@ public class RouteController extends AbstractBaseController { ...@@ -56,7 +57,7 @@ public class RouteController extends AbstractBaseController {
* @param route 路线 * @param route 路线
* @return CommonResponse * @return CommonResponse
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "新增巡检路线", notes = "新增巡检路线") @ApiOperation(value = "新增巡检路线", notes = "新增巡检路线")
@PostMapping(value = "/addRoute", produces = "application/json;charset=UTF-8") @PostMapping(value = "/addRoute", produces = "application/json;charset=UTF-8")
public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
...@@ -83,7 +84,7 @@ public class RouteController extends AbstractBaseController { ...@@ -83,7 +84,7 @@ public class RouteController extends AbstractBaseController {
* @param route * @param route
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "更新巡检路线", notes = "更新巡检路线") @ApiOperation(value = "更新巡检路线", notes = "更新巡检路线")
@PutMapping(value = "/updateRoute", produces = "application/json;charset=UTF-8") @PutMapping(value = "/updateRoute", produces = "application/json;charset=UTF-8")
public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
...@@ -106,7 +107,7 @@ public class RouteController extends AbstractBaseController { ...@@ -106,7 +107,7 @@ public class RouteController extends AbstractBaseController {
* @param routeIds * @param routeIds
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "删除巡检路线", notes = "删除巡检路线") @ApiOperation(value = "删除巡检路线", notes = "删除巡检路线")
@DeleteMapping(value = "/deleteRoute", produces = "application/json;charset=UTF-8") @DeleteMapping(value = "/deleteRoute", produces = "application/json;charset=UTF-8")
public CommonResponse deleteRoute(@ApiParam(value = "巡检路线ID", required = false) @RequestParam List<Long> routeIds) { public CommonResponse deleteRoute(@ApiParam(value = "巡检路线ID", required = false) @RequestParam List<Long> routeIds) {
...@@ -151,7 +152,7 @@ public class RouteController extends AbstractBaseController { ...@@ -151,7 +152,7 @@ public class RouteController extends AbstractBaseController {
* @param id * @param id
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检路线信息", notes = "查询巡检路线信息") @ApiOperation(value = "查询巡检路线信息", notes = "查询巡检路线信息")
@GetMapping(value = "/queryRouteById/{id}", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryRouteById/{id}", produces = "application/json;charset=UTF-8")
public CommonResponse queryRouteById( public CommonResponse queryRouteById(
...@@ -165,7 +166,7 @@ public class RouteController extends AbstractBaseController { ...@@ -165,7 +166,7 @@ public class RouteController extends AbstractBaseController {
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "迁移路线上点到其他路线", notes = "迁移路线上点到其他路线") @ApiOperation(value = "迁移路线上点到其他路线", notes = "迁移路线上点到其他路线")
@PostMapping(value = "/migrateRoutePoint", produces = "application/json;charset=UTF-8") @PostMapping(value = "/migrateRoutePoint", produces = "application/json;charset=UTF-8")
public CommonResponse migrateRoutePoint( public CommonResponse migrateRoutePoint(
...@@ -186,7 +187,7 @@ public class RouteController extends AbstractBaseController { ...@@ -186,7 +187,7 @@ public class RouteController extends AbstractBaseController {
* *
* @return CommonResponse * @return CommonResponse
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检路线信息", notes = "查询巡检路线信息") @ApiOperation(value = "查询巡检路线信息", notes = "查询巡检路线信息")
@PostMapping(value = "/list", produces = "application/json;charset=UTF-8") @PostMapping(value = "/list", produces = "application/json;charset=UTF-8")
public CommonResponse listRoute( public CommonResponse listRoute(
...@@ -205,7 +206,7 @@ public class RouteController extends AbstractBaseController { ...@@ -205,7 +206,7 @@ public class RouteController extends AbstractBaseController {
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询当前登录公司的的所有巡检路线", notes = "查询当前登录公司的的所有巡检路线") @ApiOperation(value = "查询当前登录公司的的所有巡检路线", notes = "查询当前登录公司的的所有巡检路线")
@GetMapping(value = "/All", produces = "application/json;charset=UTF-8") @GetMapping(value = "/All", produces = "application/json;charset=UTF-8")
public CommonResponse queryAllRoute( public CommonResponse queryAllRoute(
...@@ -228,7 +229,7 @@ public class RouteController extends AbstractBaseController { ...@@ -228,7 +229,7 @@ public class RouteController extends AbstractBaseController {
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询所有路线列表<font color='blue'>手机app</font>", notes = "查询所有路线列表<font color='blue'>手机app</font>") @ApiOperation(value = "查询所有路线列表<font color='blue'>手机app</font>", notes = "查询所有路线列表<font color='blue'>手机app</font>")
@GetMapping(value = "/routeList", produces = "application/json;charset=UTF-8") @GetMapping(value = "/routeList", produces = "application/json;charset=UTF-8")
public CommonResponse queryRouteList() { public CommonResponse queryRouteList() {
...@@ -249,7 +250,7 @@ public class RouteController extends AbstractBaseController { ...@@ -249,7 +250,7 @@ public class RouteController extends AbstractBaseController {
* @param * @param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检路线上点列表", notes = "查询巡检路线上点列表") @ApiOperation(value = "查询巡检路线上点列表", notes = "查询巡检路线上点列表")
@PostMapping(value = "/{routeId}/listRoutePoint", produces = "application/json;charset=UTF-8") @PostMapping(value = "/{routeId}/listRoutePoint", produces = "application/json;charset=UTF-8")
public CommonResponse listRoutePoint(@PathVariable Long routeId) { public CommonResponse listRoutePoint(@PathVariable Long routeId) {
...@@ -262,7 +263,7 @@ public class RouteController extends AbstractBaseController { ...@@ -262,7 +263,7 @@ public class RouteController extends AbstractBaseController {
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检路线上点列表", notes = "查询巡检路线上点列表") @ApiOperation(value = "查询巡检路线上点列表", notes = "查询巡检路线上点列表")
@PutMapping(value = "/exchangeOrderNumber", produces = "application/json;charset=UTF-8") @PutMapping(value = "/exchangeOrderNumber", produces = "application/json;charset=UTF-8")
public CommonResponse exchangeRoutePointOrderNumber(@ApiParam(value = "路线巡检点id", required = true) @RequestParam long src, public CommonResponse exchangeRoutePointOrderNumber(@ApiParam(value = "路线巡检点id", required = true) @RequestParam long src,
...@@ -279,7 +280,7 @@ public class RouteController extends AbstractBaseController { ...@@ -279,7 +280,7 @@ public class RouteController extends AbstractBaseController {
* @param * @param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检路线上增加巡检点", notes = "巡检路线上增加巡检点") @ApiOperation(value = "巡检路线上增加巡检点", notes = "巡检路线上增加巡检点")
@PostMapping(value = "/addRoutePoint", produces = "application/json;charset=UTF-8") @PostMapping(value = "/addRoutePoint", produces = "application/json;charset=UTF-8")
public CommonResponse addRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam String routeId, public CommonResponse addRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam String routeId,
...@@ -316,7 +317,7 @@ public class RouteController extends AbstractBaseController { ...@@ -316,7 +317,7 @@ public class RouteController extends AbstractBaseController {
* @param * @param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检路线上删除巡检点", notes = "巡检路线上删除巡检点") @ApiOperation(value = "巡检路线上删除巡检点", notes = "巡检路线上删除巡检点")
@DeleteMapping(value = "/deleteRoutePoint", produces = "application/json;charset=UTF-8") @DeleteMapping(value = "/deleteRoutePoint", produces = "application/json;charset=UTF-8")
public CommonResponse deleteRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam Long routeId, public CommonResponse deleteRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam Long routeId,
...@@ -336,7 +337,7 @@ public class RouteController extends AbstractBaseController { ...@@ -336,7 +337,7 @@ public class RouteController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "列出巡检线路点的巡检项", notes = "列出巡检线路点的巡检项") @ApiOperation(value = "列出巡检线路点的巡检项", notes = "列出巡检线路点的巡检项")
@PostMapping(value = "/listRoutePointInputItem", produces = "application/json;charset=UTF-8") @PostMapping(value = "/listRoutePointInputItem", produces = "application/json;charset=UTF-8")
public CommonResponse listRoutePointInputItem(@ApiParam(value = "路线id", required = true) @RequestBody RoutePointInputItemRequest request) { public CommonResponse listRoutePointInputItem(@ApiParam(value = "路线id", required = true) @RequestBody RoutePointInputItemRequest request) {
...@@ -355,7 +356,7 @@ public class RouteController extends AbstractBaseController { ...@@ -355,7 +356,7 @@ public class RouteController extends AbstractBaseController {
* @param pointId * @param pointId
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "列出巡检线路点的分类及巡检项", notes = "列出巡检线路点的分类及巡检项") @ApiOperation(value = "列出巡检线路点的分类及巡检项", notes = "列出巡检线路点的分类及巡检项")
@PostMapping(value = "/listRoutePointInputItemWithClassify", produces = "application/json;charset=UTF-8") @PostMapping(value = "/listRoutePointInputItemWithClassify", produces = "application/json;charset=UTF-8")
public CommonResponse listRoutePointInputItemWithClassify(@ApiParam(value = "路线id", required = true) @RequestParam long routeId, public CommonResponse listRoutePointInputItemWithClassify(@ApiParam(value = "路线id", required = true) @RequestParam long routeId,
...@@ -377,7 +378,7 @@ public class RouteController extends AbstractBaseController { ...@@ -377,7 +378,7 @@ public class RouteController extends AbstractBaseController {
* @param inputItemIds * @param inputItemIds
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "修改巡检线路点的巡检项", notes = "修改巡检线路点的巡检项") @ApiOperation(value = "修改巡检线路点的巡检项", notes = "修改巡检线路点的巡检项")
@PostMapping(value = "/updateRoutePointInputItem", produces = "application/json;charset=UTF-8") @PostMapping(value = "/updateRoutePointInputItem", produces = "application/json;charset=UTF-8")
public CommonResponse updateRoutePointInputItem(@ApiParam(value = "巡检路线id", required = true) @RequestParam Long routeId, public CommonResponse updateRoutePointInputItem(@ApiParam(value = "巡检路线id", required = true) @RequestParam Long routeId,
...@@ -397,7 +398,7 @@ public class RouteController extends AbstractBaseController { ...@@ -397,7 +398,7 @@ public class RouteController extends AbstractBaseController {
* *
* @return IDs * @return IDs
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取巡检路线上的所有点ID", notes = "获取巡检路线上的所有点ID") @ApiOperation(value = "获取巡检路线上的所有点ID", notes = "获取巡检路线上的所有点ID")
@RequestMapping(value = "/points/{routeID}", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/points/{routeID}", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse getPointIDByRouyeId(@ApiParam(value = "巡检路线ID") @PathVariable(required = true) Long routeID) { public CommonResponse getPointIDByRouyeId(@ApiParam(value = "巡检路线ID") @PathVariable(required = true) Long routeID) {
...@@ -410,7 +411,7 @@ public class RouteController extends AbstractBaseController { ...@@ -410,7 +411,7 @@ public class RouteController extends AbstractBaseController {
* *
* @return IDs * @return IDs
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取巡检路线上的所有点ID", notes = "获取巡检路线上的所有点ID") @ApiOperation(value = "获取巡检路线上的所有点ID", notes = "获取巡检路线上的所有点ID")
@RequestMapping(value = "/points", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/points", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse getPointIDByRouteId(@ApiParam(value = "巡检路线ID信息") @RequestBody(required = true) Map routeInfo) { public CommonResponse getPointIDByRouteId(@ApiParam(value = "巡检路线ID信息") @RequestBody(required = true) Map routeInfo) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/SafetyController.java
View file @ e8d929a6
...@@ -9,11 +9,12 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -9,11 +9,12 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.util.CommonResponse; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.feign.RemoteSecurityService; import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -57,7 +58,7 @@ public class SafetyController extends AbstractBaseController{ ...@@ -57,7 +58,7 @@ public class SafetyController extends AbstractBaseController{
/** /**
* 保存登陆用户选择公司信息 * 保存登陆用户选择公司信息
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息") @ApiOperation(value = " 保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息")
@PostMapping(value = "/save/curCompany") @PostMapping(value = "/save/curCompany")
public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) { public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) {
...@@ -71,7 +72,7 @@ public class SafetyController extends AbstractBaseController{ ...@@ -71,7 +72,7 @@ public class SafetyController extends AbstractBaseController{
/** /**
* 保存登陆用户选择公司信息（换流站项目登录巡检） * 保存登陆用户选择公司信息（换流站项目登录巡检）
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息") @ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息")
@GetMapping(value = "/save/shortCutCompany") @GetMapping(value = "/save/shortCutCompany")
public CommonResponse specialSaveCurCompany( public CommonResponse specialSaveCurCompany(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/SynDataController.java
View file @ e8d929a6
...@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.param.SynInputItemParam; import com.yeejoin.amos.maintenance.business.param.SynInputItemParam;
...@@ -20,7 +22,6 @@ import com.yeejoin.amos.maintenance.business.service.intfc.ISynDataService; ...@@ -20,7 +22,6 @@ import com.yeejoin.amos.maintenance.business.service.intfc.ISynDataService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.util.Toke; import com.yeejoin.amos.maintenance.business.util.Toke;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -46,7 +47,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -46,7 +47,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检项 * 同步巡检项
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检项", notes = "同步巡检项") @ApiOperation(value = "同步巡检项", notes = "同步巡检项")
@PostMapping(value = "/inputItem/{operationType}") @PostMapping(value = "/inputItem/{operationType}")
public CommonResponse inputItem(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse inputItem(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -77,7 +78,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -77,7 +78,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检点 * 同步巡检点
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检点", notes = "同步巡检点") @ApiOperation(value = "同步巡检点", notes = "同步巡检点")
@PostMapping(value = "/point/{operationType}") @PostMapping(value = "/point/{operationType}")
public CommonResponse point(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse point(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -108,7 +109,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -108,7 +109,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检点和巡检项关系 * 同步巡检点和巡检项关系
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检点和巡检项关系", notes = "同步巡检点和巡检项关系") @ApiOperation(value = "同步巡检点和巡检项关系", notes = "同步巡检点和巡检项关系")
@PostMapping(value = "/pointItem/relation/{operationType}") @PostMapping(value = "/pointItem/relation/{operationType}")
public CommonResponse relation(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse relation(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -135,7 +136,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -135,7 +136,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检路线 * 同步巡检路线
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检路线", notes = "同步巡检路线") @ApiOperation(value = "同步巡检路线", notes = "同步巡检路线")
@PostMapping(value = "/route/{operationType}") @PostMapping(value = "/route/{operationType}")
public CommonResponse route(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse route(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -164,7 +165,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -164,7 +165,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检计划 * 同步巡检计划
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检计划", notes = "同步巡检计划") @ApiOperation(value = "同步巡检计划", notes = "同步巡检计划")
@PostMapping(value = "/plan/{operationType}") @PostMapping(value = "/plan/{operationType}")
public CommonResponse plan(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse plan(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -197,7 +198,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -197,7 +198,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 停用巡检计划 * 停用巡检计划
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "停用巡检计划", notes = "停用巡检计划") @ApiOperation(value = "停用巡检计划", notes = "停用巡检计划")
@PostMapping(value = "/stopPlan") @PostMapping(value = "/stopPlan")
public CommonResponse stopPlan(@ApiParam(value = "巡检计划信息", required = true) @RequestParam String originalId) { public CommonResponse stopPlan(@ApiParam(value = "巡检计划信息", required = true) @RequestParam String originalId) {
...@@ -217,7 +218,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -217,7 +218,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 获取巡检计划已完成次数 * 获取巡检计划已完成次数
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取巡检计划已完成次数", notes = "获取巡检计划已完成次数") @ApiOperation(value = "获取巡检计划已完成次数", notes = "获取巡检计划已完成次数")
@GetMapping(value = "/plan/getFinishTimes") @GetMapping(value = "/plan/getFinishTimes")
public CommonResponse getPlanFinishTimes(@ApiParam(value = "巡检计划原始编号（多个逗号隔开）", required = true) @RequestParam String originalIds) { public CommonResponse getPlanFinishTimes(@ApiParam(value = "巡检计划原始编号（多个逗号隔开）", required = true) @RequestParam String originalIds) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/TaskReportController.java
View file @ e8d929a6
...@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.param.TaskStatisticsParam; import com.yeejoin.amos.maintenance.business.param.TaskStatisticsParam;
...@@ -18,7 +20,6 @@ import com.yeejoin.amos.maintenance.business.service.impl.TaskReportService; ...@@ -18,7 +20,6 @@ import com.yeejoin.amos.maintenance.business.service.impl.TaskReportService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.util.Toke; import com.yeejoin.amos.maintenance.business.util.Toke;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -34,7 +35,7 @@ public class TaskReportController extends AbstractBaseController{ ...@@ -34,7 +35,7 @@ public class TaskReportController extends AbstractBaseController{
@Autowired @Autowired
private TaskReportService taskReportService; private TaskReportService taskReportService;
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 巡检完成情况月报表", notes = " 巡检完成情况月报表") @ApiOperation(value = " 巡检完成情况月报表", notes = " 巡检完成情况月报表")
@RequestMapping(value = "/{statistical}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/{statistical}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse taskReport( public CommonResponse taskReport(
...@@ -52,7 +53,7 @@ public class TaskReportController extends AbstractBaseController{ ...@@ -52,7 +53,7 @@ public class TaskReportController extends AbstractBaseController{
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 人员综合统计分析", notes = " 人员综合统计分析") @ApiOperation(value = " 人员综合统计分析", notes = " 人员综合统计分析")
@PostMapping(value = "/comprehensive/user", produces = "application/json;charset=UTF-8") @PostMapping(value = "/comprehensive/user", produces = "application/json;charset=UTF-8")
public CommonResponse comprehensiveStatisticalForUser( public CommonResponse comprehensiveStatisticalForUser(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/UserController.java
View file @ e8d929a6
...@@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
...@@ -51,7 +53,6 @@ import com.yeejoin.amos.maintenance.business.util.DepartmentUserTreeAppVo; ...@@ -51,7 +53,6 @@ import com.yeejoin.amos.maintenance.business.util.DepartmentUserTreeAppVo;
import com.yeejoin.amos.maintenance.business.util.DepartmentUserTreeWebVo; import com.yeejoin.amos.maintenance.business.util.DepartmentUserTreeWebVo;
import com.yeejoin.amos.maintenance.business.util.DesUtil; import com.yeejoin.amos.maintenance.business.util.DesUtil;
import com.yeejoin.amos.maintenance.business.util.StringUtil; import com.yeejoin.amos.maintenance.business.util.StringUtil;
import com.yeejoin.amos.maintenance.core.framework.Permission;
import com.yeejoin.amos.maintenance.feign.RemoteSecurityService; import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
import com.yeejoin.amos.maintenance.jpush.AppMessagePushService; import com.yeejoin.amos.maintenance.jpush.AppMessagePushService;
...@@ -97,7 +98,7 @@ public class UserController extends AbstractBaseController { ...@@ -97,7 +98,7 @@ public class UserController extends AbstractBaseController {
* @param deptId * @param deptId
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "部门人员查询", notes = "部门人员查询") @ApiOperation(value = "部门人员查询", notes = "部门人员查询")
@RequestMapping(value = "/queryDeptUser", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDeptUser", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryDeptUser(@RequestParam(value = "deptId", required = false) String deptId) { public CommonResponse queryDeptUser(@RequestParam(value = "deptId", required = false) String deptId) {
...@@ -177,7 +178,7 @@ public class UserController extends AbstractBaseController { ...@@ -177,7 +178,7 @@ public class UserController extends AbstractBaseController {
return userList; return userList;
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "部门人员树查询", notes = "部门人员树查询") @ApiOperation(value = "部门人员树查询", notes = "部门人员树查询")
@RequestMapping(value = "/queryDeptUserTree1", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDeptUserTree1", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryDeptUserTree1() { public CommonResponse queryDeptUserTree1() {
...@@ -294,7 +295,7 @@ public class UserController extends AbstractBaseController { ...@@ -294,7 +295,7 @@ public class UserController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "人员查询", notes = "人员查询") @ApiOperation(value = "人员查询", notes = "人员查询")
@RequestMapping(value = "/queryAuthUsers", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryAuthUsers", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
// @Authorization(ingore = true) // @Authorization(ingore = true)
...@@ -312,7 +313,7 @@ public class UserController extends AbstractBaseController { ...@@ -312,7 +313,7 @@ public class UserController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "部门人员树查询", notes = "部门人员树查询") @ApiOperation(value = "部门人员树查询", notes = "部门人员树查询")
@RequestMapping(value = "/queryDeptUserTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDeptUserTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryDeptUserTree() { public CommonResponse queryDeptUserTree() {
...@@ -330,7 +331,7 @@ public class UserController extends AbstractBaseController { ...@@ -330,7 +331,7 @@ public class UserController extends AbstractBaseController {
* @return * @return
* @RequestParam userName 用户名 * @RequestParam userName 用户名
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "通讯录(<font color='blue'>手机app</font>)", notes = "通讯录(<font color='blue'>手机app</font>)") @ApiOperation(value = "通讯录(<font color='blue'>手机app</font>)", notes = "通讯录(<font color='blue'>手机app</font>)")
@RequestMapping(value = "/queryUserAddressList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryUserAddressList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryUserAddressListTree( public CommonResponse queryUserAddressListTree(
...@@ -490,7 +491,7 @@ public class UserController extends AbstractBaseController { ...@@ -490,7 +491,7 @@ public class UserController extends AbstractBaseController {
return userList; return userList;
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "用户登录成功之后数据初始化(<font color='blue'>手机app</font>)", notes = "用户登录成功之后数据初始化") @ApiOperation(value = "用户登录成功之后数据初始化(<font color='blue'>手机app</font>)", notes = "用户登录成功之后数据初始化")
@RequestMapping(value = "/initData", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/initData", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse initUserApp() { public CommonResponse initUserApp() {
...@@ -529,7 +530,7 @@ public class UserController extends AbstractBaseController { ...@@ -529,7 +530,7 @@ public class UserController extends AbstractBaseController {
} }
///////////////////////////////2019-11-18安全服务升级/////////////////////////////// ///////////////////////////////2019-11-18安全服务升级///////////////////////////////
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "通讯录", notes = "通讯录") @ApiOperation(value = "通讯录", notes = "通讯录")
@RequestMapping(value = "/mobile/addressList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/mobile/addressList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse addressList() { public CommonResponse addressList() {
...@@ -740,7 +741,7 @@ public class UserController extends AbstractBaseController { ...@@ -740,7 +741,7 @@ public class UserController extends AbstractBaseController {
/** /**
* 保存登陆用户选择公司信息 * 保存登陆用户选择公司信息
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息") @ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息")
@PostMapping(value = "/save/curCompany") @PostMapping(value = "/save/curCompany")
public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) { public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) {
...@@ -791,7 +792,7 @@ public class UserController extends AbstractBaseController { ...@@ -791,7 +792,7 @@ public class UserController extends AbstractBaseController {
/** /**
* 装备登录返回巡检统计信息 * 装备登录返回巡检统计信息
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "装备登录返回巡检统计信息", notes = "装备登录返回巡检统计信息") @ApiOperation(value = "装备登录返回巡检统计信息", notes = "装备登录返回巡检统计信息")
@GetMapping(value = "/patrolCount") @GetMapping(value = "/patrolCount")
public CommonResponse getPatrolCount() { public CommonResponse getPatrolCount() {
...@@ -808,7 +809,7 @@ public class UserController extends AbstractBaseController { ...@@ -808,7 +809,7 @@ public class UserController extends AbstractBaseController {
/** /**
* 修改密码 * 修改密码
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 修改密码", notes = " 修改密码") @ApiOperation(value = " 修改密码", notes = " 修改密码")
@GetMapping(value = "/editPassword") @GetMapping(value = "/editPassword")
public CommonResponse editPassword(@ApiParam(value = "旧密码", required = true) @RequestParam String password, public CommonResponse editPassword(@ApiParam(value = "旧密码", required = true) @RequestParam String password,
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/Permission.java
View file @ e8d929a6
package com.yeejoin.amos.maintenance.core.framework; //package com.yeejoin.amos.maintenance.core.framework;
//
import java.lang.annotation.Documented; //import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; //import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; //import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; //import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; //import java.lang.annotation.Target;
//
/** ///**
* @author DELL // * @author DELL
*/ // */
@Target(ElementType.METHOD) //@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) //@Retention(RetentionPolicy.RUNTIME)
@Documented //@Documented
public @interface Permission { //public @interface Permission {
/** // /**
* value // * value
* @return // * @return
*/ // */
String value() default ""; // String value() default "";
//
/** // /**
* 是否进行人员校验 // * 是否进行人员校验
* @return // * @return
*/ // */
boolean isPersonIdentity() default false; // boolean isPersonIdentity() default false;
} //}
//
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CatalogTreeController.java
View file @ e8d929a6
...@@ -22,7 +22,7 @@ import com.yeejoin.amos.patrol.business.util.CommonResponse; ...@@ -22,7 +22,7 @@ import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.core.common.request.CommonPageable; import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
import com.yeejoin.amos.patrol.core.common.request.CommonRequest; import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.dao.entity.CatalogTree; import com.yeejoin.amos.patrol.dao.entity.CatalogTree;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -42,7 +42,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -42,7 +42,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "树结构查询", notes = "树结构查询") @ApiOperation(value = "树结构查询", notes = "树结构查询")
@RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/getCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getCatalogTree() { public CommonResponse getCatalogTree() {
...@@ -57,7 +57,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -57,7 +57,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "树结构查询", notes = "树结构查询") @ApiOperation(value = "树结构查询", notes = "树结构查询")
@RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/catalogList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getCatalogList() { public CommonResponse getCatalogList() {
...@@ -72,7 +72,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -72,7 +72,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分类新增", notes = "分类新增") @ApiOperation(value = "分类新增", notes = "分类新增")
@RequestMapping(value = "/addCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/addCatalogTree", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse catalogTreeAdd(@ApiParam(value = "分类", required = true) @RequestBody CatalogTree param) { public CommonResponse catalogTreeAdd(@ApiParam(value = "分类", required = true) @RequestBody CatalogTree param) {
...@@ -124,7 +124,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -124,7 +124,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "删除分类", notes = "删除分类") @ApiOperation(value = "删除分类", notes = "删除分类")
@RequestMapping(value = "/deleteCatalogTreeById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/deleteCatalogTreeById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse deleteCatalogTreeById( public CommonResponse deleteCatalogTreeById(
...@@ -144,7 +144,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -144,7 +144,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分类数据查询", notes = "分类数据查询") @ApiOperation(value = "分类数据查询", notes = "分类数据查询")
@RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCatalogTreeInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
...@@ -164,7 +164,7 @@ public class CatalogTreeController extends AbstractBaseController { ...@@ -164,7 +164,7 @@ public class CatalogTreeController extends AbstractBaseController {
* @param id * @param id
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询分类按照id", notes = "查询分类按照id") @ApiOperation(value = "查询分类按照id", notes = "查询分类按照id")
@RequestMapping(value = "/catalogTreeDetById/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/catalogTreeDetById/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryCatalogTreeById(@ApiParam(value = "分类id", required = true) @PathVariable(name = "id") Long id) { public CommonResponse queryCatalogTreeById(@ApiParam(value = "分类id", required = true) @PathVariable(name = "id") Long id) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CommonController.java
View file @ e8d929a6
...@@ -12,7 +12,7 @@ import com.yeejoin.amos.patrol.common.enums.CheckStatisticsTypeEnum; ...@@ -12,7 +12,7 @@ import com.yeejoin.amos.patrol.common.enums.CheckStatisticsTypeEnum;
import com.yeejoin.amos.patrol.common.enums.PlanTaskExecution; import com.yeejoin.amos.patrol.common.enums.PlanTaskExecution;
import com.yeejoin.amos.patrol.common.enums.PlanTaskFinishStatusEnum; import com.yeejoin.amos.patrol.common.enums.PlanTaskFinishStatusEnum;
import com.yeejoin.amos.patrol.common.enums.TaskStatisticsTypeEnum; import com.yeejoin.amos.patrol.common.enums.TaskStatisticsTypeEnum;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -28,35 +28,35 @@ public class CommonController extends AbstractBaseController{ ...@@ -28,35 +28,35 @@ public class CommonController extends AbstractBaseController{
@Autowired @Autowired
private IAppService iAppService; private IAppService iAppService;
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "任务统计口径类型", notes = "任务统计口径类型") @ApiOperation(value = "任务统计口径类型", notes = "任务统计口径类型")
@RequestMapping(value = "/taskgetStatisticsType", method = RequestMethod.GET) @RequestMapping(value = "/taskgetStatisticsType", method = RequestMethod.GET)
public CommonResponse getTaskStatisticsType() { public CommonResponse getTaskStatisticsType() {
return CommonResponseUtil.success(TaskStatisticsTypeEnum.getEnumList()); return CommonResponseUtil.success(TaskStatisticsTypeEnum.getEnumList());
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检统计口径类型", notes = "巡检统计口径类型") @ApiOperation(value = "巡检统计口径类型", notes = "巡检统计口径类型")
@RequestMapping(value = "/checkStatisticsType", method = RequestMethod.GET) @RequestMapping(value = "/checkStatisticsType", method = RequestMethod.GET)
public CommonResponse getCheckStatisticsType() { public CommonResponse getCheckStatisticsType() {
return CommonResponseUtil.success(CheckStatisticsTypeEnum.getEnumList()); return CommonResponseUtil.success(CheckStatisticsTypeEnum.getEnumList());
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "计划任务完成种类", notes = "计划任务完成种类") @ApiOperation(httpMethod = "GET", value = "计划任务完成种类", notes = "计划任务完成种类")
@RequestMapping(value = "/planTaskFinishStatus", method = RequestMethod.GET) @RequestMapping(value = "/planTaskFinishStatus", method = RequestMethod.GET)
public CommonResponse getPlanTaskFinishStatus() { public CommonResponse getPlanTaskFinishStatus() {
return CommonResponseUtil.success(PlanTaskFinishStatusEnum.getEnumList()); return CommonResponseUtil.success(PlanTaskFinishStatusEnum.getEnumList());
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "计划任务执行情况种类", notes = "计划任务执行情况种类") @ApiOperation(value = "计划任务执行情况种类", notes = "计划任务执行情况种类")
@RequestMapping(value = "/planTaskExecution", method = RequestMethod.GET) @RequestMapping(value = "/planTaskExecution", method = RequestMethod.GET)
public CommonResponse getPlanTaskExecution() { public CommonResponse getPlanTaskExecution() {
return CommonResponseUtil.success(PlanTaskExecution.getEnumList()); return CommonResponseUtil.success(PlanTaskExecution.getEnumList());
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取app最新版本信息", notes = "获取app最新版本信息") @ApiOperation(value = "获取app最新版本信息", notes = "获取app最新版本信息")
@RequestMapping(value = "/queryAppVersion", method = RequestMethod.GET) @RequestMapping(value = "/queryAppVersion", method = RequestMethod.GET)
//@Authorization(ingore=true) //@Authorization(ingore=true)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/ConfigController.java
View file @ e8d929a6
...@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.patrol.business.dao.repository.IConfigDao; import com.yeejoin.amos.patrol.business.dao.repository.IConfigDao;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.dao.entity.Config; import com.yeejoin.amos.patrol.dao.entity.Config;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -42,7 +42,7 @@ public class ConfigController extends AbstractBaseController{ ...@@ -42,7 +42,7 @@ public class ConfigController extends AbstractBaseController{
* @return * @return
*/ */
//@Authorization(ingore = true) //@Authorization(ingore = true)
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取配置接口信息", notes = " 获取配置接口信息") @ApiOperation(value = "获取配置接口信息", notes = " 获取配置接口信息")
@RequestMapping(value = "/getConfigsInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/getConfigsInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getConfigsInfo() { public CommonResponse getConfigsInfo() {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/EquipmentRuleController.java
View file @ e8d929a6
...@@ -18,7 +18,7 @@ import com.yeejoin.amos.patrol.business.service.intfc.IEquipmentHandlerService; ...@@ -18,7 +18,7 @@ import com.yeejoin.amos.patrol.business.service.intfc.IEquipmentHandlerService;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.business.util.Toke; import com.yeejoin.amos.patrol.business.util.Toke;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.dao.entity.InputItem; import com.yeejoin.amos.patrol.dao.entity.InputItem;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -43,7 +43,7 @@ public class EquipmentRuleController extends AbstractBaseController{ ...@@ -43,7 +43,7 @@ public class EquipmentRuleController extends AbstractBaseController{
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "装备检查项", notes = "装备检查项") @ApiOperation(value = "装备检查项", notes = "装备检查项")
@RequestMapping(value = "/equipmnetInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/equipmnetInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse getPlanTaskList( public CommonResponse getPlanTaskList(
...@@ -63,7 +63,7 @@ public class EquipmentRuleController extends AbstractBaseController{ ...@@ -63,7 +63,7 @@ public class EquipmentRuleController extends AbstractBaseController{
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "装备检查项", notes = "装备检查项") @ApiOperation(value = "装备检查项", notes = "装备检查项")
@RequestMapping(value = "/getEquipmnetRules", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/getEquipmnetRules", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getEquipmnetRules( public CommonResponse getEquipmnetRules(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/ExcelExportController.java
View file @ e8d929a6
...@@ -26,7 +26,7 @@ import com.yeejoin.amos.patrol.business.service.impl.TaskReportService; ...@@ -26,7 +26,7 @@ import com.yeejoin.amos.patrol.business.service.impl.TaskReportService;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.business.util.Toke; import com.yeejoin.amos.patrol.business.util.Toke;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
...@@ -57,7 +57,7 @@ public class ExcelExportController extends AbstractBaseController{ ...@@ -57,7 +57,7 @@ public class ExcelExportController extends AbstractBaseController{
* *
* 导出格式为：vnd.ms-excel * 导出格式为：vnd.ms-excel
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检完成情况月报表导出excel", notes = " 巡检完成情况月报表导出excel") @ApiOperation(value = "巡检完成情况月报表导出excel", notes = " 巡检完成情况月报表导出excel")
@RequestMapping(value = "/task/{statistical}", produces = "application/vnd.ms-excel;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/task/{statistical}", produces = "application/vnd.ms-excel;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse taskReport( public CommonResponse taskReport(
...@@ -86,7 +86,7 @@ public class ExcelExportController extends AbstractBaseController{ ...@@ -86,7 +86,7 @@ public class ExcelExportController extends AbstractBaseController{
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 人员综合统计分析Excel导出", notes = " 人员综合统计分析Excel导出") @ApiOperation(value = " 人员综合统计分析Excel导出", notes = " 人员综合统计分析Excel导出")
@RequestMapping(value = "/comprehensive/user", produces = "application/vnd.ms-excel;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/comprehensive/user", produces = "application/vnd.ms-excel;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse comprehensiveStatisticalForUser( public CommonResponse comprehensiveStatisticalForUser(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/GroupController.java
View file @ e8d929a6
...@@ -23,7 +23,7 @@ import com.yeejoin.amos.patrol.business.service.intfc.ISafety3DDataSendService; ...@@ -23,7 +23,7 @@ import com.yeejoin.amos.patrol.business.service.intfc.ISafety3DDataSendService;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.core.common.response.TaskInfoRespone; import com.yeejoin.amos.patrol.core.common.response.TaskInfoRespone;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.email.IEmailService; import com.yeejoin.amos.patrol.email.IEmailService;
import com.yeejoin.amos.patrol.feign.RemoteSecurityService; import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
...@@ -51,7 +51,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -51,7 +51,7 @@ public class GroupController extends AbstractBaseController{
* 部门查询 * 部门查询
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取当前用户所属公司的所有部门", notes = "获取当前用户所属公司的所有部门") @ApiOperation(value = "获取当前用户所属公司的所有部门", notes = "获取当前用户所属公司的所有部门")
@RequestMapping(value = "/queryDept", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDept", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryCurrentCompanyDept() { public CommonResponse queryCurrentCompanyDept() {
...@@ -138,7 +138,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -138,7 +138,7 @@ public class GroupController extends AbstractBaseController{
return CommonResponseUtil.success(res); return CommonResponseUtil.success(res);
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取当前用户所属公司的所有部门及人员", notes = "获取当前用户所属公司的所有部门及人员") @ApiOperation(value = "获取当前用户所属公司的所有部门及人员", notes = "获取当前用户所属公司的所有部门及人员")
@RequestMapping(value = "/queryDeptAndUser",produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDeptAndUser",produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryCurrentCompanyDeptAndUser() { public CommonResponse queryCurrentCompanyDeptAndUser() {
...@@ -288,7 +288,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -288,7 +288,7 @@ public class GroupController extends AbstractBaseController{
* @param companyId * @param companyId
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "根据指定公司ID获取公司和所属公司的子公司信息", notes = "根据指定公司ID获取公司和所属公司的子公司信息") @ApiOperation(value = "根据指定公司ID获取公司和所属公司的子公司信息", notes = "根据指定公司ID获取公司和所属公司的子公司信息")
@RequestMapping(value = "/queryCompanyLeaves", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryCompanyLeaves", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryCompanyLeavesById(@ApiParam(value="公司Id") @RequestParam("companyId") String companyId) { public CommonResponse queryCompanyLeavesById(@ApiParam(value="公司Id") @RequestParam("companyId") String companyId) {
...@@ -308,7 +308,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -308,7 +308,7 @@ public class GroupController extends AbstractBaseController{
* 根据用户所有属公司ID，查询所有子公司末端公司信息 * 根据用户所有属公司ID，查询所有子公司末端公司信息
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取用户所属公司和所属公司的子公司信息", notes = "获取用户所属公司和所属公司的子公司信息") @ApiOperation(value = "获取用户所属公司和所属公司的子公司信息", notes = "获取用户所属公司和所属公司的子公司信息")
@RequestMapping(value = "/queryAuthCompanyLeaves", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryAuthCompanyLeaves", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryAuthCompanyLeaves() { public CommonResponse queryAuthCompanyLeaves() {
...@@ -351,7 +351,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -351,7 +351,7 @@ public class GroupController extends AbstractBaseController{
@Autowired @Autowired
private ISafety3DDataSendService safety3DDataSend; private ISafety3DDataSendService safety3DDataSend;
//@Authorization(ingore=true) //@Authorization(ingore=true)
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "检查点状态推送", notes = "检查点状态推送") @ApiOperation(value = "检查点状态推送", notes = "检查点状态推送")
@RequestMapping(value = "/testCheckPushStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/testCheckPushStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse testCheckPushStatus(@ApiParam(value="Id") @RequestParam("checkId") long checkId) { public CommonResponse testCheckPushStatus(@ApiParam(value="Id") @RequestParam("checkId") long checkId) {
...@@ -366,7 +366,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -366,7 +366,7 @@ public class GroupController extends AbstractBaseController{
} }
//@Authorization(ingore=true) //@Authorization(ingore=true)
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "任务状态推送", notes = "任务状态推送") @ApiOperation(value = "任务状态推送", notes = "任务状态推送")
@RequestMapping(value = "/testTaskPushStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/testTaskPushStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse testTaskPushStatus(@ApiParam(value="Id") @RequestParam("checkId") Long taskId) { public CommonResponse testTaskPushStatus(@ApiParam(value="Id") @RequestParam("checkId") Long taskId) {
...@@ -379,7 +379,7 @@ public class GroupController extends AbstractBaseController{ ...@@ -379,7 +379,7 @@ public class GroupController extends AbstractBaseController{
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检点信息", notes = "巡检点信息") @ApiOperation(value = "巡检点信息", notes = "巡检点信息")
@RequestMapping(value = "/pointInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/pointInfo", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse getPointInfo(@ApiParam(value="Id") @RequestParam("pointId") Long pointId) { public CommonResponse getPointInfo(@ApiParam(value="Id") @RequestParam("pointId") Long pointId) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/HomeController.java
View file @ e8d929a6
...@@ -19,7 +19,7 @@ import com.yeejoin.amos.patrol.business.service.intfc.IPointService; ...@@ -19,7 +19,7 @@ import com.yeejoin.amos.patrol.business.service.intfc.IPointService;
import com.yeejoin.amos.patrol.business.service.intfc.ITaskService; import com.yeejoin.amos.patrol.business.service.intfc.ITaskService;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.feign.RemoteSecurityService; import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -46,7 +46,7 @@ public class HomeController extends AbstractBaseController{ ...@@ -46,7 +46,7 @@ public class HomeController extends AbstractBaseController{
@Autowired @Autowired
private RemoteSecurityService remoteSecurityService; private RemoteSecurityService remoteSecurityService;
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "首页数据", notes = "首页数据") @ApiOperation(value = "首页数据", notes = "首页数据")
@GetMapping(value="/overviewData") @GetMapping(value="/overviewData")
// @Authorization(ingore = true) // @Authorization(ingore = true)
...@@ -83,7 +83,7 @@ public class HomeController extends AbstractBaseController{ ...@@ -83,7 +83,7 @@ public class HomeController extends AbstractBaseController{
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "首页数据", notes = "首页数据") @ApiOperation(value = "首页数据", notes = "首页数据")
@GetMapping(value="/getCheckData") @GetMapping(value="/getCheckData")
public CommonResponse getCheckData() { public CommonResponse getCheckData() {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java
View file @ e8d929a6
...@@ -35,7 +35,7 @@ import com.yeejoin.amos.patrol.common.enums.DictTypeEnum; ...@@ -35,7 +35,7 @@ import com.yeejoin.amos.patrol.common.enums.DictTypeEnum;
import com.yeejoin.amos.patrol.core.common.request.CommonPageable; import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
import com.yeejoin.amos.patrol.core.common.request.CommonRequest; import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum; import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.core.util.StringUtil; import com.yeejoin.amos.patrol.core.util.StringUtil;
import com.yeejoin.amos.patrol.dao.entity.InputItem; import com.yeejoin.amos.patrol.dao.entity.InputItem;
...@@ -67,7 +67,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -67,7 +67,7 @@ public class InputItemController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "新增检查项", notes = "新增检查项") @ApiOperation(value = "新增检查项", notes = "新增检查项")
@RequestMapping(value = "/addItem", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/addItem", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse addNewItem(@ApiParam(value = "检查项信息") @RequestBody InputItemParam param) { public CommonResponse addNewItem(@ApiParam(value = "检查项信息") @RequestBody InputItemParam param) {
...@@ -100,7 +100,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -100,7 +100,7 @@ public class InputItemController extends AbstractBaseController {
* @param itemID * @param itemID
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "检查项ID", notes = "检查项详情") @ApiOperation(value = "检查项ID", notes = "检查项详情")
@RequestMapping(value = "/queryItem", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryItem", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryItemDetail(@ApiParam(value = "巡检项ID") @RequestParam(required = true) Long itemID) { public CommonResponse queryItemDetail(@ApiParam(value = "巡检项ID") @RequestParam(required = true) Long itemID) {
...@@ -113,7 +113,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -113,7 +113,7 @@ public class InputItemController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "更新检查项", notes = "更新检查项") @ApiOperation(value = "更新检查项", notes = "更新检查项")
@RequestMapping(value = "/updateItem", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT) @RequestMapping(value = "/updateItem", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
public CommonResponse updateItem(@ApiParam(value = "检查项详情", required = false) @RequestBody InputItemParam param) { public CommonResponse updateItem(@ApiParam(value = "检查项详情", required = false) @RequestBody InputItemParam param) {
...@@ -142,7 +142,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -142,7 +142,7 @@ public class InputItemController extends AbstractBaseController {
* @param itemID * @param itemID
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "批量删除检查项", notes = "批量删除检查项") @ApiOperation(value = "批量删除检查项", notes = "批量删除检查项")
@RequestMapping(value = "/batchDelItem", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE) @RequestMapping(value = "/batchDelItem", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
public CommonResponse batchDelItem( public CommonResponse batchDelItem(
...@@ -165,7 +165,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -165,7 +165,7 @@ public class InputItemController extends AbstractBaseController {
* @param itemID * @param itemID
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "删除检查项", notes = "删除检查项") @ApiOperation(value = "删除检查项", notes = "删除检查项")
@RequestMapping(value = "/delItem", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/delItem", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse delItem(@ApiParam(value = "巡检项ID") @RequestParam(required = true) Long itemID) { public CommonResponse delItem(@ApiParam(value = "巡检项ID") @RequestParam(required = true) Long itemID) {
...@@ -183,7 +183,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -183,7 +183,7 @@ public class InputItemController extends AbstractBaseController {
* @param itemID * @param itemID
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "检查项另存为", notes = "检查项另存为") @ApiOperation(value = "检查项另存为", notes = "检查项另存为")
@RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse saveAs(@ApiParam(value = "巡检项ID") @RequestParam(required = true) String itemIDs) { public CommonResponse saveAs(@ApiParam(value = "巡检项ID") @RequestParam(required = true) String itemIDs) {
...@@ -210,7 +210,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -210,7 +210,7 @@ public class InputItemController extends AbstractBaseController {
* @param pageable * @param pageable
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分页查询检查项", notes = "分页查询检查项") @ApiOperation(value = "分页查询检查项", notes = "分页查询检查项")
@RequestMapping(value = "/queryItemByPage", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/queryItemByPage", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse queryItemByPage( public CommonResponse queryItemByPage(
...@@ -235,7 +235,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -235,7 +235,7 @@ public class InputItemController extends AbstractBaseController {
* @param queryRequests * @param queryRequests
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/queryItemByCondition", produces = "application/json;charset=UTF-8") @PostMapping(value = "/queryItemByCondition", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项") @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
public CommonResponse queryItemByCondition( public CommonResponse queryItemByCondition(
...@@ -261,7 +261,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -261,7 +261,7 @@ public class InputItemController extends AbstractBaseController {
* @param params * @param params
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/queryCustomInputItem", produces = "application/json;charset=UTF-8") @PostMapping (value = "/queryCustomInputItem", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项") @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
public CommonResponse queryCustomInputItem( @RequestBody HashMap<String,Object> params){ public CommonResponse queryCustomInputItem( @RequestBody HashMap<String,Object> params){
...@@ -276,7 +276,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -276,7 +276,7 @@ public class InputItemController extends AbstractBaseController {
* @param queryRequests 查询条件 * @param queryRequests 查询条件
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/queryItemByCondition1", produces = "application/json;charset=UTF-8") @PostMapping(value = "/queryItemByCondition1", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "条件查询检查项", notes = "条件查询检查项") @ApiOperation(value = "条件查询检查项", notes = "条件查询检查项")
public CommonResponse queryItemByCondition1( public CommonResponse queryItemByCondition1(
...@@ -321,7 +321,7 @@ public class InputItemController extends AbstractBaseController { ...@@ -321,7 +321,7 @@ public class InputItemController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检点编号信息", notes = "查询巡检点编号信息") @ApiOperation(value = "查询巡检点编号信息", notes = "查询巡检点编号信息")
@GetMapping(value = "/queryItemNo/{itemId}", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryItemNo/{itemId}", produces = "application/json;charset=UTF-8")
public CommonResponse queryItemNoList( public CommonResponse queryItemNoList(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/MeasuresController.java
View file @ e8d929a6
...@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.patrol.business.service.intfc.IMeasuresService; import com.yeejoin.amos.patrol.business.service.intfc.IMeasuresService;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.dao.entity.Measure; import com.yeejoin.amos.patrol.dao.entity.Measure;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -27,7 +27,7 @@ public class MeasuresController extends AbstractBaseController { ...@@ -27,7 +27,7 @@ public class MeasuresController extends AbstractBaseController {
@Autowired @Autowired
IMeasuresService measuresService; IMeasuresService measuresService;
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "add", produces = "application/json;charset=UTF-8") @PostMapping(value = "add", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "新增风险措施", notes = "新增风险措施") @ApiOperation(value = "新增风险措施", notes = "新增风险措施")
public CommonResponse measuresAdd(@ApiParam(value = "风险措施参数", required = false) @RequestBody(required = false) Measure measure) { public CommonResponse measuresAdd(@ApiParam(value = "风险措施参数", required = false) @RequestBody(required = false) Measure measure) {
...@@ -39,7 +39,7 @@ public class MeasuresController extends AbstractBaseController { ...@@ -39,7 +39,7 @@ public class MeasuresController extends AbstractBaseController {
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "update", produces = "application/json;charset=UTF-8") @PostMapping(value = "update", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "修改风险措施", notes = "修改风险措施") @ApiOperation(value = "修改风险措施", notes = "修改风险措施")
public CommonResponse measuresUpdate(@ApiParam(value = "风险措施参数", required = false) @RequestBody(required = false) Measure measure) { public CommonResponse measuresUpdate(@ApiParam(value = "风险措施参数", required = false) @RequestBody(required = false) Measure measure) {
...@@ -53,7 +53,7 @@ public class MeasuresController extends AbstractBaseController { ...@@ -53,7 +53,7 @@ public class MeasuresController extends AbstractBaseController {
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "delete/{id}", produces = "application/json;charset=UTF-8") @PostMapping(value = "delete/{id}", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "删除风险措施", notes = "删除风险措施") @ApiOperation(value = "删除风险措施", notes = "删除风险措施")
public CommonResponse measuresDelete(@ApiParam(value = "风险措施id", required = false) @PathVariable(required = true) Long id) { public CommonResponse measuresDelete(@ApiParam(value = "风险措施id", required = false) @PathVariable(required = true) Long id) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/MsgController.java
View file @ e8d929a6
...@@ -44,7 +44,7 @@ import com.yeejoin.amos.patrol.common.enums.CheckTypeEnum; ...@@ -44,7 +44,7 @@ import com.yeejoin.amos.patrol.common.enums.CheckTypeEnum;
import com.yeejoin.amos.patrol.common.enums.MsgTypeEnum; import com.yeejoin.amos.patrol.common.enums.MsgTypeEnum;
import com.yeejoin.amos.patrol.core.common.request.CommonPageable; import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
import com.yeejoin.amos.patrol.core.common.request.CommonRequest; import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.dao.entity.Msg; import com.yeejoin.amos.patrol.dao.entity.Msg;
import com.yeejoin.amos.patrol.dao.entity.MsgSubscribe; import com.yeejoin.amos.patrol.dao.entity.MsgSubscribe;
import com.yeejoin.amos.patrol.quartz.IJobService; import com.yeejoin.amos.patrol.quartz.IJobService;
...@@ -90,7 +90,7 @@ public class MsgController extends AbstractBaseController { ...@@ -90,7 +90,7 @@ public class MsgController extends AbstractBaseController {
* 获取用户当前所选择公司的消息订阅信息 * 获取用户当前所选择公司的消息订阅信息
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value="获取用户当前所选择公司的消息订阅信息", notes="获取用户当前所选择公司的消息订阅信息") @ApiOperation(value="获取用户当前所选择公司的消息订阅信息", notes="获取用户当前所选择公司的消息订阅信息")
@GetMapping(value="/querySubscribe", produces = "application/json;charset=UTF-8") @GetMapping(value="/querySubscribe", produces = "application/json;charset=UTF-8")
public CommonResponse queryMsgSetting() { public CommonResponse queryMsgSetting() {
...@@ -181,7 +181,7 @@ public class MsgController extends AbstractBaseController { ...@@ -181,7 +181,7 @@ public class MsgController extends AbstractBaseController {
* @param subscribe * @param subscribe
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value="保存用户消息订阅信息", notes="保存用户消息订阅信息") @ApiOperation(value="保存用户消息订阅信息", notes="保存用户消息订阅信息")
@PostMapping(value="/saveSubscribe",produces = "application/json;charset=UTF-8") @PostMapping(value="/saveSubscribe",produces = "application/json;charset=UTF-8")
public CommonResponse saveSubscribe(@ApiParam(value = "消息订阅信息", required = false) @RequestBody(required = true) List<MsgSubscribe> subscribe) { public CommonResponse saveSubscribe(@ApiParam(value = "消息订阅信息", required = false) @RequestBody(required = true) List<MsgSubscribe> subscribe) {
...@@ -252,7 +252,7 @@ public class MsgController extends AbstractBaseController { ...@@ -252,7 +252,7 @@ public class MsgController extends AbstractBaseController {
* 根据登陆用户APP获取未读消息个数 * 根据登陆用户APP获取未读消息个数
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value="APP根据登陆用户获取未读消息个数", notes="APP根据登陆用户获取未读消息个数") @ApiOperation(value="APP根据登陆用户获取未读消息个数", notes="APP根据登陆用户获取未读消息个数")
@GetMapping(value="/unreadCount",produces = "application/json;charset=UTF-8") @GetMapping(value="/unreadCount",produces = "application/json;charset=UTF-8")
public CommonResponse getUnreadCount() { public CommonResponse getUnreadCount() {
...@@ -270,7 +270,7 @@ public class MsgController extends AbstractBaseController { ...@@ -270,7 +270,7 @@ public class MsgController extends AbstractBaseController {
* 获取消息类型 * 获取消息类型
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value="APP获取消息类型", notes="APP获取消息类型") @ApiOperation(value="APP获取消息类型", notes="APP获取消息类型")
@GetMapping(value="/MsgType",produces = "application/json;charset=UTF-8") @GetMapping(value="/MsgType",produces = "application/json;charset=UTF-8")
public CommonResponse getMsgType() { public CommonResponse getMsgType() {
...@@ -288,7 +288,7 @@ public class MsgController extends AbstractBaseController { ...@@ -288,7 +288,7 @@ public class MsgController extends AbstractBaseController {
* @param commonPageable * @param commonPageable
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "APP 根据条件获取消息列表", notes = "APP 根据条件获取消息列表") @ApiOperation(value = "APP 根据条件获取消息列表", notes = "APP 根据条件获取消息列表")
@PostMapping(value = "/msgList", produces = "application/json;charset=UTF-8") @PostMapping(value = "/msgList", produces = "application/json;charset=UTF-8")
public CommonResponse queryMsgList( public CommonResponse queryMsgList(
...@@ -358,7 +358,7 @@ public class MsgController extends AbstractBaseController { ...@@ -358,7 +358,7 @@ public class MsgController extends AbstractBaseController {
* @param commonPageable * @param commonPageable
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "根据条件获取消息列表", notes = "APP 根据条件获取消息列表") @ApiOperation(value = "根据条件获取消息列表", notes = "APP 根据条件获取消息列表")
@PostMapping(value = "/list", produces = "application/json;charset=UTF-8") @PostMapping(value = "/list", produces = "application/json;charset=UTF-8")
public CommonResponse querylist( public CommonResponse querylist(
...@@ -385,7 +385,7 @@ public class MsgController extends AbstractBaseController { ...@@ -385,7 +385,7 @@ public class MsgController extends AbstractBaseController {
* @param msgId * @param msgId
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "修改消失为已读", notes = "修改消失为已读") @ApiOperation(value = "修改消失为已读", notes = "修改消失为已读")
@PostMapping(value = "/isRead", produces = "application/json;charset=UTF-8") @PostMapping(value = "/isRead", produces = "application/json;charset=UTF-8")
public CommonResponse isRead( public CommonResponse isRead(
...@@ -404,7 +404,7 @@ public class MsgController extends AbstractBaseController { ...@@ -404,7 +404,7 @@ public class MsgController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "通知发布", notes = "通知发布") @ApiOperation(value = "通知发布", notes = "通知发布")
@PostMapping(value = "/noticePublish", produces = "application/json;charset=UTF-8") @PostMapping(value = "/noticePublish", produces = "application/json;charset=UTF-8")
public CommonResponse noticePublish(@ApiParam(value = "通知信息", required = true) @RequestBody NoticePublishParam msg) { public CommonResponse noticePublish(@ApiParam(value = "通知信息", required = true) @RequestBody NoticePublishParam msg) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java
View file @ e8d929a6
...@@ -22,7 +22,7 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; ...@@ -22,7 +22,7 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.business.util.PlanPageParamUtil; import com.yeejoin.amos.patrol.business.util.PlanPageParamUtil;
import com.yeejoin.amos.patrol.core.common.request.CommonPageable; import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
import com.yeejoin.amos.patrol.core.common.request.CommonRequest; import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.dao.entity.Plan; import com.yeejoin.amos.patrol.dao.entity.Plan;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -41,7 +41,7 @@ public class PlanController extends AbstractBaseController { ...@@ -41,7 +41,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检计划查询", notes = "巡检计划查询") @ApiOperation(value = "巡检计划查询", notes = "巡检计划查询")
@RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, public CommonResponse qryCheckInfoPage(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
...@@ -71,7 +71,7 @@ public class PlanController extends AbstractBaseController { ...@@ -71,7 +71,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑") @ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑")
@RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) { public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
...@@ -96,7 +96,7 @@ public class PlanController extends AbstractBaseController { ...@@ -96,7 +96,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "删除巡检计划", notes = "删除巡检计划") @ApiOperation(value = "删除巡检计划", notes = "删除巡检计划")
@RequestMapping(value = "/deletePlanById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/deletePlanById", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse deletePlanById( public CommonResponse deletePlanById(
...@@ -116,7 +116,7 @@ public class PlanController extends AbstractBaseController { ...@@ -116,7 +116,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "另存巡检计划", notes = "另存巡检计划") @ApiOperation(value = "另存巡检计划", notes = "另存巡检计划")
@RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse planSaveAs( @ApiParam(value = "参数", required = true) @RequestBody String[] param) { public CommonResponse planSaveAs( @ApiParam(value = "参数", required = true) @RequestBody String[] param) {
...@@ -135,7 +135,7 @@ public class PlanController extends AbstractBaseController { ...@@ -135,7 +135,7 @@ public class PlanController extends AbstractBaseController {
* @param id * @param id
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检计划明细", notes = "查询巡检计划明细") @ApiOperation(value = "查询巡检计划明细", notes = "查询巡检计划明细")
@RequestMapping(value = "/detail/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/detail/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) { public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) {
...@@ -151,7 +151,7 @@ public class PlanController extends AbstractBaseController { ...@@ -151,7 +151,7 @@ public class PlanController extends AbstractBaseController {
* @param param * @param param
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检计划查询", notes = "巡检计划查询") @ApiOperation(value = "巡检计划查询", notes = "巡检计划查询")
@RequestMapping(value = "/queryPlanByOrgCode", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/queryPlanByOrgCode", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) { public CommonResponse qryCheckInfo(@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
...@@ -164,7 +164,7 @@ public class PlanController extends AbstractBaseController { ...@@ -164,7 +164,7 @@ public class PlanController extends AbstractBaseController {
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询计划列表(<font color='blue'>手机app</font>)", notes = "查询计划列表(<font color='blue'>手机app</font>)") @ApiOperation(value = "查询计划列表(<font color='blue'>手机app</font>)", notes = "查询计划列表(<font color='blue'>手机app</font>)")
@RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryPlanList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPlanList() { public CommonResponse queryPlanList() {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/QueryStatsController.java
View file @ e8d929a6
...@@ -19,7 +19,7 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; ...@@ -19,7 +19,7 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.business.vo.CheckStatsVo; import com.yeejoin.amos.patrol.business.vo.CheckStatsVo;
import com.yeejoin.amos.patrol.core.common.request.CommonPageable; import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
import com.yeejoin.amos.patrol.core.common.request.CommonRequest; import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -39,7 +39,7 @@ public class QueryStatsController extends AbstractBaseController { ...@@ -39,7 +39,7 @@ public class QueryStatsController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检点信息", notes = "查询巡检点信息") @ApiOperation(value = "查询巡检点信息", notes = "查询巡检点信息")
@PostMapping(value = "/checkStats", produces = "application/json;charset=UTF-8") @PostMapping(value = "/checkStats", produces = "application/json;charset=UTF-8")
public CommonResponse queryCheckStats( public CommonResponse queryCheckStats(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java
View file @ e8d929a6
...@@ -39,7 +39,7 @@ import com.yeejoin.amos.patrol.core.common.request.CommonPageable; ...@@ -39,7 +39,7 @@ import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
import com.yeejoin.amos.patrol.core.common.request.CommonRequest; import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
import com.yeejoin.amos.patrol.core.common.request.RoutePointInputItemRequest; import com.yeejoin.amos.patrol.core.common.request.RoutePointInputItemRequest;
import com.yeejoin.amos.patrol.core.common.response.RoutePointRespone; import com.yeejoin.amos.patrol.core.common.response.RoutePointRespone;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.dao.entity.InputItem; import com.yeejoin.amos.patrol.dao.entity.InputItem;
import com.yeejoin.amos.patrol.dao.entity.Plan; import com.yeejoin.amos.patrol.dao.entity.Plan;
import com.yeejoin.amos.patrol.dao.entity.Route; import com.yeejoin.amos.patrol.dao.entity.Route;
...@@ -70,7 +70,7 @@ public class RouteController extends AbstractBaseController { ...@@ -70,7 +70,7 @@ public class RouteController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "新增巡检路线", notes = "新增巡检路线") @ApiOperation(value = "新增巡检路线", notes = "新增巡检路线")
@PostMapping(value = "/addRoute", produces = "application/json;charset=UTF-8") @PostMapping(value = "/addRoute", produces = "application/json;charset=UTF-8")
public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
...@@ -120,7 +120,7 @@ public class RouteController extends AbstractBaseController { ...@@ -120,7 +120,7 @@ public class RouteController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "更新巡检路线", notes = "更新巡检路线") @ApiOperation(value = "更新巡检路线", notes = "更新巡检路线")
@PutMapping(value = "/updateRoute", produces = "application/json;charset=UTF-8") @PutMapping(value = "/updateRoute", produces = "application/json;charset=UTF-8")
public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
...@@ -145,7 +145,7 @@ public class RouteController extends AbstractBaseController { ...@@ -145,7 +145,7 @@ public class RouteController extends AbstractBaseController {
* @param routeIds * @param routeIds
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "删除巡检路线", notes = "删除巡检路线") @ApiOperation(value = "删除巡检路线", notes = "删除巡检路线")
@DeleteMapping(value = "/deleteRoute", produces = "application/json;charset=UTF-8") @DeleteMapping(value = "/deleteRoute", produces = "application/json;charset=UTF-8")
public CommonResponse deleteRoute(@ApiParam(value = "巡检路线ID", required = false) @RequestParam List<Long> routeIds) { public CommonResponse deleteRoute(@ApiParam(value = "巡检路线ID", required = false) @RequestParam List<Long> routeIds) {
...@@ -194,7 +194,7 @@ public class RouteController extends AbstractBaseController { ...@@ -194,7 +194,7 @@ public class RouteController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检路线信息", notes = "查询巡检路线信息") @ApiOperation(value = "查询巡检路线信息", notes = "查询巡检路线信息")
@GetMapping(value = "/queryRouteById/{id}", produces = "application/json;charset=UTF-8") @GetMapping(value = "/queryRouteById/{id}", produces = "application/json;charset=UTF-8")
public CommonResponse queryRouteById( public CommonResponse queryRouteById(
...@@ -208,7 +208,7 @@ public class RouteController extends AbstractBaseController { ...@@ -208,7 +208,7 @@ public class RouteController extends AbstractBaseController {
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "迁移路线上点到其他路线", notes = "迁移路线上点到其他路线") @ApiOperation(value = "迁移路线上点到其他路线", notes = "迁移路线上点到其他路线")
@PostMapping(value = "/migrateRoutePoint", produces = "application/json;charset=UTF-8") @PostMapping(value = "/migrateRoutePoint", produces = "application/json;charset=UTF-8")
public CommonResponse migrateRoutePoint( public CommonResponse migrateRoutePoint(
...@@ -230,7 +230,7 @@ public class RouteController extends AbstractBaseController { ...@@ -230,7 +230,7 @@ public class RouteController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检路线信息", notes = "查询巡检路线信息") @ApiOperation(value = "查询巡检路线信息", notes = "查询巡检路线信息")
@PostMapping(value = "/list", produces = "application/json;charset=UTF-8") @PostMapping(value = "/list", produces = "application/json;charset=UTF-8")
public CommonResponse listRoute( public CommonResponse listRoute(
...@@ -279,7 +279,7 @@ public class RouteController extends AbstractBaseController { ...@@ -279,7 +279,7 @@ public class RouteController extends AbstractBaseController {
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询当前登录公司的的所有巡检路线", notes = "查询当前登录公司的的所有巡检路线") @ApiOperation(value = "查询当前登录公司的的所有巡检路线", notes = "查询当前登录公司的的所有巡检路线")
@GetMapping(value = "/All", produces = "application/json;charset=UTF-8") @GetMapping(value = "/All", produces = "application/json;charset=UTF-8")
public CommonResponse queryAllRoute() { public CommonResponse queryAllRoute() {
...@@ -303,7 +303,7 @@ public class RouteController extends AbstractBaseController { ...@@ -303,7 +303,7 @@ public class RouteController extends AbstractBaseController {
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询所有路线列表<font color='blue'>手机app</font>", notes = "查询所有路线列表<font color='blue'>手机app</font>") @ApiOperation(value = "查询所有路线列表<font color='blue'>手机app</font>", notes = "查询所有路线列表<font color='blue'>手机app</font>")
@GetMapping(value = "/routeList", produces = "application/json;charset=UTF-8") @GetMapping(value = "/routeList", produces = "application/json;charset=UTF-8")
public CommonResponse queryRouteList() { public CommonResponse queryRouteList() {
...@@ -339,7 +339,7 @@ public class RouteController extends AbstractBaseController { ...@@ -339,7 +339,7 @@ public class RouteController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检路线上点列表", notes = "查询巡检路线上点列表") @ApiOperation(value = "查询巡检路线上点列表", notes = "查询巡检路线上点列表")
@PostMapping(value = "/listRoutePoint", produces = "application/json;charset=UTF-8") @PostMapping(value = "/listRoutePoint", produces = "application/json;charset=UTF-8")
public CommonResponse listRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam long routeId, public CommonResponse listRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam long routeId,
...@@ -360,7 +360,7 @@ public class RouteController extends AbstractBaseController { ...@@ -360,7 +360,7 @@ public class RouteController extends AbstractBaseController {
} }
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询巡检路线上点列表", notes = "查询巡检路线上点列表") @ApiOperation(value = "查询巡检路线上点列表", notes = "查询巡检路线上点列表")
@PutMapping(value = "/exchangeOrderNumber", produces = "application/json;charset=UTF-8") @PutMapping(value = "/exchangeOrderNumber", produces = "application/json;charset=UTF-8")
public CommonResponse exchangeRoutePointOrderNumber(@ApiParam(value = "路线巡检点id", required = true) @RequestParam long src, public CommonResponse exchangeRoutePointOrderNumber(@ApiParam(value = "路线巡检点id", required = true) @RequestParam long src,
...@@ -377,7 +377,7 @@ public class RouteController extends AbstractBaseController { ...@@ -377,7 +377,7 @@ public class RouteController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检路线上增加巡检点", notes = "巡检路线上增加巡检点") @ApiOperation(value = "巡检路线上增加巡检点", notes = "巡检路线上增加巡检点")
@PostMapping(value = "/addRoutePoint", produces = "application/json;charset=UTF-8") @PostMapping(value = "/addRoutePoint", produces = "application/json;charset=UTF-8")
public CommonResponse addRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam String routeId, public CommonResponse addRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam String routeId,
...@@ -414,7 +414,7 @@ public class RouteController extends AbstractBaseController { ...@@ -414,7 +414,7 @@ public class RouteController extends AbstractBaseController {
* @param point * @param point
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "巡检路线上删除巡检点", notes = "巡检路线上删除巡检点") @ApiOperation(value = "巡检路线上删除巡检点", notes = "巡检路线上删除巡检点")
@DeleteMapping(value = "/deleteRoutePoint", produces = "application/json;charset=UTF-8") @DeleteMapping(value = "/deleteRoutePoint", produces = "application/json;charset=UTF-8")
public CommonResponse deleteRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam Long routeId, public CommonResponse deleteRoutePoint(@ApiParam(value = "路线id", required = true) @RequestParam Long routeId,
...@@ -434,7 +434,7 @@ public class RouteController extends AbstractBaseController { ...@@ -434,7 +434,7 @@ public class RouteController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "列出巡检线路点的巡检项", notes = "列出巡检线路点的巡检项") @ApiOperation(value = "列出巡检线路点的巡检项", notes = "列出巡检线路点的巡检项")
@PostMapping(value = "/listRoutePointInputItem", produces = "application/json;charset=UTF-8") @PostMapping(value = "/listRoutePointInputItem", produces = "application/json;charset=UTF-8")
public CommonResponse listRoutePointInputItem(@ApiParam(value = "路线id", required = true) @RequestBody RoutePointInputItemRequest request) { public CommonResponse listRoutePointInputItem(@ApiParam(value = "路线id", required = true) @RequestBody RoutePointInputItemRequest request) {
...@@ -454,7 +454,7 @@ public class RouteController extends AbstractBaseController { ...@@ -454,7 +454,7 @@ public class RouteController extends AbstractBaseController {
* @param pointId * @param pointId
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "列出巡检线路点的分类及巡检项", notes = "列出巡检线路点的分类及巡检项") @ApiOperation(value = "列出巡检线路点的分类及巡检项", notes = "列出巡检线路点的分类及巡检项")
@PostMapping(value = "/listRoutePointInputItemWithClassify", produces = "application/json;charset=UTF-8") @PostMapping(value = "/listRoutePointInputItemWithClassify", produces = "application/json;charset=UTF-8")
public CommonResponse listRoutePointInputItemWithClassify(@ApiParam(value = "路线id", required = true) @RequestParam long routeId, public CommonResponse listRoutePointInputItemWithClassify(@ApiParam(value = "路线id", required = true) @RequestParam long routeId,
...@@ -476,7 +476,7 @@ public class RouteController extends AbstractBaseController { ...@@ -476,7 +476,7 @@ public class RouteController extends AbstractBaseController {
* @param inputItemIds * @param inputItemIds
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "修改巡检线路点的巡检项", notes = "修改巡检线路点的巡检项") @ApiOperation(value = "修改巡检线路点的巡检项", notes = "修改巡检线路点的巡检项")
@PostMapping(value = "/updateRoutePointInputItem", produces = "application/json;charset=UTF-8") @PostMapping(value = "/updateRoutePointInputItem", produces = "application/json;charset=UTF-8")
public CommonResponse updateRoutePointInputItem(@ApiParam(value = "巡检路线id", required = true) @RequestParam Long routeId, public CommonResponse updateRoutePointInputItem(@ApiParam(value = "巡检路线id", required = true) @RequestParam Long routeId,
...@@ -495,7 +495,7 @@ public class RouteController extends AbstractBaseController { ...@@ -495,7 +495,7 @@ public class RouteController extends AbstractBaseController {
* 根据巡检路线ID获取该路线上的所有点ID * 根据巡检路线ID获取该路线上的所有点ID
* @return IDs * @return IDs
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取巡检路线上的所有点ID", notes = "获取巡检路线上的所有点ID") @ApiOperation(value = "获取巡检路线上的所有点ID", notes = "获取巡检路线上的所有点ID")
@RequestMapping(value = "/points/{routeID}", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/points/{routeID}", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse getPointIDByRouyeId(@ApiParam(value = "巡检路线ID") @PathVariable(required = true) Long routeID) { public CommonResponse getPointIDByRouyeId(@ApiParam(value = "巡检路线ID") @PathVariable(required = true) Long routeID) {
...@@ -507,7 +507,7 @@ public class RouteController extends AbstractBaseController { ...@@ -507,7 +507,7 @@ public class RouteController extends AbstractBaseController {
* 根据巡检路线ID获取该路线上的所有点ID * 根据巡检路线ID获取该路线上的所有点ID
* @return IDs * @return IDs
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取巡检路线上的所有点ID", notes = "获取巡检路线上的所有点ID") @ApiOperation(value = "获取巡检路线上的所有点ID", notes = "获取巡检路线上的所有点ID")
@RequestMapping(value = "/points", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/points", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse getPointIDByRouteId(@ApiParam(value = "巡检路线ID信息") @RequestBody(required = true) Map routeInfo) { public CommonResponse getPointIDByRouteId(@ApiParam(value = "巡检路线ID信息") @RequestBody(required = true) Map routeInfo) {
...@@ -520,7 +520,7 @@ public class RouteController extends AbstractBaseController { ...@@ -520,7 +520,7 @@ public class RouteController extends AbstractBaseController {
* 修改保存巡检路线 * 修改保存巡检路线
* @return IDs * @return IDs
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "新*保存巡检路线", notes = "新*保存巡检路线") @ApiOperation(value = "新*保存巡检路线", notes = "新*保存巡检路线")
@PutMapping(value = "/save-new", produces = "application/json;charset=UTF-8") @PutMapping(value = "/save-new", produces = "application/json;charset=UTF-8")
public CommonResponse updateRouteNew(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse updateRouteNew(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyController.java
View file @ e8d929a6
...@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.feign.RemoteSecurityService; import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -57,7 +57,7 @@ public class SafetyController extends AbstractBaseController{ ...@@ -57,7 +57,7 @@ public class SafetyController extends AbstractBaseController{
/** /**
* 保存登陆用户选择公司信息 * 保存登陆用户选择公司信息
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息") @ApiOperation(value = " 保存登陆用户选择公司信息", notes = " 保存登陆用户选择公司信息")
@PostMapping(value = "/save/curCompany") @PostMapping(value = "/save/curCompany")
public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) { public CommonResponse saveCurCompany(@RequestBody ReginParams reginParams) {
...@@ -71,7 +71,7 @@ public class SafetyController extends AbstractBaseController{ ...@@ -71,7 +71,7 @@ public class SafetyController extends AbstractBaseController{
/** /**
* 保存登陆用户选择公司信息（换流站项目登录巡检） * 保存登陆用户选择公司信息（换流站项目登录巡检）
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息") @ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息")
@GetMapping(value = "/save/shortCutCompany") @GetMapping(value = "/save/shortCutCompany")
public CommonResponse specialSaveCurCompany( public CommonResponse specialSaveCurCompany(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SynDataController.java
View file @ e8d929a6
...@@ -20,7 +20,7 @@ import com.yeejoin.amos.patrol.business.service.intfc.ISynDataService; ...@@ -20,7 +20,7 @@ import com.yeejoin.amos.patrol.business.service.intfc.ISynDataService;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.business.util.Toke; import com.yeejoin.amos.patrol.business.util.Toke;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -46,7 +46,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -46,7 +46,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检项 * 同步巡检项
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检项", notes = "同步巡检项") @ApiOperation(value = "同步巡检项", notes = "同步巡检项")
@PostMapping(value = "/inputItem/{operationType}") @PostMapping(value = "/inputItem/{operationType}")
public CommonResponse inputItem(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse inputItem(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -77,7 +77,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -77,7 +77,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检点 * 同步巡检点
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检点", notes = "同步巡检点") @ApiOperation(value = "同步巡检点", notes = "同步巡检点")
@PostMapping(value = "/point/{operationType}") @PostMapping(value = "/point/{operationType}")
public CommonResponse point(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse point(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -108,7 +108,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -108,7 +108,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检点和巡检项关系 * 同步巡检点和巡检项关系
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检点和巡检项关系", notes = "同步巡检点和巡检项关系") @ApiOperation(value = "同步巡检点和巡检项关系", notes = "同步巡检点和巡检项关系")
@PostMapping(value = "/pointItem/relation/{operationType}") @PostMapping(value = "/pointItem/relation/{operationType}")
public CommonResponse relation(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse relation(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -135,7 +135,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -135,7 +135,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检路线 * 同步巡检路线
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检路线", notes = "同步巡检路线") @ApiOperation(value = "同步巡检路线", notes = "同步巡检路线")
@PostMapping(value = "/route/{operationType}") @PostMapping(value = "/route/{operationType}")
public CommonResponse route(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse route(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -164,7 +164,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -164,7 +164,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 同步巡检计划 * 同步巡检计划
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "同步巡检计划", notes = "同步巡检计划") @ApiOperation(value = "同步巡检计划", notes = "同步巡检计划")
@PostMapping(value = "/plan/{operationType}") @PostMapping(value = "/plan/{operationType}")
public CommonResponse plan(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType, public CommonResponse plan(@ApiParam(value = "操作类型（save/update/delete）", required = true) @PathVariable String operationType,
...@@ -197,7 +197,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -197,7 +197,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 停用巡检计划 * 停用巡检计划
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "停用巡检计划", notes = "停用巡检计划") @ApiOperation(value = "停用巡检计划", notes = "停用巡检计划")
@PostMapping(value = "/stopPlan") @PostMapping(value = "/stopPlan")
public CommonResponse stopPlan(@ApiParam(value = "巡检计划信息", required = true) @RequestParam String originalId) { public CommonResponse stopPlan(@ApiParam(value = "巡检计划信息", required = true) @RequestParam String originalId) {
...@@ -217,7 +217,7 @@ public class SynDataController extends AbstractBaseController { ...@@ -217,7 +217,7 @@ public class SynDataController extends AbstractBaseController {
/** /**
* 获取巡检计划已完成次数 * 获取巡检计划已完成次数
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取巡检计划已完成次数", notes = "获取巡检计划已完成次数") @ApiOperation(value = "获取巡检计划已完成次数", notes = "获取巡检计划已完成次数")
@GetMapping(value = "/plan/getFinishTimes") @GetMapping(value = "/plan/getFinishTimes")
public CommonResponse getPlanFinishTimes(@ApiParam(value = "巡检计划原始编号（多个逗号隔开）", required = true) @RequestParam String originalIds) { public CommonResponse getPlanFinishTimes(@ApiParam(value = "巡检计划原始编号（多个逗号隔开）", required = true) @RequestParam String originalIds) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/TaskReportController.java
View file @ e8d929a6
...@@ -18,7 +18,7 @@ import com.yeejoin.amos.patrol.business.service.impl.TaskReportService; ...@@ -18,7 +18,7 @@ import com.yeejoin.amos.patrol.business.service.impl.TaskReportService;
import com.yeejoin.amos.patrol.business.util.CommonResponse; import com.yeejoin.amos.patrol.business.util.CommonResponse;
import com.yeejoin.amos.patrol.business.util.CommonResponseUtil; import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.business.util.Toke; import com.yeejoin.amos.patrol.business.util.Toke;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -34,7 +34,7 @@ public class TaskReportController extends AbstractBaseController{ ...@@ -34,7 +34,7 @@ public class TaskReportController extends AbstractBaseController{
@Autowired @Autowired
private TaskReportService taskReportService; private TaskReportService taskReportService;
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 巡检完成情况月报表", notes = " 巡检完成情况月报表") @ApiOperation(value = " 巡检完成情况月报表", notes = " 巡检完成情况月报表")
@RequestMapping(value = "/{statistical}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/{statistical}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse taskReport( public CommonResponse taskReport(
...@@ -52,7 +52,7 @@ public class TaskReportController extends AbstractBaseController{ ...@@ -52,7 +52,7 @@ public class TaskReportController extends AbstractBaseController{
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 人员综合统计分析", notes = " 人员综合统计分析") @ApiOperation(value = " 人员综合统计分析", notes = " 人员综合统计分析")
@PostMapping(value = "/comprehensive/user", produces = "application/json;charset=UTF-8") @PostMapping(value = "/comprehensive/user", produces = "application/json;charset=UTF-8")
public CommonResponse comprehensiveStatisticalForUser( public CommonResponse comprehensiveStatisticalForUser(
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/UserController.java
View file @ e8d929a6
...@@ -51,7 +51,7 @@ import com.yeejoin.amos.patrol.business.util.DepartmentUserTreeAppVo; ...@@ -51,7 +51,7 @@ import com.yeejoin.amos.patrol.business.util.DepartmentUserTreeAppVo;
import com.yeejoin.amos.patrol.business.util.DepartmentUserTreeWebVo; import com.yeejoin.amos.patrol.business.util.DepartmentUserTreeWebVo;
import com.yeejoin.amos.patrol.business.util.DesUtil; import com.yeejoin.amos.patrol.business.util.DesUtil;
import com.yeejoin.amos.patrol.business.util.StringUtil; import com.yeejoin.amos.patrol.business.util.StringUtil;
import com.yeejoin.amos.patrol.core.framework.Permission; import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.yeejoin.amos.patrol.feign.RemoteSecurityService; import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
import com.yeejoin.amos.patrol.jpush.AppMessagePushService; import com.yeejoin.amos.patrol.jpush.AppMessagePushService;
...@@ -97,7 +97,7 @@ public class UserController extends AbstractBaseController { ...@@ -97,7 +97,7 @@ public class UserController extends AbstractBaseController {
* @param deptId * @param deptId
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "部门人员查询", notes = "部门人员查询") @ApiOperation(value = "部门人员查询", notes = "部门人员查询")
@RequestMapping(value = "/queryDeptUser", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDeptUser", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryDeptUser(@RequestParam(value = "deptId", required = false) String deptId) { public CommonResponse queryDeptUser(@RequestParam(value = "deptId", required = false) String deptId) {
...@@ -177,7 +177,7 @@ public class UserController extends AbstractBaseController { ...@@ -177,7 +177,7 @@ public class UserController extends AbstractBaseController {
return userList; return userList;
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "部门人员树查询", notes = "部门人员树查询") @ApiOperation(value = "部门人员树查询", notes = "部门人员树查询")
@RequestMapping(value = "/queryDeptUserTree1", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDeptUserTree1", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryDeptUserTree1() { public CommonResponse queryDeptUserTree1() {
...@@ -294,7 +294,7 @@ public class UserController extends AbstractBaseController { ...@@ -294,7 +294,7 @@ public class UserController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "人员查询", notes = "人员查询") @ApiOperation(value = "人员查询", notes = "人员查询")
@RequestMapping(value = "/queryAuthUsers", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryAuthUsers", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
// @Authorization(ingore = true) // @Authorization(ingore = true)
...@@ -312,7 +312,7 @@ public class UserController extends AbstractBaseController { ...@@ -312,7 +312,7 @@ public class UserController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "部门人员树查询", notes = "部门人员树查询") @ApiOperation(value = "部门人员树查询", notes = "部门人员树查询")
@RequestMapping(value = "/queryDeptUserTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryDeptUserTree", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryDeptUserTree() { public CommonResponse queryDeptUserTree() {
...@@ -330,7 +330,7 @@ public class UserController extends AbstractBaseController { ...@@ -330,7 +330,7 @@ public class UserController extends AbstractBaseController {
* @return * @return
* @RequestParam userName 用户名 * @RequestParam userName 用户名
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "通讯录(<font color='blue'>手机app</font>)", notes = "通讯录(<font color='blue'>手机app</font>)") @ApiOperation(value = "通讯录(<font color='blue'>手机app</font>)", notes = "通讯录(<font color='blue'>手机app</font>)")
@RequestMapping(value = "/queryUserAddressList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryUserAddressList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryUserAddressListTree( public CommonResponse queryUserAddressListTree(
...@@ -490,7 +490,7 @@ public class UserController extends AbstractBaseController { ...@@ -490,7 +490,7 @@ public class UserController extends AbstractBaseController {
return userList; return userList;
} }
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "用户登录成功之后数据初始化(<font color='blue'>手机app</font>)", notes = "用户登录成功之后数据初始化") @ApiOperation(value = "用户登录成功之后数据初始化(<font color='blue'>手机app</font>)", notes = "用户登录成功之后数据初始化")
@RequestMapping(value = "/initData", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/initData", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse initUserApp() { public CommonResponse initUserApp() {
...@@ -529,7 +529,7 @@ public class UserController extends AbstractBaseController { ...@@ -529,7 +529,7 @@ public class UserController extends AbstractBaseController {
} }
///////////////////////////////2019-11-18安全服务升级/////////////////////////////// ///////////////////////////////2019-11-18安全服务升级///////////////////////////////
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "通讯录", notes = "通讯录") @ApiOperation(value = "通讯录", notes = "通讯录")
@RequestMapping(value = "/mobile/addressList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/mobile/addressList", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse addressList() { public CommonResponse addressList() {
...@@ -740,7 +740,7 @@ public class UserController extends AbstractBaseController { ...@@ -740,7 +740,7 @@ public class UserController extends AbstractBaseController {
/** /**
* 保存登陆用户选择公司信息 * 保存登陆用户选择公司信息
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息") @ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息")
@PostMapping(value = "/save/curCompany") @PostMapping(value = "/save/curCompany")
public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) { public CommonResponse saveCurCompany(@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams reginParams) {
...@@ -791,7 +791,7 @@ public class UserController extends AbstractBaseController { ...@@ -791,7 +791,7 @@ public class UserController extends AbstractBaseController {
/** /**
* 装备登录返回巡检统计信息 * 装备登录返回巡检统计信息
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "装备登录返回巡检统计信息", notes = "装备登录返回巡检统计信息") @ApiOperation(value = "装备登录返回巡检统计信息", notes = "装备登录返回巡检统计信息")
@GetMapping(value = "/patrolCount") @GetMapping(value = "/patrolCount")
public CommonResponse getPatrolCount() { public CommonResponse getPatrolCount() {
...@@ -808,7 +808,7 @@ public class UserController extends AbstractBaseController { ...@@ -808,7 +808,7 @@ public class UserController extends AbstractBaseController {
/** /**
* 修改密码 * 修改密码
*/ */
@Permission @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = " 修改密码", notes = " 修改密码") @ApiOperation(value = " 修改密码", notes = " 修改密码")
@GetMapping(value = "/editPassword") @GetMapping(value = "/editPassword")
public CommonResponse editPassword(@ApiParam(value = "旧密码", required = true) @RequestParam String password, public CommonResponse editPassword(@ApiParam(value = "旧密码", required = true) @RequestParam String password,
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/core/framework/Permission.java
View file @ e8d929a6
package com.yeejoin.amos.patrol.core.framework; //package com.yeejoin.amos.patrol.core.framework;
//
import java.lang.annotation.Documented; //import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; //import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; //import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; //import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; //import java.lang.annotation.Target;
//
@Target(ElementType.METHOD) //@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) //@Retention(RetentionPolicy.RUNTIME)
@Documented //@Documented
public @interface Permission { //public @interface Permission {
String value() default ""; // String value() default "";
} //}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment