Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/util/AssertionUtils.java

@@ -0,0 +1,80 @@
+package com.jzg.util;
+
+import com.jzg.exception.SystemException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * 断言工具类
+ *
+ * @author dongxin
+ */
+public class AssertionUtils {
+
+    private AssertionUtils() {
+        throw new IllegalStateException("AssertionUtils class");
+    }
+
+
+    private static void assertion(boolean b, String message) {
+        if (b) {
+            throw new SystemException(message);
+        }
+    }
+
+    /**
+     * true -> 报错 false -> 跳过
+     *
+     * @param b       true/false
+     * @param message 报错内容
+     */
+    public static void isFail(boolean b, String message) {
+        assertion(b, message);
+    }
+
+    /**
+     * true -> 跳过 false -> 报错
+     *
+     * @param b       true/false
+     * @param message 报错内容
+     */
+    public static void isSucceed(boolean b, String message) {
+        assertion(!b, message);
+    }
+
+
+    /**
+     * 判断对象是否为空 并报错
+     * 空->报错
+     *
+     * @param o       java.lang.Object
+     * @param message 报错内容
+     */
+    public static void isEmpty(Object o, String message) {
+        assertion(ObjectUtils.isEmpty(o), message);
+    }
+
+    /**
+     * 判断对象是否为空 并报错
+     * 不为空-> 报错
+     *
+     * @param o       java.lang.Object
+     * @param message 报错内容
+     */
+    public static void isNotEmpty(Object o, String message) {
+        assertion(!ObjectUtils.isEmpty(o), message);
+    }
+
+
+    /**
+     * 判断字符串是否为空 并报错
+     * 空->报错
+     *
+     * @param s       java.lang.String
+     * @param message 报错内容
+     */
+    public static void isStringEmpty(String s, String message) {
+        assertion(StringUtils.isEmpty(s), message);
+    }
+
+}

platform/src/main/java/com/jzg/aop/aspect/LogAspect.java

@@ -89,8 +89,8 @@ public class LogAspect
         try
         {
             // 获取当前的用户
-//            String userName = baseController.getUserName();
-//            LoginUser loginUser = SecurityUtils.getLoginUser();
+            String userName = baseController.getUserName();
+            String systemId = baseController.getUserLoginSystem();
 
             // *========数据库日志=========*//
             SysOperLog operLog = new SysOperLog();
@@ -99,6 +99,12 @@ public class LogAspect
             String ip = IpUtils.getIpAddr();
             operLog.setOperIp(ip);
             operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
+            if(StringUtils.isNotEmpty(userName))
+            {
+                operLog.setOperName(userName);
+                operLog.setSysCode(systemId);
+                operLog.setDeptName("");
+            }
 //            if (loginUser != null)
 //            {
 //                operLog.setOperName(loginUser.getUsername());

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -7,8 +7,12 @@ import com.jzg.entity.enums.BusinessType;
 import com.jzg.entity.vo.SysRoleVo;
 import com.jzg.entity.vo.SysSystemVo;
 import com.jzg.service.SysSystemService;
+import com.jzg.util.AssertionUtils;
+import com.jzg.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotEmpty;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -29,7 +33,7 @@ public class SysSystemController {
     private SysSystemService sysSystemService;
 
     /**
-     * 租户分页列表
+     * 租户列表
      * @param sysSystemVo
      * @return
      */
@@ -41,36 +45,72 @@ public class SysSystemController {
     }
 
     /**
-     * 根据ID获取租户详情
+     * 租户信息查询
      * @param id
      * @return
      */
     @GetMapping(value = { "/sysGet"})
-    @Operation(summary = "根据id获取租户详情")
+    @Operation(summary = "租户信息查询")
     public HttpResult sysGet(@RequestBody String id) {
         return HttpResult.ok(sysSystemService.queryById(id));
     }
 
-//    @Log(title = "租户管理", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    public HttpResult add(@Validated @RequestBody SysSystemVo sysSystemVo) {
-//
-//
-//        deptService.checkDeptDataScope(user.getDeptId());
-//        if (!userService.checkUserNameUnique(user)) {
-//            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-//        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
-//            return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-//        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
-//            return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-//        }
-//        if (TenantHelper.isEnable()) {
-//            if (!tenantService.checkAccountBalance(TenantHelper.getTenantId())) {
-//                return R.fail("当前租户下用户名额不足，请联系管理员");
-//            }
-//        }
-//        user.setPassword(BCrypt.hashpw(user.getPassword()));
-//        return toAjax(userService.insertUser(user));
-//    }
+    /**
+     * 租户添加
+     * @param sysSystemVo
+     * @return
+     */
+    @Log(title = "租户管理", businessType = BusinessType.INSERT)
+    @Operation(summary = "租户添加")
+    @PostMapping("/sysAdd")
+    public HttpResult sysAdd(@Validated @RequestBody SysSystemVo sysSystemVo) {
+        // 编码和名称不允许重复
+        boolean codeExists = sysSystemService.isExistsCode(sysSystemVo.getSysCode(), null);
+        boolean nameExists = sysSystemService.isExistsName(sysSystemVo.getSysName(), null);
+        AssertionUtils.isFail(codeExists,"租户编码重复！");
+        AssertionUtils.isFail(nameExists,"租户名称重复！");
+        return HttpResult.ok(sysSystemService.sysAdd(sysSystemVo));
+    }
+
+    /**
+     * 租户修改
+     * @param sysSystemVo
+     * @return
+     */
+    @Log(title = "租户管理", businessType = BusinessType.UPDATE)
+    @Operation(summary = "租户修改")
+    @PutMapping("/sysEdit")
+    public HttpResult sysEdit(@Validated @RequestBody SysSystemVo sysSystemVo) {
+        AssertionUtils.isFail(StringUtils.isNull(sysSystemVo.getId()),"租户id不能为空！");
+        // 编码和名称不允许重复
+        boolean codeExists = sysSystemService.isExistsCode(sysSystemVo.getSysCode(), sysSystemVo.getId());
+        boolean nameExists = sysSystemService.isExistsName(sysSystemVo.getSysName(), sysSystemVo.getId());
+        AssertionUtils.isFail(codeExists,"租户编码重复！");
+        AssertionUtils.isFail(nameExists,"租户名称重复！");
+        return HttpResult.ok(sysSystemService.sysEdit(sysSystemVo));
+    }
 
+    /**
+     * 批量启用
+     */
+    @Log(title = "租户管理", businessType = BusinessType.UPDATE)
+    @Operation(summary = "状态修改 0-停用 1-在用")
+    @PutMapping("/changeStatus")
+    public HttpResult changeStatus(@RequestBody SysSystemVo sysSystemVo) {
+        AssertionUtils.isFail(StringUtils.isNull(sysSystemVo.getId()),"租户id不能为空！");
+        return HttpResult.ok(sysSystemService.changeStatus(sysSystemVo));
+    }
+
+    /**
+     * 删除租户
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "租户", businessType = BusinessType.DELETE)
+    @Operation(summary = "删除租户")
+    @DeleteMapping("/{ids}")
+    public HttpResult remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return HttpResult.ok(sysSystemService.deleteWithValidByIds(List.of(ids)));
+    }
 }

platform/src/main/java/com/jzg/entity/po/SysOperLog.java

@@ -41,6 +41,9 @@ public class SysOperLog {
     /** 部门名称 */
     private String deptName;
 
+    /** 租户CODE */
+    private String sysCode;
+
     /** 请求url */
     private String operUrl;
 

platform/src/main/java/com/jzg/entity/po/SysSystem.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.jzg.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -11,57 +12,75 @@ import lombok.Data;
  *
  * @author dongxin
  */
+@Schema(description = "租户管理表")
 @Data
 public class SysSystem extends BaseModel {
     /** 租户id */
+    @Schema(description = "租户id")
     private String id;
 
     /** 租户Code */
+    @Schema(description = "租户Code")
     private String sysCode;
 
     /** 租户名称 */
+    @Schema(description = "租户名称")
     private String sysName;
 
     /** 租户简称 */
+    @Schema(description = "租户简称")
     private String shortName;
 
     /** 系统图标 */
+    @Schema(description = "系统图标")
     private String sysIcon;
 
     /** 租户类型 0-保险公司 1-保险分公司 2-保险经济公司 3-汽车经销商 4-保险代理公司 */
+    @Schema(description = "租户类型 0-保险公司 1-保险分公司 2-保险经济公司 3-汽车经销商 4-保险代理公司")
     private Integer sysType;
 
     /** 租户状态 0-停用 1-在用 */
+    @Schema(description = "租户状态 0-停用 1-在用")
     private Integer available;
 
     /** 省 */
+    @Schema(description = "省")
     private String provinceId;
 
     /** 市 */
+    @Schema(description = "市")
     private String cityId;
 
     /** 区 */
+    @Schema(description = "区")
     private String districtId;
 
     /** 详细地址 */
+    @Schema(description = "详细地址")
     private String address;
 
     /** 联系人 */
+    @Schema(description = "联系人")
     private String contact;
 
     /** 联系电话 */
+    @Schema(description = "联系电话")
     private String telephone;
 
     /** 联系人地址 */
+    @Schema(description = "联系人地址")
     private String contactAdress;
 
     /** 联系人职务 */
+    @Schema(description = "联系人职务")
     private String contactJob;
 
     /** 企业规模（人）*/
+    @Schema(description = "企业规模（人）")
     private Integer businessSize;
 
     /** 法人代表 */
+    @Schema(description = "法人代表")
     private String legalName;
 
 }

platform/src/main/java/com/jzg/entity/vo/SysSystemVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.jzg.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 @Schema(description = "租户表VO")
@@ -16,11 +17,13 @@ public class SysSystemVo extends PageRequest {
 
     /** 租户Code */
     @Schema(description = "租户code")
+    @Size(min=1,max=20,message = "租户编码长度不能大于20")
     @NotNull(message = "租户编码不能为空")
     private String sysCode;
 
     /** 租户名称 */
     @Schema(description = "租户名称")
+    @Size(min=1,max=20,message = "租户名称长度不能大于20")
     @NotNull(message = "租户名称不能为空")
     private String sysName;
 
@@ -29,22 +32,79 @@ public class SysSystemVo extends PageRequest {
     @NotNull(message = "租户简称不能为空")
     private String shortName;
 
+    @Schema(description = "管理员姓名")
+    @Size(min=1,max=20,message = "管理员姓名长度不能大于20")
+    @NotNull(message = "管理员姓名不能为空")
+    private String userName;
+
+    @Schema(description = "管理员账号")
+    @Size(min=1,max=20,message = "管理员账号长度不能大于20")
+    @NotNull(message = "管理员账号不能为空")
+    private String userAccount;
+
+    @Schema(description = "登录密码")
+    @Size(min=8,max=20,message = "登录密码长度不能大于20,不能小于8")
+    @NotNull(message = "登录密码不能为空")
+    private String password;
+
     /** 省 */
     @Schema(description = "省id")
+    @NotNull(message = "请选择租户所在地区")
     private String provinceId;
 
     /** 市 */
     @Schema(description = "市id")
+    @NotNull(message = "请选择租户所在地区")
     private String cityId;
 
     /** 区 */
     @Schema(description = "区id")
+    @NotNull(message = "请选择租户所在地区")
     private String districtId;
 
+    /** 详细地址 */
+    @Schema(description = "详细地址")
+    @NotNull(message = "请输入租户详细地址")
+    private String address;
+
     /** 租户类型 0-保险公司 1-保险分公司 2-保险经济公司 3-汽车经销商 4-保险代理公司 */
     @Schema(description = "租户类型  0-保险公司 1-保险分公司 2-保险经济公司 3-汽车经销商 4-保险代理公司 ")
+    @NotNull(message = "请选择机构类型")
     private Integer sysType;
 
+    /** 详细地址 */
+    @Schema(description = "租户状态 0-停用 1-在用")
+    private Integer available;
+
+    /** 系统图标 */
+    @Schema(description = "系统图标")
+    @NotNull(message = "品牌LOGO不能为空")
+    private String sysIcon;
+
+    /** 联系人 */
+    @Schema(description = "联系人")
+    private String contact;
+
+    /** 联系电话 */
+    @Schema(description = "联系电话")
+    private String telephone;
+
+    /** 联系人地址 */
+    @Schema(description = "联系人地址")
+    private String contactAdress;
+
+    /** 联系人职务 */
+    @Schema(description = "联系人职务")
+    private String contactJob;
+
+    /** 企业规模（人）*/
+    @Schema(description = "企业规模（人）")
+    private Integer businessSize;
+
+    /** 法人代表 */
+    @Schema(description = "法人代表")
+    private String legalName;
+
     /**
      * 租户信息搜索值
      */

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -1,9 +1,13 @@
 package com.jzg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.core.page.HttpResult;
 import com.jzg.entity.po.SysSystem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.entity.vo.SysSystemVo;
+import jakarta.validation.constraints.NotEmpty;
+
+import java.util.List;
 
 /**
  * 租户管理表服务层 sys_system
@@ -22,9 +26,19 @@ public interface SysSystemService extends IService<SysSystem> {
     /**
      * 根据systemCode 判断是否存在数据
      * @param systemCode
+     * @param id 修改传id
      * @return
      */
-    public boolean isExists(String systemCode);
+    public boolean isExistsCode(String systemCode,String id);
+
+    /**
+     * 根据systemName 判断是否存在数据
+     * @param systemName
+     * @param id 修改传id
+     * @return
+     */
+    public boolean isExistsName(String systemName,String id);
+
 
     /**
      * 租户分页列表
@@ -35,9 +49,37 @@ public interface SysSystemService extends IService<SysSystem> {
     Page<SysSystem> queryPage(Page page, SysSystemVo sysSystemVo);
 
     /**
-     *
+     * 租户明细
      * @param sysId
      * @return
      */
     String queryById(String sysId);
+
+    /**
+     * 租户新增
+     * @param sysSystemVo
+     * @return
+     */
+    boolean sysAdd(SysSystemVo sysSystemVo);
+
+    /**
+     * 租户修改
+     * @param sysSystemVo
+     * @return
+     */
+    boolean sysEdit(SysSystemVo sysSystemVo);
+
+    /**
+     * 租户状态修改 （0-停用 1-在用）
+     * @param sysSystemVo
+     * @return
+     */
+    boolean changeStatus(SysSystemVo sysSystemVo);
+
+    /**
+     * 批量删除租户信息
+     * @param ids
+     * @return
+     */
+    boolean deleteWithValidByIds(List<@NotEmpty(message = "主键不能为空") Long> ids);
 }

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -3,14 +3,19 @@ package com.jzg.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.core.page.HttpResult;
 import com.jzg.entity.po.SysSystem;
 import com.jzg.entity.vo.SysSystemVo;
 import com.jzg.mapper.SysSystemMapper;
 import com.jzg.service.SysSystemService;
 import com.jzg.util.StringUtils;
+import jakarta.validation.constraints.NotEmpty;
 import jodd.util.StringUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 租户管理表 服务层处理 sys_system
  *
@@ -26,7 +31,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
      * @return
      */
     @Override
-    public SysSystem getBySystemCode(String systemCode) {
+    public SysSystem getBySystemCode(String systemCode ) {
         return this.getOne(new LambdaQueryWrapper<SysSystem>()
                 .eq(SysSystem::getSysCode, systemCode));
     }
@@ -37,23 +42,42 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
      * @return
      */
     @Override
-    public boolean isExists(String systemCode) {
+    public boolean isExistsCode(String systemCode ,String id) {
         long count = this.count(new LambdaQueryWrapper<SysSystem>()
-                .eq(SysSystem::getSysCode, systemCode));
+                .eq(SysSystem::getSysCode, systemCode)
+                .ne(StringUtils.isNotNull(id),SysSystem::getId, id)
+        );
+        return count > 0;
+    }
+
+    @Override
+    public boolean isExistsName(String systemName, String id) {
+        long count = this.count(new LambdaQueryWrapper<SysSystem>()
+                .eq(SysSystem::getSysCode, systemName)
+                .ne(StringUtils.isNotNull(id),SysSystem::getId, id)
+        );
         return count > 0;
     }
 
     @Override
     public Page<SysSystem> queryPage(Page page, SysSystemVo sysSystemVo) {
         LambdaQueryWrapper<SysSystem> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotEmpty(sysSystemVo.getProvinceId()), SysSystem::getProvinceId, sysSystemVo.getProvinceId())
-                .eq(StringUtils.isNotEmpty(sysSystemVo.getCityId()), SysSystem::getCityId, sysSystemVo.getCityId())
-                .eq(StringUtils.isNotEmpty(sysSystemVo.getDistrictId()), SysSystem::getDistrictId, sysSystemVo.getDistrictId())
-                .eq(StringUtils.isNotNull(sysSystemVo.getSysType()), SysSystem::getSysType, sysSystemVo.getSysType())
-                .eq(StringUtils.isNotEmpty(sysSystemVo.getSearchValue()), SysSystem::getSysName, sysSystemVo.getSearchValue())
-                .eq(StringUtils.isNotEmpty(sysSystemVo.getSearchValue()), SysSystem::getSysCode, sysSystemVo.getSearchValue())
-                .eq(StringUtils.isNotEmpty(sysSystemVo.getContactValue()), SysSystem::getContact, sysSystemVo.getContactValue())
-                .eq(StringUtils.isNotEmpty(sysSystemVo.getContactValue()), SysSystem::getTelephone, sysSystemVo.getContactValue());
+        wrapper.eq(StringUtils.isNotEmpty(sysSystemVo.getProvinceId()),
+                        SysSystem::getProvinceId, sysSystemVo.getProvinceId())
+                .eq(StringUtils.isNotEmpty(sysSystemVo.getCityId()),
+                        SysSystem::getCityId, sysSystemVo.getCityId())
+                .eq(StringUtils.isNotEmpty(sysSystemVo.getDistrictId()),
+                        SysSystem::getDistrictId, sysSystemVo.getDistrictId())
+                .eq(StringUtils.isNotNull(sysSystemVo.getSysType()),
+                        SysSystem::getSysType, sysSystemVo.getSysType())
+                .eq(StringUtils.isNotEmpty(sysSystemVo.getSearchValue()),
+                        SysSystem::getSysName, sysSystemVo.getSearchValue()).or()
+                .eq(StringUtils.isNotEmpty(sysSystemVo.getSearchValue()),
+                        SysSystem::getSysCode, sysSystemVo.getSearchValue())
+                .eq(StringUtils.isNotEmpty(sysSystemVo.getContactValue()),
+                        SysSystem::getContact, sysSystemVo.getContactValue()).or()
+                .eq(StringUtils.isNotEmpty(sysSystemVo.getContactValue()),
+                        SysSystem::getTelephone, sysSystemVo.getContactValue());
         Page<SysSystem> sysPage = page(page, wrapper);
         return sysPage;
     }
@@ -63,6 +87,42 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         return "";
     }
 
+    @Override
+    public boolean sysAdd(SysSystemVo sysSystemVo) {
+        SysSystem sysSystem = new SysSystem();
+        BeanUtils.copyProperties(sysSystemVo, sysSystem);
+
+        // 新增管理员信息
+
+        // 初始化租户基本信息
+
+        return save(sysSystem);
+    }
+
+    @Override
+    public boolean sysEdit(SysSystemVo sysSystemVo) {
+        SysSystem sysSystem = new SysSystem();
+        BeanUtils.copyProperties(sysSystemVo, sysSystem);
+
+        // 修改管理员信息
+
+        // 初始化租户基本信息
+        return updateById(sysSystem);
+    }
+
+    @Override
+    public boolean changeStatus(SysSystemVo sysSystemVo) {
+        SysSystem sysSystem = new SysSystem();
+        sysSystem.setId(sysSystemVo.getId());
+        sysSystem.setAvailable(sysSystemVo.getAvailable());
+        return updateById(sysSystem);
+    }
+
+    @Override
+    public boolean deleteWithValidByIds(List<Long> ids) {
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
 }
 
 

platform/src/main/resources/mapper/SysOperLogMapper.xml

@@ -25,13 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectOperLogVo">
-        select id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
+        select id, title, business_type, method, request_method, operator_type, oper_name ,dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
         from sys_oper_log
     </sql>
     
 	<insert id="insertOperlog" parameterType="com.jzg.entity.po.SysOperLog">
-		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
+		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name,dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName} ,#{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
 	</insert>
 	
 	<select id="selectOperLogList" parameterType="com.jzg.entity.po.SysOperLog" resultMap="SysOperLogResult">