Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 98c87341 by huangjy
Options

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

parents cf637827 e468221f
Inline Side-by-side
Showing with 127 additions and 33 deletions
saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java
...@@ -10,6 +10,7 @@ import com.makeit.dto.saas.device.PlatDeviceEditSaasDTO; ...@@ -10,6 +10,7 @@ import com.makeit.dto.saas.device.PlatDeviceEditSaasDTO;
import com.makeit.entity.platform.device.PlatDevice; import com.makeit.entity.platform.device.PlatDevice;
import com.makeit.global.aspect.tenant.TenantIdIgnore; import com.makeit.global.aspect.tenant.TenantIdIgnore;
import com.makeit.service.platform.device.PlatDeviceService; import com.makeit.service.platform.device.PlatDeviceService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -24,11 +25,14 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -24,11 +25,14 @@ import org.springframework.web.bind.annotation.RestController;
public class SaasDeviceController { public class SaasDeviceController {
@Autowired @Autowired
private PlatDeviceService platDeviceService; private PlatDeviceService platDeviceService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@ApiOperation("列表") @ApiOperation("列表")
@PostMapping("page") @PostMapping("page")
@TenantIdIgnore @TenantIdIgnore
public ApiResponseEntity<PageVO<PlatDevice>> page(@RequestBody PageReqDTO<PlatDevice> pageReqDTO) { public ApiResponseEntity<PageVO<PlatDevice>> page(@RequestBody PageReqDTO<PlatDevice> pageReqDTO) {
return ApiResponseUtils.success(platDeviceService.pageSaas(pageReqDTO)); return ApiResponseUtils.success(platDeviceService.pageSaas(pageReqDTO));
} }
...@@ -36,6 +40,7 @@ public class SaasDeviceController { ...@@ -36,6 +40,7 @@ public class SaasDeviceController {
@PostMapping("detail") @PostMapping("detail")
@TenantIdIgnore @TenantIdIgnore
public ApiResponseEntity<PlatDeviceDetailDTO> detail(@RequestBody BaseIdDTO baseIdDTO) { public ApiResponseEntity<PlatDeviceDetailDTO> detail(@RequestBody BaseIdDTO baseIdDTO) {
saasOperationLogService.add("saas端-租户设备管理-设备信息", null);
return ApiResponseUtils.success(platDeviceService.getDetailDTO(baseIdDTO.getId())); return ApiResponseUtils.success(platDeviceService.getDetailDTO(baseIdDTO.getId()));
} }
...@@ -44,6 +49,8 @@ public class SaasDeviceController { ...@@ -44,6 +49,8 @@ public class SaasDeviceController {
@TenantIdIgnore @TenantIdIgnore
public ApiResponseEntity<Void> edit(@RequestBody PlatDeviceEditSaasDTO dto) { public ApiResponseEntity<Void> edit(@RequestBody PlatDeviceEditSaasDTO dto) {
platDeviceService.saasEdit(dto); platDeviceService.saasEdit(dto);
saasOperationLogService.add("saas端-租户设备管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/PlatTenantController.java
...@@ -7,12 +7,14 @@ import com.makeit.common.page.PageVO; ...@@ -7,12 +7,14 @@ import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.entity.saas.PlatTenant; import com.makeit.entity.saas.PlatTenant;
import com.makeit.enums.CommonEnum;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.plat.PlatTenantDTOVO; import com.makeit.module.admin.dto.plat.PlatTenantDTOVO;
import com.makeit.module.admin.dto.plat.PlatTenantMenuDTO; import com.makeit.module.admin.dto.plat.PlatTenantMenuDTO;
import com.makeit.module.admin.dto.plat.PlatTenantStatusDTO; import com.makeit.module.admin.dto.plat.PlatTenantStatusDTO;
import com.makeit.module.admin.vo.plat.PlatTenantVO; import com.makeit.module.admin.vo.plat.PlatTenantVO;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -39,6 +41,8 @@ public class PlatTenantController { ...@@ -39,6 +41,8 @@ public class PlatTenantController {
@Autowired @Autowired
private PlatTenantService platTenantService; private PlatTenantService platTenantService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "租户管理-租户", name = "分页列表", code = "saas:tenant:page") @Action(module = "租户管理-租户", name = "分页列表", code = "saas:tenant:page")
@ApiOperation("分页列表") @ApiOperation("分页列表")
...@@ -76,8 +80,11 @@ public class PlatTenantController { ...@@ -76,8 +80,11 @@ public class PlatTenantController {
@Action(module = "租户管理-租户", name = "新增", code = "saas:tenant:add") @Action(module = "租户管理-租户", name = "新增", code = "saas:tenant:add")
@ApiOperation("新增") @ApiOperation("新增")
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody PlatTenantDTOVO dto){ ; public ApiResponseEntity<String> add(@Validated @RequestBody PlatTenantDTOVO dto){
return ApiResponseUtils.success(platTenantService.add(dto)); String add = platTenantService.add(dto);
saasOperationLogService.add("saas端-租户管理-新增", add);
return ApiResponseUtils.success(add);
} }
@Action(module = "租户管理-租户", name = "编辑", code = "saas:tenant:edit") @Action(module = "租户管理-租户", name = "编辑", code = "saas:tenant:edit")
...@@ -85,6 +92,8 @@ public class PlatTenantController { ...@@ -85,6 +92,8 @@ public class PlatTenantController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody PlatTenantDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody PlatTenantDTOVO dto){
platTenantService.edit(dto); platTenantService.edit(dto);
saasOperationLogService.add("saas端-租户管理-编辑", dto.getId());
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -92,6 +101,8 @@ public class PlatTenantController { ...@@ -92,6 +101,8 @@ public class PlatTenantController {
@ApiOperation("详情") @ApiOperation("详情")
@PostMapping("view") @PostMapping("view")
public ApiResponseEntity<PlatTenantDTOVO> view(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<PlatTenantDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-租户管理-详情", dto.getId());
return ApiResponseUtils.success(platTenantService.view(dto.getId())); return ApiResponseUtils.success(platTenantService.view(dto.getId()));
} }
...@@ -106,6 +117,8 @@ public class PlatTenantController { ...@@ -106,6 +117,8 @@ public class PlatTenantController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
platTenantService.del(dto.getId()); platTenantService.del(dto.getId());
saasOperationLogService.add("saas端-租户管理-删除", dto.getId());
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -114,6 +127,11 @@ public class PlatTenantController { ...@@ -114,6 +127,11 @@ public class PlatTenantController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<?> changeStatus(@RequestBody PlatTenantStatusDTO dto){ public ApiResponseEntity<?> changeStatus(@RequestBody PlatTenantStatusDTO dto){
platTenantService.changeStatus(dto); platTenantService.changeStatus(dto);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-租户管理-启用", dto.getId());
} else {
saasOperationLogService.add("saas端-租户管理-禁用", dto.getId());
}
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -123,6 +141,8 @@ public class PlatTenantController { ...@@ -123,6 +141,8 @@ public class PlatTenantController {
@Deprecated @Deprecated
public ApiResponseEntity<?> assignMenuList(@RequestBody PlatTenantMenuDTO tntTenantMenuDTO){ public ApiResponseEntity<?> assignMenuList(@RequestBody PlatTenantMenuDTO tntTenantMenuDTO){
platTenantService.assignMenuList(tntTenantMenuDTO); platTenantService.assignMenuList(tntTenantMenuDTO);
saasOperationLogService.add("saas端-租户管理-分配菜单", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasLoginController.java
...@@ -3,8 +3,10 @@ package com.makeit.controller.saas; ...@@ -3,8 +3,10 @@ package com.makeit.controller.saas;
import com.makeit.common.dto.LoginDTO; import com.makeit.common.dto.LoginDTO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.service.saas.SaasUserService;
import com.makeit.module.admin.vo.saas.SaasUserLoginVO; import com.makeit.module.admin.vo.saas.SaasUserLoginVO;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasUserService;
import com.makeit.utils.request.RequestUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,17 +22,23 @@ public class SaasLoginController { ...@@ -20,17 +22,23 @@ public class SaasLoginController {
@Autowired @Autowired
private SaasUserService saasUserService; private SaasUserService saasUserService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@ApiOperation("登录") @ApiOperation("登录")
@PostMapping("login") @PostMapping("login")
public ApiResponseEntity<SaasUserLoginVO> login(@RequestBody LoginDTO loginDTO) { public ApiResponseEntity<SaasUserLoginVO> login(@RequestBody LoginDTO loginDTO) {
return ApiResponseUtils.success(saasUserService.login(loginDTO)); SaasUserLoginVO login = saasUserService.login(loginDTO);
RequestUtil.setHeader("token",login.getToken());
saasOperationLogService.add("saas端-用户-登录", null);
return ApiResponseUtils.success(login);
} }
@ApiOperation("退出登录") @ApiOperation("退出登录")
@PostMapping("logout") @PostMapping("logout")
public ApiResponseEntity<?> logout() { public ApiResponseEntity<?> logout() {
saasUserService.logout(); saasUserService.logout();
saasOperationLogService.add("saas端-用户-退出", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
} }
saas-module/src/main/java/com/makeit/controller/saas/SaasMenuController.java
...@@ -5,10 +5,12 @@ import com.makeit.common.dto.BaseIdDTO; ...@@ -5,10 +5,12 @@ import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.dto.StatusDTO; import com.makeit.common.dto.StatusDTO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.enums.CommonEnum;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.saas.SaasMenuDTOVO; import com.makeit.module.admin.dto.saas.SaasMenuDTOVO;
import com.makeit.module.admin.dto.saas.SaasMenuQueryDTO; import com.makeit.module.admin.dto.saas.SaasMenuQueryDTO;
import com.makeit.service.saas.SaasMenuService; import com.makeit.service.saas.SaasMenuService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -35,6 +37,8 @@ public class SaasMenuController { ...@@ -35,6 +37,8 @@ public class SaasMenuController {
@Autowired @Autowired
private SaasMenuService saasMenuService; private SaasMenuService saasMenuService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-菜单", name = "列表", code = "saas:menu:list") @Action(module = "saas端-菜单", name = "列表", code = "saas:menu:list")
@ApiOperation("列表") @ApiOperation("列表")
...@@ -67,6 +71,8 @@ public class SaasMenuController { ...@@ -67,6 +71,8 @@ public class SaasMenuController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody SaasMenuDTOVO dto) { public ApiResponseEntity<String> add(@Validated @RequestBody SaasMenuDTOVO dto) {
String id = saasMenuService.add(dto); String id = saasMenuService.add(dto);
saasOperationLogService.add("saas端-菜单-新增", null);
return ApiResponseUtils.success(id); return ApiResponseUtils.success(id);
} }
...@@ -75,6 +81,8 @@ public class SaasMenuController { ...@@ -75,6 +81,8 @@ public class SaasMenuController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody SaasMenuDTOVO dto) { public ApiResponseEntity<?> edit(@Validated @RequestBody SaasMenuDTOVO dto) {
saasMenuService.edit(dto); saasMenuService.edit(dto);
saasOperationLogService.add("saas端-菜单-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -90,6 +98,8 @@ public class SaasMenuController { ...@@ -90,6 +98,8 @@ public class SaasMenuController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto) { public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto) {
saasMenuService.del(dto.getId()); saasMenuService.del(dto.getId());
saasOperationLogService.add("saas端-菜单-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -98,6 +108,11 @@ public class SaasMenuController { ...@@ -98,6 +108,11 @@ public class SaasMenuController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<Void> changeStatus(@RequestBody StatusDTO dto) { public ApiResponseEntity<Void> changeStatus(@RequestBody StatusDTO dto) {
saasMenuService.changeStatus(dto); saasMenuService.changeStatus(dto);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-菜单-启用", null);
} else {
saasOperationLogService.add("saas端-菜单-禁用", null);
}
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasPlatMenuController.java
...@@ -9,6 +9,7 @@ import com.makeit.global.annotation.Action; ...@@ -9,6 +9,7 @@ import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.plat.PlatMenuDTOVO; import com.makeit.module.admin.dto.plat.PlatMenuDTOVO;
import com.makeit.module.admin.dto.plat.PlatMenuQueryDTO; import com.makeit.module.admin.dto.plat.PlatMenuQueryDTO;
import com.makeit.service.saas.PlatMenuService; import com.makeit.service.saas.PlatMenuService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -35,6 +36,8 @@ public class SaasPlatMenuController { ...@@ -35,6 +36,8 @@ public class SaasPlatMenuController {
@Autowired @Autowired
private PlatMenuService platMenuService; private PlatMenuService platMenuService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-租户资源管理(菜单)", name = "列表", code = "saas:plat:menu:list") @Action(module = "saas端-租户资源管理(菜单)", name = "列表", code = "saas:plat:menu:list")
@ApiOperation("列表") @ApiOperation("列表")
...@@ -67,6 +70,8 @@ public class SaasPlatMenuController { ...@@ -67,6 +70,8 @@ public class SaasPlatMenuController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody PlatMenuDTOVO dto){ public ApiResponseEntity<String> add(@Validated @RequestBody PlatMenuDTOVO dto){
String add = platMenuService.add(dto); String add = platMenuService.add(dto);
saasOperationLogService.add("saas端-租户资源管理-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -75,6 +80,8 @@ public class SaasPlatMenuController { ...@@ -75,6 +80,8 @@ public class SaasPlatMenuController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody PlatMenuDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody PlatMenuDTOVO dto){
platMenuService.edit(dto); platMenuService.edit(dto);
saasOperationLogService.add("saas端-租户资源管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -90,6 +97,8 @@ public class SaasPlatMenuController { ...@@ -90,6 +97,8 @@ public class SaasPlatMenuController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
platMenuService.del(dto.getId()); platMenuService.del(dto.getId());
saasOperationLogService.add("saas端-租户资源管理-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasPlatUserController.java
...@@ -7,10 +7,12 @@ import com.makeit.common.page.PageReqDTO; ...@@ -7,10 +7,12 @@ import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.enums.CommonEnum;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.plat.PlatUserDTOVO; import com.makeit.module.admin.dto.plat.PlatUserDTOVO;
import com.makeit.module.admin.dto.plat.PlatUserQueryDTO; import com.makeit.module.admin.dto.plat.PlatUserQueryDTO;
import com.makeit.service.platform.auth.PlatUserService; import com.makeit.service.platform.auth.PlatUserService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -37,6 +39,8 @@ public class SaasPlatUserController { ...@@ -37,6 +39,8 @@ public class SaasPlatUserController {
@Autowired @Autowired
private PlatUserService platUserService; private PlatUserService platUserService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-租户账号", name = "分页列表", code = "saas.plat.user.pageTenant") @Action(module = "saas端-租户账号", name = "分页列表", code = "saas.plat.user.pageTenant")
//@PlatOperationLogger //@PlatOperationLogger
...@@ -70,6 +74,8 @@ public class SaasPlatUserController { ...@@ -70,6 +74,8 @@ public class SaasPlatUserController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody PlatUserDTOVO dto){ public ApiResponseEntity<String> add(@Validated @RequestBody PlatUserDTOVO dto){
String add = platUserService.add(dto); String add = platUserService.add(dto);
saasOperationLogService.add("saas端-租户账号管理-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -78,6 +84,8 @@ public class SaasPlatUserController { ...@@ -78,6 +84,8 @@ public class SaasPlatUserController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody PlatUserDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody PlatUserDTOVO dto){
platUserService.edit(dto); platUserService.edit(dto);
saasOperationLogService.add("saas端-租户账号管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -87,6 +95,8 @@ public class SaasPlatUserController { ...@@ -87,6 +95,8 @@ public class SaasPlatUserController {
@PostMapping("changePasword") @PostMapping("changePasword")
public ApiResponseEntity<?> changePassword(@RequestBody PlatUserDTOVO dto){ public ApiResponseEntity<?> changePassword(@RequestBody PlatUserDTOVO dto){
platUserService.changePassword(dto); platUserService.changePassword(dto);
saasOperationLogService.add("saas端-租户账号管理-修改密码", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -94,6 +104,8 @@ public class SaasPlatUserController { ...@@ -94,6 +104,8 @@ public class SaasPlatUserController {
@ApiOperation("详情") @ApiOperation("详情")
@PostMapping("view") @PostMapping("view")
public ApiResponseEntity<PlatUserDTOVO> view(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<PlatUserDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-租户账号管理-详情", null);
return ApiResponseUtils.success(platUserService.view(dto.getId())); return ApiResponseUtils.success(platUserService.view(dto.getId()));
} }
...@@ -102,6 +114,8 @@ public class SaasPlatUserController { ...@@ -102,6 +114,8 @@ public class SaasPlatUserController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
platUserService.del(dto.getId()); platUserService.del(dto.getId());
saasOperationLogService.add("saas端-租户账号管理-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -110,6 +124,11 @@ public class SaasPlatUserController { ...@@ -110,6 +124,11 @@ public class SaasPlatUserController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){ public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){
platUserService.changeStatus(dto); platUserService.changeStatus(dto);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-租户账号管理-启用", dto.getId());
} else {
saasOperationLogService.add("saas端-租户账号管理-禁用", dto.getId());
}
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasPrivacyConfigController.java
...@@ -4,6 +4,7 @@ import com.makeit.common.response.ApiResponseEntity; ...@@ -4,6 +4,7 @@ import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.saas.SaasPrivacyConfigDTO; import com.makeit.dto.saas.SaasPrivacyConfigDTO;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasPrivacyConfigService; import com.makeit.service.saas.SaasPrivacyConfigService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -28,6 +29,8 @@ public class SaasPrivacyConfigController { ...@@ -28,6 +29,8 @@ public class SaasPrivacyConfigController {
@Autowired @Autowired
private SaasPrivacyConfigService saasPrivacyConfigService; private SaasPrivacyConfigService saasPrivacyConfigService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-隐私政策-关于我们", name = "新增", code = "saas.sys.privacyConfig.add") @Action(module = "saas端-隐私政策-关于我们", name = "新增", code = "saas.sys.privacyConfig.add")
//@PlatOperationLogger //@PlatOperationLogger
...@@ -35,6 +38,7 @@ public class SaasPrivacyConfigController { ...@@ -35,6 +38,7 @@ public class SaasPrivacyConfigController {
@PostMapping("/add") @PostMapping("/add")
public ApiResponseEntity<String> add(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){ public ApiResponseEntity<String> add(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
String add = saasPrivacyConfigService.add(saasPrivacyConfigDTO); String add = saasPrivacyConfigService.add(saasPrivacyConfigDTO);
saasOperationLogService.add("saas端-隐私政策-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -42,6 +46,7 @@ public class SaasPrivacyConfigController { ...@@ -42,6 +46,7 @@ public class SaasPrivacyConfigController {
@ApiOperation(value = "获取隐私政策-关于我们", notes = "") @ApiOperation(value = "获取隐私政策-关于我们", notes = "")
@PostMapping("/view") @PostMapping("/view")
public ApiResponseEntity<SaasPrivacyConfigDTO> view(@RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){ public ApiResponseEntity<SaasPrivacyConfigDTO> view(@RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
saasOperationLogService.add("saas端-隐私政策-详情", null);
return ApiResponseUtils.success(saasPrivacyConfigService.view(saasPrivacyConfigDTO.getCategory())); return ApiResponseUtils.success(saasPrivacyConfigService.view(saasPrivacyConfigDTO.getCategory()));
} }
...@@ -51,6 +56,8 @@ public class SaasPrivacyConfigController { ...@@ -51,6 +56,8 @@ public class SaasPrivacyConfigController {
@PostMapping("/addAbout") @PostMapping("/addAbout")
public ApiResponseEntity<?> addAbout(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){ public ApiResponseEntity<?> addAbout(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
saasPrivacyConfigService.add(saasPrivacyConfigDTO); saasPrivacyConfigService.add(saasPrivacyConfigDTO);
saasOperationLogService.add("saas端-关于我们-新增", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -58,6 +65,8 @@ public class SaasPrivacyConfigController { ...@@ -58,6 +65,8 @@ public class SaasPrivacyConfigController {
@ApiOperation(value = "获取关于我们", notes = "") @ApiOperation(value = "获取关于我们", notes = "")
@PostMapping("/viewAbout") @PostMapping("/viewAbout")
public ApiResponseEntity<SaasPrivacyConfigDTO> viewAbout(@RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){ public ApiResponseEntity<SaasPrivacyConfigDTO> viewAbout(@RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
saasOperationLogService.add("saas端-关于我们-详情", null);
return ApiResponseUtils.success(saasPrivacyConfigService.view(saasPrivacyConfigDTO.getCategory())); return ApiResponseUtils.success(saasPrivacyConfigService.view(saasPrivacyConfigDTO.getCategory()));
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasRoleController.java
...@@ -7,10 +7,12 @@ import com.makeit.common.page.PageReqDTO; ...@@ -7,10 +7,12 @@ import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.enums.CommonEnum;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.saas.SaasRoleDTOVO; import com.makeit.module.admin.dto.saas.SaasRoleDTOVO;
import com.makeit.module.admin.dto.saas.SaasRoleMenuDTO; import com.makeit.module.admin.dto.saas.SaasRoleMenuDTO;
import com.makeit.module.admin.dto.saas.SaasUserRoleDTO; import com.makeit.module.admin.dto.saas.SaasUserRoleDTO;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasRoleService; import com.makeit.service.saas.SaasRoleService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -38,6 +40,8 @@ public class SaasRoleController { ...@@ -38,6 +40,8 @@ public class SaasRoleController {
@Autowired @Autowired
private SaasRoleService saasRoleService; private SaasRoleService saasRoleService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-角色", name = "列表", code = "saas:role:list") @Action(module = "saas端-角色", name = "列表", code = "saas:role:list")
@ApiOperation("列表不分页") @ApiOperation("列表不分页")
...@@ -65,6 +69,7 @@ public class SaasRoleController { ...@@ -65,6 +69,7 @@ public class SaasRoleController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody SaasRoleDTOVO dto){ public ApiResponseEntity<String> add(@Validated @RequestBody SaasRoleDTOVO dto){
String add = saasRoleService.add(dto); String add = saasRoleService.add(dto);
saasOperationLogService.add("saas端-角色管理-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -73,6 +78,7 @@ public class SaasRoleController { ...@@ -73,6 +78,7 @@ public class SaasRoleController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody SaasRoleDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody SaasRoleDTOVO dto){
saasRoleService.edit(dto); saasRoleService.edit(dto);
saasOperationLogService.add("saas端-角色管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -80,6 +86,7 @@ public class SaasRoleController { ...@@ -80,6 +86,7 @@ public class SaasRoleController {
@ApiOperation("详情") @ApiOperation("详情")
@PostMapping("view") @PostMapping("view")
public ApiResponseEntity<SaasRoleDTOVO> view(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<SaasRoleDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-角色管理-详情", null);
return ApiResponseUtils.success(saasRoleService.view(dto.getId())); return ApiResponseUtils.success(saasRoleService.view(dto.getId()));
} }
...@@ -88,6 +95,7 @@ public class SaasRoleController { ...@@ -88,6 +95,7 @@ public class SaasRoleController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
saasRoleService.del(dto.getId()); saasRoleService.del(dto.getId());
saasOperationLogService.add("saas端-角色管理-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -96,6 +104,11 @@ public class SaasRoleController { ...@@ -96,6 +104,11 @@ public class SaasRoleController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){ public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){
saasRoleService.changeStatus(dto); saasRoleService.changeStatus(dto);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-角色管理-启用", null);
} else {
saasOperationLogService.add("saas端-角色管理-禁用", null);
}
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -104,6 +117,7 @@ public class SaasRoleController { ...@@ -104,6 +117,7 @@ public class SaasRoleController {
@PostMapping("assignUserList") @PostMapping("assignUserList")
public ApiResponseEntity<?> assignUserList(@RequestBody List<SaasUserRoleDTO> userRoleDTOList){//参数要不要是一个对象里 有一个数组 public ApiResponseEntity<?> assignUserList(@RequestBody List<SaasUserRoleDTO> userRoleDTOList){//参数要不要是一个对象里 有一个数组
saasRoleService.assignUserList(userRoleDTOList); saasRoleService.assignUserList(userRoleDTOList);
saasOperationLogService.add("saas端-角色管理-分配用户", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -112,6 +126,7 @@ public class SaasRoleController { ...@@ -112,6 +126,7 @@ public class SaasRoleController {
@PostMapping("removeAssignUserList") @PostMapping("removeAssignUserList")
public ApiResponseEntity<?> removeAssignUserList(@RequestBody List<SaasUserRoleDTO> userRoleDTOList){ public ApiResponseEntity<?> removeAssignUserList(@RequestBody List<SaasUserRoleDTO> userRoleDTOList){
saasRoleService.removeAssignUserList(userRoleDTOList); saasRoleService.removeAssignUserList(userRoleDTOList);
saasOperationLogService.add("saas端-角色管理-删除分配用户", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -121,6 +136,7 @@ public class SaasRoleController { ...@@ -121,6 +136,7 @@ public class SaasRoleController {
@Deprecated @Deprecated
public ApiResponseEntity<?> assignMenuList(@RequestBody SaasRoleMenuDTO roleMenuDTO){ public ApiResponseEntity<?> assignMenuList(@RequestBody SaasRoleMenuDTO roleMenuDTO){
saasRoleService.assignMenuList(roleMenuDTO); saasRoleService.assignMenuList(roleMenuDTO);
saasOperationLogService.add("saas端-角色管理-分配菜单", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasUserController.java
...@@ -13,6 +13,7 @@ import com.makeit.module.admin.dto.saas.SaasUserDTOVO; ...@@ -13,6 +13,7 @@ import com.makeit.module.admin.dto.saas.SaasUserDTOVO;
import com.makeit.module.admin.dto.saas.SaasUserQueryDTO; import com.makeit.module.admin.dto.saas.SaasUserQueryDTO;
import com.makeit.module.admin.vo.plat.PlatUserLoginVO; import com.makeit.module.admin.vo.plat.PlatUserLoginVO;
import com.makeit.module.admin.vo.saas.SaasUserLoginVO; import com.makeit.module.admin.vo.saas.SaasUserLoginVO;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasUserService; import com.makeit.service.saas.SaasUserService;
import com.makeit.utils.user.ThreadLocalUserUtil; import com.makeit.utils.user.ThreadLocalUserUtil;
import com.makeit.utils.user.wechat.WechatUserInfo; import com.makeit.utils.user.wechat.WechatUserInfo;
...@@ -42,6 +43,8 @@ public class SaasUserController { ...@@ -42,6 +43,8 @@ public class SaasUserController {
@Autowired @Autowired
private SaasUserService saasUserService; private SaasUserService saasUserService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-用户", name = "分页列表", code = "saas:user:page") @Action(module = "saas端-用户", name = "分页列表", code = "saas:user:page")
@ApiOperation("分页列表") @ApiOperation("分页列表")
...@@ -80,6 +83,7 @@ public class SaasUserController { ...@@ -80,6 +83,7 @@ public class SaasUserController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody SaasUserDTOVO dto){ public ApiResponseEntity<String> add(@Validated @RequestBody SaasUserDTOVO dto){
String add = saasUserService.add(dto); String add = saasUserService.add(dto);
saasOperationLogService.add("saas端-用户管理-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -88,6 +92,7 @@ public class SaasUserController { ...@@ -88,6 +92,7 @@ public class SaasUserController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody SaasUserDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody SaasUserDTOVO dto){
saasUserService.edit(dto); saasUserService.edit(dto);
saasOperationLogService.add("saas端-用户管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -96,13 +101,15 @@ public class SaasUserController { ...@@ -96,13 +101,15 @@ public class SaasUserController {
@PostMapping("changePassword") @PostMapping("changePassword")
public ApiResponseEntity<?> changePassword(@RequestBody SaasUserDTOVO dto){ public ApiResponseEntity<?> changePassword(@RequestBody SaasUserDTOVO dto){
saasUserService.changePassword(dto); saasUserService.changePassword(dto);
saasOperationLogService.add("saas端-用户管理-修改密码", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@Action(module = "saas端-用户", name = "详情", code = "saas:user:view") @Action(module = "saas端-用户", name = "详情", code = "saas:user:view")
@ApiOperation("详情") @ApiOperation("详情")
@PostMapping("view") @PostMapping("view")
public ApiResponseEntity<SaasUserDTOVO> view(@RequestBody BaseIdDTO dto){; public ApiResponseEntity<SaasUserDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-用户管理-详情", null);
return ApiResponseUtils.success(saasUserService.view(dto.getId())); return ApiResponseUtils.success(saasUserService.view(dto.getId()));
} }
...@@ -111,6 +118,7 @@ public class SaasUserController { ...@@ -111,6 +118,7 @@ public class SaasUserController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
saasUserService.del(dto.getId()); saasUserService.del(dto.getId());
saasOperationLogService.add("saas端-用户管理-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -119,6 +127,7 @@ public class SaasUserController { ...@@ -119,6 +127,7 @@ public class SaasUserController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){ public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){
saasUserService.changeStatus(dto); saasUserService.changeStatus(dto);
saasOperationLogService.add("saas端-用户管理-改变状态", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatDayDurationRecord.java
package com.makeit.entity.platform.alarm; package com.makeit.entity.platform.alarm;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -30,9 +31,10 @@ public class PlatDayDurationRecord extends BaseBusEntity { ...@@ -30,9 +31,10 @@ public class PlatDayDurationRecord extends BaseBusEntity {
private String oriDeviceId; private String oriDeviceId;
/** /**
* 日期 yyyyMMdd * 日期
*/ */
private String day; @JsonFormat(pattern = "yyyy-MM-dd")
private Date day;
/** /**
* 本次进入时间 * 本次进入时间
......
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
...@@ -29,8 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -29,8 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
...@@ -141,7 +139,6 @@ public class BehaviorAlarm implements IAlarm { ...@@ -141,7 +139,6 @@ public class BehaviorAlarm implements IAlarm {
PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting(); PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting();
Date now = new Date(); Date now = new Date();
long endLong = now.getTime(); long endLong = now.getTime();
Long startLong = alarmRedisDTO.getStartLong();
long count = endLong - alarmRedisDTO.getStartLong(); long count = endLong - alarmRedisDTO.getStartLong();
//save db //save db
platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO); platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
...@@ -156,8 +153,7 @@ public class BehaviorAlarm implements IAlarm { ...@@ -156,8 +153,7 @@ public class BehaviorAlarm implements IAlarm {
durationRecord.setElderIds(platElderList.stream().map(BaseEntity::getId).collect(Collectors.joining(","))); durationRecord.setElderIds(platElderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
durationRecord.setDuration(count); durationRecord.setDuration(count);
durationRecord.setOriDeviceId(platDevice.getOriDeviceId()); durationRecord.setOriDeviceId(platDevice.getOriDeviceId());
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd"); durationRecord.setDay(alarmRedisDTO.getStart());
durationRecord.setDay(dateTimeFormatter.format(LocalDateTime.ofEpochSecond(startLong / 1000, 0, ZoneOffset.ofHours(8))));
durationRecord.setStartDate(alarmRedisDTO.getStart()); durationRecord.setStartDate(alarmRedisDTO.getStart());
durationRecord.setEndDate(now); durationRecord.setEndDate(now);
durationRecord.setTenantId(config.getTenantId()); durationRecord.setTenantId(config.getTenantId());
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
...@@ -254,7 +254,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace ...@@ -254,7 +254,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
PlatSpaceVO vo = new PlatSpaceVO(); PlatSpaceVO vo = new PlatSpaceVO();
vo.setName(space.getName()); vo.setName(space.getName());
vo.setParentId(space.getId()); vo.setParentId(space.getParentId());
vo.setId(space.getId()); vo.setId(space.getId());
return vo; return vo;
} }
......
server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java
...@@ -31,7 +31,6 @@ import com.makeit.service.platform.auth.PlatOrgService; ...@@ -31,7 +31,6 @@ import com.makeit.service.platform.auth.PlatOrgService;
import com.makeit.service.platform.auth.PlatUserService; import com.makeit.service.platform.auth.PlatUserService;
import com.makeit.service.saas.PlatTenantMenuService; import com.makeit.service.saas.PlatTenantMenuService;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasUserService; import com.makeit.service.saas.SaasUserService;
import com.makeit.utils.data.convert.BeanDtoVoUtils; import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.data.convert.PageUtil; import com.makeit.utils.data.convert.PageUtil;
...@@ -71,9 +70,6 @@ implements PlatTenantService { ...@@ -71,9 +70,6 @@ implements PlatTenantService {
private SaasUserService saasUserService; private SaasUserService saasUserService;
@Autowired @Autowired
private SaasOperationLogService saasOperationLogService;
@Autowired
private SysConfigService sysConfigService; private SysConfigService sysConfigService;
@Autowired @Autowired
private PlatTenantMenuService platTenantMenuService; private PlatTenantMenuService platTenantMenuService;
...@@ -256,8 +252,6 @@ implements PlatTenantService { ...@@ -256,8 +252,6 @@ implements PlatTenantService {
//分配菜单 //分配菜单
assignMenuList(tntTenant.getId(),dto.getMenuIdList()); assignMenuList(tntTenant.getId(),dto.getMenuIdList());
saasOperationLogService.add("saas端-租户账号-编辑", dto.getId());
} }
public PlatOrg convertToPlatOrg(PlatTenant platTenant){ public PlatOrg convertToPlatOrg(PlatTenant platTenant){
...@@ -278,8 +272,6 @@ implements PlatTenantService { ...@@ -278,8 +272,6 @@ implements PlatTenantService {
TntUserJoinUtil.join(platUserService,Arrays.asList(userVO), PlatTenantDTOVO::getPlatUserId,(t,u)->t.setPlatUserVO(BeanDtoVoUtils.convert(u,PlatUserVO.class)) ,PlatUser::getId); TntUserJoinUtil.join(platUserService,Arrays.asList(userVO), PlatTenantDTOVO::getPlatUserId,(t,u)->t.setPlatUserVO(BeanDtoVoUtils.convert(u,PlatUserVO.class)) ,PlatUser::getId);
saasOperationLogService.add("saas端-租户账号-详情", id);
LambdaQueryWrapper<PlatTenantMenu> tenantMenuLambdaQueryWrapper = new LambdaQueryWrapper<PlatTenantMenu>() LambdaQueryWrapper<PlatTenantMenu> tenantMenuLambdaQueryWrapper = new LambdaQueryWrapper<PlatTenantMenu>()
.eq(BaseBusEntity::getTenantId, id); .eq(BaseBusEntity::getTenantId, id);
List<PlatTenantMenu> list = platTenantMenuService.list(tenantMenuLambdaQueryWrapper); List<PlatTenantMenu> list = platTenantMenuService.list(tenantMenuLambdaQueryWrapper);
...@@ -296,8 +288,6 @@ implements PlatTenantService { ...@@ -296,8 +288,6 @@ implements PlatTenantService {
public void del(String id) { public void del(String id) {
removeById(id); removeById(id);
saasOperationLogService.add("saas端-租户账号-删除", id);
} }
@Transactional @Transactional
...@@ -319,12 +309,6 @@ implements PlatTenantService { ...@@ -319,12 +309,6 @@ implements PlatTenantService {
tntTenant.setStatus(dto.getStatus()); tntTenant.setStatus(dto.getStatus());
updateById(tntTenant); updateById(tntTenant);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-租户账号-启用", dto.getId());
} else {
saasOperationLogService.add("saas端-租户账号-禁用", dto.getId());
}
} }
@Transactional @Transactional
......
server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeBedVO.java
...@@ -36,7 +36,7 @@ public class WorkStationHomeBedVO { ...@@ -36,7 +36,7 @@ public class WorkStationHomeBedVO {
private String bedId; private String bedId;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private String stauts; private String status;
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
......
server-service/src/main/resources/mappers/PlatBedMapper.xml
...@@ -66,14 +66,14 @@ ...@@ -66,14 +66,14 @@
</select> </select>
<select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO"> <select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pb.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pb.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status
FROM plat_bed pb FROM plat_bed pb
LEFT JOIN plat_room pm ON pm.id = pb.room_id LEFT JOIN plat_room pm ON pm.id = pb.room_id
LEFT JOIN plat_space ps ON ps.id = pm.space_id LEFT JOIN plat_space ps ON ps.id = pm.space_id
LEFT JOIN plat_elder pe ON pe.bed_id = pb.id LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id
<where> <where>
pb.del_flag = 0 and pe.del_flag = 0 and prbd.del_flag = 0 and pb.status = 0 pb.del_flag = 0 and pe.del_flag = 0 and pb.status = 0
<if test="dto.elderName != null and dto.elderName != ''"> <if test="dto.elderName != null and dto.elderName != ''">
AND pe.naem LIKE CONCAT('%',#{dto.elderName},'%') AND pe.naem LIKE CONCAT('%',#{dto.elderName},'%')
</if> </if>
......
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 sign in to comment