feature 代码提交

js-common/src/main/java/com/rongwei/safecommon/utils/ExportExcelByEasyExcel.java

@@ -44,7 +44,7 @@ public class ExportExcelByEasyExcel {
             MultipartFile multipartFile = new MockMultipartFile(file,
                     originalFilename,
                     SaveConstans.ContentType.XLSX, byteArray);
-            R upload = CXCommonUtils.upload(multipartFile, notifyId);
+            R upload = JSCommonUtils.upload(multipartFile, notifyId);
 
             if ("200".equals(upload.getCode())) {
                 JSONObject jsonObject = JSONUtil.parseObj(upload.getData());

js-common/src/main/java/com/rongwei/safecommon/utils/CXCommonUtils.java

@@ -13,7 +13,6 @@ import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
-import com.rongwei.rwcommon.vo.CriteriaQuery;
 import com.rongwei.rwcommon.vo.generalsql.BatchSaveVo;
 import com.rongwei.rwcommon.vo.generalsql.GeneralInsertVo;
 import com.rongwei.rwcommonentity.commonservers.vo.SysNotifyAnnounceVo;
@@ -45,9 +44,9 @@ import static com.rongwei.safecommon.utils.SaveConstans.*;
  * @date 2023/12/15
  */
 @Component
-public class CXCommonUtils {
+public class JSCommonUtils {
     public static final String DEFAULT_NOTIFY_STATUS = "3";
-    private static final Logger log = LoggerFactory.getLogger(CXCommonUtils.class.getName());
+    private static final Logger log = LoggerFactory.getLogger(JSCommonUtils.class.getName());
     private static SysSerialNumberService sysSerialNumberService;
     private static RedisService redisService;
     private static CXCommonFeginClient commonFeginClient;

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/ApsDetailsHazardInvestigationTasksDao.java

@@ -0,0 +1,13 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksDo;
+
+
+/**
+* @Entity generator.domain.ApsDetailsHazardInvestigationTasks
+*/
+public interface ApsDetailsHazardInvestigationTasksDao extends BaseMapper<ApsDetailsHazardInvestigationTasksDo> {
+
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/ApsDetailsHazardInvestigationTasksJcxzibiaoDao.java

@@ -0,0 +1,13 @@
+package com.rongwei.sfcommon.sys.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksJcxzibiaoDo;
+
+/**
+ * @Entity generator.domain.ApsDetailsHazardInvestigationTasksJcxzibiao
+ */
+public interface ApsDetailsHazardInvestigationTasksJcxzibiaoDao extends BaseMapper<ApsDetailsHazardInvestigationTasksJcxzibiaoDo> {
+
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/ApsHazardInvestigationTemplateDao.java

@@ -0,0 +1,12 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateDo;
+
+/**
+* @Entity generator.domain.ApsHazardInvestigationTemplate
+*/
+public interface ApsHazardInvestigationTemplateDao extends BaseMapper<ApsHazardInvestigationTemplateDo> {
+
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/ApsHazardInvestigationTemplateZibiaoDao.java

@@ -0,0 +1,13 @@
+package com.rongwei.sfcommon.sys.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateZibiaoDo;
+
+/**
+* @Entity generator.domain.ApsHazardInvestigationTemplateZibiao
+*/
+public interface ApsHazardInvestigationTemplateZibiaoDao extends BaseMapper<ApsHazardInvestigationTemplateZibiaoDo> {
+
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/ApsDetailsHazardInvestigationTasksJcxzibiaoService.java

@@ -0,0 +1,12 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksJcxzibiaoDo;
+
+/**
+*
+*/
+public interface ApsDetailsHazardInvestigationTasksJcxzibiaoService extends
+        IService<ApsDetailsHazardInvestigationTasksJcxzibiaoDo> {
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/ApsDetailsHazardInvestigationTasksService.java

@@ -0,0 +1,12 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksDo;
+
+
+/**
+*
+*/
+public interface ApsDetailsHazardInvestigationTasksService extends IService<ApsDetailsHazardInvestigationTasksDo> {
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/ApsHazardInvestigationTemplateService.java

@@ -0,0 +1,12 @@
+package com.rongwei.sfcommon.sys.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateDo;
+
+/**
+ *
+ */
+public interface ApsHazardInvestigationTemplateService extends IService<ApsHazardInvestigationTemplateDo> {
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/ApsHazardInvestigationTemplateZibiaoService.java

@@ -0,0 +1,12 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateZibiaoDo;
+
+
+/**
+*
+*/
+public interface ApsHazardInvestigationTemplateZibiaoService extends IService<ApsHazardInvestigationTemplateZibiaoDo> {
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/HazardInvestigationService.java

@@ -0,0 +1,14 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.rongwei.rwcommon.base.R;
+
+/**
+ * HazardInvestigationService class
+ *
+ * @author XH
+ * @date 2024/08/09
+ */
+public interface HazardInvestigationService {
+
+    R createTask(String id);
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ApsDetailsHazardInvestigationTasksJcxzibiaoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksJcxzibiaoDo;
+import com.rongwei.sfcommon.sys.dao.ApsDetailsHazardInvestigationTasksJcxzibiaoDao;
+
+import com.rongwei.sfcommon.sys.service.ApsDetailsHazardInvestigationTasksJcxzibiaoService;
+import org.springframework.stereotype.Service;
+
+/**
+*
+*/
+@Service
+public class ApsDetailsHazardInvestigationTasksJcxzibiaoServiceImpl extends ServiceImpl<ApsDetailsHazardInvestigationTasksJcxzibiaoDao, ApsDetailsHazardInvestigationTasksJcxzibiaoDo>
+implements ApsDetailsHazardInvestigationTasksJcxzibiaoService {
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ApsDetailsHazardInvestigationTasksServiceImpl.java

@@ -0,0 +1,17 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksDo;
+import com.rongwei.sfcommon.sys.dao.ApsDetailsHazardInvestigationTasksDao;
+import com.rongwei.sfcommon.sys.service.ApsDetailsHazardInvestigationTasksService;
+import org.springframework.stereotype.Service;
+
+/**
+*
+*/
+@Service
+public class ApsDetailsHazardInvestigationTasksServiceImpl extends ServiceImpl<ApsDetailsHazardInvestigationTasksDao, ApsDetailsHazardInvestigationTasksDo>
+implements ApsDetailsHazardInvestigationTasksService {
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ApsHazardInvestigationTemplateServiceImpl.java

@@ -0,0 +1,18 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateDo;
+import com.rongwei.sfcommon.sys.dao.ApsHazardInvestigationTemplateDao;
+
+import com.rongwei.sfcommon.sys.service.ApsHazardInvestigationTemplateService;
+import org.springframework.stereotype.Service;
+
+/**
+*
+*/
+@Service
+public class ApsHazardInvestigationTemplateServiceImpl extends ServiceImpl<ApsHazardInvestigationTemplateDao, ApsHazardInvestigationTemplateDo>
+implements ApsHazardInvestigationTemplateService {
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ApsHazardInvestigationTemplateZibiaoServiceImpl.java

@@ -0,0 +1,17 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateZibiaoDo;
+import com.rongwei.sfcommon.sys.dao.ApsHazardInvestigationTemplateZibiaoDao;
+import com.rongwei.sfcommon.sys.service.ApsHazardInvestigationTemplateZibiaoService;
+import org.springframework.stereotype.Service;
+
+/**
+*
+*/
+@Service
+public class ApsHazardInvestigationTemplateZibiaoServiceImpl extends ServiceImpl<ApsHazardInvestigationTemplateZibiaoDao, ApsHazardInvestigationTemplateZibiaoDo>
+implements ApsHazardInvestigationTemplateZibiaoService {
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafeAttachmentsServiceImpl.java

@@ -14,7 +14,7 @@ import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.AspSafeAttachmentsDao;
 import com.rongwei.sfcommon.sys.dao.SaveCheckCommonDao;
 import com.rongwei.sfcommon.sys.service.AspSafeAttachmentsService;
@@ -125,7 +125,7 @@ public class AspSafeAttachmentsServiceImpl extends ServiceImpl<AspSafeAttachment
     public void sendNotify(Map<AspSafeAttachmentsDo, List<String>> sendNotifyMap) {
         sendNotifyMap.forEach((k, v) -> {
             // 发送消息提醒
-            CXCommonUtils.sendNotify(SAFETY_ATTACHMENT_VERIFICATION_TITLE,
+            JSCommonUtils.sendNotify(SAFETY_ATTACHMENT_VERIFICATION_TITLE,
                     String.format(SAFETY_ATTACHMENT_VERIFICATION_CONTENT, k.getName(), k.getNumber(), k.getInspectiondate(),
                             k.getNextinspectiondate(), k.getResponsible()), null, v.stream().distinct().collect(Collectors.toList()),
                     k.getId(), SAFETY_ATTACHMENT_VERIFICATION, false);
@@ -142,13 +142,13 @@ public class AspSafeAttachmentsServiceImpl extends ServiceImpl<AspSafeAttachment
     @Override
     public R importExcel(Map<String, String> queryParameter) {
         String fileId = queryParameter.getOrDefault("fileId", "");
-        CXCommonUtils.parameterCheck(() -> StringUtils.isBlank(fileId), "请上传文件", "文件ID为空");
+        JSCommonUtils.parameterCheck(() -> StringUtils.isBlank(fileId), "请上传文件", "文件ID为空");
         SysFileItemDo fileItemDo = saveCheckCommonDao.getFileItemByID(fileId);
-        CXCommonUtils.parameterCheck(() -> fileItemDo == null, "文件解析有误!请联系管理员", "无法根据文件ID:{},获取到文件信息", fileId);
+        JSCommonUtils.parameterCheck(() -> fileItemDo == null, "文件解析有误!请联系管理员", "无法根据文件ID:{},获取到文件信息", fileId);
         String realPath = fileItemDo.getFullpath();
-        CXCommonUtils.parameterCheck(() -> StringUtils.isBlank(realPath), "文件解析有误!请联系管理员", "根据文件ID:{},无法获取到文件路径", fileId);
+        JSCommonUtils.parameterCheck(() -> StringUtils.isBlank(realPath), "文件解析有误!请联系管理员", "根据文件ID:{},无法获取到文件路径", fileId);
         File file = new File(realPath);
-        CXCommonUtils.parameterCheck(() -> !file.exists(), "文件解析有误!请联系管理员", "根据文件地址:{},无法获取文件", realPath);
+        JSCommonUtils.parameterCheck(() -> !file.exists(), "文件解析有误!请联系管理员", "根据文件地址:{},无法获取文件", realPath);
         ImportParams params = new ImportParams();
         params.setTitleRows(0);
         params.setHeadRows(1);
@@ -160,7 +160,7 @@ public class AspSafeAttachmentsServiceImpl extends ServiceImpl<AspSafeAttachment
         // 解析后的数据
         List<AspSafeAttachmentsDo> saveList = new ArrayList<>();
         ImportAspSafeAttachmentsVo importAspSafeAttachmentsVo;
-        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        SysUserVo currentUser = JSCommonUtils.getCurrentUser();
         String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
         //获取区域信息
         Map<String, String> checkAreaMap = saveCheckCommonDao.getCheckArea(tenantId).stream().collect(Collectors.toMap(CheckAreaVo::getName, CheckAreaVo::getId, (v1, v2) -> v1));

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyDrillProgrammeServiceImpl.java

@@ -14,11 +14,10 @@ import com.rongwe.scentity.vo.AspSafetyTeamMemberVo;
 import com.rongwe.scentity.vo.AspSafetyTeamVo;
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
 import com.rongwei.rwadmincommon.system.service.SysDictService;
-import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.AspSafetyDrillProgrammeDao;
 import com.rongwei.sfcommon.sys.service.AspSafetyDrillProgrammeMsgNotifyRecordService;
 import com.rongwei.sfcommon.sys.service.AspSafetyDrillProgrammeService;
@@ -31,7 +30,6 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
-import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.List;
@@ -706,7 +704,7 @@ public class AspSafetyDrillProgrammeServiceImpl extends ServiceImpl<AspSafetyDri
         }
 
         //发送消息
-        CXCommonUtils.sendNotify("安全应急",
+        JSCommonUtils.sendNotify("安全应急",
                 sb.toString(),
                 null,
                 userIdList,

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyMeetingImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwe.scentity.domian.AspSafetyMeeting;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.AspSafetyMeetingDao;
 import com.rongwei.sfcommon.sys.service.AspSafetyMeetingService;
 import org.springframework.stereotype.Service;
@@ -31,7 +31,7 @@ public class AspSafetyMeetingImpl extends ServiceImpl<AspSafetyMeetingDao, AspSa
             String meetingRemark = ObjectUtil.isNotEmpty(item.getMeetingremark()) ? item.getMeetingremark() : "";
 
             //发送消息
-            CXCommonUtils.sendNotify("会议提醒",
+            JSCommonUtils.sendNotify("会议提醒",
                     "由【" + meetingHeader + "】主持的【"
                             + meetingTitle + "】，将于【"
                             + meetingDate + "】在【"

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyPerformanceAppraisalServiceImpl.java

@@ -9,7 +9,7 @@ import com.rongwe.scentity.domian.AspSafetyPerformanceAppraisalDetail;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.AspSafetyPerformanceAppraisalDao;
 import com.rongwei.sfcommon.sys.service.AspSafetyPerformanceAppraisalDetailService;
 import com.rongwei.sfcommon.sys.service.AspSafetyPerformanceAppraisalService;
@@ -232,7 +232,7 @@ public class AspSafetyPerformanceAppraisalServiceImpl extends ServiceImpl<AspSaf
             //主表保存
             AspSafetyPerformanceAppraisal main = new AspSafetyPerformanceAppraisal();
             String id = SecurityUtil.getUUID();
-            SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+            SysUserVo currentUser = JSCommonUtils.getCurrentUser();
             DateTime date = DateUtil.date();
             main.setId(id);
             main.setName(fileName);

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyProductObjectiveServiceImpl.java

@@ -11,7 +11,7 @@ import com.rongwe.scentity.domian.AspSafetyProductObjectiveResultScoreDetail;
 import com.rongwe.scentity.domian.AspSafetyProductObjectiveScoreDetail;
 import com.rongwe.scentity.vo.RoleIdAndUserIdsVo;
 import com.rongwei.rwcommon.utils.SecurityUtil;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.AspSafetyProductObjectiveDao;
 import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveResultScoreDetailService;
 import com.rongwei.sfcommon.sys.service.AspSafetyProductObjectiveResultService;
@@ -129,7 +129,7 @@ public class AspSafetyProductObjectiveServiceImpl extends ServiceImpl<AspSafetyP
                 String userId = split[1];
                 String count = split[2];
                 //系统通知（移动端和PC端个人工作台）
-                CXCommonUtils.sendNotify(OBSERVATION_TITLE,
+                JSCommonUtils.sendNotify(OBSERVATION_TITLE,
                         String.format(OBSERVATION_CONTENT, count),
                         null,
                         Collections.singletonList(userId),
@@ -189,7 +189,7 @@ public class AspSafetyProductObjectiveServiceImpl extends ServiceImpl<AspSafetyP
             }
             List<String> userIdList = Arrays.asList(map.get(roleId).split(","));
             //发送消息
-            CXCommonUtils.sendNotify("目标考核",
+            JSCommonUtils.sendNotify("目标考核",
                     "目标考核:【" + item.getYear().split("-")[0] + "】年，【" + item.getQuerter() + "】季度，【" + item.getDepartname() + "】单位的考核已生成，请及时完善",
                     null,
                     userIdList,

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSpecialEquipmentCertificateServiceImpl.java

@@ -6,7 +6,7 @@ import com.rongwe.scentity.vo.UserMailOrgVo;
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
 import com.rongwei.rwadmincommon.system.service.SysDictService;
 import com.rongwei.rwcommon.base.R;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.AspSpecialEquipmentCertificateDao;
 import com.rongwei.sfcommon.sys.dao.SaveCheckCommonDao;
 import com.rongwei.sfcommon.sys.service.AspSpecialEquipmentCertificateService;
@@ -103,7 +103,7 @@ public class AspSpecialEquipmentCertificateServiceImpl extends ServiceImpl<AspSp
                     .filter(info -> info.getValue().equals(k.getCertificatesort()))
                     .findFirst().orElse(null);
             // 发送消息提醒
-            CXCommonUtils.sendNotify(PERSONNEL_CERTIFICATES_TITLE,
+            JSCommonUtils.sendNotify(PERSONNEL_CERTIFICATES_TITLE,
                     String.format(PERSONNEL_CERTIFICATES_CONTENT, k.getName(), k.getOrgname(), sysDictDo == null ? "" : sysDictDo.getName(),
                             k.getReviewdate()), null, v.stream().distinct().collect(Collectors.toList()),
                     k.getId(), PERSONNEL_CERTIFICATES, false);

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckItemsServiceImpl.java

@@ -21,7 +21,7 @@ import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.CheckItemsDao;
 import com.rongwei.sfcommon.sys.dao.SaveCheckCommonDao;
 import com.rongwei.sfcommon.sys.service.CheckItemsService;
@@ -168,7 +168,7 @@ public class CheckItemsServiceImpl extends ServiceImpl<CheckItemsDao, CheckItems
                 String nextCheckDate = ObjectUtil.isNotEmpty(item.getNextcheckdate()) ? DateUtil.format(item.getNextcheckdate(), "yyy-MM-dd") : "";
 
                 //发送消息
-                CXCommonUtils.sendNotify(SPECIALEQUIPMENT_TITLE,
+                JSCommonUtils.sendNotify(SPECIALEQUIPMENT_TITLE,
                         SPECIALEQUIPMENT_CONTENT_PREFIX + String.format(SPECIALEQUIPMENT_CONTENT, typeName, checkItemCode, checkItemName, nextCheckDate),
                         null,
                         equManager.get(item.getTenantid()),
@@ -234,7 +234,7 @@ public class CheckItemsServiceImpl extends ServiceImpl<CheckItemsDao, CheckItems
             SysDictDo sysDictDo = aspCheckItemType.stream().filter(info -> info.getValue().equals(k.getCheckitemtype())).findFirst().orElse(null);
 
             // 发送消息提醒
-            CXCommonUtils.sendNotify(EQUIPMENT_CHECK_TITLE,
+            JSCommonUtils.sendNotify(EQUIPMENT_CHECK_TITLE,
                     String.format(EQUIPMENT_CHECK_CONTENT, sysDictDo == null ? "" : sysDictDo.getName(), k.getCheckitemcode(), k.getCheckitemname(),
                             k.getNextcheckdate()), null, v.stream().distinct().collect(Collectors.toList()),
                     k.getId(), SPECIALEQUIPMENT, false);
@@ -245,13 +245,13 @@ public class CheckItemsServiceImpl extends ServiceImpl<CheckItemsDao, CheckItems
     @Override
     public R importExcel(Map<String, String> queryParameter) {
         String fileId = queryParameter.getOrDefault("fileId", "");
-        CXCommonUtils.parameterCheck(() -> StringUtils.isBlank(fileId), "请上传文件", "文件ID为空");
+        JSCommonUtils.parameterCheck(() -> StringUtils.isBlank(fileId), "请上传文件", "文件ID为空");
         SysFileItemDo fileItemDo = saveCheckCommonDao.getFileItemByID(fileId);
-        CXCommonUtils.parameterCheck(() -> fileItemDo == null, "文件解析有误!请联系管理员", "无法根据文件ID:{},获取到文件信息", fileId);
+        JSCommonUtils.parameterCheck(() -> fileItemDo == null, "文件解析有误!请联系管理员", "无法根据文件ID:{},获取到文件信息", fileId);
         String realPath = fileItemDo.getFullpath();
-        CXCommonUtils.parameterCheck(() -> StringUtils.isBlank(realPath), "文件解析有误!请联系管理员", "根据文件ID:{},无法获取到文件路径", fileId);
+        JSCommonUtils.parameterCheck(() -> StringUtils.isBlank(realPath), "文件解析有误!请联系管理员", "根据文件ID:{},无法获取到文件路径", fileId);
         File file = new File(realPath);
-        CXCommonUtils.parameterCheck(() -> !file.exists(), "文件解析有误!请联系管理员", "根据文件地址:{},无法获取文件", realPath);
+        JSCommonUtils.parameterCheck(() -> !file.exists(), "文件解析有误!请联系管理员", "根据文件地址:{},无法获取文件", realPath);
         ImportParams params = new ImportParams();
         params.setTitleRows(0);
         params.setHeadRows(1);
@@ -263,7 +263,7 @@ public class CheckItemsServiceImpl extends ServiceImpl<CheckItemsDao, CheckItems
         // 解析后的数据
         List<CheckItemsDo> saveList = new ArrayList<>();
         ImportCheckItemsVo importCheckItemsVo;
-        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        SysUserVo currentUser = JSCommonUtils.getCurrentUser();
         String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
         //获取区域信息
         Map<String, String> checkAreaMap = saveCheckCommonDao.getCheckArea(tenantId).stream().collect(Collectors.toMap(CheckAreaVo::getName, CheckAreaVo::getId, (v1, v2) -> v1));

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckTemplateServiceImpl.java

@@ -16,7 +16,7 @@ import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.generalsql.GeneralApiParameter;
 import com.rongwei.rwcommon.vo.generalsql.SlaveDMLVo;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.CheckTemplateDao;
 import com.rongwei.sfcommon.sys.service.*;
 import com.rongwei.sfcommon.utils.MlConstants;
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.rongwei.safecommon.utils.CXCommonUtils.streamCodeGeneration;
+import static com.rongwei.safecommon.utils.JSCommonUtils.streamCodeGeneration;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.INSPECTION_CONTENT;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.INSPECTION_TITLE;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.INSPECTION;
@@ -460,7 +460,7 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
                 String checkitemname = k.getCheckitemname();
                 String checkitemcode = k.getCheckitemcode();
                 SysDictDo sysDictDo = dictsByType.stream().filter(info -> info.getValue().equals(templatetype)).findFirst().orElse(null);
-                CXCommonUtils.sendNotify(INSPECTION_TITLE, String.format(INSPECTION_CONTENT, pointcheckname, checkitemname, checkitemcode, sysDictDo == null ? "" : sysDictDo.getName()),
+                JSCommonUtils.sendNotify(INSPECTION_TITLE, String.format(INSPECTION_CONTENT, pointcheckname, checkitemname, checkitemcode, sysDictDo == null ? "" : sysDictDo.getName()),
                         null, v, k.getId(), INSPECTION + "-" + shift, false);
             });
         }

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/FsFileDataListServiceImpl.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwe.scentity.domian.FsFileDataListDo;
 import com.rongwei.rwcommon.base.R;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.FsFileDataListDao;
 import com.rongwei.sfcommon.sys.service.FsFileDataListService;
 import lombok.extern.slf4j.Slf4j;
@@ -49,7 +49,7 @@ public class FsFileDataListServiceImpl extends ServiceImpl<FsFileDataListDao, Fs
             List<String> userIdList = fileDataListDao.selectPeopleIdListByFileId(id);
 
             //发送消息
-            CXCommonUtils.sendNotify("制度培训提醒",
+            JSCommonUtils.sendNotify("制度培训提醒",
                     msg,
                     null,
                     userIdList,

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/HazardInvestigationServiceImpl.java

@@ -0,0 +1,115 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksDo;
+import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateDo;
+import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateZibiaoDo;
+import com.rongwei.commonservice.serial.service.SysSerialNumberService;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.BaseDo;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import com.rongwei.rwcommon.utils.StringUtils;
+import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
+import com.rongwei.safecommon.utils.JSCommonUtils;
+import com.rongwei.sfcommon.sys.service.HazardInvestigationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * HazardInvestigationServiceImpl class
+ *
+ * @author XH
+ * @date 2024/08/09
+ */
+@Service
+public class HazardInvestigationServiceImpl implements HazardInvestigationService {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+    @Autowired
+    private ApsHazardInvestigationTemplateServiceImpl apsHazardInvestigationTemplateService;
+    @Autowired
+    private ApsHazardInvestigationTemplateZibiaoServiceImpl apsHazardInvestigationTemplateZibiaoService;
+    @Autowired
+    private SysSerialNumberService autoSysSerialNumberService;
+
+    @Override
+    public R createTask(String id) {
+        log.info("开始根据模板：{}创建隐患排查任务", id);
+        ApsHazardInvestigationTemplateDo tempData = apsHazardInvestigationTemplateService.getById(id);
+        if (tempData == null) {
+            log.error("无法获取隐患模板信息");
+            throw new CustomException("该模板已删除");
+        }
+        // 模板检查项
+        List<ApsHazardInvestigationTemplateZibiaoDo> templateZibiaoDos = apsHazardInvestigationTemplateZibiaoService.list(new LambdaQueryWrapper<ApsHazardInvestigationTemplateZibiaoDo>()
+                .eq(ApsHazardInvestigationTemplateZibiaoDo::getMubanid, id)
+                .eq(BaseDo::getDeleted, "0"));
+        if (templateZibiaoDos.isEmpty()) {
+            log.debug("模板检查项为空");
+            return R.ok("模板检查项为空");
+        }
+        // 生成隐患排查任务
+        assembleTask(tempData);
+
+        return null;
+    }
+
+    public void assembleTask(ApsHazardInvestigationTemplateDo tempData) {
+        ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo;
+        SysUserVo currentUser = JSCommonUtils.getCurrentUser();
+        if (StringUtils.isBlank(tempData.getHiddendangerid())) {
+            log.error("风险点为空");
+            throw new RuntimeException("模板对应需检查的风险点为空");
+        }
+        // 风险点
+        List<String> riskPointIds = Arrays.asList(tempData.getHiddendangerid().split(","));
+        // 按照风险点 分开生成隐患排查任务
+        for (String s : riskPointIds) {
+            apsDetailsHazardInvestigationTasksDo = new ApsDetailsHazardInvestigationTasksDo();
+            apsDetailsHazardInvestigationTasksDo.setId(SecurityUtil.getUUID());
+            apsDetailsHazardInvestigationTasksDo.setCreatedate(new Date());
+            apsDetailsHazardInvestigationTasksDo.setModifydate(new Date());
+            apsDetailsHazardInvestigationTasksDo.setCreateuserid(currentUser.getId());
+            apsDetailsHazardInvestigationTasksDo.setCreateusername(currentUser.getName());
+            apsDetailsHazardInvestigationTasksDo.setModifyuserid(currentUser.getId());
+            apsDetailsHazardInvestigationTasksDo.setModifyusername(currentUser.getName());
+            apsDetailsHazardInvestigationTasksDo.setRiskunit(tempData.getHiddendangerid());
+            apsDetailsHazardInvestigationTasksDo.setRiskanalysisobjectcode(tempData.getHiddendanger());
+            SysSerialVo sysSerialVo = new SysSerialVo();
+            sysSerialVo.setModulecode("aps_hazard_investigation_template_TEMPLATENUMBER");
+            sysSerialVo.setRuleTemplateStr("BIANHAO@{serialNumber:#000000}");
+            sysSerialVo.setIfautomaticreset("n");
+            apsDetailsHazardInvestigationTasksDo.setNumber(autoSysSerialNumberService.getCodeByTemplate(sysSerialVo));
+            apsDetailsHazardInvestigationTasksDo.setIdentifyperple();
+            apsDetailsHazardInvestigationTasksDo.setIdentifyperpleid();
+
+            // 获取当前时间的0点0分0秒
+            Calendar startOfDay = Calendar.getInstance();
+            startOfDay.setTime(new Date());
+            startOfDay.set(Calendar.HOUR_OF_DAY, 0);
+            startOfDay.set(Calendar.MINUTE, 0);
+            startOfDay.set(Calendar.SECOND, 1);
+            apsDetailsHazardInvestigationTasksDo.setPlannedstarttime(startOfDay.getTime());
+            // 获取当前时间的23点59分59秒
+            startOfDay.set(Calendar.HOUR_OF_DAY, 23);
+            startOfDay.set(Calendar.MINUTE, 59);
+            startOfDay.set(Calendar.SECOND, 59);
+            startOfDay.set(Calendar.MILLISECOND, 999);
+            apsDetailsHazardInvestigationTasksDo.setPlannedendtime(startOfDay.getTime());
+
+        }
+
+
+    }
+
+
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SafeCheckSendNotifyServiceImpl.java

@@ -11,7 +11,7 @@ import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.safecommon.utils.ExportExcelByEasyExcel;
 import com.rongwei.sfcommon.sys.dao.DangerousDao;
 import com.rongwei.sfcommon.sys.dao.SaveCheckCommonDao;
@@ -141,7 +141,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
                 String assignmentTimeEnd = item.get("ASSIGNMENTTIMEEND") == null ? "" : item.get("ASSIGNMENTTIMEEND").toString();
                 String penaltyAmount = item.get("PENALTYAMOUNT") == null ? "" : item.get("PENALTYAMOUNT").toString();
                 String modifyDate = item.get("MODIFYDATE") == null ? "" : item.get("MODIFYDATE").toString();
-                CXCommonUtils.sendNotify(DANGEROUS_TITLE, String.format(DANGEROUS_CONTENT,
+                JSCommonUtils.sendNotify(DANGEROUS_TITLE, String.format(DANGEROUS_CONTENT,
                                 jobType, assignmentTimeStart, assignmentTimeEnd, penaltyAmount, modifyDate),
                         "", personnelIdList, (String) item.get("ID"), DANGEROUS);
             }
@@ -163,7 +163,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
             String assignmentTimeEnd = dangerous.get("ASSIGNMENTTIMEEND") == null ? "" : dangerous.get("ASSIGNMENTTIMEEND").toString();
             String penaltyAmount = dangerous.get("PENALTYAMOUNT") == null ? "" : dangerous.get("PENALTYAMOUNT").toString();
             String modifyDate = dangerous.get("MODIFYDATE") == null ? "" : dangerous.get("MODIFYDATE").toString();
-            CXCommonUtils.sendNotify(DANGEROUS_TITLE, String.format(DANGEROUS_CONTENT,
+            JSCommonUtils.sendNotify(DANGEROUS_TITLE, String.format(DANGEROUS_CONTENT,
                             jobType, assignmentTimeStart, assignmentTimeEnd, penaltyAmount, modifyDate),
                     "", personnelIdList, (String) dangerous.get("ID"), DANGEROUS);
         }
@@ -174,7 +174,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
      * 检查任务提醒
      */
     public void sendInspectionTasksNotify(Map<String, String> sendNotifyMap) {
-        sendNotifyMap.forEach((k, v) -> CXCommonUtils.sendNotify(INSPECTION_TASKS_TITLE, k.split(DEFAULT_SEPARATOR)[0], "",
+        sendNotifyMap.forEach((k, v) -> JSCommonUtils.sendNotify(INSPECTION_TASKS_TITLE, k.split(DEFAULT_SEPARATOR)[0], "",
                 Arrays.asList(v), k.split(DEFAULT_SEPARATOR)[1], INSPECTIONTASKS));
     }
 
@@ -182,7 +182,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
      * 隐患任务提醒
      */
     public void sendDangerTasksNotify(List<HiddenDangerTrackDo> hiddenDangerTrackDos) {
-        hiddenDangerTrackDos.forEach((k) -> CXCommonUtils.sendNotify(DANGER_TASKS_TITLE,
+        hiddenDangerTrackDos.forEach((k) -> JSCommonUtils.sendNotify(DANGER_TASKS_TITLE,
                 String.format(DANGER_TASKS_CONTENT, k.getWorkshop(), k.getRectificationdate())
                 , "",
                 new ArrayList<String>() {{
@@ -261,7 +261,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         if (userId.size() == 0) {
             log.error("无法找到接收人！");
         }
-        CXCommonUtils.sendNotify(title,
+        JSCommonUtils.sendNotify(title,
                 context, null, userId, hiddenDangerTrackDo.getId(), DANGERTASKS);
         return R.ok();
     }
@@ -305,7 +305,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         if (userId.size() == 0) {
             log.error("无法找到接收人！");
         }
-        CXCommonUtils.sendNotify(title,
+        JSCommonUtils.sendNotify(title,
                 context, null, userId, hiddenDangerTrackDo.getId(), DANGERTASKS);
         return R.ok();
     }
@@ -427,7 +427,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         if (StringUtils.isBlank(fileNameAndId)) {
             return;
         }
-        CXCommonUtils.sendNotify(notifyId, tenantId, WEEK_HIDDEN_DANGER_TASK,
+        JSCommonUtils.sendNotify(notifyId, tenantId, WEEK_HIDDEN_DANGER_TASK,
                 String.format(HIDDEN_DANGER_TASK_CONTENT, dangerTrackDos.size()), fileNameAndId, recipientIds, null,
                 notifyType, false);
     }
@@ -445,7 +445,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
     public void rectificationNotify(List<HiddenDangerTrackDo> hiddenDangerTrackList) {
         hiddenDangerTrackList.forEach(hiddenDangerTrack -> {
             List<String> userIds = Arrays.asList(hiddenDangerTrack.getTrackuserid().split(","));
-            CXCommonUtils.sendNotify(RECTIFICATION_MAIL_TITLE,
+            JSCommonUtils.sendNotify(RECTIFICATION_MAIL_TITLE,
                     String.format(RECTIFICATION_MAIL_CONTENT, hiddenDangerTrack.getCode(), hiddenDangerTrack.getFindtime(),
                             hiddenDangerTrack.getFindusername(), hiddenDangerTrack.getHiddendangercontent(),
                             hiddenDangerTrack.getRectificationdate()), null, userIds, hiddenDangerTrack.getId(), DANGERTASKS);
@@ -467,7 +467,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         hiddenDangerTrackList.forEach(hiddenDangerTrack -> {
             List<String> userIds = Arrays.asList(hiddenDangerTrack.getShopfacilitatorid().split(","));
             String format = String.format(VERIFICATION_REMIND_TEMP, hiddenDangerTrack.getCode(), hiddenDangerTrack.getHiddendangercontent());
-            CXCommonUtils.sendNotify(VERIFICATION_MAIL_TITLE,
+            JSCommonUtils.sendNotify(VERIFICATION_MAIL_TITLE,
                     String.format(VERIFICATION_REMIND_MAIL_CONTENT, format), null, userIds, hiddenDangerTrack.getId(), DANGERTASKS);
         });
 
@@ -486,7 +486,7 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
         hiddenDangerTrackList.forEach(hiddenDangerTrack -> {
             List<String> userIds = Arrays.asList(hiddenDangerTrack.getSafetypromoterid().split(","));
             String format = String.format(VERIFICATION_REMIND_TEMP, hiddenDangerTrack.getCode(), hiddenDangerTrack.getHiddendangercontent());
-            CXCommonUtils.sendNotify(AFFIRM_MAIL_TITLE,
+            JSCommonUtils.sendNotify(AFFIRM_MAIL_TITLE,
                     String.format(AFFIRM_REMIND_MAIL_CONTENT, format), null, userIds, hiddenDangerTrack.getId(), DANGERTASKS);
         });
 

js-security/security-common/src/main/resources/mybatis/ApsHazardInvestigationTemplateMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.sfcommon.sys.dao.ApsHazardInvestigationTemplateDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwe.scentity.domian.ApsHazardInvestigationTemplateDo">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="templatenumber" column="TEMPLATENUMBER" jdbcType="VARCHAR"/>
+            <result property="templatename" column="TEMPLATENAME" jdbcType="VARCHAR"/>
+            <result property="checktype" column="CHECKTYPE" jdbcType="VARCHAR"/>
+            <result property="taskgenerator" column="TASKGENERATOR" jdbcType="VARCHAR"/>
+            <result property="hiddendangerid" column="HIDDENDANGERID" jdbcType="VARCHAR"/>
+            <result property="hiddendanger" column="HIDDENDANGER" jdbcType="VARCHAR"/>
+            <result property="tempstate" column="TEMPSTATE" jdbcType="VARCHAR"/>
+            <result property="frequencyid" column="FREQUENCYID" jdbcType="VARCHAR"/>
+            <result property="frequency" column="FREQUENCY" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,TEMPLATENUMBER,
+        TEMPLATENAME,CHECKTYPE,TASKGENERATOR,
+        HIDDENDANGERID,HIDDENDANGER,TEMPSTATE,
+        FREQUENCYID,FREQUENCY
+    </sql>
+</mapper>

js-security/security-common/src/main/resources/mybatis/ApsHazardInvestigationTemplateZibiaoMapper.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.sfcommon.sys.dao.ApsHazardInvestigationTemplateZibiaoDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwe.scentity.domian.ApsHazardInvestigationTemplateZibiaoDo">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="mubanid" column="MUBANID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="controlmeasurenumber" column="CONTROLMEASURENUMBER" jdbcType="VARCHAR"/>
+            <result property="inspectioncycle" column="INSPECTIONCYCLE" jdbcType="VARCHAR"/>
+            <result property="inspectioncycleunit" column="INSPECTIONCYCLEUNIT" jdbcType="VARCHAR"/>
+            <result property="tasktype" column="TASKTYPE" jdbcType="VARCHAR"/>
+            <result property="startingtimeofwork" column="STARTINGTIMEOFWORK" jdbcType="TIMESTAMP"/>
+            <result property="endtimeofwork" column="ENDTIMEOFWORK" jdbcType="TIMESTAMP"/>
+            <result property="workingdaytype" column="WORKINGDAYTYPE" jdbcType="VARCHAR"/>
+            <result property="correspondingitemsforwarrantytasks" column="CORRESPONDINGITEMSFORWARRANTYTASKS" jdbcType="VARCHAR"/>
+            <result property="hiddendangerinvestigationcontent" column="HIDDENDANGERINVESTIGATIONCONTENT" jdbcType="VARCHAR"/>
+            <result property="riskevent" column="RISKEVENT" jdbcType="VARCHAR"/>
+            <result property="riskunit" column="RISKUNIT" jdbcType="VARCHAR"/>
+            <result property="controlmethod" column="CONTROLMETHOD" jdbcType="VARCHAR"/>
+            <result property="classificationofcontrolmeasures1" column="CLASSIFICATIONOFCONTROLMEASURES1" jdbcType="VARCHAR"/>
+            <result property="classificationofcontrolmeasures2" column="CLASSIFICATIONOFCONTROLMEASURES2" jdbcType="VARCHAR"/>
+            <result property="descriptionofcontrolmeasures" column="DESCRIPTIONOFCONTROLMEASURES" jdbcType="VARCHAR"/>
+            <result property="classificationofcontrolmeasures3" column="CLASSIFICATIONOFCONTROLMEASURES3" jdbcType="VARCHAR"/>
+            <result property="inspector" column="INSPECTOR" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,MUBANID,TENANTID,
+        ROPTION,DELETED,REMARK,
+        CREATEDATE,CREATEUSERID,MODIFYDATE,
+        MODIFYUSERID,CREATEUSERNAME,MODIFYUSERNAME,
+        CONTROLMEASURENUMBER,INSPECTIONCYCLE,INSPECTIONCYCLEUNIT,
+        TASKTYPE,STARTINGTIMEOFWORK,ENDTIMEOFWORK,
+        WORKINGDAYTYPE,CORRESPONDINGITEMSFORWARRANTYTASKS,HIDDENDANGERINVESTIGATIONCONTENT,
+        RISKEVENT,RISKUNIT,CONTROLMETHOD,
+        CLASSIFICATIONOFCONTROLMEASURES1,CLASSIFICATIONOFCONTROLMEASURES2,DESCRIPTIONOFCONTROLMEASURES,
+        CLASSIFICATIONOFCONTROLMEASURES3,INSPECTOR
+    </sql>
+</mapper>

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsDetailsHazardInvestigationTasksDo.java

@@ -0,0 +1,92 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患排查任务详情
+ * @TableName aps_details_hazard_investigation_tasks
+ */
+@TableName(value ="aps_details_hazard_investigation_tasks")
+@Data
+public class ApsDetailsHazardInvestigationTasksDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 风险单元
+     */
+
+    private String riskunit;
+
+    /**
+     * 风险分析对象编码
+     */
+    private String riskanalysisobjectcode;
+
+    /**
+     * 任务类型
+     */
+    private String tasktype;
+
+    /**
+     * 包保任务对应项
+     */
+    private String correspondingitemsforwarrantytasks;
+
+    /**
+     * 排查时间
+     */
+    private Date investigationtime;
+
+    /**
+     * IMEI
+     */
+    private String imei;
+
+    /**
+     * 排查人
+     */
+    private String identifyperple;
+    /**
+     * 排查人ID
+     */
+    private String identifyperpleid;
+
+    /**
+     * 计划开始时间
+     */
+    private Date plannedstarttime;
+
+    /**
+     * 计划结束时间
+     */
+    private Date plannedendtime;
+
+    /**
+     * 隐患排查编号
+     */
+    private String number;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsDetailsHazardInvestigationTasksJcxzibiaoDo.java

@@ -0,0 +1,132 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患排查任务子表—检查项
+ * @TableName aps_details_hazard_investigation_tasks_jcxzibiao
+ */
+@TableName(value ="aps_details_hazard_investigation_tasks_jcxzibiao")
+@Data
+public class ApsDetailsHazardInvestigationTasksJcxzibiaoDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 隐患排查任务 id
+     */
+    private String taskid;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 管控措施编号
+     */
+    private String controlmeasurenumber;
+
+    /**
+     * 巡检周期
+     */
+    private String inspectioncycle;
+
+    /**
+     * 巡检周期单位
+     */
+    private String inspectioncycleunit;
+
+    /**
+     * 任务类型
+     */
+    private String tasktype;
+
+    /**
+     * 工作开始时间
+     */
+    private Date startingtimeofwork;
+
+    /**
+     * 工作结束时间
+     */
+    private Date endtimeofwork;
+
+    /**
+     * 工作日类型
+     */
+    private String workingdaytype;
+
+    /**
+     * 包保任务对应项
+     */
+    private String correspondingitemsforwarrantytasks;
+
+    /**
+     * 隐患排查内容
+     */
+    private String hiddendangerinvestigationcontent;
+
+    /**
+     * 风险事件
+     */
+    private String riskevent;
+
+    /**
+     * 风险单元
+     */
+    private String riskunit;
+
+    /**
+     * 管控方式
+     */
+    private String controlmethod;
+
+    /**
+     * 管控措施分类1
+     */
+    private String classificationofcontrolmeasures1;
+
+    /**
+     * 管控措施分类2
+     */
+    private String classificationofcontrolmeasures2;
+
+    /**
+     * 管控措施描述
+     */
+    private String descriptionofcontrolmeasures;
+
+    /**
+     * 管控措施分类3
+     */
+    private String classificationofcontrolmeasures3;
+
+    /**
+     * 巡检人
+     */
+    private String inspector;
+
+    /**
+     * 检查结论
+     */
+    private String inspectionconclusion;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsHazardInvestigationTemplateDo.java

@@ -0,0 +1,82 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患排查模板
+ * @TableName aps_hazard_investigation_template
+ */
+@TableName(value ="aps_hazard_investigation_template")
+@Data
+public class ApsHazardInvestigationTemplateDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 模板编号
+     */
+    private String templatenumber;
+
+    /**
+     * 模板名称
+     */
+    private String templatename;
+
+    /**
+     * 检查类型
+     */
+    private String checktype;
+
+    /**
+     * 任务生成机制
+     */
+    private String taskgenerator;
+
+    /**
+     * 隐患地点ID
+     */
+    private String hiddendangerid;
+
+    /**
+     * 隐患地点
+     */
+    private String hiddendanger;
+
+    /**
+     * 模板状态
+     */
+    private String tempstate;
+
+    /**
+     * 频次ID
+     */
+    private String frequencyid;
+
+    /**
+     * 频次
+     */
+    private String frequency;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsHazardInvestigationTemplateZibiaoDo.java

@@ -0,0 +1,127 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患排查模板子表-检查项
+ * @TableName aps_hazard_investigation_template_zibiao
+ */
+@TableName(value ="aps_hazard_investigation_template_zibiao")
+@Data
+public class ApsHazardInvestigationTemplateZibiaoDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 隐患排查模板 id
+     */
+    private String mubanid;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 管控措施编号
+     */
+    private String controlmeasurenumber;
+
+    /**
+     * 巡检周期
+     */
+    private String inspectioncycle;
+
+    /**
+     * 巡检周期单位
+     */
+    private String inspectioncycleunit;
+
+    /**
+     * 任务类型
+     */
+    private String tasktype;
+
+    /**
+     * 工作开始时间
+     */
+    private Date startingtimeofwork;
+
+    /**
+     * 工作结束时间
+     */
+    private Date endtimeofwork;
+
+    /**
+     * 工作日类型
+     */
+    private String workingdaytype;
+
+    /**
+     * 包保任务对应项
+     */
+    private String correspondingitemsforwarrantytasks;
+
+    /**
+     * 隐患排查内容
+     */
+    private String hiddendangerinvestigationcontent;
+
+    /**
+     * 风险事件
+     */
+    private String riskevent;
+
+    /**
+     * 风险单元
+     */
+    private String riskunit;
+
+    /**
+     * 管控方式
+     */
+    private String controlmethod;
+
+    /**
+     * 管控措施分类1
+     */
+    private String classificationofcontrolmeasures1;
+
+    /**
+     * 管控措施分类2
+     */
+    private String classificationofcontrolmeasures2;
+
+    /**
+     * 管控措施描述
+     */
+    private String descriptionofcontrolmeasures;
+
+    /**
+     * 管控措施分类3
+     */
+    private String classificationofcontrolmeasures3;
+
+    /**
+     * 巡检人
+     */
+    private String inspector;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

js-security/security-server/src/main/java/com/rongwei/savecheck/controller/AppPushMessageController.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.rongwe.scentity.vo.PushMessageToAppRequestVo;
 import com.rongwei.rwcommon.base.R;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,7 +31,7 @@ public class AppPushMessageController {
             String title = jsonObject.getString("title");
             String content = jsonObject.getString("content");
             List<String> userIdList = JSON.parseArray(jsonObject.getJSONArray("userIds").toJSONString(), String.class);
-            Lists.partition(userIdList, 10).forEach(userIds -> CXCommonUtils.pushApp(title, content, userIds));
+            Lists.partition(userIdList, 10).forEach(userIds -> JSCommonUtils.pushApp(title, content, userIds));
             return R.ok("发送app通知成功");
         } catch (Exception e) {
             e.printStackTrace();
@@ -49,7 +49,7 @@ public class AppPushMessageController {
             String title = model.getTitle();
             String content = model.getContent();
             List<String> userIdList = model.getUserIds();
-            Lists.partition(userIdList, 10).forEach(userIds -> CXCommonUtils.pushApp(title, content, userIds));
+            Lists.partition(userIdList, 10).forEach(userIds -> JSCommonUtils.pushApp(title, content, userIds));
             return R.ok("发送app通知成功");
         } catch (Exception e) {
             e.printStackTrace();

js-security/security-server/src/main/java/com/rongwei/savecheck/controller/HazardInvestigationController.java

@@ -0,0 +1,37 @@
+package com.rongwei.savecheck.controller;
+
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.sfcommon.sys.service.impl.HazardInvestigationServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * HazardInvestigationController class
+ *
+ * @author XH
+ * @date 2024/08/09
+ */
+@RestController
+@RequestMapping("/hazard-investigation")
+public class HazardInvestigationController {
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+    @Autowired
+    private HazardInvestigationServiceImpl hazardInvestigationService;
+
+    /**
+     * 生成隐患排查任务
+     *
+     * @param map
+     * @return
+     */
+    @GetMapping("/create/task/{id}")
+    public R createTask(@PathVariable(name = "id") String id) {
+        log.info("根据模板: {}生成隐患排查任务", id);
+        return hazardInvestigationService.createTask(id);
+    }
+
+}

js-security/security-server/src/main/resources/license.xml

@@ -0,0 +1,15 @@
+<License>
+    <Data>
+        <Products>
+            <Product>Aspose.Total for Java</Product>
+            <Product>Aspose.Words for Java</Product>
+        </Products>
+        <EditionType>Enterprise</EditionType>
+        <SubscriptionExpiry>20991231</SubscriptionExpiry>
+        <LicenseExpiry>20991231</LicenseExpiry>
+        <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+    </Data>
+    <Signature>
+        sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=
+    </Signature>
+</License>

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingDemandServiceImpl.java

@@ -24,7 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.rongwei.safecommon.utils.CXCommonUtils.aFewDaysApart;
+import static com.rongwei.safecommon.utils.JSCommonUtils.aFewDaysApart;
 import static com.rongwei.safecommon.utils.SaveConstans.DemandState.RELEASE;
 
 /**

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingSendNotifyServiceImpl.java

@@ -8,7 +8,7 @@ import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.StringUtils;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.training.domain.*;
 import com.rongwei.trainingcommon.sys.service.EmpExamService;
 import com.rongwei.trainingcommon.sys.service.PlanPaperService;
@@ -108,7 +108,7 @@ public class TrainingSendNotifyServiceImpl implements TrainingSendNotifyService
             PlanDo planDo = planDoList.stream().filter(info -> info.getId().equals(k)).findFirst().get();
             v.forEach((courseName, infos) -> {
                 log.info("准备发送课程截止提醒邮件");
-                CXCommonUtils.sendNotify(CUT_OFF_TRAIN_TITLE, String.format(CUT_OFF_TRAIN_CONTENT, planDo.getCoursename(), planDo.getTrainingendtimt()), "",
+                JSCommonUtils.sendNotify(CUT_OFF_TRAIN_TITLE, String.format(CUT_OFF_TRAIN_CONTENT, planDo.getCoursename(), planDo.getTrainingendtimt()), "",
                         infos.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList())
                         , planDo.getId(), COURSE);
             });
@@ -148,7 +148,7 @@ public class TrainingSendNotifyServiceImpl implements TrainingSendNotifyService
         Map<String, List<EmpExamDo>> collect = examDoList.stream().collect(Collectors.groupingBy(info -> info.getPaperid() + info.getPlanpaperid(), Collectors.toList()));
         collect.forEach((k, v) -> {
             EmpExamDo empExamDo = v.get(0);
-            CXCommonUtils.sendNotify(CUT_OFF_PAPER_TITLE, String.format(CUT_OFF_PAPER_CONTENT, empExamDo.getPapername(), empExamDo.getExamdeadtime()), "",
+            JSCommonUtils.sendNotify(CUT_OFF_PAPER_TITLE, String.format(CUT_OFF_PAPER_CONTENT, empExamDo.getPapername(), empExamDo.getExamdeadtime()), "",
                     v.stream().map(EmpExamDo::getEmpid).distinct().collect(Collectors.toList()), empExamDo.getPlanid(), TRAINING);
         });
 
@@ -227,7 +227,7 @@ public class TrainingSendNotifyServiceImpl implements TrainingSendNotifyService
         // 获取用户id
         saveDemandSurveyBackupsDos.forEach((info) -> {
             List<String> userIds = Arrays.asList(info.getNoparticipatinguserid().split(","));
-            CXCommonUtils.sendNotify(QUESTIONNAIRE_SURVEY_TITLE, String.format(QUESTIONNAIRE_SURVEY_CONTENT, info.getYear(),
+            JSCommonUtils.sendNotify(QUESTIONNAIRE_SURVEY_TITLE, String.format(QUESTIONNAIRE_SURVEY_CONTENT, info.getYear(),
                     info.getName()), "", userIds, info.getId(), TRAININGFORM);
         });
     }
@@ -261,11 +261,11 @@ public class TrainingSendNotifyServiceImpl implements TrainingSendNotifyService
     public void sendTrainingPlanCancelNotify(Map<String, List<String>> courseMap,
                                              Map<String, List<String>> paperMap) {
         courseMap.forEach((k, v) -> {
-            CXCommonUtils.sendNotify(CANCEL_TRAIN_TITLE, String.format(CANCEL_TRAIN_CONTENT, k), "",
+            JSCommonUtils.sendNotify(CANCEL_TRAIN_TITLE, String.format(CANCEL_TRAIN_CONTENT, k), "",
                     v, null, COURSE);
         });
         paperMap.forEach((k, v) -> {
-            CXCommonUtils.sendNotify(CANCEL_TRAIN_TITLE, String.format(CANCEL_TRAIN_CONTENT, k), "",
+            JSCommonUtils.sendNotify(CANCEL_TRAIN_TITLE, String.format(CANCEL_TRAIN_CONTENT, k), "",
                     v, null, TRAINING);
         });
     }

js-training/training-server/src/main/java/com/rongwei/training/controller/EmpExamDetailController.java

@@ -2,12 +2,11 @@ package com.rongwei.training.controller;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.QueryPar;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.training.domain.EmpExamDetailDo;
 import com.rongwei.training.domain.EmpExamDo;
 import com.rongwei.training.vo.EmpExamDetailVo;
@@ -41,7 +40,7 @@ public class EmpExamDetailController {
             EmpExamDetailDo empExamDetail = new EmpExamDetailDo();
             BeanUtils.copyProperties(empExamDetail, empExamDetailVo);
             empExamDetail.setId(SecurityUtil.getUUID());
-            String factoryId = CXCommonUtils.getCurrentUserFactoryId(null);
+            String factoryId = JSCommonUtils.getCurrentUserFactoryId(null);
             empExamDetail.setTenantid(factoryId);
             empExamDetailService.save(empExamDetail);
             // 更新考试状态

js-training/training-server/src/main/java/com/rongwei/training/controller/PlanController.java

@@ -12,11 +12,9 @@ import com.rongwei.rwcommon.base.QueryPar;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
-import com.rongwei.safecommon.utils.CXCommonUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.training.domain.*;
 import com.rongwei.trainingcommon.sys.service.*;
-import com.rongwei.trainingcommon.sys.service.impl.EmpCourseServiceImpl;
-import com.rongwei.trainingcommon.sys.service.impl.TrainingSendNotifyServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -104,13 +102,13 @@ public class PlanController {
                         return R.errorWithMsg("单一培训计划只可对应一张试卷");
                     }
                     if (!planCourseList.isEmpty()) {
-                        CXCommonUtils.sendNotify(COURSE_NOTIFY_TITLE, String.format(COURSE_NOTIFY_CONTENT, row.getCoursename(),
+                        JSCommonUtils.sendNotify(COURSE_NOTIFY_TITLE, String.format(COURSE_NOTIFY_CONTENT, row.getCoursename(),
                                         row.getTrainingstarttime(), row.getTrainingendtimt()), "", new ArrayList<>(userIds),
                                 row.getId(), COURSE);
                     }
                     if (!planPaperList.isEmpty()) {
                         planPaperList.forEach(data -> {
-                            CXCommonUtils.sendNotify(TRAIN_NOTIFY_TITLE, String.format(TRAIN_NOTIFY_CONTENT, data.getPapername(),
+                            JSCommonUtils.sendNotify(TRAIN_NOTIFY_TITLE, String.format(TRAIN_NOTIFY_CONTENT, data.getPapername(),
                                             data.getDeadline()), "", new ArrayList<>(userIds),
                                     row.getId(), TRAINING);
                         });

js-training/training-server/src/main/resources/license.xml

@@ -0,0 +1,15 @@
+<License>
+    <Data>
+        <Products>
+            <Product>Aspose.Total for Java</Product>
+            <Product>Aspose.Words for Java</Product>
+        </Products>
+        <EditionType>Enterprise</EditionType>
+        <SubscriptionExpiry>20991231</SubscriptionExpiry>
+        <LicenseExpiry>20991231</LicenseExpiry>
+        <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+    </Data>
+    <Signature>
+        sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=
+    </Signature>
+</License>