Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/Application.java

@@ -3,8 +3,10 @@ package cn.wisenergy.chnmuseum.party;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
+@EnableScheduling
 public class Application {
 
     public static void main(String[] args) {

src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -206,7 +206,7 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
                 Audit byId = auditService.getById(auditStatusParam.getId());
                 type = byId.getType();
                 status=auditStatusParam.getStatus();
-                if ("REFUSED".equals(status)){
+                if (AuditStatusEnum.REFUSED.name().equals(status)){
                     sysLog.setOperationContent(AuditStatusEnum.REFUSED.getMsg());
                 }else {
                     sysLog.setOperationContent(AuditStatusEnum.APPROVED_FINAL.getMsg());

src/main/java/cn/wisenergy/chnmuseum/party/common/mvc/GlobalExceptionAdvisor.java

@@ -80,7 +80,7 @@ public class GlobalExceptionAdvisor {
         //            FieldError error = bindingResult.getFieldErrors().get(i);
         //            errMsg.append(error.getField()).append(":").append(error.getDefaultMessage());
         //        }
-        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, message);
+        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", message);
         //throw new InterfaceException(RESPONSE_CODE_ENUM.PARAM_NOT_VALID.getCode(), errMsg.toString());
     }
 
@@ -112,12 +112,12 @@ public class GlobalExceptionAdvisor {
                 }
             }
         }
-        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, msg);
+        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", msg);
     }
 
     @ExceptionHandler(DataAccessException.class)
     public cn.wisenergy.chnmuseum.party.common.validator.HttpResult dataAccessException(DataAccessException exception) {
-        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, exception.getLocalizedMessage());
+        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", exception.getLocalizedMessage());
     }
 
     @ExceptionHandler(DuplicateKeyException.class)
@@ -127,11 +127,11 @@ public class GlobalExceptionAdvisor {
         String message = Splitter.on(System.lineSeparator()).trimResults().splitToList(localizedMessage).get(1);
         String substring = message.substring(message.indexOf("Exception:"));
         if (substring.toUpperCase().contains("NAME")) {
-            return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, "名称已存在");
+            return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", "名称已存在");
         } else if (substring.toUpperCase().contains("CODE")) {
-            return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, "编码已存在");
+            return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", "编码已存在");
         }
-        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, message);
+        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", message);
     }
 
     @ExceptionHandler(SQLIntegrityConstraintViolationException.class)
@@ -141,11 +141,11 @@ public class GlobalExceptionAdvisor {
         String message = Splitter.on(System.lineSeparator()).trimResults().splitToList(localizedMessage).get(1);
         String substring = message.substring(message.indexOf("Exception:"));
         if (substring.toUpperCase().contains("NAME")) {
-            return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, "名称已存在");
+            return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", "名称已存在");
         } else if (substring.toUpperCase().contains("CODE")) {
-            return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, "编码已存在");
+            return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", "编码已存在");
         }
-        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, message);
+        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", message);
     }
 
     /**
@@ -157,7 +157,7 @@ public class GlobalExceptionAdvisor {
     @ExceptionHandler(HttpMessageConversionException.class)
     public cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpMessageConversionException(HttpMessageConversionException exception) {
         log.error(exception.getCause().getLocalizedMessage());
-        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult(400, exception.getCause().getLocalizedMessage());
+        return new cn.wisenergy.chnmuseum.party.common.validator.HttpResult("400", exception.getCause().getLocalizedMessage());
     }
 
     /**
@@ -169,7 +169,7 @@ public class GlobalExceptionAdvisor {
     @ExceptionHandler(InterfaceException.class)
     public cn.wisenergy.chnmuseum.party.common.validator.HttpResult handleInterfaceException(InterfaceException exception) {
         cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpResult = new cn.wisenergy.chnmuseum.party.common.validator.HttpResult();
-        httpResult.setResultCode(Integer.parseInt(exception.getErrorCode()));
+        httpResult.setResultCode(exception.getErrorCode());
         httpResult.setMessage(exception.getErrorMsg());
         return httpResult;
     }
@@ -209,7 +209,7 @@ public class GlobalExceptionAdvisor {
      * @param httpResult       响应对象
      */
     private void addResCodeToMap(RESPONSE_CODE_ENUM responseCodeEnum, cn.wisenergy.chnmuseum.party.common.validator.HttpResult httpResult) {
-        httpResult.setResultCode(Integer.parseInt(responseCodeEnum.getResultCode()));
+        httpResult.setResultCode(responseCodeEnum.getResultCode());
         httpResult.setMessage(responseCodeEnum.getMessage());
     }
 }
\ No newline at end of file

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/HttpResult.java

@@ -2,7 +2,7 @@ package cn.wisenergy.chnmuseum.party.common.validator;
 
 public class HttpResult {
     // 响应的状态码
-    private int resultCode;
+    private String resultCode;
 
     // 响应的响应信息
     private String message;
@@ -13,21 +13,21 @@ public class HttpResult {
     public HttpResult() {
     }
 
-    public HttpResult(int resultCode, String message) {
+    public HttpResult(String resultCode, String message) {
         this.resultCode = resultCode;
         this.message = message;
     }
 
-    public HttpResult(int resultCode, Object data) {
+    public HttpResult(String resultCode, Object data) {
         this.resultCode = resultCode;
         this.data = data;
     }
 
-    public int getResultCode() {
+    public String getResultCode() {
         return resultCode;
     }
 
-    public void setResultCode(int resultCode) {
+    public void setResultCode(String resultCode) {
         this.resultCode = resultCode;
     }
 

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TBoardStatisticServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -38,7 +39,7 @@ import java.util.Map;
 @Service
 public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMapper, TBoardStatistic> implements TBoardStatisticService {
 
-    @Autowired
+    @Resource
     private TBoardStatisticMapper boardStatisticMapper;
 
     @Autowired
@@ -55,15 +56,22 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
     @Override
     @RedisLock(value = "boardLock",timeLock = 20 ,required = true,timeOut = 1100000)
     public Object boardStatisticInfo(TBoardStatistic tBoardStatistic, boolean autoUpdate) {
-        // 根据用户id获取用户信息
-        TUser user = userService.selectById(tBoardStatistic.getUserId());
-
-        tBoardStatistic.setOrganId(user.getOrgId());    // 用户所属机构
-        tBoardStatistic.setAreaId(Integer.parseInt(user.getAreaId()));// 用户所属地区
-        if (StringUtils.isEmpty(tBoardStatistic.getPlayDate())){
-            // 获取当前日期
-            tBoardStatistic.setPlayDate(DateUtil.getCurrentDate("yyyyMMdd"));
+        if (tBoardStatistic!=null) {
+            // 根据用户id获取用户信息
+            TUser user = userService.selectById(tBoardStatistic.getUserId());
+            tBoardStatistic.setOrganId(user.getOrgId());    // 用户所属机构
+            tBoardStatistic.setAreaId(Integer.parseInt(user.getAreaId()));// 用户所属地区
+            if (StringUtils.isEmpty(tBoardStatistic.getPlayDate())) {
+                // 获取当前日期
+                tBoardStatistic.setPlayDate(DateUtil.getCurrentDate("yyyyMMdd"));
+            }
+            if (null==tBoardStatistic.getPlayNumber()) {
+                // 获取当前日期
+                tBoardStatistic.setPlayNumber(1);
+            }
+
         }
+
         List<TBoardStatistic> statisticList = new ArrayList<>();
         String redisKey = STATISTIC_BOARD_INFO_KEY;
         // 获取统计信息缓存数据
@@ -72,10 +80,12 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
         if (StringUtils.isNotEmpty(businessJsonArray)){
             statisticList = JSONObject.parseArray(businessJsonArray, TBoardStatistic.class);
         }
-        statisticList.add(tBoardStatistic);
+        if (tBoardStatistic!=null) {
+            statisticList.add(tBoardStatistic);
+        }
         redisUtil.set(redisKey, JSON.toJSON(statisticList).toString());
         // 统计记录数等于100 时，或者需要自动更新时 汇总统计数据
-        if (statisticList.size() >= 100 || autoUpdate){
+        if (statisticList.size() >= 100 || (autoUpdate&&statisticList.size()>0)){
             // 更新展板统计信息
             updateBoardStatisticInfo(statisticList,redisKey);
         }
@@ -186,15 +196,6 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
                 this.save(bs);
             }
         }
-        // 更新展板播放排行 t_board_play_rank
-
-        // 插入
-
-        // 看板播放趋势
-
-        // 地区看板播放统计
-
-        // 播放数据概览
 
         // 清空redis
         redisUtil.del(redisKey);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java

@@ -232,6 +232,7 @@ public class AuditController extends BaseController {
             @ApiImplicitParam(name = "status", value = "待初审：TBC, 驳回：REFUSED,待复审：TBCA, 通过：APPROVED_FINAL", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "type", value = "视频内容：VIDEO_CONTENT,展板内容：EXHIBITION_BOARD,学习内容：LEARNING_CONTENT", paramType = "query", dataType = "String", allowableValues = "VIDEO_CONTENT,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT", required = true)
     })
+    @MethodLog(operModule = OperModule.CHECKVIDEO,operType = OperType.SELECT)
     public Map<String, Object> getPageAllList(String name, String status, @NotBlank(message = "type参数不能为空") String type) {
         AuditStatusEnum auditStatus = null;
         AuditStatusEnum auditStatusLevel = null;

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -2,6 +2,7 @@ package cn.wisenergy.chnmuseum.party.web.controller;
 
 import cn.wisenergy.chnmuseum.party.auth.SHA256PasswordEncryptionService;
 import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
+import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.FileCatEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.FileTypeEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.LanguageEnum;
@@ -34,6 +35,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -191,7 +193,7 @@ public class ChinaMobileRestApiController extends BaseController {
                     resultMap.put("message", "mac地址不正确！");
                     return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
                 }
-                if ("2".equals(user.getStatus())) {
+                if (AuditOperationEnum.DISABLE.name().equals(user.getStatus())) {
                     throw new DisabledAccountException("此帐号已禁用，请联系管理员！");
                 }
 
@@ -447,6 +449,17 @@ public class ChinaMobileRestApiController extends BaseController {
         return getFailResult();
     }
 
+    @Scheduled(cron = "0 0/5 * * * *")
+    public void boardStatistic(){
+        try {
+            System.out.println("定时汇总播放记录开始...");
+            tBoardStatisticService.boardStatisticInfo(null, true);
+            System.out.println("定时汇总播放记录成功...");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java

@@ -3,9 +3,12 @@ package cn.wisenergy.chnmuseum.party.web.controller;
 import cn.wisenergy.chnmuseum.party.auth.SHA256PasswordEncryptionService;
 import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
 import cn.wisenergy.chnmuseum.party.common.checkcode.SpecCaptcha;
+import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
+import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
 import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
 import cn.wisenergy.chnmuseum.party.common.log.OperModule;
 import cn.wisenergy.chnmuseum.party.common.log.OperType;
+import cn.wisenergy.chnmuseum.party.model.Audit;
 import cn.wisenergy.chnmuseum.party.model.Role;
 import cn.wisenergy.chnmuseum.party.model.TUser;
 import cn.wisenergy.chnmuseum.party.model.Menu;
@@ -128,7 +131,7 @@ public class LoginController extends BaseController {
             ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
             if ("LOCK".equals(opsForValue.get(SHIRO_IS_LOCK + username))) {
                 resultMap.put("resultCode", "500");
-                resultMap.put("message", "由于密码输入错误次数大于5次，12小时内帐号已禁止登录！请您联系相关管理人员，联系电话：13924551212，邮箱：325346534@zh.com。");
+                resultMap.put("message", "由于密码输入错误次数大于5次，12小时内帐号已禁止登录！请您联系相关管理人员。");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
 
@@ -139,7 +142,7 @@ public class LoginController extends BaseController {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
             }
 
-            if ("2".equals(user.getStatus())) {
+            if (AuditOperationEnum.DISABLE.name().equals(user.getStatus())) {
                 resultMap.put("resultCode", "500");
                 resultMap.put("message", "此帐号已禁用，请联系管理员！");
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
@@ -153,7 +156,6 @@ public class LoginController extends BaseController {
                 }
             }
 
-
                 byte[] salt = user.getPasswordSalt();
                 String s1 = new String(SHA256PasswordEncryptionService.createPasswordHash(password, salt));
                 if (!new String(SHA256PasswordEncryptionService.createPasswordHash(password, salt)).equals(new String(user.getPasswordHash()))) {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

@@ -55,6 +55,7 @@ public class TBoxOperationController extends BaseController {
     @PostMapping("/selectPageList")
     @RequiresPermissions("/boxOperation/selectPageList")
     @ApiOperation(value = "获取机顶盒基础信息分页列表", notes = "获取机顶盒基础信息分页列表")
+    @MethodLog(operModule = OperModule.STBBASE,operType = OperType.SELECT)
     public Map<String, Object> selectPageList(String organId, String areaId) {
         TUser user1 = getcurUser();
         TUser user = new TUser();
@@ -82,6 +83,7 @@ public class TBoxOperationController extends BaseController {
     @PostMapping("/add")
     @RequiresPermissions("/boxOperation/add")
     @ApiOperation(value = "添加机顶盒运维信息", notes = "添加机顶盒运维信息")
+    @MethodLog(operModule = OperModule.STBOPERATION,operType = OperType.ADD)
     public Map<String, Object> saveTBoxOperation(TBoxOperation tBoxOperation) {
         // 保存业务节点信息
         boolean result;
@@ -139,6 +141,7 @@ public class TBoxOperationController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "query", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.STBOPERATION,operType = OperType.DELETE)
     public Map<String, Object> deleteTBoxOperation(String id) {
         boolean result;
         try {
@@ -156,6 +159,7 @@ public class TBoxOperationController extends BaseController {
     @GetMapping("/getList")
     @RequiresPermissions("/boxOperation/getList")
     @ApiOperation(value = "获取机顶盒运维信息全部列表(无分页)", notes = "获取机顶盒运维信息全部列表(无分页)")
+    @MethodLog(operModule = OperModule.STBOPERATION,operType = OperType.SELECT)
     public Map<String, Object> getTBoxOperationList(String status) {
         List<TBoxOperation> tBoxOperationList = null;
         TUser user = getcurUser();
@@ -180,6 +184,7 @@ public class TBoxOperationController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresPermissions("/boxOperation/getPageList")
     @ApiOperation(value = "获取机顶盒运维信息分页列表", notes = "获取机顶盒运维信息分页列表")
+    @MethodLog(operModule = OperModule.STBOPERATION,operType = OperType.SELECT)
     public Map<String, Object> getTBoxOperationPageList(String organId, Integer status, String areaId) {
         TUser user = getcurUser();
         TBoxOperation tBoxOperation = new TBoxOperation();
@@ -209,6 +214,7 @@ public class TBoxOperationController extends BaseController {
     @ApiOperation(value = "获取机顶盒运维信息详情", notes = "获取机顶盒运维信息详情")
     @GetMapping("/getById")
     @RequiresPermissions("/boxOperation/getById")
+    @MethodLog(operModule = OperModule.STBOPERATION,operType = OperType.SELECT)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         TBoxOperation tBoxOperation = null;
         try {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TInteractionController.java

@@ -2,6 +2,9 @@ package cn.wisenergy.chnmuseum.party.web.controller;
 
 import cn.wisenergy.chnmuseum.party.auth.SHA256PasswordEncryptionService;
 import cn.wisenergy.chnmuseum.party.auth.SecureRandomSaltService;
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
 import cn.wisenergy.chnmuseum.party.model.TUser;
 import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
@@ -62,6 +65,7 @@ public class TInteractionController extends BaseController {
     @PostMapping("/add")
     @RequiresPermissions("/interaction/add")
     @ApiOperation(value = "添加看板互动", notes = "添加看板互动")
+    @MethodLog(operModule = OperModule.INTERACTIVE,operType = OperType.ADD)
     public Map<String, Object> saveTInteraction(TInteraction tInteraction) {
 
         // 保存业务节点信息
@@ -110,6 +114,7 @@ public class TInteractionController extends BaseController {
     @PutMapping("/update")
     @RequiresPermissions("/interaction/update")
     @ApiOperation(value = "修改看板互动信息", notes = "修改看板互动信息")
+    @MethodLog(operModule = OperModule.INTERACTIVE,operType = OperType.UPDATE)
     public Map<String, Object> updateTInteraction(TInteraction tInteraction) {
         boolean flag = false;
         try {
@@ -132,6 +137,7 @@ public class TInteractionController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "query", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.INTERACTIVE,operType = OperType.DELETE)
     public Map<String, Object> deleteTInteraction(String id) {
         boolean result = tInteractionService.removeById(id);
         if (result) {
@@ -149,6 +155,7 @@ public class TInteractionController extends BaseController {
             @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "query", dataType = "String")
     })
     @ApiOperation(value = "获取看板互动列表", notes = "获取看板互动列表")
+    @MethodLog(operModule = OperModule.INTERACTIVE,operType = OperType.SELECT)
     public Map<String, Object> getTInteractionPageList(String orgId) {
         Page<TInteraction> list = null;
         try {
@@ -164,6 +171,7 @@ public class TInteractionController extends BaseController {
     @ApiOperation(value = "获取看板互动详情", notes = "获取看板互动详情")
     @GetMapping("/getById")
     @RequiresPermissions("/interaction/getById")
+    @MethodLog(operModule = OperModule.INTERACTIVE,operType = OperType.SELECT)
     public Map<String, Object> getById(String id) {
         TInteraction tInteraction = null;
         try {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -69,7 +69,7 @@ public class TOrganController extends BaseController {
     @PostMapping("/add")
     @RequiresPermissions("/organ/add")
     @ApiOperation(value = "添加机构", notes = "添加机构")
-//    @MethodLog(operModule = OperModule.ORG,operType = OperType.ADD)
+    @MethodLog(operModule = OperModule.ORG,operType = OperType.ADD)
     public Map<String, Object> add(TOrgan organ) {
 
         QueryWrapper<TOrgan> ew = new QueryWrapper<>();
@@ -104,7 +104,7 @@ public class TOrganController extends BaseController {
     @PutMapping("/update")
     @RequiresPermissions("/organ/update")
     @ApiOperation(value = "update", notes = "修改机构信息")
-//    @MethodLog(operModule = OperModule.ORG,operType = OperType.UPDATE)
+    @MethodLog(operModule = OperModule.ORG,operType = OperType.UPDATE)
     public Map<String, Object> updateTOrgan(TOrgan tOrgan) {
 
         try {
@@ -141,7 +141,7 @@ public class TOrganController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "query", dataType = "String")
     })
-//    @MethodLog(operModule = OperModule.ORG,operType = OperType.DELETE)
+    @MethodLog(operModule = OperModule.ORG,operType = OperType.DELETE)
     public Map<String, Object> deleteTOrgan(String id) {
         boolean result = false;
         try {
@@ -162,7 +162,7 @@ public class TOrganController extends BaseController {
     @GetMapping("/getList")
     @RequiresPermissions("/organ/getList")
     @ApiOperation(value = "获取机构全部列表(无分页)", notes = "获取机构全部列表(无分页)")
-//    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
+    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
     public Map<String, Object> getTOrganList() {
         TUser user = null;
         try {
@@ -238,7 +238,7 @@ public class TOrganController extends BaseController {
 	@GetMapping("/getTree")
 	@RequiresPermissions("/organ/getTree")
 	@ApiOperation(value = "获取机构树", notes = "获取机构树")
-//    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
+    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
 	public Map<String, Object> getTree(String name) {
         TUser user = getcurUser();
         List<TOrgan> list = new ArrayList<>();
@@ -257,8 +257,8 @@ public class TOrganController extends BaseController {
 
     @GetMapping("/getAreaTree")
     @RequiresPermissions("/organ/getAreaTree")
-    @ApiOperation(value = "获取区域树", notes = "获取机构树")
-//    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
+    @ApiOperation(value = "获取区域树", notes = "获取区域树")
+    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
     public Map<String, Object> getAreaTree() {
         List<TArea> list = null;
         try {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java

@@ -80,7 +80,7 @@ public class TUserController extends BaseController {
     })
     @RequestMapping(value = "/getPageList", method = RequestMethod.GET)
     @RequiresPermissions("/user/getPageList")
-//    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
+    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
     public Map<String, Object> getPageList(String userName, String status, String type, String orgId, String areaId) {
         TUser user1 = getcurUser();
         TUser user = new TUser();
@@ -131,7 +131,7 @@ public class TUserController extends BaseController {
     @ApiOperation(value = "获取用户列表")
     @RequestMapping(value = "/getUserList", method = RequestMethod.GET)
     @RequiresPermissions("/user/getUserList")
-//    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
+    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
     public Map<String, Object> getUserList(String type, String status, String auditStatus) {
         TUser user1 = getcurUser();
         TUser user = new TUser();
@@ -164,7 +164,7 @@ public class TUserController extends BaseController {
     @ApiOperation(value = "获取用户详情", notes = "获取用户详情")
     @GetMapping("/getById")
     @RequiresPermissions("/user/getById")
-//    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
+    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
     public Map<String, Object> getById(String id) {
         try {
             TUser tUser = userService.selectById(id);
@@ -185,7 +185,7 @@ public class TUserController extends BaseController {
     @ApiOperation(value = "新增成员")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @RequiresPermissions("/user/add")
-//    @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
+    @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
     public Map<String, Object> add(@RequestBody TUser user) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
@@ -539,7 +539,7 @@ public class TUserController extends BaseController {
     @ApiOperation(value = "管理员更改自己的登录密码", notes = "管理员更改自己的登录密码")
     @RequestMapping(value = "/editPwd", method = RequestMethod.PUT)
     @RequiresPermissions("/user/editPwd")
-    @MethodLog(operModule = OperModule.USER, operType = OperType.UPDATE)
+    @MethodLog(operModule = OperModule.CHANGEPWD, operType = OperType.CHANGE_PASSWORD)
     public ResponseEntity<Map<String, Object>> editPwd(@RequestParam(value = "oldPassWord") String oldPassWord,
                                                        @RequestParam(value = "password") String password) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
@@ -583,7 +583,7 @@ public class TUserController extends BaseController {
     @ApiOperation(value = "管理员重置密码", notes = "管理员重置密码")
     @RequestMapping(value = "/resetPassword", method = RequestMethod.PUT)
     @RequiresPermissions("/user/resetPassword")
-    @MethodLog(operModule = OperModule.CHANGEPWD, operType = OperType.UPDATE)
+    @MethodLog(operModule = OperModule.USER, operType = OperType.RESET_PASSWORD)
     public ResponseEntity<Map<Object, Object>> resetPassword(String userId) {
         try {
             Map<Object, Object> map = new LinkedHashMap<>();
@@ -615,7 +615,7 @@ public class TUserController extends BaseController {
     @ApiOperation(value = "新增机顶盒账号")
     @RequestMapping(value = "/boxAdd", method = RequestMethod.POST)
     @RequiresPermissions("/user/boxAdd")
-//    @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
+    @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
     public ResponseEntity<Map<String, Object>> BoxAdd(TUser user) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
@@ -708,7 +708,7 @@ public class TUserController extends BaseController {
     @ApiOperation(value = "新增运维账号")
     @RequestMapping(value = "/operationAdd", method = RequestMethod.POST)
     @RequiresPermissions("/user/operationAdd")
-//    @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
+    @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
     public ResponseEntity<Map<String, Object>> operationAdd(TUser user) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
@@ -779,7 +779,7 @@ public class TUserController extends BaseController {
     @ApiOperation(value = "新增统计账号")
     @RequestMapping(value = "/statisticsAdd", method = RequestMethod.POST)
     @RequiresPermissions("/user/statisticsAdd")
-//    @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
+    @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
     public ResponseEntity<Map<String, Object>> statisticsAdd(TUser user) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {