添加日志功能

gis_admin/src/main/java/com/gis/admin/controller/LogController.java

@@ -1,42 +1,42 @@
-//package com.gis.admin.controller;
-//
-//
-//import com.gis.common.base.entity.dto.PageDateDto;
-//import com.gis.common.base.entity.vo.LogVo;
-//import com.gis.common.base.service.LogService;
-//import com.gis.common.util.Result;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.log4j.Log4j2;
-//import org.apache.shiro.authz.annotation.Logical;
-//import org.apache.shiro.authz.annotation.RequiresRoles;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//
-///**
-// * Created by owen on 2020/5/12 0018 12:17
-// * 日志管理,只有admin权限访问
-// */
-//@Log4j2
-//@Api(tags = "sys-日志管理")
-//@RestController
-//@RequestMapping("sys/log")
-//@RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
-//public class LogController  {
-//
-//    @Autowired
-//    public LogService logService;
-//
-//
-//    @ApiOperation("列表")
-//    @PostMapping("list")
-//    public Result<LogVo> list(@RequestBody PageDateDto param) {
-//
-//        return logService.search(param);
-//    }
-//
-//}
+package com.gis.admin.controller;
+
+
+import com.gis.common.base.entity.dto.PageDateDto;
+import com.gis.common.base.entity.vo.LogVo;
+import com.gis.common.base.service.LogService;
+import com.gis.common.util.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * Created by owen on 2020/5/12 0018 12:17
+ * 日志管理,只有admin权限访问
+ */
+@Log4j2
+@Api(tags = "sys-日志管理")
+@RestController
+@RequestMapping("sys/log")
+@RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
+public class LogController  {
+
+    @Autowired
+    public LogService logService;
+
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public Result<LogVo> list(@RequestBody PageDateDto param) {
+
+        return logService.search(param);
+    }
+
+}

gis_admin/src/main/java/com/gis/admin/controller/LoginController.java

@@ -2,6 +2,7 @@ package com.gis.admin.controller;
 
 import com.gis.admin.entity.po.SysRoleEntity;
 import com.gis.common.base.entity.po.LogEntity;
+import com.gis.common.base.service.LogService;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.util.*;
 import com.gis.admin.entity.po.SysUserEntity;
@@ -36,8 +37,8 @@ import java.util.concurrent.TimeUnit;
 @Log4j2
 public class LoginController {
 
-//    @Autowired
-//    private LogService logService;
+    @Autowired
+    private LogService logService;
 
     @Autowired
     private SysUserService userService;
@@ -116,7 +117,7 @@ public class LoginController {
 //        result.put("role", role);
 
 //        // 保存操作日志
-//        saveLog(userId);
+        saveLog(userId);
 
         redisUtil.set(configConstant.redisPrefix + token, token, 86400);
 
@@ -166,7 +167,7 @@ public class LoginController {
      */
     private void saveLog(Long userId){
         LogEntity entity = new LogEntity(userId, "登录管理", "用户登录", request.getRemoteAddr());
-//        logService.save(entity);
+        logService.save(entity);
     }
 
 

gis_admin/src/main/java/com/gis/admin/controller/SysUserController.java

@@ -69,7 +69,7 @@ public class SysUserController {
 
 
     @RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
-    @WebControllerLog(description = "用户管理-启用、停用账户")
+    @WebControllerLog(description = "用户管理-启用、停用账户", addDb = true)
     @ApiOperation(value = "启用、停用账户", notes = "isEnabled-> 1:可用， 0：禁用")
     @GetMapping("editStatus/{id}/{isEnabled}")
     public Result editStatus(@PathVariable Long id, @PathVariable Integer isEnabled) {
@@ -78,13 +78,13 @@ public class SysUserController {
     }
 
 
-//    @RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
-//    @WebControllerLog(description = "用户管理-删除",addDb = true)
-//    @ApiOperation("删除")
-//    @GetMapping("removes/{ids}")
-//    public Result removes(@PathVariable String ids) {
-//        return userService.removes(ids);
-//    }
+    @RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
+    @WebControllerLog(description = "用户管理-删除",addDb = true)
+    @ApiOperation("删除")
+    @GetMapping("removes/{ids}")
+    public Result removes(@PathVariable String ids) {
+        return userService.removes(ids);
+    }
 
 //    @RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
 //    @WebControllerLog(description = "用户管理-获取角色")

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
@@ -88,19 +89,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 
     @Override
     public Result removes(String ids) {
-
-//        List<SysUserEntity> entityList = this.findByIds(ids);
-//        for (SysUserEntity entity: entityList) {
-//            Long id = entity.getId();
-//            Set<String> roleKeys = sysRoleService.findRoleKeyByUserId(id);
-//            if (roleKeys.contains("sys_admin")) {
-//                log.error("管理员账户不能删除 {}", id);
-//                return Result.failure("管理员账户不能删除");
-//            }
+        List<String> idList = Arrays.asList(ids);
+        List<SysUserEntity> entityList = this.listByIds(idList);
+        for (SysUserEntity entity: entityList) {
+            Integer isAdmin = entity.getIsAdmin();
+            if (isAdmin == 1) {
+                log.error("管理员账户不能删除 {}", entity.getId());
+                return Result.failure("管理员账户不能删除");
+            }
 //            entity.setIsDelete(1);
 //            entity.setUpdateTime(LocalDateTime.now());
 //            this.update(entity);
-//        }
+        }
+        this.removeByIds(idList);
 
         return Result.success();
     }
@@ -112,7 +113,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
         IPage<SysUserEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
         LambdaQueryWrapper<SysUserEntity> wrapper = new LambdaQueryWrapper<>();
 
-            wrapper.eq(SysUserEntity::getIsEnabled, 1);
+//            wrapper.eq(SysUserEntity::getIsEnabled, 1);
 
 
         String startTime = param.getStartTime();

gis_application/src/main/resources/sh/shutdown.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-RESOURCE_NAME=scene_zhuhai_partyhistor.jar
+RESOURCE_NAME=smart_shezhen_pengcheng.jar
    Pid=`awk '{print $1}' tpid`
 
 if [ ${Pid} ]; then

gis_application/src/main/resources/sh/startup.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
-RESOURCE_NAME=scene_zhuhai_partyhistor.jar
+RESOURCE_NAME=smart_shezhen_pengcheng.jar
 APP_DEBUG=5005
 rm -f tpid
-nohup java -jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${APP_DEBUG} $RESOURCE_NAME --spring.profiles.active=sit --server.port=8012 & echo $! > tpid
+nohup java -jar ./$RESOURCE_NAME --spring.profiles.active=sit --server.port=8012 & echo $! > tpid
 echo Start Success!
 
 

gis_cms/src/main/java/com/gis/cms/controller/AerialController.java

@@ -87,6 +87,7 @@ public class AerialController {
         return Result.success(imgService.getById(id));
     }
 
+    @WebControllerLog(description = "无人机监控图-删除", addDb = true)
     @ApiOperation("无人机监控图-删除")
     @GetMapping("img/remove/{id}")
     public Result imgRemove(@PathVariable Long id) {

gis_cms/src/main/java/com/gis/cms/controller/EnergyController.java

@@ -33,12 +33,11 @@ public class EnergyController {
     @ApiOperation(value = "列表", notes = NOTE_STR)
     @PostMapping("list")
     public Result list(@RequestBody TypePageDto param) {
-//        return entityService.search(param);
         return Result.success(entityService.list());
     }
 
 
-    @WebControllerLog(description = "整体概况-编辑", addDb = true)
+    @WebControllerLog(description = "能耗管理-整体概况/编辑", addDb = true)
     @ApiOperation(value = "编辑", notes = NOTE_STR)
     @PostMapping("save")
     public Result save(@Valid @RequestBody BaseDto param) {

gis_cms/src/main/java/com/gis/cms/controller/LotController.java

@@ -74,7 +74,7 @@ public class LotController {
         return entityService.alarmDetail(id);
     }
 
-
+    @WebControllerLog(description = "今日报警-删除", addDb = true)
     @ApiOperation("今日报警-删除")
     @GetMapping("alarm/remove/{id}")
     public Result alarmRemove(@PathVariable Long id) {

gis_cms/src/main/java/com/gis/cms/controller/SecurityController.java

@@ -87,6 +87,7 @@ public class SecurityController {
         return Result.success(videoService.getById(id));
     }
 
+    @WebControllerLog(description = "监控画面-删除", addDb = true)
     @ApiOperation("监控画面-删除")
     @GetMapping("video/remove/{id}")
     public Result videoRemove(@PathVariable Long id) {

gis_cms/src/main/java/com/gis/cms/controller/SiteController.java

@@ -125,6 +125,7 @@ public class SiteController {
         return Result.success(imgService.getById(id));
     }
 
+    @WebControllerLog(description = "进度管理-删除", addDb = true)
     @ApiOperation("进度管理-删除")
     @GetMapping("img/remove/{id}")
     public Result imgRemove(@PathVariable Long id) {

gis_common/src/main/java/com/gis/common/base/aop/WebLogAspect.java

@@ -1,6 +1,7 @@
 package com.gis.common.base.aop;
 
 import com.gis.common.base.entity.po.LogEntity;
+import com.gis.common.base.service.LogService;
 import com.gis.common.util.JwtUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -34,8 +35,8 @@ public class WebLogAspect {
     @Resource
     private HttpServletRequest request;
 
-//    @Autowired
-//    LogService logService;
+    @Autowired
+    LogService logService;
 
     private long startTime ;
 
@@ -52,8 +53,9 @@ public class WebLogAspect {
         MDC.put("TRACE_ID", startTime+"");
 
         // 记录下请求内容
+        String remoteAddr = request.getRemoteAddr();
         log.warn("start : {}, {}, uuid: {}" , request.getMethod(), request.getRequestURI(), startTime);
-        log.info("request IP:{}" , request.getRemoteAddr());
+        log.info("request IP:{}" , remoteAddr);
         log.info("request Args : {}" , Arrays.toString(joinPoint.getArgs()));
 
 
@@ -83,7 +85,7 @@ public class WebLogAspect {
             if (StringUtils.isNotBlank(description)) {
                 // 保存数据库
                 List<String> detail = getDetail(description);
-//            logService.save(new LogEntity(userId, detail.get(0), detail.get(1), remoteAddr));
+            logService.save(new LogEntity(userId, detail.get(0), detail.get(1), remoteAddr));
             }
 
         }

gis_common/src/main/java/com/gis/common/base/mapper/LogMapper.java

@@ -1,23 +1,25 @@
-//package com.gis.common.base.mapper;
-//
-//
-//import com.gis.common.base.entity.dto.PageDateDto;
-//import com.gis.common.base.entity.po.LogEntity;
-//import com.gis.common.base.entity.vo.LogVo;
-//import com.gis.common.base.mapper.provider.LogProvider;
-//import org.apache.ibatis.annotations.Mapper;
-//import org.apache.ibatis.annotations.SelectProvider;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.List;
-//
-//@Component
-//@Mapper
-//public interface LogMapper extends IBaseMapper<LogEntity, Long> {
-//
-//    /**
-//     * 注意日期，需要传字符串类型
-//     */
-//    @SelectProvider(type = LogProvider.class, method = "findBySearchKey")
-//    List<LogVo> search(PageDateDto param);
-//}
+package com.gis.common.base.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gis.common.base.entity.dto.PageDateDto;
+import com.gis.common.base.entity.po.LogEntity;
+import com.gis.common.base.entity.vo.LogVo;
+import com.gis.common.base.mapper.provider.LogProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.springframework.stereotype.Component;
+
+
+@Component
+@Mapper
+public interface LogMapper extends BaseMapper<LogEntity> {
+
+    /**
+     * 注意日期，需要传字符串类型
+     */
+    @SelectProvider(type = LogProvider.class, method = "findBySearchKey")
+    Page<LogVo> search(PageDateDto param, IPage<LogEntity> page);
+}

gis_common/src/main/java/com/gis/common/base/service/LogService.java

@@ -1,19 +1,18 @@
-//package com.gis.common.base.service;
-//
-//
-//import com.gis.common.base.entity.dto.PageDateDto;
-//import com.gis.common.base.entity.po.LogEntity;
-//import com.gis.common.base.entity.vo.LogVo;
-//import com.gis.common.util.Result;
-//
-//import java.util.List;
-//
-//
-///**
-// * Created by owen on 2020/5/12 0011 16:14
-// */
-//public interface LogService extends IBaseService<LogEntity, Long> {
-//
-//
-//    Result search(PageDateDto param);
-//}
+package com.gis.common.base.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gis.common.base.entity.dto.PageDateDto;
+import com.gis.common.base.entity.po.LogEntity;
+import com.gis.common.util.Result;
+
+
+
+/**
+ * Created by owen on 2020/5/12 0011 16:14
+ */
+public interface LogService extends IService<LogEntity> {
+
+
+    Result search(PageDateDto param);
+}

gis_common/src/main/java/com/gis/common/base/service/impl/LogServiceImpl.java

@@ -1,39 +1,30 @@
-//package com.gis.common.base.service.impl;
-//
-//import com.gis.common.base.mapper.LogMapper;
-//import com.gis.common.base.service.LogService;
-//import com.gis.common.base.entity.dto.PageDateDto;
-//import com.gis.common.base.entity.po.LogEntity;
-//import com.gis.common.base.entity.vo.LogVo;
-//import com.gis.common.base.mapper.IBaseMapper;
-//import com.gis.common.util.Result;
-//import com.github.pagehelper.PageInfo;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//
-//
-///**
-// * Created by owen on 2020/5/12 0011 16:16
-// */
-//@Service
-//public class LogServiceImpl extends IBaseServiceImpl<LogEntity, Long> implements LogService {
-//
-//    @Autowired
-//    private LogMapper entityMapper;
-//
-//    @Override
-//    public IBaseMapper<LogEntity, Long> getBaseMapper() {
-//        return this.entityMapper;
-//    }
-//
-//
-//    @Override
-//    public Result search(PageDateDto param) {
-//        startPage(param);
-//
-////        PageInfo<SysUserEntity> page = new PageInfo<>(this.findAll());
-//        return Result.success(new PageInfo<>(entityMapper.search(param)));
-//    }
-//}
+package com.gis.common.base.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.common.base.mapper.LogMapper;
+import com.gis.common.base.service.LogService;
+import com.gis.common.base.entity.dto.PageDateDto;
+import com.gis.common.base.entity.po.LogEntity;
+import com.gis.common.util.BaseUtil;
+import com.gis.common.util.Result;
+import org.springframework.stereotype.Service;
+
+
+
+/**
+ * Created by owen on 2020/5/12 0011 16:16
+ */
+@Service
+public class LogServiceImpl extends ServiceImpl<LogMapper, LogEntity> implements LogService {
+
+
+    @Override
+    public Result search(PageDateDto param) {
+        BaseUtil.startPage(param);
+        IPage<LogEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
+
+        return Result.success((getBaseMapper().search(param, page)));
+    }
+}