初步统一日志格式

src/main/java/com/keymobile/indicators/api/hytobacco/TaskCtrl.java

@@ -55,12 +55,12 @@ public class TaskCtrl  {
             if (ruleIds.size() > 1) {
                 taskService.batchCreateTaskByRule(ruleIds, valueTime, need);
                 result = Result.genOkResult("开始批量启动任务");
-                LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}启动了批量任务数据时间为：{}的任务， ids为{}",
-                        SystemUserUtil.getCurrentUser(), valueTime,ruleIds);
+                LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "启动了批量任务数据时间为：{}的任务， ids为{}",
+                         valueTime,ruleIds);
             } else {
                 result = taskService.createTaskByRule(ruleIds.get(0), valueTime, need);
-                LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}启动了数据时间为：{}的任务id为{}",
-                        SystemUserUtil.getCurrentUser(), valueTime,ruleIds);
+                LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "启动了数据时间为：{}的任务id为{}",
+                         valueTime,ruleIds);
             }
         } else {
             result = Result.genFailedResult("没有选择需要启动的任务");
@@ -83,8 +83,7 @@ public class TaskCtrl  {
         if(StringUtils.isNotBlank(param.getUserId())){
             param.setUserId(SystemUserUtil.getCurrentUserId());
         }
-        LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}查询了我任务的",
-                SystemUserUtil.getCurrentUser());
+        LogManager.logInfo(Constants.LOG_CONTEXT_API, "查询了我任务的");
         return taskService.findAllTask(param);
     }
 

src/main/java/com/keymobile/indicators/api/hytobacco/TaskRuleCtrl.java

@@ -70,7 +70,7 @@ public class TaskRuleCtrl {
     @GetMapping("deleteById")
     public Result deleteById(@ApiParam("id") @RequestParam("id")Integer id) {
         taskRuleService.delete(id);
-        LogManager.logInfo(Constants.LOG_CONTEXT_API, "删除id={}的任务规则", id);
+        LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "删除id={}的任务规则", id);
         return  Result.genOkResult();
     }
 
@@ -91,13 +91,13 @@ public class TaskRuleCtrl {
                 rule.setCreateTime(now);
                 rule.setCreator(currentUserId);
                 taskRuleService.createRule(rule);
-                LogManager.logInfo(Constants.LOG_CONTEXT_API, "创建了规则id={},name={}", rule.getId(), rule.getName());
+                LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "创建了规则id={},name={}", rule.getId(), rule.getName());
             } else {
                 TaskRule t = taskRuleService.getById(rule.getId(), false);
                 rule.setCreator(t.getCreator());
                 rule.setCreateTime(t.getCreateTime());
                 taskRuleService.updateRule(rule);
-                LogManager.logInfo(Constants.LOG_CONTEXT_API, "修改id={}, name={} 的任务规则", rule.getId(), rule.getName());
+                LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "修改id={}, name={} 的任务规则", rule.getId(), rule.getName());
             }
             result = Result.genOkResult(rule);
         }

src/main/java/com/keymobile/indicators/constant/Constants.java

@@ -9,7 +9,21 @@ public class Constants {
      * 日志---操作日志
      */
     public static final String LOG_CONTEXT_API = "indicator.operate";
-    
+
+    /**
+     * 日志---数据填报，任务下发
+     */
+    public static final String LOG_INDICATOR_TASK_START_API = "indicator.task.start";
+
+    /**
+     * 日志---数据填报，数据审核
+     */
+    public static final String LOG_INDICATOR_TASK_AUDIT_API = "indicator.task.audit";
+    /**
+     * 日志---数据填报，数据确认
+     */
+    public static final String LOG_INDICATOR_TASK_PASS_API = "indicator.task.pass";
+
     public static final String LOG_INDICATOR_UNIT_CAL_API = "indicator.unit.cal";
     
     public static final String LOG_INDICATOR_BASE_INDI_API = "indicator.base.indi";

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -356,8 +356,8 @@ public class TaskServiceImpl implements TaskService {
                     //填报消息设为已读
                     noticeInfoService.updateToReadByToUsersAndTaskIdAndNoticeClass(task.getEnterUsers(),taskId,Constants.NOTICEINFO_DATA_ENTER);
 
-                    LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}提交任务id:{},name:{}到审核",
-                           user, taskId, task.getRuleName());
+                    LogManager.logInfo(Constants.LOG_CONTEXT_API, "提交任务id:{},name:{}到审核",
+                            taskId, task.getRuleName());
                 } else {
                     result = Result.genFailedResult("此配置此任务审批人,ruleLevel=" + ruleLevel + ",归属部门=" + indDept);
                 }
@@ -407,8 +407,16 @@ public class TaskServiceImpl implements TaskService {
         auditRecord.setUpdateTime(now);
         auditRecord.setCreateTime(now);
         taskAuditRecordMapper.insert(auditRecord);
-        LogManager.logInfo(Constants.LOG_CONTEXT_API, "{} {}任务:{}Id:{},ruleId:{}, ruleLevel:{}",
-                auditUser, recordType, task.getRuleName(), task.getId(), task.getRuleId(), task.getRuleLevel());
+        //数据确认
+        if(task.getStatus()==Constants.APPLY_STATE_PASSED){
+            LogManager.logInfo(Constants.LOG_INDICATOR_TASK_PASS_API, " {}任务:{}Id:{},ruleId:{}, ruleLevel:{}",
+                    recordType, task.getRuleName(), task.getId(), task.getRuleId(), task.getRuleLevel());
+        }else{
+            //数据审核
+            LogManager.logInfo(Constants.LOG_INDICATOR_TASK_AUDIT_API, " {}任务:{}Id:{},ruleId:{}, ruleLevel:{}",
+                    recordType, task.getRuleName(), task.getId(), task.getRuleId(), task.getRuleLevel());
+        }
+
 
         if(status==Constants.APPLY_STATE_DRAFT){
             String user = SystemUserUtil.getCurrentUser();
@@ -819,9 +827,9 @@ public class TaskServiceImpl implements TaskService {
             result = Result.genFailedResult("规则不存在");
         }
         if (result.isSuccess()) {
-            LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字：{}下发成功", rule.getId(), rule.getName()  );
+            LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "任务id:{},名字：{}下发成功", rule.getId(), rule.getName()  );
         } else {
-            LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字：{}下发失败, {}",
+            LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "任务id:{},名字：{}下发失败, {}",
                     rule.getId(), rule.getName(), result.getMsg()  );
         }
         return result;

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardTaskService.java

@@ -76,7 +76,7 @@ public class ShortboardTaskService {
             //标记为已下发
             shortboardRecord.setIsIssue("1");
             shortboardRecordMapper.updateByPrimaryKeySelective(shortboardRecord);
-            String message = currentUser+"：下发了短板，短板id：{}短板名：{}";
+            String message = "下发了短板，短板id：{}短板名：{}";
             LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_RECORD_API,message,shortBoardTask.getId(),shortBoardTask.getShortboardName());
         }
         return Result.genOkResult();
@@ -155,7 +155,7 @@ public class ShortboardTaskService {
         shortBoardTask.setId(taskId);
         shortBoardTask.setStatus(status);
         shortboardTaskMapper.updateByPrimaryKeySelective(shortBoardTask);
-        String message = SystemUserUtil.getCurrentUser()+":把id={}的短板清单状态修改为{} ";
+        String message ="把id={}的短板清单状态修改为{} ";
         LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_AUDIT_API,message,taskId,status);
         if(StringUtils.isNotBlank(description)){
             ShortBoardAuditRecord shortBoardAuditRecord = new ShortBoardAuditRecord();

src/main/java/com/keymobile/indicators/utils/LogManager.java

@@ -75,7 +75,7 @@ public class LogManager {
     public static void logInfo(String context, String message, Object... objects) {
         Logger logger = LoggerFactory.getLogger(context);
         String ip = getIp();
-        message = message + "; IP: " + ip;
+       // message = message + "; IP: " + ip;
         message = StringUtils.replace(message, "{}", "%s");
         message = String.format(message, objects);
         String menuPath = getMenuPath(context);

src/main/java/com/keymobile/indicators/utils/ModelPathEnum.java

@@ -2,10 +2,13 @@ package com.keymobile.indicators.utils;
 
 public enum ModelPathEnum {
 	LOG_CONTEXT_API("indicator.operate","数据填报/数据填报"),
+	LOG_INDICATOR_TASK_START_API("indicator.task.start","数据填报/任务下发"),
+	LOG_INDICATOR_TASK_PASS_API("indicator.task.pass","数据填报/数据确认"),
+	LOG_INDICATOR_TASK_AUDIT_API("indicator.task.audit","数据填报/数据审核"),
 	LOG_INDICATOR_UNIT_CAL_API("indicator.unit.cal","数据填报/数据运算"),
 	LOG_INDICATOR_BASE_INDI_API("indicator.base.indi","规则管理/数据项管理"),
 	LOG_INDICATOR_DRIVE_INDI_API("indicator.drive.indi","规则管理/对标指标管理"),
-	LOG_INDICATOR_SCORECARD_API("indicator.scorecard","规则管理/指标计分规则管理"),
+	LOG_INDICATOR_SCORECARD_API("indicator.scorecard","规则管理/指标积分规则管理"),
 	LOG_INDICATOR_OBJ_SCORERULE_API("indicator.obj.scorerule","规则管理/单位得分规则管理"),
 	LOG_INDICATOR_SHORTBOARD_RULE_API("indicator.shortboardrule","规则管理/短板筛选规则管理"),
 	LOG_INDICATOR_PARAMETER_API("indicator.parameter","数据填报/精益台账"),//台账管理

src/main/resources/logback-custom.xml

@@ -60,7 +60,15 @@
     <logger name="indicator.uploadfile">
         <appender-ref ref="db" />
     </logger>
-
+    <logger name="indicator.task.start">
+        <appender-ref ref="db" />
+    </logger>
+    <logger name="indicator.task.pass">
+        <appender-ref ref="db" />
+    </logger>
+    <logger name="indicator.task.audit">
+        <appender-ref ref="db" />
+    </logger>
     <root level="INFO">
         <appender-ref ref="stdout" />
     </root>