首页和待办

src/main/java/com/qdport/annotation/WebLog.java

@@ -0,0 +1,12 @@
+package com.qdport.annotation;
+
+import java.lang.annotation.*;
+
+@Target(ElementType.METHOD)
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface WebLog {
+    String operateType() default "";
+
+    String operateName() default "";
+}

src/main/java/com/qdport/config/WebLogAspect.java

@@ -0,0 +1,71 @@
+package com.qdport.config;
+
+import com.qdport.annotation.WebLog;
+import com.qdport.core.secure.QdportUser;
+import com.qdport.core.secure.utils.AuthUtil;
+import com.qdport.enums.QDPortEnum;
+import com.qdport.service.PolicyLogService;
+import com.qdport.vo.PolicyLogVO;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+
+/**
+ * @date 2023/10/6
+ * @time 下午9:19
+ * @discription
+ **/
+@Aspect
+@Component
+public class WebLogAspect {
+    @Resource
+    PolicyLogService policyLogService;
+
+    /**
+     * 以自定义 @WebLog 注解为切点
+     */
+    @Pointcut("@annotation(com.qdport.annotation.WebLog)")
+    public void webLog() {
+    }
+
+    /**
+     * 在切面织入
+     *
+     * @param joinPoint
+     * @throws Throwable
+     */
+    @Around("webLog()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        // 开始打印请求日志
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        QdportUser user = AuthUtil.getUser();
+        /*从切面值入点获取植入点方法*/
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        /*获取切入点方法*/
+        Method method = signature.getMethod();
+        /*获取方法上的值*/
+        WebLog webLog = method.getAnnotation(WebLog.class);
+        PolicyLogVO logVO = new PolicyLogVO();
+        logVO.setOperateName(webLog.operateName());
+        logVO.setOperateType(webLog.operateType());
+        logVO.setUserId(Long.valueOf(user.getUserId()));
+        logVO.setLoginName(user.getUserName());
+        logVO.setUserName(user.getNickName());
+        logVO.setIpHost(request.getRemoteAddr());
+        policyLogService.save(logVO);
+        Object result = joinPoint.proceed();
+        return result;
+    }
+}

src/main/java/com/qdport/controller/ImportDataController.java

@@ -3,22 +3,21 @@ package com.qdport.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qdport.annotation.WebLog;
 import com.qdport.core.tool.api.R;
 import com.qdport.core.tool.utils.DateUtil;
 import com.qdport.entity.PolicyStrive;
 import com.qdport.enums.QDPortEnum;
 import com.qdport.modules.system.entity.SysUser;
 import com.qdport.modules.system.service.TSysUserService;
+import com.qdport.service.PolicyLogService;
 import com.qdport.service.PolicyShareService;
 import com.qdport.service.PolicyStriveService;
 import com.qdport.service.impl.PolicySystemService;
 import com.qdport.util.ExcelUtil;
 import com.qdport.util.HttpsUtil;
 import com.qdport.util.StringUtil;
-import com.qdport.vo.PolicyShareExcelVO;
-import com.qdport.vo.PolicyShareVO;
-import com.qdport.vo.PolicyStriveExcelVO;
-import com.qdport.vo.PolicyStriveVO;
+import com.qdport.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
@@ -28,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -50,6 +50,7 @@ public class ImportDataController {
 
     @PostMapping("/policyShare")
     @ApiOperation(value = "导入政策分享")
+    @WebLog(operateName = "导入政策分享excel", operateType = "policy_share")
     public R importPolicyShare(@RequestBody PolicyShareVO vo) throws Exception {
         byte[] byteFromUrl = HttpsUtil.getByteFromUrl(vo.getExcelUrl());
         List<PolicyShareExcelVO> list = ExcelUtil.readPolicyShareFromXls(byteFromUrl);
@@ -88,6 +89,7 @@ public class ImportDataController {
 
     @PostMapping("/policyStrive")
     @ApiOperation(value = "导入政策争取")
+    @WebLog(operateName = "导入政策争取excel", operateType = "policy_strive")
     public R policyStrive(@RequestBody PolicyStriveVO vo) throws Exception {
         byte[] byteFromUrl = HttpsUtil.getByteFromUrl(vo.getExcelUrl());
         List<PolicyStriveExcelVO> list = ExcelUtil.readPolicyStriveFromXls(byteFromUrl);
@@ -129,6 +131,7 @@ public class ImportDataController {
 
     @PostMapping("/policyStriveMonth")
     @ApiOperation(value = "导入政策争取月度")
+    @WebLog(operateName = "导入政策争取月度excel", operateType = "policy_strive")
     public R policyStriveMonth(@RequestBody PolicyStriveVO vo) throws Exception {
         byte[] byteFromUrl = HttpsUtil.getByteFromUrl(vo.getExcelUrl());
         List<PolicyStriveExcelVO> list = ExcelUtil.readPolicyStriveMonthFromXls(byteFromUrl);
@@ -174,7 +177,6 @@ public class ImportDataController {
                 excelVOList.add(model);
             }
         }
-
         return R.data(excelVOList);
     }
 }

src/main/java/com/qdport/controller/PolicyCaseController.java

@@ -1,20 +1,19 @@
 package com.qdport.controller;
 
+import com.qdport.annotation.WebLog;
 import com.qdport.entity.PolicyStrive;
 import com.qdport.enums.QDPortEnum;
 import com.qdport.modules.system.entity.SysDept;
 import com.qdport.modules.system.entity.SysUser;
 import com.qdport.modules.system.service.SysDeptService;
 import com.qdport.modules.system.service.TSysUserService;
-import com.qdport.service.PolicyFileService;
-import com.qdport.service.PolicyStriveService;
-import com.qdport.service.PolicyTodoService;
+import com.qdport.service.*;
 import com.qdport.service.impl.PolicySystemService;
 import com.qdport.util.StringUtil;
 import com.qdport.vo.PolicyFileVO;
+import com.qdport.vo.PolicyLogVO;
 import com.qdport.vo.PolicyStriveVO;
 import com.qdport.entity.PolicyCase;
-import com.qdport.service.PolicyCaseService;
 import com.qdport.query.PolicyCaseQuery;
 import com.qdport.vo.PolicyCaseVO;
 import com.qdport.wrapper.PolicyCaseWrapper;
@@ -30,6 +29,7 @@ import com.qdport.core.boot.ctrl.QdportController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -112,6 +112,7 @@ public class PolicyCaseController extends QdportController {
      */
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "传入PolicyCase")
+    @WebLog(operateName = "新增", operateType = "policy_case")
     public R save(@RequestBody PolicyCaseVO vo) {
         vo.setStatus(QDPortEnum.POLICY_CASE_STATUS_ACTIVE.getValue());
         policyCaseService.save(vo);
@@ -120,6 +121,7 @@ public class PolicyCaseController extends QdportController {
 
     @PostMapping("/saveDone")
     @ApiOperation(value = "新增", notes = "传入PolicyCase")
+    @WebLog(operateName = "管理员新增", operateType = "policy_case")
     @Transactional(rollbackFor = Exception.class)
     public R saveDone(@RequestBody PolicyCaseVO vo) {
         vo.setStatus(QDPortEnum.POLICY_CASE_STATUS_DONE.getValue());
@@ -129,6 +131,7 @@ public class PolicyCaseController extends QdportController {
 
     @PostMapping("/saveApprove")
     @ApiOperation(value = "新增并且提交", notes = "传入PolicyCase")
+    @WebLog(operateName = "新增并且上报", operateType = "policy_case")
     public R saveApprove(@RequestBody PolicyCaseVO vo) throws ExecutionException, InterruptedException {
         policyCaseService.saveApprove(vo);
         policyTodoService.save(vo);
@@ -140,6 +143,7 @@ public class PolicyCaseController extends QdportController {
      */
     @PostMapping("/update")
     @ApiOperation(value = "编辑", notes = "传入PolicyCase")
+    @WebLog(operateName = "修改", operateType = "policy_case")
     public R update(@RequestBody @Valid PolicyCaseVO vo) {
         policyCaseService.update(vo);
         return R.success("更新成功");
@@ -147,6 +151,7 @@ public class PolicyCaseController extends QdportController {
 
     @PostMapping("/withdraw")
     @ApiOperation(value = "撤回", notes = "传入PolicyCase")
+    @WebLog(operateName = "撤回", operateType = "policy_case")
     public R withdraw(@RequestBody @Valid PolicyCaseVO vo) {
         policyCaseService.withdraw(vo);
         return R.success("撤回成功");
@@ -154,6 +159,7 @@ public class PolicyCaseController extends QdportController {
 
     @PostMapping("/approve")
     @ApiOperation(value = "审核通过", notes = "传入PolicyCase")
+    @WebLog(operateName = "审核通过", operateType = "policy_case")
     public R approve(@RequestBody @Valid PolicyCaseVO vo) throws ExecutionException, InterruptedException {
         vo.setIsWithdraw(0);
         policyCaseService.approve(vo);
@@ -163,6 +169,7 @@ public class PolicyCaseController extends QdportController {
 
     @PostMapping("/refuse")
     @ApiOperation(value = "审核拒绝", notes = "传入PolicyCase")
+    @WebLog(operateName = "审核拒绝", operateType = "policy_case")
     public R refuse(@RequestBody @Valid PolicyCaseVO vo) {
         vo.setIsWithdraw(1);
         policyCaseService.refuse(vo);
@@ -171,6 +178,7 @@ public class PolicyCaseController extends QdportController {
 
     @PostMapping("/resubmit")
     @ApiOperation(value = "重新提交", notes = "传入PolicyCase")
+    @WebLog(operateName = "重新上报", operateType = "policy_case")
     public R resubmit(@RequestBody @Valid PolicyCaseVO vo) throws ExecutionException, InterruptedException {
         vo.setStatus(QDPortEnum.POLICY_CASE_STATUS_APPROVE.getValue());
         policyCaseService.approve(vo);
@@ -183,6 +191,7 @@ public class PolicyCaseController extends QdportController {
      */
     @PostMapping("/remove")
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @WebLog(operateName = "删除", operateType = "policy_case")
     public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids) {
         List<String> idList = Func.toStrList(ids);
         policyCaseService.delete(idList);

src/main/java/com/qdport/controller/PolicyConditionController.java

@@ -1,23 +1,16 @@
 package com.qdport.controller;
 
-import lombok.AllArgsConstructor;
-import com.qdport.entity.PolicyCondition;
-import com.qdport.service.PolicyConditionService;
+import com.qdport.annotation.WebLog;
+import com.qdport.core.redis.cache.QdportRedis;
 import com.qdport.query.PolicyConditionQuery;
-import com.qdport.vo.PolicyConditionVO;
-import com.qdport.wrapper.PolicyConditionWrapper;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import com.qdport.core.tool.api.R;
-import com.qdport.core.tool.utils.Func;
 import com.qdport.core.boot.ctrl.QdportController;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 系统配置
@@ -30,56 +23,29 @@ import java.util.List;
 @Api(value = "系统配置", tags = "系统配置")
 public class PolicyConditionController extends QdportController {
     @Resource
-    private PolicyConditionService policyConditionService;
-
-    /**
-     * 分页
-     */
-    @GetMapping("page")
-    @ApiOperation(value = "分页", notes = "分页")
-    public R<IPage<PolicyConditionVO>> page(@Valid PolicyConditionQuery query) {
-        IPage<PolicyConditionVO> page = policyConditionService.page(query);
-
-        return R.data(page);
-    }
-
-    /**
-     * 详情
-     */
-    @GetMapping("{id}")
-    @ApiOperation(value = "详情", notes = "id")
-    public R<PolicyConditionVO> get(@PathVariable("id") String id) {
-        PolicyCondition entity = policyConditionService.getById(id);
-        return R.data(PolicyConditionWrapper.build().entityVO(entity));
-    }
+    private QdportRedis redis;
 
-    /**
-     * 新增
-     */
-    @PostMapping("/save")
-    @ApiOperation(value = "新增", notes = "传入PolicyCondition")
-    public R save(@RequestBody PolicyConditionVO vo) {
-        policyConditionService.save(vo);
-        return R.success("保存成功");
-    }
 
     /**
      * 修改
      */
     @PostMapping("/update")
-    public R update(@RequestBody @Valid PolicyConditionVO vo) {
-        policyConditionService.update(vo);
+    @WebLog(operateName = "修改", operateType = "policy_condition")
+    public R update(@RequestBody @Valid PolicyConditionQuery query) {
+        redis.set("ytbDate", query.getYtbDate());
         return R.success("更新成功");
     }
 
     /**
-     * 删除
+     * 详情
      */
-    @PostMapping("/remove")
-    @ApiOperation(value = "逻辑删除", notes = "传入ids")
-    public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids) {
-        List<String> idList = Func.toStrList(ids);
-        policyConditionService.delete(idList);
-        return R.success("删除成功");
+    @GetMapping("getYtbDate")
+    @ApiOperation(value = "详情", notes = "id")
+    public R<Integer> get() {
+        Integer ytbDate = 0;
+        if (redis.exists("ytbDate")) {
+            ytbDate = redis.get("ytbDate");
+        }
+        return R.data(ytbDate);
     }
 }

src/main/java/com/qdport/controller/PolicyLogController.java

@@ -1,6 +1,10 @@
 package com.qdport.controller;
 
+import com.qdport.annotation.WebLog;
+import com.qdport.core.secure.QdportUser;
+import com.qdport.core.secure.utils.AuthUtil;
 import com.qdport.entity.PolicyLog;
+import com.qdport.modules.system.service.TSysUserService;
 import com.qdport.service.PolicyLogService;
 import com.qdport.query.PolicyLogQuery;
 import com.qdport.vo.PolicyLogVO;
@@ -15,6 +19,7 @@ import com.qdport.core.boot.ctrl.QdportController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -30,6 +35,8 @@ import java.util.List;
 public class PolicyLogController extends QdportController {
     @Resource
     private PolicyLogService policyLogService;
+    @Resource
+    private TSysUserService sysUserService;
 
     /**
      * 分页
@@ -38,7 +45,6 @@ public class PolicyLogController extends QdportController {
     @ApiOperation(value = "分页", notes = "分页")
     public R<IPage<PolicyLogVO>> page(@Valid PolicyLogQuery query) {
         IPage<PolicyLogVO> page = policyLogService.page(query);
-
         return R.data(page);
     }
 
@@ -57,7 +63,9 @@ public class PolicyLogController extends QdportController {
      */
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "传入PolicyLog")
-    public R save(@RequestBody PolicyLogVO vo) {
+    public R save(@RequestBody PolicyLogVO vo, HttpServletRequest request) {
+        String host = request.getRemoteHost();
+        vo.setIpHost(host);
         policyLogService.save(vo);
         return R.success("保存成功");
     }

src/main/java/com/qdport/controller/PolicyMessageController.java

@@ -2,11 +2,15 @@ package com.qdport.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qdport.annotation.WebLog;
 import com.qdport.entity.PolicyMessage;
 import com.qdport.entity.PolicyShare;
+import com.qdport.enums.QDPortEnum;
+import com.qdport.service.PolicyLogService;
 import com.qdport.service.PolicyMessageService;
 import com.qdport.query.PolicyMessageQuery;
 import com.qdport.service.PolicyShareService;
+import com.qdport.vo.PolicyLogVO;
 import com.qdport.vo.PolicyMessageVO;
 import com.qdport.wrapper.PolicyMessageWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -19,6 +23,7 @@ import com.qdport.core.boot.ctrl.QdportController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -91,6 +96,7 @@ public class PolicyMessageController extends QdportController {
      */
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "传入PolicyMessage")
+    @WebLog(operateName = "新增", operateType = "policy_message")
     public R save(@RequestBody PolicyMessageVO vo) {
         policyMessageService.save(vo);
         return R.success("保存成功");
@@ -100,6 +106,7 @@ public class PolicyMessageController extends QdportController {
      * 修改
      */
     @PostMapping("/update")
+    @WebLog(operateName = "修改", operateType = "policy_message")
     public R update(@RequestBody @Valid PolicyMessageVO vo) {
         policyMessageService.update(vo);
         return R.success("更新成功");
@@ -110,6 +117,7 @@ public class PolicyMessageController extends QdportController {
      */
     @PostMapping("/remove")
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @WebLog(operateName = "删除", operateType = "policy_message")
     public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids) {
         List<String> idList = Func.toStrList(ids);
         policyMessageService.delete(idList);

src/main/java/com/qdport/controller/PolicyProgressController.java

@@ -5,13 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qdport.core.boot.ctrl.QdportController;
 import com.qdport.core.tool.api.R;
-import com.qdport.entity.PolicyCondition;
 import com.qdport.entity.PolicyShare;
 import com.qdport.modules.system.entity.SysDept;
 import com.qdport.modules.system.service.SysDeptService;
 import com.qdport.query.PolicyProgressQuery;
 import com.qdport.query.QueryWrapperBuilder;
-import com.qdport.service.PolicyConditionService;
 import com.qdport.service.PolicyShareService;
 import com.qdport.service.PolicyStriveService;
 import com.qdport.util.StringUtil;
@@ -35,10 +33,6 @@ public class PolicyProgressController extends QdportController {
     @Resource
     private PolicyShareService policyShareService;
     @Resource
-    private PolicyStriveService policyStriveService;
-    @Resource
-    private PolicyConditionService policyConditionService;
-    @Resource
     private SysDeptService sysDeptService;
 
     @GetMapping("sharePage")

src/main/java/com/qdport/controller/PolicyShareController.java

@@ -1,14 +1,17 @@
 package com.qdport.controller;
 
+import com.qdport.annotation.WebLog;
 import com.qdport.entity.PolicyShare;
 import com.qdport.enums.QDPortEnum;
 import com.qdport.modules.system.entity.SysDept;
 import com.qdport.modules.system.service.SysDeptService;
 import com.qdport.query.PolicyShareQuery;
 import com.qdport.service.PolicyFileService;
+import com.qdport.service.PolicyLogService;
 import com.qdport.service.PolicyShareService;
 import com.qdport.service.PolicyTodoService;
 import com.qdport.vo.PolicyFileVO;
+import com.qdport.vo.PolicyLogVO;
 import com.qdport.vo.PolicyShareVO;
 import com.qdport.wrapper.PolicyShareWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +24,7 @@ import com.qdport.core.boot.ctrl.QdportController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
@@ -88,6 +92,7 @@ public class PolicyShareController extends QdportController {
      */
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "传入PolicyShare")
+    @WebLog(operateName = "新增", operateType = "policy_share")
     public R save(@RequestBody PolicyShareVO vo) {
         vo.setStatus(QDPortEnum.POLICY_SHARE_STATUS_ACTIVE.getValue());
         policyShareService.save(vo);
@@ -96,6 +101,7 @@ public class PolicyShareController extends QdportController {
 
     @PostMapping("/saveDone")
     @ApiOperation(value = "新增", notes = "传入PolicyShare")
+    @WebLog(operateName = "管理员新增", operateType = "policy_share")
     public R saveDone(@RequestBody PolicyShareVO vo) {
         vo.setStatus(QDPortEnum.POLICY_SHARE_STATUS_DONE.getValue());
         policyShareService.save(vo);
@@ -104,6 +110,7 @@ public class PolicyShareController extends QdportController {
 
     @PostMapping("/saveApprove")
     @ApiOperation(value = "新增并且提交", notes = "传入PolicyShare")
+    @WebLog(operateName = "新增并且上报", operateType = "policy_share")
     public R saveApprove(@RequestBody PolicyShareVO vo) throws ExecutionException, InterruptedException {
         policyShareService.saveApprove(vo);
         policyTodoService.save(vo);
@@ -115,6 +122,7 @@ public class PolicyShareController extends QdportController {
      */
     @PostMapping("/update")
     @ApiOperation(value = "编辑", notes = "传入PolicyShare")
+    @WebLog(operateName = "修改", operateType = "policy_share")
     public R update(@RequestBody @Valid PolicyShareVO vo) {
         policyShareService.update(vo);
         return R.success("更新成功");
@@ -122,6 +130,7 @@ public class PolicyShareController extends QdportController {
 
     @PostMapping("/withdraw")
     @ApiOperation(value = "撤回", notes = "传入PolicyShare")
+    @WebLog(operateName = "撤回", operateType = "policy_share")
     public R withdraw(@RequestBody @Valid PolicyShareVO vo) {
         policyShareService.withdraw(vo);
         return R.success("撤回成功");
@@ -129,6 +138,7 @@ public class PolicyShareController extends QdportController {
 
     @PostMapping("/approve")
     @ApiOperation(value = "审核通过", notes = "传入PolicyShare")
+    @WebLog(operateName = "审核通过", operateType = "policy_share")
     public R approve(@RequestBody @Valid PolicyShareVO vo) throws ExecutionException, InterruptedException {
         vo.setIsWithdraw(0);
         policyShareService.approve(vo);
@@ -138,6 +148,7 @@ public class PolicyShareController extends QdportController {
 
     @PostMapping("/refuse")
     @ApiOperation(value = "审核拒绝", notes = "传入PolicyShare")
+    @WebLog(operateName = "审核拒绝", operateType = "policy_share")
     public R refuse(@RequestBody @Valid PolicyShareVO vo) {
         vo.setIsWithdraw(1);
         policyShareService.refuse(vo);
@@ -146,6 +157,7 @@ public class PolicyShareController extends QdportController {
 
     @PostMapping("/resubmit")
     @ApiOperation(value = "重新提交", notes = "传入PolicyShare")
+    @WebLog(operateName = "重新上报", operateType = "policy_share")
     public R resubmit(@RequestBody @Valid PolicyShareVO vo) throws ExecutionException, InterruptedException {
         vo.setStatus(QDPortEnum.POLICY_SHARE_STATUS_APPROVE.getValue());
         policyShareService.approve(vo);
@@ -158,6 +170,7 @@ public class PolicyShareController extends QdportController {
      */
     @PostMapping("/remove")
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @WebLog(operateName = "删除", operateType = "policy_share")
     public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids) {
         List<String> idList = Func.toStrList(ids);
         policyShareService.delete(idList);

src/main/java/com/qdport/controller/PolicyStriveController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qdport.annotation.WebLog;
 import com.qdport.entity.PolicyTodo;
 import com.qdport.enums.QDPortEnum;
 import com.qdport.modules.system.entity.SysDept;
@@ -11,6 +12,7 @@ import com.qdport.modules.system.entity.SysUser;
 import com.qdport.modules.system.service.SysDeptService;
 import com.qdport.modules.system.service.TSysUserService;
 import com.qdport.service.PolicyFileService;
+import com.qdport.service.PolicyLogService;
 import com.qdport.service.PolicyTodoService;
 import com.qdport.service.impl.PolicySystemService;
 import com.qdport.util.StringUtil;
@@ -18,6 +20,7 @@ import com.qdport.vo.PolicyFileVO;
 import com.qdport.entity.PolicyStrive;
 import com.qdport.service.PolicyStriveService;
 import com.qdport.query.PolicyStriveQuery;
+import com.qdport.vo.PolicyLogVO;
 import com.qdport.vo.PolicyStriveVO;
 import com.qdport.wrapper.PolicyStriveWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -30,6 +33,7 @@ import com.qdport.core.boot.ctrl.QdportController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -104,6 +108,7 @@ public class PolicyStriveController extends QdportController {
      */
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "传入PolicyStrive")
+    @WebLog(operateName = "新增", operateType = "policy_strive")
     public R save(@RequestBody PolicyStriveVO vo) {
         vo.setStatus(QDPortEnum.POLICY_STRIVE_STATUS_ACTIVE.getValue());
         policyStriveService.save(vo);
@@ -112,6 +117,7 @@ public class PolicyStriveController extends QdportController {
 
     @PostMapping("/saveDone")
     @ApiOperation(value = "新增", notes = "传入PolicyStrive")
+    @WebLog(operateName = "管理员新增", operateType = "policy_strive")
     public R saveDone(@RequestBody PolicyStriveVO vo) {
         vo.setStatus(QDPortEnum.POLICY_STRIVE_STATUS_DONE.getValue());
         policyStriveService.save(vo);
@@ -120,6 +126,7 @@ public class PolicyStriveController extends QdportController {
 
     @PostMapping("/saveApprove")
     @ApiOperation(value = "新增并且提交", notes = "传入PolicyStrive")
+    @WebLog(operateName = "新增并且上报", operateType = "policy_strive")
     public R saveApprove(@RequestBody PolicyStriveVO vo) throws ExecutionException, InterruptedException {
         policyStriveService.saveApprove(vo);
         policyTodoService.save(vo);
@@ -131,6 +138,7 @@ public class PolicyStriveController extends QdportController {
      */
     @PostMapping("/update")
     @ApiOperation(value = "编辑", notes = "传入PolicyStrive")
+    @WebLog(operateName = "修改", operateType = "policy_strive")
     public R update(@RequestBody @Valid PolicyStriveVO vo) {
         policyStriveService.update(vo);
         return R.success("更新成功");
@@ -138,6 +146,7 @@ public class PolicyStriveController extends QdportController {
 
     @PostMapping("/updateById")
     @ApiOperation(value = "月度维护、奖励分配", notes = "传入PolicyStrive")
+    @WebLog(operateName = "月度维护/奖励分配", operateType = "policy_strive")
     public R updateById(@RequestBody @Valid PolicyStriveVO vo) {
         if (StringUtil.isNotEmpty(vo.getIsReward()) && vo.getIsReward() == 1) {
             String partPersonArr = vo.getPartPersonArr();
@@ -161,6 +170,7 @@ public class PolicyStriveController extends QdportController {
 
     @PostMapping("/withdraw")
     @ApiOperation(value = "撤回", notes = "传入PolicyStrive")
+    @WebLog(operateName = "撤回", operateType = "policy_strive")
     public R withdraw(@RequestBody @Valid PolicyStriveVO vo) {
         policyStriveService.withdraw(vo);
         return R.success("撤回成功");
@@ -168,6 +178,7 @@ public class PolicyStriveController extends QdportController {
 
     @PostMapping("/approve")
     @ApiOperation(value = "审批通过", notes = "传入PolicyStrive")
+    @WebLog(operateName = "审批通过", operateType = "policy_strive")
     public R approve(@RequestBody @Valid PolicyStriveVO vo) throws ExecutionException, InterruptedException {
         vo.setIsWithdraw(0);
         policyStriveService.approve(vo);
@@ -177,6 +188,7 @@ public class PolicyStriveController extends QdportController {
 
     @PostMapping("/refuse")
     @ApiOperation(value = "审批拒绝", notes = "传入PolicyStrive")
+    @WebLog(operateName = "审批拒绝", operateType = "policy_strive")
     public R refuse(@RequestBody @Valid PolicyStriveVO vo) {
         vo.setIsWithdraw(1);
         policyStriveService.refuse(vo);
@@ -185,6 +197,7 @@ public class PolicyStriveController extends QdportController {
 
     @PostMapping("/resubmit")
     @ApiOperation(value = "重新提交", notes = "传入PolicyStrive")
+    @WebLog(operateName = "重新上报", operateType = "policy_strive")
     public R resubmit(@RequestBody @Valid PolicyStriveVO vo) throws ExecutionException, InterruptedException {
         vo.setStatus(QDPortEnum.POLICY_STRIVE_STATUS_APPROVE.getValue());
         policyStriveService.approve(vo);
@@ -197,6 +210,7 @@ public class PolicyStriveController extends QdportController {
      */
     @PostMapping("/remove")
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @WebLog(operateName = "删除", operateType = "policy_strive")
     public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids) {
         List<String> idList = Func.toStrList(ids);
         policyStriveService.delete(idList);

src/main/java/com/qdport/controller/PolicyTemplateController.java

@@ -1,11 +1,14 @@
 package com.qdport.controller;
 
+import com.qdport.annotation.WebLog;
 import com.qdport.entity.PolicyTemplate;
 import com.qdport.enums.QDPortEnum;
 import com.qdport.service.PolicyFileService;
+import com.qdport.service.PolicyLogService;
 import com.qdport.service.PolicyTemplateService;
 import com.qdport.query.PolicyTemplateQuery;
 import com.qdport.vo.PolicyFileVO;
+import com.qdport.vo.PolicyLogVO;
 import com.qdport.vo.PolicyTemplateVO;
 import com.qdport.wrapper.PolicyTemplateWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -18,6 +21,7 @@ import com.qdport.core.boot.ctrl.QdportController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -66,6 +70,7 @@ public class PolicyTemplateController extends QdportController {
      */
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "传入PolicyTemplate")
+    @WebLog(operateName = "新增", operateType = "policy_template")
     public R save(@RequestBody PolicyTemplateVO vo) {
         policyTemplateService.save(vo);
         return R.success("保存成功");
@@ -75,6 +80,7 @@ public class PolicyTemplateController extends QdportController {
      * 修改
      */
     @PostMapping("/update")
+    @WebLog(operateName = "修改", operateType = "policy_template")
     public R update(@RequestBody @Valid PolicyTemplateVO vo) {
         policyTemplateService.update(vo);
         return R.success("更新成功");
@@ -85,6 +91,7 @@ public class PolicyTemplateController extends QdportController {
      */
     @PostMapping("/remove")
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @WebLog(operateName = "删除", operateType = "policy_template")
     public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids) {
         List<String> idList = Func.toStrList(ids);
         policyTemplateService.delete(idList);

src/main/java/com/qdport/entity/PolicyCondition.java

@@ -1,52 +0,0 @@
-package com.qdport.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.*;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 系统配置
- *
- * @author yuheng 
- * @since 1.0.0 2024-10-28
- */
-
-@Data
-@TableName("POLICY_CONDITION")
-@ApiModel(value = "PolicyCondition对象", description = "系统配置")
-public class PolicyCondition implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@ApiModelProperty(value = "id")
-	@TableId(
-			value = "id",
-			type = IdType.ASSIGN_UUID
-	)
-	private String id;
-
-	@ApiModelProperty(value = "关联类型")
-	private String refType;
-
-	@ApiModelProperty(value = "政策等级")
-	private String zcLevel;
-
-	@DateTimeFormat(
-			pattern = "yyyy-MM-dd"
-	)
-	@JsonFormat(
-			pattern = "yyyy-MM-dd"
-	)
-	@ApiModelProperty(value = "应填报日期")
-	private Date ytbDate;
-
-	@ApiModelProperty(value = "备用字段")
-	private String otherCondition;
-
-}

src/main/java/com/qdport/entity/PolicyLog.java

@@ -1,6 +1,8 @@
 package com.qdport.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -52,4 +54,11 @@ public class PolicyLog implements Serializable {
 	@ApiModelProperty(value = "操作登录用户名")
 	private String loginName;
 
+	@ApiModelProperty(value = "操作人id")
+	@JsonSerialize(
+			using = ToStringSerializer.class
+	)
+	private Long userId;
+
+	private String ipHost;
 }

src/main/java/com/qdport/enums/QDPortEnum.java

@@ -47,7 +47,12 @@ public enum QDPortEnum {
 
     POLICY_PROCESS_TYPE_USER_TASK("userTask", "已经审批通过的节点+正在审批的节点(去除箭头)"),
 
-
+    POLICY_LOG_OPERATE_TYPE_POLICY_SHARE("policy_share", "政策分享"),
+    POLICY_LOG_OPERATE_TYPE_POLICY_STRIVE("policy_strive", "政策争取"),
+    POLICY_LOG_OPERATE_TYPE_POLICY_CASE("policy_case", "案例分享"),
+    POLICY_LOG_OPERATE_TYPE_POLICY_MESSAGE("policy_message", "留言"),
+    POLICY_LOG_OPERATE_TYPE_POLICY_TEMPLATE("policy_template", "模板管理"),
+    POLICY_LOG_OPERATE_TYPE_POLICY_CONDITION("policy_condition", "应填报日期管理"),
 
     ;
 

src/main/java/com/qdport/mapper/PolicyConditionMapper.java

@@ -1,14 +0,0 @@
-package com.qdport.mapper;
-
-import com.qdport.entity.PolicyCondition;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* 系统配置
-*
-* @author yuheng 
-* @since 1.0.0 2024-10-28
-*/
-public interface PolicyConditionMapper extends BaseMapper<PolicyCondition> {
-
-}

src/main/java/com/qdport/query/PolicyConditionQuery.java

@@ -18,4 +18,6 @@ public class PolicyConditionQuery implements Serializable {
     private Integer page=1;
     @ApiModelProperty("分页参数页码大小")
     private Integer size=20;
+
+    private Integer ytbDate;
 }

src/main/java/com/qdport/query/PolicyLogQuery.java

@@ -1,8 +1,13 @@
 package com.qdport.query;
+import com.qdport.annotation.Wrapper;
+import com.qdport.enums.Comparison;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -18,4 +23,20 @@ public class PolicyLogQuery implements Serializable {
     private Integer page=1;
     @ApiModelProperty("分页参数页码大小")
     private Integer size=20;
+    @Wrapper(value = Comparison.LIKE)
+    private String loginName;
+    @Wrapper(value = Comparison.LIKE)
+    private String userName;
+    @Wrapper
+    private String operateType;
+    @Wrapper(value = Comparison.GT, column = "CREATE_TIME")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    private Date beginCreateTime;
+    @Wrapper(value = Comparison.LT, column = "CREATE_TIME")
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    private Date endCreateTime;
 }

src/main/java/com/qdport/service/PolicyConditionService.java

@@ -1,24 +0,0 @@
-package com.qdport.service;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qdport.vo.PolicyConditionVO;
-import com.qdport.query.PolicyConditionQuery;
-import com.qdport.entity.PolicyCondition;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.List;
-
-/**
- * 系统配置
- *
- * @author yuheng 
- * @since 1.0.0 2024-10-28
- */
-public interface PolicyConditionService  extends IService<PolicyCondition> {
-
-    IPage<PolicyConditionVO> page(PolicyConditionQuery query);
-
-    void save(PolicyConditionVO vo);
-
-    void update(PolicyConditionVO vo);
-
-    void delete(List<String> idList);
-}

src/main/java/com/qdport/service/impl/PolicyConditionServiceImpl.java

@@ -1,63 +0,0 @@
-package com.qdport.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import com.qdport.entity.PolicyCondition;
-import com.qdport.query.PolicyConditionQuery;
-import com.qdport.vo.PolicyConditionVO;
-import com.qdport.mapper.PolicyConditionMapper;
-import com.qdport.service.PolicyConditionService;
-import com.qdport.wrapper.PolicyConditionWrapper;
-import com.qdport.core.tool.utils.Func;
-import com.qdport.core.tool.utils.BeanUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.List;
-
-/**
- * 系统配置
- *
- * @author yuheng 
- * @since 1.0.0 2024-10-28
- */
-@Service
-public class PolicyConditionServiceImpl extends ServiceImpl<PolicyConditionMapper, PolicyCondition> implements PolicyConditionService {
-
-    @Override
-    public IPage<PolicyConditionVO> page(PolicyConditionQuery query) {
-        IPage<PolicyCondition> page = new Page<>(query.getPage(), query.getSize());
-        page = baseMapper.selectPage(page, getWrapper(query));
-        return PolicyConditionWrapper.build().pageVO(page);
-    }
-
-    private LambdaQueryWrapper<PolicyCondition> getWrapper(PolicyConditionQuery query){
-        LambdaQueryWrapper<PolicyCondition> wrapper = Wrappers.lambdaQuery();
-        return wrapper;
-    }
-
-    @Override
-    public void save(PolicyConditionVO vo) {
-        PolicyCondition entity = BeanUtil.copy(vo,PolicyCondition.class);
-
-        baseMapper.insert(entity);
-    }
-
-    @Override
-    public void update(PolicyConditionVO vo) {
-        PolicyCondition entity = BeanUtil.copy(vo,PolicyCondition.class);
-
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(List<String> idList) {
-        removeByIds(idList);
-    }
-
-}

src/main/java/com/qdport/service/impl/PolicyLogServiceImpl.java

@@ -1,9 +1,14 @@
 package com.qdport.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qdport.modules.system.entity.SysUser;
+import com.qdport.modules.system.mapper.TSysUserMapper;
+import com.qdport.query.QueryWrapperBuilder;
+import com.qdport.util.StringUtil;
 import lombok.AllArgsConstructor;
 import com.qdport.entity.PolicyLog;
 import com.qdport.query.PolicyLogQuery;
@@ -16,16 +21,20 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
  * 日志管理
  *
- * @author yuheng 
+ * @author yuheng
  * @since 1.0.0 2024-10-28
  */
 @Service
 public class PolicyLogServiceImpl extends ServiceImpl<PolicyLogMapper, PolicyLog> implements PolicyLogService {
+    @Resource
+    TSysUserMapper sysUserMapper;
 
     @Override
     public IPage<PolicyLogVO> page(PolicyLogQuery query) {
@@ -34,21 +43,28 @@ public class PolicyLogServiceImpl extends ServiceImpl<PolicyLogMapper, PolicyLog
         return PolicyLogWrapper.build().pageVO(page);
     }
 
-    private LambdaQueryWrapper<PolicyLog> getWrapper(PolicyLogQuery query){
-        LambdaQueryWrapper<PolicyLog> wrapper = Wrappers.lambdaQuery();
+    private QueryWrapper<PolicyLog> getWrapper(PolicyLogQuery query) {
+        QueryWrapper<PolicyLog> wrapper = QueryWrapperBuilder.buildQueryWrapper(query, PolicyLog.class);
+        wrapper.orderByDesc("CREATE_TIME");
         return wrapper;
     }
 
     @Override
     public void save(PolicyLogVO vo) {
-        PolicyLog entity = BeanUtil.copy(vo,PolicyLog.class);
+        PolicyLog entity = BeanUtil.copy(vo, PolicyLog.class);
 
+        if (StringUtil.isEmpty(entity.getLoginName()) || StringUtil.isEmpty(entity.getUserName())) {
+            SysUser sysUser = sysUserMapper.selectById(entity.getUserId());
+            entity.setLoginName(sysUser.getUserName());
+            entity.setUserName(sysUser.getName());
+        }
+        entity.setCreateTime(new Date());
         baseMapper.insert(entity);
     }
 
     @Override
     public void update(PolicyLogVO vo) {
-        PolicyLog entity = BeanUtil.copy(vo,PolicyLog.class);
+        PolicyLog entity = BeanUtil.copy(vo, PolicyLog.class);
 
         updateById(entity);
     }

src/main/java/com/qdport/vo/PolicyConditionVO.java

@@ -1,17 +0,0 @@
-package com.qdport.vo;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.qdport.entity.PolicyCondition;
-/**
-* 系统配置
-*
-* @author yuheng 
-* @since 1.0.0 2024-10-28
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PolicyConditionVO extends PolicyCondition {
-	private static final long serialVersionUID = 1L;
-
-
-}

src/main/java/com/qdport/wrapper/PolicyConditionWrapper.java

@@ -1,31 +0,0 @@
-package com.qdport.wrapper;
-import com.qdport.core.mp.support.BaseEntityWrapper;
-import com.qdport.core.tool.utils.BeanUtil;
-import java.util.Objects;
-import com.qdport.vo.PolicyConditionVO;
-import com.qdport.entity.PolicyCondition;
-import lombok.Data;
-/**
-* 系统配置Wrapper
-*
-* @author yuheng 
-* @since 1.0.0 2024-10-28
-*/
-@Data
-public class PolicyConditionWrapper extends BaseEntityWrapper<PolicyCondition, PolicyConditionVO> {
-
-    public static PolicyConditionWrapper build() {
-        return new PolicyConditionWrapper();
-    }
-
-    @Override
-    public PolicyConditionVO entityVO(PolicyCondition entity) {
-        PolicyConditionVO vo = Objects.requireNonNull(BeanUtil.copy(entity, PolicyConditionVO.class));
-        //User createUser = UserCache.getUser(entity.getCreateUser());
-        //User updateUser = UserCache.getUser(entity.getUpdateUser());
-        //vo.setCreateUserName(createUser.getName());
-        //vo.setUpdateUserName(updateUser.getName());
-        return vo;
-    }
-
-}

src/main/java/com/qdport/wrapper/PolicyFlowNoWrapper.java

@@ -22,7 +22,7 @@ public class PolicyFlowNoWrapper extends BaseEntityWrapper<PolicyFlowNo, PolicyF
     @Override
     public PolicyFlowNoVO entityVO(PolicyFlowNo entity) {
         PolicyFlowNoVO vo = Objects.requireNonNull(BeanUtil.copy(entity, PolicyFlowNoVO.class));
-        //User createUser = UserCache.getUser(entity.getCreateUser());
+//        User createUser = UserCache.getUser(entity.getCreateUser());
         //User updateUser = UserCache.getUser(entity.getUpdateUser());
         //vo.setCreateUserName(createUser.getName());
         //vo.setUpdateUserName(updateUser.getName());