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

Compare commits

base: haozq:f86a77f5643e9131427d49e35bc996cf27254c33
Branches Tags
haozq:main
...
compare: haozq:fd8e6d6e204e3cab7c9df1636a100a3f33722422
Branches Tags
haozq:main

2 Commits
f86a77f564 ... fd8e6d6e20

Author SHA1 Message Date
haozq fd8e6d6e20 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/StagingController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TRiskPressDropRateController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/UavPatrolController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java
 2024-12-19 10:49:48 +08:00
haozq 6f68e2c4a9 注解修改 2024-12-19 10:42:50 +08:00
8 changed files with 71 additions and 46 deletions
Show Stats Expand all files Collapse all files

7
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java
View File

@ -7,7 +7,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.vo.DeviceLedGer;
import com.sercurityControl.proteam.domain.vo.DeviceVo;
@ -33,7 +35,7 @@ public class DeviceLedgerController extends BaseController {
private DeviceLedgerService service;
@PostMapping("/getDeviceLedgerList")
@Log(title = "设备流转台帐", menu = "设备管理->设备流转台帐", businessType = BusinessType.QUERY, details = "设备流转台帐", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "设备流转台帐", model = "设备管理->设备流转台帐", operaType = OperaType.QUERY, details = "设备流转台帐列表查询")
public Map<String,Object> getDeviceLedgerList(DeviceLedGer deviceLedGer) {
PageHelper.startPage(deviceLedGer.getPage(), deviceLedGer.getLimit());
List<DeviceLedGer> deviceList = service.getDeviceLedgerList(deviceLedGer);
@ -49,7 +51,7 @@ public class DeviceLedgerController extends BaseController {
}
@GetMapping("/exportDeviceLedger")
@Log(title = "设备流转台帐", menu = "设备管理->设备流转台帐", businessType = BusinessType.EXPORT, details = "设备流转台帐导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备流转台帐", model = "设备管理->设备流转台帐", operaType = OperaType.EXPORT, details = "设备流转台帐导出")
public void exportDeviceLedger(HttpServletResponse response, DeviceLedGer deviceLedGer) {
List<DeviceLedGer> LedgerList = service.getDeviceLedgerList(deviceLedGer);
for (DeviceLedGer entity : LedgerList) {
@ -60,7 +62,6 @@ public class DeviceLedgerController extends BaseController {
}
@PostMapping("/getDeviceNum")
@Log(title = "设备流转台帐", menu = "设备管理->设备流转台帐", businessType = BusinessType.QUERY, details = "设备流转台帐设备信息查看", grade = OperationType.QUERY_BUSINESS)
public AjaxResult getDeviceNum(DeviceLedGer deviceLedGer) {
return service.getDeviceNum(deviceLedGer);
}

20
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceMachineController.java
View File

@ -12,7 +12,9 @@ import com.securityControl.common.core.utils.aes.StringHelper;
import com.securityControl.common.core.web.controller.BaseController;
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.securityControl.common.log.enums.OperationType;
import com.securityControl.common.redis.service.RedisService;
import com.sercurityControl.proteam.domain.DeviceMachineEntity;
@ -57,7 +59,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "获取设备分配数据")
@PostMapping("/getDeviceMachineList")
@Log(title = "获取设备分配数据", menu = "获取设备分配数据", businessType = BusinessType.QUERY, details = "获取设备分配数据")
@SysLog(title = "设备流转台帐", model = "设备管理->获取设备分配数据", operaType = OperaType.QUERY, details = "获取设备分配数据")
public Map<String, Object> getDeviceMachineList(DeviceMachineEntity entity) {
PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit()));
Map<String, Object> map = new HashMap<String, Object>(6);
@ -88,7 +90,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "获取分组节点")
@PostMapping("getGroupNode")
@Log(title = "获取分组节点", menu = "获取分组节点", businessType = BusinessType.EXPORT, details = "获取分组节点", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->获取分组节点", operaType = OperaType.QUERY, details = "获取分组节点")
public AjaxResult getGroupNode(String type) {
try {
String groupNode = (String) redisUtil.get("dev:groupNode");
@ -138,7 +140,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "查询设备")
@PostMapping("getPu")
@Log(title = "查询设备", menu = "查询设备", businessType = BusinessType.EXPORT, details = "查询设备", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->查询设备", operaType = OperaType.QUERY, details = "查询设备")
public AjaxResult getPu(String puId, String all) {
try {
String pu = QxWebUtil.getPu(puId);
@ -165,7 +167,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "分组节点添加设备")
@PostMapping("getPuSet")
@Log(title = "分组节点添加设备", menu = "分组节点添加设备", businessType = BusinessType.EXPORT, details = "分组节点添加设备", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.INSERT, details = "分组节点添加设备")
public AjaxResult getPuSet(String puIds, String node, String oldNode) {
try {
List<NodeVo> nodeList = JSON.parseArray(node, NodeVo.class);
@ -211,7 +213,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "分组节点添加设备")
@PostMapping("refreshRedisUtil")
@Log(title = "分组节点添加设备", menu = "分组节点添加设备", businessType = BusinessType.EXPORT, details = "分组节点添加设备", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.QUERY, details = "刷新设备分配")
public AjaxResult refreshRedisUtil() {
try {
String groupNode = QxWebUtil.getGroupNode();
@ -232,7 +234,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "节点添加")
@PostMapping("nodeAdd")
@Log(title = "节点添加", menu = "节点添加", businessType = BusinessType.EXPORT, details = "节点添加", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.INSERT, details = "节点添加")
public AjaxResult nodeAdd(NodeEntity entity) {
try {
if (entity.getContext().length() > 255) {
@ -268,7 +270,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "节点修改")
@PostMapping("nodeSet")
@Log(title = "节点修改", menu = "节点修改", businessType = BusinessType.EXPORT, details = "节点修改", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.UPDATE, details = "修改节点数据")
public AjaxResult nodeSet(NodeEntity entity) {
try {
if (entity.getContext().length() > 255) {
@ -305,7 +307,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "节点删除")
@PostMapping("nodeRemove")
@Log(title = "节点删除", menu = "节点删除", businessType = BusinessType.EXPORT, details = "节点删除", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.DELETE, details = "删除数据节点")
public AjaxResult nodeRemove(NodeEntity entity) {
try {
String nodeRemove = QxWebUtil.nodeRemove(entity.getNodeId());
@ -336,7 +338,7 @@ public class DeviceMachineController extends BaseController {
*/
@ApiOperation(value = "获取分组节点")
@PostMapping("groupNode")
@Log(title = "获取分组节点", menu = "获取分组节点", businessType = BusinessType.EXPORT, details = "获取分组节点", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备分配", operaType = OperaType.QUERY, details = "获取分组节点")
public AjaxResult groupNode(String type) {
try {
String groupNode = QxWebUtil.getGroupNode();

11
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceTypeController.java
View File

@ -8,7 +8,9 @@ import com.securityControl.common.core.utils.aes.Aes;
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.DeviceTypeVo;
import com.sercurityControl.proteam.domain.vo.DeviceVo;
@ -43,7 +45,7 @@ public class DeviceTypeController {
* @return
*/
@PostMapping("getTypeList")
@Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.QUERY, details = "设备类型列表", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备类型管理", operaType = OperaType.QUERY, details = "查询设备类型列表")
public List<DeviceTypeVo> getTypeList(DeviceTypeVo deviceTypeVo) {
List<DeviceTypeVo> list = service.getTypeList(deviceTypeVo);
Map<String, Object> map = new HashMap<String, Object>(16);
@ -81,7 +83,7 @@ public class DeviceTypeController {
* @return
*/
@PostMapping("addDeviceType")
@Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.INSERT, details = "新增设备类型", grade = OperationType.ADD_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备类型管理", operaType = OperaType.INSERT, details = "新增设备类型")
public ReturnCodeEntity addDeviceType(DeviceTypeVo typeVo) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -96,7 +98,7 @@ public class DeviceTypeController {
}
@PostMapping("updateDeviceType")
@Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.UPDATE, details = "修改设备类型", grade = OperationType.UPDATE_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备类型管理", operaType = OperaType.UPDATE, details = "修改设备类型")
public ReturnCodeEntity updateDeviceType(DeviceTypeVo typeVo) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -117,7 +119,6 @@ public class DeviceTypeController {
* @return
*/
@PostMapping("getDeviceTypeDetail")
@Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.QUERY, details = "查看设备类型", grade = OperationType.QUERY_BUSINESS)
public DeviceTypeVo getDeviceDetail(String params) {
DeviceTypeVo deviceTypeVo = null;
try {
@ -137,7 +138,7 @@ public class DeviceTypeController {
* @return
*/
@PostMapping("deleteType")
@Log(title = "设备类型管理", menu = "设备管理->设备类型管理", businessType = BusinessType.DELETE, details = "删除设备类型", grade = OperationType.DELETE_BUSINESS)
@SysLog(title = "设备分配", model = "设备管理->设备类型管理", operaType = OperaType.DELETE, details = "删除设备类型")
public ReturnCodeEntity deleteType(String params) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {

6
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java
View File

@ -6,7 +6,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.sercurityControl.proteam.domain.WeekRiskData;
import com.sercurityControl.proteam.domain.vo.DutyChildVo;
import com.sercurityControl.proteam.domain.vo.NewDutyVo;
@ -46,6 +48,7 @@ public class DutyChildController {
* @return
*/
@PostMapping(value = "getProList")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "工程数据统计查询")
public Map<String, Object> getProList(DutyChildVo vo) {
if(StringHelper.isNotEmpty(vo.getBuildCode())){
List<String> list= Arrays.asList(vo.getBuildCode().split(",")) ;
@ -69,6 +72,7 @@ public class DutyChildController {
* @return
*/
@PostMapping(value = "getWeekList")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "主计划统计数据查询")
public Map<String, Object> getWeekList(DutyChildVo vo) {
String time= DateTimeHelper.getNowDay();
//本周开始时间
@ -121,6 +125,7 @@ public class DutyChildController {
*/
@GetMapping("/exportWeekExcel")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.EXPORT, details = "导出周计划数据")
public void exportWeekExcel(HttpServletResponse response, DutyChildVo data) {
List<DutyChildVo> list = service.exportWeekList(data);
ExcelUtil<DutyChildVo> util = new ExcelUtil<DutyChildVo>(DutyChildVo.class);
@ -141,6 +146,7 @@ public class DutyChildController {
* @return
*/
@PostMapping(value = "getDayList")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "日计划数据统计查询")
public Map<String, Object> getDayList(DutyChildVo vo) {
if(StringHelper.isNotEmpty(vo.getBuildCode())){
List<String> list= Arrays.asList(vo.getBuildCode().split(",")) ;

21
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java
View File

@ -10,7 +10,9 @@ import com.securityControl.common.core.utils.poi.ExcelUtil;
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.ProClassMettingVo;
@ -65,7 +67,7 @@ public class PreservationController extends BaseController {
private ThreadPoolTaskExecutor testTaskExecutor;
@PostMapping("getProjectPreservation")
@Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.QUERY, grade = OperationType.QUERY_BUSINESS, details = "工程维护列表")
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.QUERY, details = "工程列表数据查询")
public Map<String,Object> getProjectPreservation(PreservationVo preservationVo) {
PageHelper.startPage(preservationVo.getPage(), preservationVo.getLimit());
List<PreservationVo> preservationList = service.getProjectPreservation(preservationVo);
@ -81,7 +83,7 @@ public class PreservationController extends BaseController {
}
@PostMapping("getPreservation")
@Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.QUERY, details = "工程维护查看详情", grade = OperationType.QUERY_BUSINESS)
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.QUERY, details = "工程维护查看详情")
public PreservationVo getDeviceDetail(String keyId) {
PreservationVo preservatioVo = null;
try {
@ -95,7 +97,7 @@ public class PreservationController extends BaseController {
}
@PostMapping("deletePreservation")
@Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.DELETE, details = "删除工程维护", grade = OperationType.DELETE_BUSINESS)
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.DELETE, details = "删除工程维护数据")
public ReturnCodeEntity deletePreservation(String keyId) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -109,7 +111,7 @@ public class PreservationController extends BaseController {
}
@PostMapping("batchDeletePreservation")
@Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.DELETE, details = "批量删除工程维护", grade = OperationType.DELETE_BUSINESS)
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.DELETE, details = "批量删除工程维护")
public ReturnCodeEntity batchDeletePreservation(String keyId) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -128,7 +130,7 @@ public class PreservationController extends BaseController {
}
@PostMapping("deleteAllPreservation")
@Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.DELETE, details = "全部删除工程维护", grade = OperationType.DELETE_BUSINESS)
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.DELETE, details = "全部删除工程维护")
public ReturnCodeEntity deleteAllPreservation(PreservationVo preservationVo) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -142,7 +144,7 @@ public class PreservationController extends BaseController {
}
@PostMapping("insertPreservation")
@Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.INSERT, details = "新增工程维护", grade = OperationType.ADD_BUSINESS)
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.INSERT, details = "新增工程维护")
public ReturnCodeEntity insertPreservation(PreservationVo preservationVo) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -155,7 +157,7 @@ public class PreservationController extends BaseController {
}
@PostMapping("updatePreservation")
@Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.UPDATE, details = "修改工程维护", grade = OperationType.UPDATE_BUSINESS)
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.UPDATE, details = "修改工程维护")
public ReturnCodeEntity updatePreservation(PreservationVo preservationVo) {
ReturnCodeEntity entity = new ReturnCodeEntity();
try {
@ -168,6 +170,7 @@ public class PreservationController extends BaseController {
}
@PostMapping("/importExcel")
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.IMPORT, details = "导入工程数据")
public void importExcel(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
try {
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();
@ -328,7 +331,7 @@ public class PreservationController extends BaseController {
// }
@GetMapping("exportPreservation")
@Log(title = "工程管理", menu = "工程管理->工程维护", businessType = BusinessType.EXPORT, details = "导出工程维护", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "工程管理", model = "工程管理->工程维护", operaType = OperaType.EXPORT, details = "导出工程维护数据")
public void exportPreservation(HttpServletResponse response, PreservationVo preservationVo) {
List<PreservationVo> studentsList = service.getProjectPreservation(preservationVo);
ExcelUtil<PreservationVo> util = new ExcelUtil<PreservationVo>(PreservationVo.class);
@ -337,7 +340,7 @@ public class PreservationController 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;

15
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ProDataController.java
View File

@ -8,7 +8,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.ProClassMettingVo;
@ -45,7 +47,7 @@ public class ProDataController extends BaseController {
* @return 集合
*/
@PostMapping("/getTicketLists")
@Log(title = "工程明细", menu = "工程信息->工程明细", businessType = BusinessType.QUERY, details = "作业票列表")
@SysLog(title = "工程明细", model = "工程信息->工程明细", operaType = OperaType.QUERY, details = "作业票列表查询")
public TableDataInfo getTicketLists(TicketData ticketData) {
startPage();
return getDataTable(service.getTicketLists(ticketData));
@ -58,7 +60,7 @@ public class ProDataController extends BaseController {
* @return 集合
*/
@PostMapping("/getClassLists")
@Log(title = "工程明细", menu = "工程信息->工程明细", businessType = BusinessType.QUERY, details = "站班会列表")
@SysLog(title = "工程明细", model = "工程信息->工程明细", operaType = OperaType.QUERY, details = "站班会列表信息查询")
public TableDataInfo getClassLists(ClassData classData) {
startPage();
return getDataTable(service.getClassLists(classData));
@ -71,14 +73,13 @@ public class ProDataController extends BaseController {
* @return 集合
*/
@PostMapping("/getProList")
@Log(title = "工程明细", menu = "工程信息->工程明细", businessType = BusinessType.QUERY, details = "工程列表")
@SysLog(title = "工程明细", model = "工程信息->工程明细", operaType = OperaType.QUERY, details = "工程列表分页查询")
public TableDataInfo getProList(ProData proData) {
startPage();
return getDataTable(service.getProList(proData));
}
@PostMapping("/getProdDetail")
@Log(title = "工程明细", menu = "工程信息->工程详情", businessType = BusinessType.QUERY, details = "工程详情")
public ProData getProdDetail(ProData proData) {
return service.getProdDetail(proData);
}
@ -90,7 +91,7 @@ public class ProDataController extends BaseController {
* @return 集合
*/
@GetMapping("/exportProData")
@Log(title = "工程明细", menu = "工程信息->工程明细", businessType = BusinessType.EXPORT, details = "工程列表导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "工程明细", model = "工程信息->工程明细", operaType = OperaType.EXPORT, details = "工程列表导出")
public void exportProData(HttpServletResponse response, ProData proData) {
List<ProData> list = service.getProList(proData);
ExcelUtil<ProData> util = new ExcelUtil<ProData>(ProData.class);
@ -144,7 +145,7 @@ public class ProDataController extends BaseController {
* @return
*/
@PostMapping(value = "getProWorkTeam")
@Log(title = "工程管理", menu = "班组记录", businessType = BusinessType.QUERY, details = "班组记录")
@SysLog(title = "工程明细", model = "工程信息->班组记录", operaType = OperaType.QUERY, details = "班组记录列表查询")
public Map<String, Object> getProWorkTeam(ProData proData) {
Map<String, Object> map = new HashMap<String, Object>(16);
try {
@ -173,7 +174,7 @@ public class ProDataController extends BaseController {
* @return
*/
@PostMapping(value = "getClassMettingList")
@Log(title = "工程管理", menu = "站班会记录", businessType = BusinessType.QUERY, details = "站班会记录")
@SysLog(title = "工程管理", model = "工程信息->工程管理", operaType = OperaType.QUERY, details = "站班会记录列表查询")
public Map<String, Object> getClassMettingList(ProClassMettingVo proClassMettingVo) {
Map<String, Object> map = new HashMap<String, Object>(16);
try {

9
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SupervisorController.java
View File

@ -1,6 +1,8 @@
package com.sercurityControl.proteam.controller;
import com.securityControl.common.core.web.domain.AjaxResult;
import com.securityControl.common.log.annotation.SysLog;
import com.securityControl.common.log.enums.OperaType;
import com.sercurityControl.proteam.domain.dto.LoginDto;
import com.sercurityControl.proteam.service.SupervisorService;
import lombok.extern.slf4j.Slf4j;
@ -33,6 +35,7 @@ public class SupervisorController {
* @return map
*/
@PostMapping("getProMaps")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "工程统计查询")
public Map<String, Object> getProMaps(LoginDto loginDto) {
return service.getProMaps(loginDto);
}
@ -45,6 +48,7 @@ public class SupervisorController {
* @return map
*/
@PostMapping("getWeekMaps")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "周计划统计查询")
public Map<String, Object> getWeekMaps(LoginDto loginDto) {
return service.getWeekMaps(loginDto);
}
@ -56,6 +60,7 @@ public class SupervisorController {
* @return map
*/
@PostMapping("getDayPlanMaps")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "日计划统计查询")
public Map<String, Object> getDayPlanMaps(LoginDto loginDto) {
return service.getDayPlanMaps(loginDto);
}
@ -69,6 +74,7 @@ public class SupervisorController {
* @return map
*/
@PostMapping("getDutyTaskMaps")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "值班任务统计查询")
public Map<String, Object> getDutyTaskMaps(LoginDto loginDto) {
return service.getDutyTaskMaps(loginDto);
}
@ -78,6 +84,7 @@ public class SupervisorController {
* 值班进度 统计
*/
@PostMapping("getDutySchedule")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "值班任务统计查询")
public Map<String, Object> getDutySchedule(LoginDto loginDto) {
return service.getDutySchedule(loginDto);
}
@ -87,6 +94,7 @@ public class SupervisorController {
* @return
*/
@PostMapping("getViolationAudit")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "待审核数据查询")
public Map<String, Object> getViolationAudit(LoginDto loginDto) {
return service.getViolationAudit(loginDto);
}
@ -98,6 +106,7 @@ public class SupervisorController {
* @return
*/
@PostMapping("getPeopleMaps")
@SysLog(title = "值长", model = "值长->值长", operaType = OperaType.QUERY, details = "人员统计查询")
public AjaxResult getPeopleMaps(LoginDto loginDto) {
return service.getPeopleMaps(loginDto);
}

28
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/TeamController.java
View File

@ -7,7 +7,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.*;
import com.sercurityControl.proteam.domain.vo.TeamLabelVo;
@ -47,7 +49,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "获取班组详细信息")
@PostMapping("/getTeamList")
@Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.QUERY, details = "获取班组详细信息")
@SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.QUERY, details = "获取班组详细信息")
public TableDataInfo getTeamList(TeamData teamData) {
try {
startPage();
@ -66,7 +68,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "获取班组详细信息导出")
@PostMapping("/exportData")
@Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.EXPORT, details = "获取班组详细信息导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.QUERY, details = "导出班组详情信息")
public TableDataInfo exportData(TeamData teamData) {
startPage();
try {
@ -84,7 +86,7 @@ public class TeamController extends BaseController {
* @return 班组评价集合
*/
@ApiOperation(value = "获取班组详细信息")
@Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.QUERY, details = "班组评价信息")
@SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.QUERY, details = "获取班组详细信息")
@PostMapping("/getTeamEvaList")
public TableDataInfo getTeamEvaList(TeamEvaData teamEvaData) {
startPage();
@ -103,7 +105,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "获取班组黑名单信息")
@PostMapping("/getTeamBlackList")
@Log(title = "班组明细", menu = "班组信息->班组黑名单", businessType = BusinessType.QUERY, details = "班组黑名单")
@SysLog(title = "班组明细", model = "班组信息->班组黑名单", operaType = OperaType.QUERY, details = "班组黑名单列表信息查询")
public TableDataInfo getTeamBlackList(TeamBlackData teamBlackData) {
startPage();
try {
@ -122,7 +124,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "获取班组人员信息")
@PostMapping("/getTeamPeople")
@Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.QUERY, details = "班组人员信息")
@SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.QUERY, details = "获取班组人员信息")
public TableDataInfo getTeamPeople(PeopleEntity entity) {
startPage();
try {
@ -141,7 +143,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "获取站班会信息")
@PostMapping("/getClassList")
@Log(title = "班组明细", menu = "班组信息->站班会记录", businessType = BusinessType.QUERY, details = "站班会信息")
@SysLog(title = "班组明细", model = "班组信息->站班会记录", operaType = OperaType.QUERY, details = "站班会信息列表查询")
public TableDataInfo getClassList(ClassData classData) {
startPage();
try {
@ -161,7 +163,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "新增班组评价信息")
@PostMapping("/insertTeamEva")
@Log(title = "班组明细", menu = "班组信息->站班会记录", businessType = BusinessType.QUERY, details = "站班会信息")
@SysLog(title = "班组评价", model = "班组评价->班组评价", operaType = OperaType.INSERT, details = "新增班组评价信息")
public AjaxResult insertTeamEva(TeamEvaData teamEvaData) {
return service.insertTeamEva(teamEvaData);
}
@ -174,7 +176,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "新增班组拉黑信息")
@PostMapping("/insertTeamBlack")
@Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.INSERT, details = "新增班组拉黑信息", grade = OperationType.ADD_BUSINESS)
@SysLog(title = "班组明细", model = "班组信息->班组信息", operaType = OperaType.INSERT, details = "新增班组拉黑信息")
public AjaxResult insertTeamBlack(TeamEvaData teamEvaData) {
return service.insertTeamBlack(teamEvaData);
}
@ -188,7 +190,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "移出班组拉黑")
@PostMapping("/deleteTeamBlack")
@Log(title = "班组明细", menu = "班组信息->班组黑名单", businessType = BusinessType.UPDATE, details = "移出班组拉黑", grade = OperationType.UPDATE_BUSINESS)
@SysLog(title = "班组评价", model = "班组评价->班组黑名单", operaType = OperaType.DELETE, details = "移出班组拉黑")
public AjaxResult deleteTeamBlack(TeamEvaData teamEvaData) {
return service.deleteTeamBlack(teamEvaData);
}
@ -222,7 +224,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "班组明细信息导出")
@GetMapping("exportTeamData")
@Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.EXPORT, details = "获取班组详细信息导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.EXPORT, details = "获取班组详细信息导出")
public void exportTeamData(HttpServletResponse response, TeamData teamData) {
List<TeamData> list = service.getTeamList2(teamData);
ExcelUtil<TeamData> util = new ExcelUtil<TeamData>(TeamData.class);
@ -236,7 +238,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "班组评价信息导出")
@GetMapping("exportTeamEvaData")
@Log(title = "班组明细", menu = "班组信息->班组明细", businessType = BusinessType.EXPORT, details = "班组评价信息导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "班组明细", model = "班组信息->班组明细", operaType = OperaType.EXPORT, details = "班组评价信息导出")
public void exportTeamEvaData(HttpServletResponse response, TeamEvaData teamEvaData) {
List<TeamEvaData> list = service.getTeamEvaList(teamEvaData);
for (TeamEvaData item : list) {
@ -253,7 +255,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "班组拉黑信息导出")
@GetMapping("exportTeamBlackData")
@Log(title = "班组明细", menu = "班组信息->班组黑名单", businessType = BusinessType.EXPORT, details = "班组拉黑信息导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "班组明细", model = "班组信息->班组黑名单", operaType = OperaType.EXPORT, details = "班组拉黑信息导出")
public void exportTeamBlackData(HttpServletResponse response, TeamBlackData teamBlackData) {
List<TeamBlackData> list = service.getTeamBlackList(teamBlackData);
for (TeamBlackData item : list) {
@ -270,7 +272,7 @@ public class TeamController extends BaseController {
*/
@ApiOperation(value = "班组拉黑信息导出")
@GetMapping("exportClassData")
@Log(title = "班组明细", menu = "班组信息->站班会记录", businessType = BusinessType.EXPORT, details = "站班会记录信息导出", grade = OperationType.EXPORT_BUSINESS)
@SysLog(title = "班组明细", model = "班组信息->站班会记录", operaType = OperaType.EXPORT, details = "站班会记录信息导出")
public void exportClassData(HttpServletResponse response, ClassData classData) {
List<ClassData> list = service.getClassList(classData);
for (ClassData item : list) {