haozq
/
jjsp_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

注解修改

This commit is contained in:
haozq 2024-12-16 17:50:17 +08:00
parent c1723c0f6a
commit d914004049
4 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/AllocationController.java
View File

@ -4,7 +4,9 @@ import com.securityControl.common.core.web.controller.BaseController;
import com.securityControl.common.core.web.domain.AjaxResult;
import com.securityControl.common.core.web.page.TableDataInfo;
import com.securityControl.common.log.annotation.Log;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.BusinessType;
import com.securityControl.common.log.enums.OperaType;
import com.securityControl.common.log.enums.OperationType;
import com.sercurityControl.proteam.domain.ClassData;
import com.sercurityControl.proteam.domain.TeamData;
@ -46,7 +48,7 @@ public class AllocationController extends BaseController {
*/
@ApiOperation(value = "查询人员分配")
@PostMapping("/getList")
@Log(title = "人员分配", menu = "人员分配", businessType = BusinessType.QUERY, details = "人员分配")
@SysLog(title = "值班任务", model = "值班任务->任务分配", operaType = OperaType.QUERY, details = "查询任务分配")
public TableDataInfo getTeamList(UserCheck entity) {
startPage();
try {
@ -64,7 +66,7 @@ public class AllocationController extends BaseController {
*/
@ApiOperation(value = "查询今日任务")
@PostMapping("/getClass")
@Log(title = "查询今日任务", menu = "查询今日任务", businessType = BusinessType.QUERY, details = "查询今日任务")
@SysLog(title = "值班任务", model = "值班任务->任务分配", operaType = OperaType.QUERY, details = "查询今日任务")
public TableDataInfo getClass(ClassData entity) {
startPage();
try {
@ -82,7 +84,7 @@ public class AllocationController extends BaseController {
*/
@ApiOperation(value = "查询今日任务")
@PostMapping("/getClassData")
@Log(title = "查询今日任务", menu = "查询今日任务", businessType = BusinessType.QUERY, details = "查询今日任务")
@SysLog(title = "值班任务", model = "值班任务->任务分配", operaType = OperaType.QUERY, details = "查询已分配的任务")
public TableDataInfo getClassData(ClassData entity) {
startPage();
try {
@ -100,7 +102,7 @@ public class AllocationController extends BaseController {
*/
@ApiOperation(value = "移除任务")
@PostMapping("/delData")
@Log(title = "移除任务", menu = "移除任务", businessType = BusinessType.UPDATE, details = "移除任务", grade = OperationType.UPDATE_BUSINESS)
@SysLog(title = "值班任务", model = "值班任务->任务分配", operaType = OperaType.DELETE, details = "移除已分配的任务")
public AjaxResult deleteTeamBlack(UserCheck entity) {
return service.delData(entity);
}
@ -114,7 +116,7 @@ public class AllocationController extends BaseController {
*/
@ApiOperation(value = "移除全部任务")
@PostMapping("/delAll")
@Log(title = "移除任务", menu = "移除全部任务", businessType = BusinessType.UPDATE, details = "移除任务", grade = OperationType.UPDATE_BUSINESS)
@SysLog(title = "值班任务", model = "值班任务->任务分配", operaType = OperaType.DELETE, details = "移除全部任务")
public AjaxResult delAll(UserCheck entity) {
return service.delAll(entity);
}
@ -128,7 +130,7 @@ public class AllocationController extends BaseController {
*/
@ApiOperation(value = "添加任务")
@PostMapping("/insertData")
@Log(title = "添加任务", menu = "添加任务", businessType = BusinessType.UPDATE, details = "添加任务", grade = OperationType.UPDATE_BUSINESS)
@SysLog(title = "值班任务", model = "值班任务->任务分配", operaType = OperaType.DELETE, details = "添加任务")
public AjaxResult insertData(String params,String userId,String quality) {
return service.insertData(params,userId,quality);
}
@ -141,6 +143,7 @@ public class AllocationController extends BaseController {
* @return 条数
*/
@PostMapping("/updateUserInformation")
@SysLog(title = "值班任务", model = "值班任务->任务分配", operaType = OperaType.UPDATE, details = "修改用户状态")
public AjaxResult updateUserInformation(String userId,String type,String value) {
return service.updateUserInformation(userId,type,value);
}
@ -153,6 +156,7 @@ public class AllocationController extends BaseController {
public WorkTeamSchedule schedule;
@PostMapping("/initRwFp")
@SysLog(title = "值班任务", model = "值班任务->任务分配", operaType = OperaType.OTHER, details = "任务自动分配")
public AjaxResult initRwFp() {
schedule.classMettingZdFp();
return AjaxResult.success("刷新成功");

3
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/CityLevelController.java
View File

@ -3,7 +3,9 @@ package com.sercurityControl.proteam.controller;
import com.google.common.collect.Maps;
import com.securityControl.common.core.web.domain.AjaxResult;
import com.securityControl.common.log.annotation.Log;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.BusinessType;
import com.securityControl.common.log.enums.OperaType;
import com.sercurityControl.proteam.domain.DayPlanNum;
import com.sercurityControl.proteam.domain.EarlyEntity;
import com.sercurityControl.proteam.domain.dto.LoginDto;
@ -33,6 +35,7 @@ public class CityLevelController {
* @return
*/
@PostMapping("getCityMaps")
@SysLog(title = "地市首页", model = "地市首页->地市首页", operaType = OperaType.UPDATE, details = "地市首页数据统计查询")
public Map<String, Object> getCityMaps(LoginDto dto){
Map<String,Object> map= Maps.newHashMap();
try{

18
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceController.java
View File

@ -10,7 +10,9 @@ import com.securityControl.common.core.utils.aes.DateTimeHelper;
import com.securityControl.common.core.utils.aes.StringHelper;
import com.securityControl.common.core.utils.poi.ExcelUtil;
import com.securityControl.common.log.annotation.Log;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.BusinessType;
import com.securityControl.common.log.enums.OperaType;
import com.securityControl.common.log.enums.OperationType;
import com.sercurityControl.proteam.domain.vo.BallSwHGVo;
import com.sercurityControl.proteam.domain.vo.DeviceVo;
@ -72,7 +74,7 @@ public class DeviceController extends BaseController {
* @return
*/
@PostMapping("getDeviceList")
@Log(title = "设备管理", menu = "设备管理->设备登记", businessType = BusinessType.QUERY, grade = OperationType.QUERY_BUSINESS, details = "设备管理列表")
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.QUERY, details = "设备管理列表查询")
public Map<String,Object> getDeviceList(DeviceVo deviceVo) {
PageHelper.startPage(deviceVo.getPage(), deviceVo.getLimit());
List<DeviceVo> deviceList = service.getDeviceList(deviceVo);
@ -88,7 +90,7 @@ public class DeviceController extends BaseController {
}
@PostMapping("insertDevice")
@Log(title = "设备管理", menu = "设备管理->设备登记", businessType = BusinessType.INSERT, details = "新增设备", grade = OperationType.ADD_BUSINESS)
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.INSERT, details = "新增设备")
public ReturnCodeEntity insertDevice(DeviceVo deviceVo) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -103,7 +105,7 @@ public class DeviceController extends BaseController {
}
@PostMapping("updateDevice")
@Log(title = "设备管理", menu = "设备管理->设备登记", businessType = BusinessType.UPDATE, details = "修改设备", grade = OperationType.UPDATE_BUSINESS)
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.UPDATE, details = "修改设备")
public ReturnCodeEntity updateDevice( DeviceVo deviceVo ) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -142,7 +144,7 @@ public class DeviceController extends BaseController {
* @return
*/
@PostMapping("deleteDevice")
@Log(title = "设备管理", menu = "设备管理->设备登记", businessType = BusinessType.DELETE, details = "删除设备", grade = OperationType.DELETE_BUSINESS)
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.DELETE, details = "删除设备")
public ReturnCodeEntity deleteDevice(String keyId) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -160,6 +162,7 @@ public class DeviceController extends BaseController {
* @return
*/
@PostMapping("refresh")
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.FLASH, details = "刷新设备状态")
public ReturnCodeEntity refresh( ) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -221,6 +224,7 @@ public class DeviceController extends BaseController {
* @return
*/
@PostMapping("refreshDevice")
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.FLASH, details = "重置设备状态")
public ReturnCodeEntity refreshDevice( ) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -241,7 +245,6 @@ public class DeviceController extends BaseController {
* @return
*/
@PostMapping("getDeviceDetail")
@Log(title = "设备管理", menu = "设备管理->设备登记", businessType = BusinessType.QUERY, details = "设备查看详情", grade = OperationType.QUERY_BUSINESS)
public DeviceVo getDeviceDetail(String keyId) {
DeviceVo deviceVo = null;
try {
@ -275,7 +278,7 @@ public class DeviceController extends BaseController {
@GetMapping("exportDevice")
@Log(title = "设备管理", menu = "设备管理->设备登记", businessType = BusinessType.EXPORT, details = "导出设备", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.EXPORT, details = "导出设备列表文件")
public void exportDevice(HttpServletResponse response, DeviceVo deviceVo) {
List<DeviceVo> studentsList = service.getDeviceList(deviceVo);
ExcelUtil<DeviceVo> util = new ExcelUtil<DeviceVo>(DeviceVo.class);
@ -285,7 +288,7 @@ public class DeviceController extends BaseController {
@ApiOperation("模板下载")
@GetMapping("/downloadExcel")
@Log(title = "设备管理", menu = "设备管理->设备登记", businessType = BusinessType.QUERY, details = "模板下载", grade = OperationType.DOWNLOAD_BUSINESS)
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.DOWNLOAD, details = "模板下载")
public void downloadExcel(HttpServletRequest request, HttpServletResponse response) {
InputStream inputStream = null;
ServletOutputStream servletOutputStream = null;
@ -329,6 +332,7 @@ public class DeviceController extends BaseController {
* @date 2022-12-21 9:45
*/
@PostMapping("/importExcel")
@SysLog(title = "设备管理", model = "预警信息->设备登记", operaType = OperaType.EXPORT, details = "导入设备数据信息")
public void importExcel(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
try {
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();

26
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/EarlyController.java
View File

@ -4,7 +4,9 @@ import com.securityControl.common.core.web.controller.BaseController;
import com.securityControl.common.core.web.domain.AjaxResult;
import com.securityControl.common.core.web.page.TableDataInfo;
import com.securityControl.common.log.annotation.Log;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.BusinessType;
import com.securityControl.common.log.enums.OperaType;
import com.securityControl.common.log.enums.OperationType;
import com.sercurityControl.proteam.domain.EarlyEntity;
import com.sercurityControl.proteam.domain.vo.UserHandleVo;
@ -51,7 +53,6 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "获取数量")
@PostMapping("/getEarlyNum")
@Log(title = "预警管理", menu = "预警管理->获取数量", businessType = BusinessType.QUERY, details = "获取数量", grade = OperationType.QUERY_BUSINESS)
public AjaxResult getEarlyNum(EarlyEntity entity) {
return service.getEarlyNum(entity);
}
@ -65,7 +66,7 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "今日无施工")
@PostMapping("/getNoWorkByDay")
@Log(title = "预警管理", menu = "预警管理->今日无施工", businessType = BusinessType.QUERY, details = "今日无施工", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->预警信息", operaType = OperaType.QUERY, details = "今日无施工预警信息查询")
public TableDataInfo getNoWorkByDay(EarlyEntity entity) {
startPage();
try {
@ -85,7 +86,7 @@ public class EarlyController extends BaseController {
@ApiOperation(value = "新进班组")
@PostMapping("/getNewTeam")
@Log(title = "预警管理", menu = "预警管理->新进班组", businessType = BusinessType.QUERY, details = "新进班组", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->新进班组", operaType = OperaType.QUERY, details = "新进班组列表查询")
public TableDataInfo getNewTeam(EarlyEntity entity) {
startPage();
try {
@ -104,7 +105,7 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "七日无施工")
@PostMapping("/getNoWorkBySeven")
@Log(title = "预警管理", menu = "预警管理->七日无施工", businessType = BusinessType.QUERY, details = "新进班组", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->七日无施工", operaType = OperaType.QUERY, details = "七日无施工列表查询")
public TableDataInfo getNoWorkBySeven(EarlyEntity entity) {
startPage();
try {
@ -123,7 +124,7 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "重点关注")
@PostMapping("/getFocusWork")
@Log(title = "预警管理", menu = "预警管理->重点关注", businessType = BusinessType.QUERY, details = "新进班组", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->重点关注", operaType = OperaType.QUERY, details = "重点关注关注班组查询")
public TableDataInfo getFocusWork(EarlyEntity entity) {
startPage();
try {
@ -142,7 +143,7 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "作业类型,工序变化")
@PostMapping("/getTeamByWork")
@Log(title = "预警管理", menu = "预警管理->重点关注", businessType = BusinessType.QUERY, details = "新进班组", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->重点关注", operaType = OperaType.QUERY, details = "作业类型详情查询")
public TableDataInfo getTeamByWork(EarlyEntity entity) {
startPage();
try {
@ -162,7 +163,7 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "作业类型,工序变化")
@PostMapping("/getTeamByJob")
@Log(title = "预警管理", menu = "预警管理->重点关注", businessType = BusinessType.QUERY, details = "新进班组", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->重点关注", operaType = OperaType.QUERY, details = "工序变化列表详情查询")
public TableDataInfo getTeamByJob(EarlyEntity entity) {
startPage();
try {
@ -181,7 +182,7 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "球机异常")
@PostMapping("/getBallByUnusual")
@Log(title = "预警管理", menu = "预警管理->球机异常", businessType = BusinessType.QUERY, details = "新进班组", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->重点关注", operaType = OperaType.QUERY, details = "球机异常列表详情查询")
public TableDataInfo getBallByUnusual(EarlyEntity entity) {
startPage();
try {
@ -201,9 +202,8 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "球机异常")
@GetMapping("/exportToExcel")
@Log(title = "预警管理", menu = "预警管理->球机异常", businessType = BusinessType.QUERY, details = "新进班组", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->预警信息", operaType = OperaType.EXPORT, details = "导出预警信息excel")
public void exportToExcel(HttpServletResponse response, EarlyEntity entity) {
try {
Workbook workbook = service.exportToExcel(entity);
String fileName = "结果表.xlsx";
@ -227,7 +227,7 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "人数变化大")
@PostMapping("/getTeamByPer")
@Log(title = "预警管理", menu = "预警管理->人数变化大", businessType = BusinessType.QUERY, details = "人数变化大", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->预警信息", operaType = OperaType.QUERY, details = "人数变化大列表信息查询")
public TableDataInfo getTeamByPer(EarlyEntity entity) {
startPage();
try {
@ -245,6 +245,7 @@ public class EarlyController extends BaseController {
* @return
*/
@PostMapping("/getTodayWarnInfo")
@SysLog(title = "预警信息", model = "预警信息->预警信息", operaType = OperaType.QUERY, details = "查询今日预警信息")
public AjaxResult getTodayWarnInfo(EarlyEntity entity) {
try {
Map<String,Object> map=service.getTodayWarnInfo(entity);
@ -266,7 +267,7 @@ public class EarlyController extends BaseController {
*/
@ApiOperation(value = "球机信号")
@PostMapping("/getBallSignal")
@Log(title = "预警管理", menu = "预警管理->球机信号", businessType = BusinessType.QUERY, details = "球机信号", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "预警信息", model = "预警信息->预警信息", operaType = OperaType.QUERY, details = "查询球机信号列表集合")
public TableDataInfo getBallSignal(EarlyEntity entity) {
startPage();
try {
@ -296,6 +297,7 @@ public class EarlyController extends BaseController {
* @return
*/
@PostMapping("/addUserHandel")
@SysLog(title = "预警信息", model = "预警信息->预警信息", operaType = OperaType.INSERT, details = "添加告警处置信息")
public AjaxResult addUserHandel(UserHandleVo userHandleVo){
return service.addUserHandel(userHandleVo);
}