Merge remote-tracking branch 'origin/master'

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -214,62 +214,62 @@ public class SaveConstans {
         /**
          * 培训截止提醒内容
          */
-        public static final String CUT_OFF_TRAIN_CONTENT = "%s,将于%tF截止，请及时完成培训！";
+        public static final String CUT_OFF_TRAIN_CONTENT = "【%s】,将于【%tF】截止，请及时完成培训！";
         /**
          * 培训截止提醒内容
          */
-        public static final String CUT_OFF_PAPER_CONTENT = "%s,将于%tF截止，请及时完成考试！";
+        public static final String CUT_OFF_PAPER_CONTENT = "【%s】,将于【%tF】截止，请及时完成考试！";
         /**
          * 考试试卷提醒内容
          */
-        public static final String TRAIN_NOTIFY_CONTENT = "%s已发布，截止时间：%tF，请及时完成考试！";
+        public static final String TRAIN_NOTIFY_CONTENT = "【%s】已发布，截止时间：【%tF】，请及时完成考试！";
         /**
          * 我的培训课程提醒内容
          */
-        public static final String COURSE_NOTIFY_CONTENT = "培训课程:%s 已发布，培训时间：%tF至%tF，请及时完成培训！";
+        public static final String COURSE_NOTIFY_CONTENT = "培训课程:【%s】 已发布，培训时间：【%tF】至【%tF】，请及时完成培训！";
         /**
          * 培训课程取消提醒内容
          */
-        public static final String CANCEL_TRAIN_CONTENT = "%s 已取消，请知悉！；";
+        public static final String CANCEL_TRAIN_CONTENT = "【%s】 已取消，请知悉！；";
         /**
          * 培训需求调查提醒内容
          */
-        public static final String QUESTIONNAIRE_SURVEY_CONTENT = "%s年%s培训需求,已发布";
+        public static final String QUESTIONNAIRE_SURVEY_CONTENT = "【%s】年【%s】培训需求,已发布";
         /**
          * 检查任务提醒内容
          */
-        public static final String INSPECTION_TASKS_CONTENT = "日常检查%s将于%tF %tT开始检查区域为%s-;-%s";
+        public static final String INSPECTION_TASKS_CONTENT = "日常检查【%s】将于【%tF 】开始检查区域为%s-;-%s";
         /**
          * 危险作业处罚内容
          */
-        public static final String DANGEROUS_CONTENT = "%s，作业时间：%s至%s，处罚金额：%s，处罚时间：【%s】";
+        public static final String DANGEROUS_CONTENT = "【%s】，作业时间：【%s】至【%s】，处罚金额：【%s】，处罚时间：【%s】";
         /**
          * 隐患任务提醒内容
          */
-        public static final String DANGER_TASKS_CONTENT = "%s发现隐患任务请在%tF前整改完成";
+        public static final String DANGER_TASKS_CONTENT = "【%s】发现隐患任务请在【%tF】前整改完成";
 
         /**
          * 隐患任务确认提醒内容
          */
-        public static final String DANGER_TASKS_CONFIRM_CONTENT = "隐患任务%s已整改请确认";
+        public static final String DANGER_TASKS_CONFIRM_CONTENT = "隐患任务【%s】已整改请确认";
         /**
          * 隐患任务验证提醒内容
          */
-        public static final String DANGER_TASKS_VERIFY_CONTENT = "隐患任务%s已整改并确认请验证";
+        public static final String DANGER_TASKS_VERIFY_CONTENT = "隐患任务【%s】已整改并确认请验证";
 
         /**
          * 点巡检任务提醒
          */
-        public static final String INSPECTION_CONTENT = "%s的%s任务请及时完成";
+        public static final String INSPECTION_CONTENT = "【%s】的【%s】任务请及时完成";
         /**
          * 保养检修工单提醒内容
          */
-        public static final String MAINTAIN_SYSTEM_CONTENT = "请及时执行%s的%s的%s（ %s ）-%s的保养任务并登记保养结果，负责人：%s，其他保养工程师：%s";
+        public static final String MAINTAIN_SYSTEM_CONTENT = "请及时执行【%s】的【%s】的【%s】（ 【%s】 ）-【%s】的保养任务并登记保养结果，负责人：【%s】，其他保养工程师：【%s】";
 
         /**
          * 保养检修工单提醒内容
          */
-        public static final String ACCEPTANCE_SYSTEM_CONTENT = "请及时对已完成保养登记的%s-%s的%s（%s ）%s的保养任务进行验收确认，（完成日期：%s，保养负责人：%s，其他保养工程师：%s";
+        public static final String ACCEPTANCE_SYSTEM_CONTENT = "请及时对已完成保养登记的【%s-%s】的【%s】（【%s】 ）【%s】的保养任务进行验收确认，（完成日期：【%s】，保养负责人：【%s】，其他保养工程师：【%s】";
 
         /**
          * 润滑任务提醒内容

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -438,12 +438,13 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             EquMaintenanceScheduleDo maintenanceSchedule,
             Integer month){
         Date newDate = new Date();
-        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        // SysUserVo currentUser = CommonUtils.getCurrentUser();
         List<EquMaintenanceTaskDo> maintenanceTaskList = new ArrayList<>();
         for (EquMaintenancePartDo maintenancePart : maintenancePartList) {
             SysSerialVo sysSerialVo = new SysSerialVo();
-            String plantSimp = PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
-            sysSerialVo.setModulecode("equ_maintenance_task_aq_code_"+plantSimp);
+            // String plantSimp = PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
+            String plantSimp = PlantEnum.addrOf(maintenancePart.getTenantid());
+            sysSerialVo.setModulecode("equ_maintenance_task_aq_code_"+ plantSimp);
             sysSerialVo.setResetrule("date:yyyy");
             sysSerialVo.setIfautomaticreset("y");
             sysSerialVo.setRuleTemplateStr(plantSimp +"-"+maintenanceSchedule.getPlantype()+"-@{date:yyyyMM}-@{serialNumber:#00000}");
@@ -453,14 +454,10 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             BeanUtils.copyProperties( maintenancePart,equMaintenanceTask);
             equMaintenanceTask.setId(SecurityUtil.getUUID())
                     .setMonth(month.toString())
-                    .setCreateuserid(currentUser.getId())
                     .setEquipmentnumber(maintenanceSchedule.getEquipmentnumber())
-                    .setCreateusername(currentUser.getName())
                     .setCreatedate(newDate)
-                    .setModifyuserid(currentUser.getId())
-                    .setModifyusername(currentUser.getName())
                     .setModifydate(newDate)
-                    .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
+                    .setTenantid(maintenancePart.getTenantid());
             if ("200".equals(serialNumberCode.getCode())){
 
                 Object data = serialNumberCode.getData();

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/HiddenDangerTaskServiceImpl.java

@@ -54,30 +54,30 @@ public class HiddenDangerTaskServiceImpl implements HiddenDangerTaskService {
     /**
      * 隐患跟踪任务整改提醒内容
      */
-    public static final String RECTIFICATION_MAIL_CONTENT = "总编号：%s\n 发现时间：%tF\n 发现人：%s\n 发现项：%s\n限整改期：%tF ";
+    public static final String RECTIFICATION_MAIL_CONTENT = "总编号：【%s】\n 发现时间：【%tF】\n 发现人：【%s】\n 发现项：【%s】\n限整改期：【%tF】 ";
 
     /**
      * 隐患跟踪任务验证完成提醒内容
      */
-    public static final String VERIFICATION_REMIND_MAIL_CONTENT = "%s 已整改完成，请您验证关闭 ";
+    public static final String VERIFICATION_REMIND_MAIL_CONTENT = "【%s】 已整改完成，请您验证关闭 ";
 
-    public static final String VERIFICATION_REMIND_TEMP = "总编号:%s %s\n";
+    public static final String VERIFICATION_REMIND_TEMP = "总编号:【%s】 【%s】\n";
 
     /**
      * 隐患跟踪任务验证重新整改内容
      */
-    public static final String RECTIFICATE_MAIL_CONTENT = "总编号：%s \n 发现时间：%tF \n 发现人：%s \n 发现项：%s \n 限整改期：%tF \n 整改验证未通过，请您重新整改  ";
+    public static final String RECTIFICATE_MAIL_CONTENT = "总编号：【%s】 \n 发现时间：【%tF】 \n 发现人：【%s】 \n 发现项：【%s】 \n 限整改期：【%tF】 \n 整改验证未通过，请您重新整改  ";
 
 
 
     /**
      * 隐患跟踪任务验证完成提醒内容
      */
-    public static final String VERIFICATION_SYSTEM_CONTENT = "%s 整改确认未通过，请您重新验证 ";
+    public static final String VERIFICATION_SYSTEM_CONTENT = "【%s】 整改确认未通过，请您重新验证 ";
     /**
      * 隐患跟踪任务验证完成提醒内容
      */
-    public static final String AFFIRM_REMIND_MAIL_CONTENT = "%s 已验证完成，请您确认关闭 ";
+    public static final String AFFIRM_REMIND_MAIL_CONTENT = "【%s】 已验证完成，请您确认关闭 ";
 
     /**
      * 发送隐患跟踪任务整改提醒

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/HiddenDangerTrackServiceImpl.java

@@ -42,7 +42,7 @@ public class HiddenDangerTrackServiceImpl extends ServiceImpl<HiddenDangerTrackD
     // 邮件标题
     public static final String MAIL_TITLE = "隐患跟踪任务待处理";
     // 邮件内容
-    public static final String MAIL_CONTENT = "您好,你有新的隐患跟踪任务待处理,限整改日期%s,请登录安全平台尽快处理;\n ";
+    public static final String MAIL_CONTENT = "您好,你有新的隐患跟踪任务待处理,限整改日期【%s】,请登录安全平台尽快处理;\n ";
 
     public static final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd");
 

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SafeCheckSendNotifyServiceImpl.java

@@ -39,27 +39,27 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
     /**
      * 隐患跟踪任务整改提醒内容
      */
-    public static final String RECTIFICATION_MAIL_CONTENT = "总编号：%s\n 发现时间：%tF\n 发现人：%s\n 发现项：%s\n限整改期：%tF";
+    public static final String RECTIFICATION_MAIL_CONTENT = "总编号：【%s】\n 发现时间：【%tF】\n 发现人：【%s】\n 发现项：【%s】\n限整改期：【%tF】";
 
     /**
      * 隐患跟踪任务验证完成提醒内容
      */
-    public static final String VERIFICATION_REMIND_MAIL_CONTENT = "%s 已整改完成，请您验证关闭";
+    public static final String VERIFICATION_REMIND_MAIL_CONTENT = "【%s】 已整改完成，请您验证关闭";
 
-    public static final String VERIFICATION_REMIND_TEMP = "总编号:%s %s\n";
+    public static final String VERIFICATION_REMIND_TEMP = "总编号:【%s】 【%s】\n";
 
     /**
      * 隐患跟踪任务验证重新整改内容
      */
-    public static final String RECTIFICATE_MAIL_CONTENT = "总编号：%s \n 发现时间：%tF \n 发现人：%s \n 发现项：%s \n 限整改期：%tF \n 整改验证未通过，请您重新整改 ";
+    public static final String RECTIFICATE_MAIL_CONTENT = "总编号：【%s】 \n 发现时间：【%tF】 \n 发现人：【%s】 \n 发现项：【%s】 \n 限整改期：【%tF】 \n 整改验证未通过，请您重新整改 ";
     /**
      * 隐患跟踪任务验证完成提醒内容
      */
-    public static final String VERIFICATION_SYSTEM_CONTENT = "%s 整改确认未通过，请您重新验证";
+    public static final String VERIFICATION_SYSTEM_CONTENT = "【%s】 整改确认未通过，请您重新验证";
     /**
      * 隐患跟踪任务验证完成提醒内容
      */
-    public static final String AFFIRM_REMIND_MAIL_CONTENT = "%s 已验证完成，请您确认关闭";
+    public static final String AFFIRM_REMIND_MAIL_CONTENT = "【%s】 已验证完成，请您确认关闭";
 
     @Autowired
     private DangerousDao dangerousDao;

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SaveCheckItemServiceImpl.java

@@ -63,8 +63,8 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
 
     private static final String SPECIALCHECK_MAIL_SUBJECT = "周五专项检查结果";
     private static final String TYPE_DAYCHECK_MAIL_SUBJECT = "主管经理检查结果";
-    private static final String DISCOVERY_ITEM_MAIL_CONTENT = "检查主题：%s \n组长：%s\n组员：%s\n检查工段：%s\n" +
-            "检查时间：%tF %tT至%tF %tT\n发现项：\n%s\n   ";
+    private static final String DISCOVERY_ITEM_MAIL_CONTENT = "检查主题：【%s】 \n组长：【%s】\n组员：【%s】\n检查工段：【%s】\n" +
+            "检查时间：【%tF %tT】至【%tF %tT】\n发现项：\n【%s】\n   ";
     private static final String DISCOVERY_ITEM_CONTENT = "%s、%s %s %s %s %s；\n";
 
     private static final String HIDDEN_DANGER_CLASSIFY = "hidden_danger_classify";

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ThemeCheckServiceImpl.java

@@ -61,8 +61,8 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
     /**
      * 检查计划邮件模板
      */
-    private static final String DISCOVERY_ITEM_MAIL_CONTENT = "检查主题：%s\n组长：%s\n组员：%s\n检查工段：%s\n" +
-            "检查时间：%tF\n发现项：%s\n%s ";
+    private static final String DISCOVERY_ITEM_MAIL_CONTENT = "检查主题：【%s】\n组长：【%s】\n组员：【%s】\n检查工段：【%s】\n" +
+            "检查时间：【%tF】\n发现项：【%s】\n【%s】 ";
     /**
      * 检查部位和内容信息
      */