Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -9,6 +9,7 @@ import com.zcxk.rmcp.api.dto.device.DeviceQueryDto;
 import com.zcxk.rmcp.api.dto.device.ValveDto;
 import com.zcxk.rmcp.api.vo.*;
 import com.zcxk.rmcp.core.mongo.DeviceDataItem;
+import com.zcxk.rmcp.web.logAdvice.LogAnnotation;
 import com.zcxk.rmcp.web.service.DeviceDataService;
 import com.zcxk.rmcp.web.service.DeviceService;
 import io.swagger.annotations.Api;
@@ -54,6 +55,7 @@ public class DeviceController {
     @ResponseBody
     @GetMapping("/getDeviceListExcel")
     @ApiOperation(value = "导出设备列表excel")
+    @LogAnnotation(module = "【档案管理】导出")
     public void getDeviceListExcel(
             @Valid DeviceQueryDto dto,
             HttpServletResponse httpServletResponse
@@ -75,6 +77,7 @@ public class DeviceController {
 
 
     @PostMapping("add")
+    @LogAnnotation(module = "【档案管理】添加")
     @ApiOperation(value = "添加设备")
     public AjaxMessage<Void> add(
             @ApiParam(value = "设备", required = true) @RequestBody(required = true) @Valid DeviceInputDto device
@@ -85,6 +88,7 @@ public class DeviceController {
 
 
     @ResponseBody
+    @LogAnnotation(module = "【档案管理】编辑")
     @PostMapping("edit")
     @ApiOperation(value = "编辑设备")
     public AjaxMessage<Void> edit(
@@ -95,6 +99,7 @@ public class DeviceController {
     }
 
     @ResponseBody
+    @LogAnnotation(module = "【档案管理】删除")
     @PostMapping("batchDelete")
     @ApiOperation(value = "批量删除")
     public AjaxMessage<Void> batchDelete(
@@ -105,6 +110,7 @@ public class DeviceController {
     }
 
     @ResponseBody
+    @LogAnnotation(module = "【档案管理】全部删除")
     @PostMapping("allDelete")
     @ApiOperation(value = "全部删除")
     public AjaxMessage<Void> allDelete(
@@ -116,6 +122,7 @@ public class DeviceController {
 
     @GetMapping("/downTemplate")
     @ApiOperation(value = "下载Execl模板", notes = "下载Execl模板")
+    @LogAnnotation(module = "【档案管理】下载模板")
     public void downTemplate(
             @ApiParam(value = "分类id", required = true) @RequestParam(required = true) Integer categoryId,
             @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String access_token,

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/ImportController.java

@@ -1,6 +1,11 @@
 package com.zcxk.rmcp.web.controller;
 
 import com.zcxk.core.common.pojo.AjaxMessage;
+import com.zcxk.core.oauth2.pojo.LoginUser;
+import com.zcxk.core.oauth2.util.UserUtil;
+import com.zcxk.rmcp.web.logAdvice.LogAnnotation;
+import com.zcxk.rmcp.web.logAdvice.OperateLogEntity;
+import com.zcxk.rmcp.web.logAdvice.UserCenterClient;
 import com.zcxk.rmcp.web.service.ImportFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,12 +17,15 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 
 @Controller
 @ResponseBody
 @RequestMapping("import")
 @Api(tags = "导入模块")
 public class ImportController {
+    @Autowired
+    private UserCenterClient userCenterClient;
 
     @Autowired
     private ImportFileService importFileService;
@@ -31,6 +39,7 @@ public class ImportController {
             @ApiParam(value = "文件") @RequestParam MultipartFile file,
             HttpServletRequest request, HttpServletResponse response
     ) {
+        sendOperateLog(importType);
         importFileService.importExcel(categoryId, importType, file);
         return AjaxMessage.success();
     }
@@ -44,4 +53,18 @@ public class ImportController {
     ) {
         importFileService.downloadFailFile(objId,response);
     }
+    public void sendOperateLog(Integer importType){
+        if(importType == 1){
+            LoginUser user = UserUtil.getCurrentUser();
+            OperateLogEntity operateLog = new OperateLogEntity();
+            operateLog.setUserName(user.getUsername());
+            operateLog.setPhone(user.getPhoneNumber());
+            operateLog.setTenantId(user.getTenantId());
+            operateLog.setCompanyId(user.getCompanyId());
+            operateLog.setDepartmentId(user.getDepartmentId());
+            operateLog.setOperateContent("【档案管理】批量添加");
+            operateLog.setCreateTime(new Date());
+            userCenterClient.insert(operateLog);
+        }
+    }
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/MeterReadRecordController.java

@@ -14,6 +14,7 @@ import com.zcxk.rmcp.api.vo.MeterReadRecordExcelVo;
 import com.zcxk.rmcp.api.vo.MeterReadRecordVo;
 import com.zcxk.rmcp.api.vo.ReadRateVo;
 import com.zcxk.rmcp.core.mongo.MeterReadRecord;
+import com.zcxk.rmcp.web.logAdvice.LogAnnotation;
 import com.zcxk.rmcp.web.service.MeterReadRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -54,6 +55,7 @@ public class MeterReadRecordController extends BaseController {
 
     @RequestMapping(value = "/update/reading", method = RequestMethod.POST)
     @ApiOperation(value = "更新读数")
+    @LogAnnotation(module = "【抄表记录】更新读数")
     public AjaxMessage<Long> updateReadData(@RequestBody @Valid MeterReadRecordUpdateDto readRecord) {
         return AjaxMessage.success(meterReadRecordService.updateReadData(readRecord));
     }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/MeterReplaceController.java

@@ -9,6 +9,7 @@ import com.zcxk.rmcp.api.dto.meterreplace.WaterMeterReplaceInputDto;
 import com.zcxk.rmcp.api.enums.RmcpErrorEnum;
 import com.zcxk.rmcp.api.vo.DeviceCommandVo;
 import com.zcxk.rmcp.api.vo.MeterReplaceVo;
+import com.zcxk.rmcp.web.logAdvice.LogAnnotation;
 import com.zcxk.rmcp.web.service.MeterReplaceLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -63,6 +64,7 @@ public class MeterReplaceController  extends BaseController {
 
     @RequestMapping(value = "/submit", method = RequestMethod.POST)
     @ApiOperation(value = "换表")
+    @LogAnnotation(module = "【换表管理】换表操作")
     public AjaxMessage submitWaterMeterReplace(@RequestBody @Valid WaterMeterReplaceInputDto waterMeterReplaceInputDto) {
         meterReplaceLogService.submitWaterMeterReplace(waterMeterReplaceInputDto);
         return AjaxMessage.success();