台账管理开发

business-service/src/main/java/com/ozs/service/service/BaseAccountManagementService.java

@@ -19,9 +19,10 @@ public interface BaseAccountManagementService extends IService<BaseAccountManage
      * 关联用户
      * @param accountManagementId
      * @param roleId
+     * @param userName
      * @return
      */
-    AjaxResult associatedUser(Long accountManagementId, Long roleId);
+    AjaxResult associatedUser(Long accountManagementId, Long roleId,String userName);
 
     /**
      * 关联用户回显

business-service/src/main/java/com/ozs/service/service/impl/BaseAccountManagementServiceImpl.java

@@ -36,7 +36,7 @@ public class BaseAccountManagementServiceImpl extends ServiceImpl<BaseAccountMan
     BaseAccountManagementMapper baseAccountManagementMapper;
 
     @Override
-    public AjaxResult associatedUser(Long accountManagementId, Long roleId) {
+    public AjaxResult associatedUser(Long accountManagementId, Long roleId,String userName) {
         BaseCameraRelation baseCameraRelation;
         int insert = 0;
         int update = 0;
@@ -47,9 +47,11 @@ public class BaseAccountManagementServiceImpl extends ServiceImpl<BaseAccountMan
         baseCameraRelation = baseCameraRelationMapper.selectOne(lw);
         if (!ObjectUtils.isEmpty(baseCameraRelation)) {
             baseCameraRelation.setRelationId(roleId);
+            baseCameraRelation.setUpdateBy(userName);
             update = baseCameraRelationMapper.updateById(baseCameraRelation);
         } else {
             baseCameraRelation = new BaseCameraRelation();
+            baseCameraRelation.setCreateBy(userName);
             baseCameraRelation.setRelationId(roleId);
             baseCameraRelation.setAccountManagementId(accountManagementId);
             baseCameraRelation.setRelationType(1);

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseAccountManagementController.java

@@ -4,7 +4,9 @@ package com.ozs.web.controller.accountmanagment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.BaseEntity;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.service.entity.BaseAccountManagement;
@@ -36,7 +38,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/service/baseAccountManagement")
-public class BaseAccountManagementController {
+public class BaseAccountManagementController extends BaseController {
     @Resource
     BaseAccountManagementService baseAccountManagementService;
 
@@ -93,6 +95,7 @@ public class BaseAccountManagementController {
     @PostMapping("/saveAccountManagement")
     @ApiOperation("新增相机信息")
     public AjaxResult saveDistributionModule(@RequestBody BaseAccountManagement baseAccountManagement) {
+        baseAccountManagement.setCreateBy(getUsername());
         if (baseAccountManagementService.save(baseAccountManagement)) {
             return AjaxResult.success();
         }
@@ -108,6 +111,7 @@ public class BaseAccountManagementController {
     @PutMapping("/editAccountManagement")
     @ApiOperation("修改相机信息")
     public AjaxResult editAccountManagement(@RequestBody BaseAccountManagement baseAccountManagement) {
+        baseAccountManagement.setUpdateBy(getUsername());
         if (baseAccountManagementService.updateById(baseAccountManagement)) {
             return AjaxResult.success();
         }
@@ -129,7 +133,7 @@ public class BaseAccountManagementController {
      */
     @GetMapping("/associatedUser/{accountManagementId}/{roleId}")
     public AjaxResult associatedUser(@PathVariable Long accountManagementId, @PathVariable Long roleId) {
-        return baseAccountManagementService.associatedUser(accountManagementId, roleId);
+        return baseAccountManagementService.associatedUser(accountManagementId, roleId,getUsername());
     }
 
     /**

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseLineManagementController.java

@@ -4,6 +4,7 @@ package com.ozs.web.controller.accountmanagment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
@@ -38,7 +39,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/service/baseLineManagement")
-public class BaseLineManagementController {
+public class BaseLineManagementController extends BaseController {
     @Resource
     BaseLineManagementService baseLineManagementService;
 
@@ -86,6 +87,7 @@ public class BaseLineManagementController {
     @PostMapping("/saveLineManagement")
     @ApiOperation("新增线路台账信息")
     public AjaxResult saveLineManagement(@RequestBody BaseLineManagement baseLineManagement) {
+        baseLineManagement.setCreateBy(getUsername());
         if (baseLineManagementService.save(baseLineManagement)) {
             return AjaxResult.success();
         }
@@ -101,6 +103,7 @@ public class BaseLineManagementController {
     @PutMapping("/editLineManagement")
     @ApiOperation("修改线路台账信息")
     public AjaxResult editLineManagement(@RequestBody BaseLineManagement baseLineManagement) {
+        baseLineManagement.setUpdateBy(getUsername());
         if (baseLineManagementService.updateById(baseLineManagement)) {
             return AjaxResult.success();
         }