From da4f7077a96cab425d7710d60624174b10c0c9e2 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 01 八月 2024 17:07:48 +0800
Subject: [PATCH] commit
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 6
src/main/java/com/product/administration/service/EarlyWarningManagerService.java | 844 ++++++++++++++++++++++++++++---------------------------
2 files changed, 428 insertions(+), 422 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 758e224..93d99d9 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -122,10 +122,10 @@
if (nameVerification!=null) {
throw new BaseException(SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getValue(), SystemCode.CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME.getText());
}
-
+
BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
//閲嶅悕楠岃瘉
-
+
return baseDao.saveFieldSetEntity(fse);
}
@@ -233,8 +233,8 @@
sql.append(" b.end_time, ");
}
sql.append(" b.flow_flag, ");
- sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
sql.append(" FROM ");
+ sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
sql.append(" product_oa_CONFERENCE_room_config a ");
sql.append(" LEFT JOIN ( SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by FROM ");
sql.append(" product_oa_conference_apply b WHERE ");
diff --git a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
index fa511f0..51c9e0d 100644
--- a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
+++ b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
@@ -37,461 +37,467 @@
@Component
public class EarlyWarningManagerService extends AbstractBaseService implements IEarlyWarningManager {
- @Autowired
- BaseDao baseDao;
+ @Autowired
+ BaseDao baseDao;
- @Autowired
- PublicService publicService;
+ @Autowired
+ PublicService publicService;
- @Autowired
- SysJobService sysJobService;
+ @Autowired
+ SysJobService sysJobService;
- @Autowired
- EarlyWarningServer earlyWarningServer;
+ @Autowired
+ EarlyWarningServer earlyWarningServer;
- @Autowired
- QueryFilterService queryFilterService;
+ @Autowired
+ QueryFilterService queryFilterService;
- /**
- * 棰勮閰嶇疆鍒楄〃
- *
- * @param pageSize
- * @param cpage
- * @param fse
- * @return
- */
- public DataTableEntity listWarning(Integer pageSize, Integer cpage, FieldSetEntity fse) {
- String queryFilter = queryFilterService.getQueryFilter(fse);
- if (!StringUtils.isEmpty(fse.getString("filter"))) {
- String filter = fse.getString("filter");
- if (!StringUtils.isEmpty(queryFilter)) {
- queryFilter += " and ";
- }
- queryFilter += " (" + filter + " ) ";
- }
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_EARLY_WARNING, queryFilter, new Object[]{}, null, null, pageSize, cpage);
- baseDao.loadPromptData(dt);
- return dt;
- }
+ /**
+ * 棰勮閰嶇疆鍒楄〃
+ *
+ * @param pageSize
+ * @param cpage
+ * @param fse
+ * @return
+ */
+ public DataTableEntity listWarning(Integer pageSize, Integer cpage, FieldSetEntity fse) {
+ String queryFilter = queryFilterService.getQueryFilter(fse);
+ if (!StringUtils.isEmpty(fse.getString("filter"))) {
+ String filter = fse.getString("filter");
+ if (!StringUtils.isEmpty(queryFilter)) {
+ queryFilter += " and ";
+ }
+ queryFilter += " (" + filter + " ) ";
+ }
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_EARLY_WARNING, queryFilter, new Object[]{}, null, null, pageSize, cpage);
+ baseDao.loadPromptData(dt);
+ return dt;
+ }
- /**
- * 棰勮閰嶇疆璇︽儏
- *
- * @param uuid
- * @return
- */
- public String findWarning(String uuid) {
- FieldSetEntity fs = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_EARLY_WARNING, uuid, true);
- JSONObject result = new JSONObject();
- Map<String, Object> values = (Map) fs.getValues();
- result.putAll(values);
- //棰勮鏂瑰紡杞崲涓篠tring[]
- if (result.get(CmnConst.WARNING_METHOD) != null) {
- result.put(CmnConst.WARNING_METHOD, result.getString(CmnConst.WARNING_METHOD).split(","));
- }
- String conditon_config = result.getString(CmnConst.CONDITON_CONFIG);
- if (!JSON.isValidArray(conditon_config)) {
- conditon_config = null;
- }
- result.put(CmnConst.CONDITON_CONFIG, configDataTransition(conditon_config));
- String warning_content_config = result.getString(CmnConst.WARNING_CONTENT_CONFIG);
- if (!JSON.isValidArray(warning_content_config)) {
- warning_content_config = null;
- }
- result.put(CmnConst.WARNING_CONTENT_CONFIG, configDataTransition(warning_content_config));
- return BaseUtil.success(result, null);
- }
+ /**
+ * 棰勮閰嶇疆璇︽儏
+ *
+ * @param uuid
+ * @return
+ */
+ public String findWarning(String uuid) {
+ FieldSetEntity fs = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_EARLY_WARNING, uuid, true);
+ JSONObject result = new JSONObject();
+ Map<String, Object> values = (Map) fs.getValues();
+ result.putAll(values);
+ //棰勮鏂瑰紡杞崲涓篠tring[]
+ if (result.get(CmnConst.WARNING_METHOD) != null) {
+ result.put(CmnConst.WARNING_METHOD, result.getString(CmnConst.WARNING_METHOD).split(","));
+ }
+ String conditon_config = result.getString(CmnConst.CONDITON_CONFIG);
+ if (!JSON.isValidArray(conditon_config)) {
+ conditon_config = null;
+ }
+ result.put(CmnConst.CONDITON_CONFIG, configDataTransition(conditon_config));
+ String warning_content_config = result.getString(CmnConst.WARNING_CONTENT_CONFIG);
+ if (!JSON.isValidArray(warning_content_config)) {
+ warning_content_config = null;
+ }
+ result.put(CmnConst.WARNING_CONTENT_CONFIG, configDataTransition(warning_content_config));
+ return BaseUtil.success(result, null);
+ }
- /**
- * 棰勮閰嶇疆鏁版嵁瑁呮崲
- */
- List<List<JSONObject>> configDataTransition(String arratStr) {
- List<List<JSONObject>> list = Lists.newArrayList();
- if (!StringUtils.isEmpty(arratStr)) {
- JSONArray array = JSON.parseArray(arratStr);
- if (array.size() == 0) {
- return configDataTransition(null);
- }
- List<JSONObject> row = Lists.newArrayList();
- for (int i = 0; i < array.size(); i++) {
- if (i != 0 && i % 6 == 0) {
- list.add(row);
- row = Lists.newArrayList();
- }
- row.add(array.getJSONObject(i));
+ /**
+ * 棰勮閰嶇疆鏁版嵁瑁呮崲
+ */
+ List<List<JSONObject>> configDataTransition(String arratStr) {
+ List<List<JSONObject>> list = Lists.newArrayList();
+ if (!StringUtils.isEmpty(arratStr)) {
+ JSONArray array = JSON.parseArray(arratStr);
+ if (array.size() == 0) {
+ return configDataTransition(null);
+ }
+ List<JSONObject> row = Lists.newArrayList();
+ for (int i = 0; i < array.size(); i++) {
+ if (i != 0 && i % 6 == 0) {
+ list.add(row);
+ row = Lists.newArrayList();
+ }
+ row.add(array.getJSONObject(i));
- }
- if (row.size() > 0) {
- if (row.size() < 6) {
- Map<String, Object> template = null;
- while (row.size() < 6) {
- template = Maps.newHashMap();
- template.put("label", "");
- template.put("val", "");
- row.add(new JSONObject(template));
- }
- }
- list.add(row);
- }
- if (!StringUtils.isEmpty(list.get(list.size() - 1).get(5).getString("label"))) {
- List<JSONObject> templates = Lists.newArrayList();
- JSONObject template = null;
- row = Lists.newArrayList();
- while (row.size() == 6) {
- template = new JSONObject();
- template.put("label", "");
- template.put("val", "");
- row.add(template);
- }
- list.add(templates);
- }
- } else {
- JSONObject template = null;
- List<JSONObject> row = Lists.newArrayList();
- while (row.size() < 6) {
- template = new JSONObject();
- template.put("label", "");
- template.put("val", "");
- row.add(template);
- }
- list.add(row);
- }
- return list;
- }
+ }
+ if (row.size() > 0) {
+ if (row.size() < 6) {
+ Map<String, Object> template = null;
+ while (row.size() < 6) {
+ template = Maps.newHashMap();
+ template.put("label", "");
+ template.put("val", "");
+ row.add(new JSONObject(template));
+ }
+ }
+ list.add(row);
+ }
+ if (!StringUtils.isEmpty(list.get(list.size() - 1).get(5).getString("label"))) {
+ List<JSONObject> templates = Lists.newArrayList();
+ JSONObject template = null;
+ row = Lists.newArrayList();
+ while (row.size() == 6) {
+ template = new JSONObject();
+ template.put("label", "");
+ template.put("val", "");
+ row.add(template);
+ }
+ list.add(templates);
+ }
+ } else {
+ JSONObject template = null;
+ List<JSONObject> row = Lists.newArrayList();
+ while (row.size() < 6) {
+ template = new JSONObject();
+ template.put("label", "");
+ template.put("val", "");
+ row.add(template);
+ }
+ list.add(row);
+ }
+ return list;
+ }
- /**
- * 棰勮閰嶇疆鏂板
- *
- * @param fse
- * @return
- * @throws TaskException
- * @throws SchedulerException
- * @throws BaseException
- */
- @Transactional
- public String addWarning(FieldSetEntity fse) throws BaseException, SchedulerException, TaskException {
- FieldSetEntity fseJob = new FieldSetEntity();
- fseJob.setTableName("product_sys_timed_task");
- fseJob.setValue("concurrent", 1);
- fseJob.setValue("job_name", fse.getString("config_name"));
- fseJob.setValue("cron_expression", fse.getString("execution_frequency"));
- fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('null')");
- fseJob.setValue("job_group", "system");
- fseJob.setValue("misfire_policy", 2);
- fseJob.setValue("remark", "");
- if (fse.getInteger("config_status") == 0) {
- fseJob.setValue("status", 0);
- } else {
- fseJob.setValue("status", 1);
- }
- fseJob.setValue("is_conceal", 1);
- sysJobService.insertJob(fseJob);
+ /**
+ * 棰勮閰嶇疆鏂板
+ *
+ * @param fse
+ * @return
+ * @throws TaskException
+ * @throws SchedulerException
+ * @throws BaseException
+ */
+ @Transactional
+ public String addWarning(FieldSetEntity fse) throws BaseException, SchedulerException, TaskException {
+ FieldSetEntity fseJob = new FieldSetEntity();
+ fseJob.setTableName("product_sys_timed_task");
+ fseJob.setValue("concurrent", 1);
+ fseJob.setValue("job_name", fse.getString("config_name"));
+ fseJob.setValue("cron_expression", fse.getString("execution_frequency"));
+ fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('null')");
+ fseJob.setValue("job_group", "system");
+ fseJob.setValue("misfire_policy", 2);
+ fseJob.setValue("remark", "");
+ if (fse.getInteger("config_status") == 0) {
+ fseJob.setValue("status", 0);
+ } else {
+ fseJob.setValue("status", 1);
+ }
+ fseJob.setValue("is_conceal", 1);
+ sysJobService.insertJob(fseJob);
- fse.setValue("time_task_uuid", fseJob.getUUID());
- fse.setValue(CmnConst.CREATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());
- fse.setValue(CmnConst.CREATED_UTC_DATETIME, new Date());
- String uuid = baseDao.add(fse);
+ fse.setValue("time_task_uuid", fseJob.getUUID());
+ fse.setValue(CmnConst.CREATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fse.setValue(CmnConst.CREATED_UTC_DATETIME, new Date());
+ String uuid = baseDao.add(fse);
- fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('" + fse.getUUID() + "')");
- sysJobService.updateJob(fseJob);
+ fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('" + fse.getUUID() + "')");
+ sysJobService.updateJob(fseJob);
- return uuid;
- }
+ return uuid;
+ }
- /**
- * 棰勮閰嶇疆淇敼
- *
- * @param fse
- * @return
- * @throws TaskException
- * @throws SchedulerException
- * @throws BaseException
- */
- @Transactional
- public boolean updateWarning(FieldSetEntity fse) throws BaseException, SchedulerException, TaskException {
- FieldSetEntity fseJob = new FieldSetEntity();
- fseJob.setTableName("product_sys_timed_task");
- fseJob.setValue("concurrent", 1);
- fseJob.setValue("job_name", fse.getString("config_name"));
- fseJob.setValue("cron_expression", fse.getString("execution_frequency"));
- fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('" + fse.getUUID() + "')");
- fseJob.setValue("job_group", "system");
- fseJob.setValue("misfire_policy", 2);
- fseJob.setValue("remark", "");
- if (fse.getInteger("config_status") == 0) {
- fseJob.setValue("status", 0);
- sysJobService.pauseJob(fse.getString("time_task_uuid"));
- } else {
- fseJob.setValue("status", 1);
- sysJobService.resumeJob(fse.getString("time_task_uuid"));
- }
- fseJob.setValue("is_conceal", 1);
- fseJob.setValue("uuid", fse.getString("time_task_uuid"));
- sysJobService.updateJob(fseJob);
+ /**
+ * 棰勮閰嶇疆淇敼
+ *
+ * @param fse
+ * @return
+ * @throws TaskException
+ * @throws SchedulerException
+ * @throws BaseException
+ */
+ @Transactional
+ public boolean updateWarning(FieldSetEntity fse) throws BaseException, SchedulerException, TaskException {
+ FieldSetEntity fseJob = new FieldSetEntity();
+ fseJob.setTableName("product_sys_timed_task");
+ fseJob.setValue("concurrent", 1);
+ fseJob.setValue("job_name", fse.getString("config_name"));
+ fseJob.setValue("cron_expression", fse.getString("execution_frequency"));
+ fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('" + fse.getUUID() + "')");
+ fseJob.setValue("job_group", "system");
+ fseJob.setValue("misfire_policy", 2);
+ fseJob.setValue("remark", "");
+ if (fse.getInteger("config_status") == 0) {
+ fseJob.setValue("status", 0);
+ sysJobService.pauseJob(fse.getString("time_task_uuid"));
+ } else {
+ fseJob.setValue("status", 1);
+ sysJobService.resumeJob(fse.getString("time_task_uuid"));
+ }
+ if (StringUtils.isEmpty(fse.getString("time_task_uuid"))) {
+ sysJobService.insertJob(fseJob);
+ fse.setValue("time_task_uuid", fseJob.getUUID());
+ }
+ fseJob.setValue("is_conceal", 1);
+ fseJob.setValue("uuid", fse.getString("time_task_uuid"));
+ sysJobService.updateJob(fseJob);
- fse.setValue(CmnConst.UPDATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());
- fse.setValue(CmnConst.UPDATED_UTC_DATETIME, new Date());
- return baseDao.update(fse);
- }
+ fse.setValue(CmnConst.UPDATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fse.setValue(CmnConst.UPDATED_UTC_DATETIME, new Date());
+ return baseDao.update(fse);
+ }
- /**
- * 棰勮閰嶇疆鍒犻櫎
- *
- * @param uuid
- * @return
- * @throws SchedulerException
- * @throws BaseException
- */
- @Transactional
- public boolean deleteWarning(String uuid) throws BaseException, SchedulerException {
- FieldSetEntity fseWarnInfo = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_EARLY_WARNING, uuid, false);
- sysJobService.deleteJobByIds(fseWarnInfo.getString("time_task_uuid").split(","));
- return baseDao.delete(CmnConst.PRODUCT_SYS_EARLY_WARNING, "uuid=?", new Object[]{uuid});
- }
+ /**
+ * 棰勮閰嶇疆鍒犻櫎
+ *
+ * @param uuid
+ * @return
+ * @throws SchedulerException
+ * @throws BaseException
+ */
+ @Transactional
+ public boolean deleteWarning(String uuid) throws BaseException, SchedulerException {
+ FieldSetEntity fseWarnInfo = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_EARLY_WARNING, uuid, false);
+ sysJobService.deleteJobByIds(fseWarnInfo.getString("time_task_uuid").split(","));
+ return baseDao.delete(CmnConst.PRODUCT_SYS_EARLY_WARNING, "uuid=?", new Object[]{uuid});
+ }
- /**
- * 鎵归噺淇敼棰勮鏃堕棿
- * @param fse
- * @return
- * @throws SchedulerException
- * @throws BaseException
- */
- @Override
- public boolean updateEarlyWarningTime(FieldSetEntity fse) throws BaseException, SchedulerException, TaskException {
- String cronExpression = fse.getString("cronExpression");
- if(!sysJobService.checkCronExpressionIsValid(cronExpression)){
- throw new BaseException (com.product.quartz.config.SystemCode.SYSTEM_QUARTZ_CRON_FAIL.getValue(), com.product.quartz.config.SystemCode.SYSTEM_QUARTZ_CRON_FAIL.getText());
- }
- String uuids = fse.getString("uuids");
- String[] uuid = uuids.split(",");
- DataTableEntity data = baseDao.listTable(fse.getTableName(), BaseUtil.buildQuestionMarkFilter("uuid", uuid,true), new String[]{});
- StringBuffer sql = new StringBuffer();
- sql.append("SELECT a.* FROM product_sys_timed_task a JOIN " + fse.getTableName() + " b on a.invoke_target like CONCAT('%',b.uuid,'%') WHERE "+ BaseUtil.buildQuestionMarkFilter("b.uuid", uuid,true));
- DataTableEntity jobData = baseDao.listTable(sql.toString(), new String[]{});
- for (int i = 0; i < data.getRows(); i++) {
- FieldSetEntity fieldSetEntity = data.getFieldSetEntity(i);
- fieldSetEntity.setValue("execution_frequency", cronExpression);
- }
- baseDao.update(data);
- for (int i = 0; i < jobData.getRows(); i++) {
- FieldSetEntity jobFse = jobData.getFieldSetEntity(i);
- jobFse.setValue("cron_expression",cronExpression);
- sysJobService.updateJob(jobFse);
- }
- return true;
- }
+ /**
+ * 鎵归噺淇敼棰勮鏃堕棿
+ *
+ * @param fse
+ * @return
+ * @throws SchedulerException
+ * @throws BaseException
+ */
+ @Override
+ public boolean updateEarlyWarningTime(FieldSetEntity fse) throws BaseException, SchedulerException, TaskException {
+ String cronExpression = fse.getString("cronExpression");
+ if (!sysJobService.checkCronExpressionIsValid(cronExpression)) {
+ throw new BaseException(com.product.quartz.config.SystemCode.SYSTEM_QUARTZ_CRON_FAIL.getValue(), com.product.quartz.config.SystemCode.SYSTEM_QUARTZ_CRON_FAIL.getText());
+ }
+ String uuids = fse.getString("uuids");
+ String[] uuid = uuids.split(",");
+ DataTableEntity data = baseDao.listTable(fse.getTableName(), BaseUtil.buildQuestionMarkFilter("uuid", uuid, true), new String[]{});
+ StringBuffer sql = new StringBuffer();
+ sql.append("SELECT a.* FROM product_sys_timed_task a JOIN " + fse.getTableName() + " b on a.invoke_target like CONCAT('%',b.uuid,'%') WHERE " + BaseUtil.buildQuestionMarkFilter("b.uuid", uuid, true));
+ DataTableEntity jobData = baseDao.listTable(sql.toString(), new String[]{});
+ for (int i = 0; i < data.getRows(); i++) {
+ FieldSetEntity fieldSetEntity = data.getFieldSetEntity(i);
+ fieldSetEntity.setValue("execution_frequency", cronExpression);
+ }
+ baseDao.update(data);
+ for (int i = 0; i < jobData.getRows(); i++) {
+ FieldSetEntity jobFse = jobData.getFieldSetEntity(i);
+ jobFse.setValue("cron_expression", cronExpression);
+ sysJobService.updateJob(jobFse);
+ }
+ return true;
+ }
- public String getFieldByFlowCode(String type_code) {
- //鑾峰彇娴佺▼淇℃伅
- FieldSetEntity fseFlow = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_SYS_FLOW_MODEL, "type_code=?", new Object[]{type_code}, false);
- if (fseFlow == null) {
- throw new BaseException(SystemCode.SYS_GET_FLOW_INFO_FAIL.getValue(), SystemCode.SYS_GET_FLOW_INFO_FAIL.getText(), this.getClass(), "getFieldByFlowCode");
- }
- String table_uuid = fseFlow.getString(CmnConst.TABLE_UUID);
+ public String getFieldByFlowCode(String type_code) {
+ //鑾峰彇娴佺▼淇℃伅
+ FieldSetEntity fseFlow = baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_SYS_FLOW_MODEL, "type_code=?", new Object[]{type_code}, false);
+ if (fseFlow == null) {
+ throw new BaseException(SystemCode.SYS_GET_FLOW_INFO_FAIL.getValue(), SystemCode.SYS_GET_FLOW_INFO_FAIL.getText(), this.getClass(), "getFieldByFlowCode");
+ }
+ String table_uuid = fseFlow.getString(CmnConst.TABLE_UUID);
- return publicService.getFields(table_uuid, false);
- }
+ return publicService.getFields(table_uuid, false);
+ }
- /**
- * 棰勮閰嶇疆鏉′欢妫�娴�
- *
- * @return
- */
- public boolean conditionCheck(String mainTableName, String warnCondition) {
- Map<String, String> tableNameAndAlias = new HashMap<>(); //鐩稿叧琛ㄥ悕-->琛ㄥ埆鍚�,tableName-->tableName1
- Map<String, String> fieldAndAlias = new HashMap<>(); //鐩稿叧瀛楁-->瀛楁鍒悕,tableName.fieldName-->tableName1fieldName
- Map<String, String> fieldReference = new HashMap<>(); //缁勫悎鐩稿叧瀛楁鐨勫弬鐓�,tableName1fieldName-->referenceName
- StringBuilder concatField = new StringBuilder(); //缁勫悎鐩稿叧瀛楁,tableName1.fieldName tableName1fieldName
- earlyWarningServer.parseWarningContent(warnCondition, concatField, tableNameAndAlias, fieldAndAlias, fieldReference);
+ /**
+ * 棰勮閰嶇疆鏉′欢妫�娴�
+ *
+ * @return
+ */
+ public boolean conditionCheck(String mainTableName, String warnCondition) {
+ Map<String, String> tableNameAndAlias = new HashMap<>(); //鐩稿叧琛ㄥ悕-->琛ㄥ埆鍚�,tableName-->tableName1
+ Map<String, String> fieldAndAlias = new HashMap<>(); //鐩稿叧瀛楁-->瀛楁鍒悕,tableName.fieldName-->tableName1fieldName
+ Map<String, String> fieldReference = new HashMap<>(); //缁勫悎鐩稿叧瀛楁鐨勫弬鐓�,tableName1fieldName-->referenceName
+ StringBuilder concatField = new StringBuilder(); //缁勫悎鐩稿叧瀛楁,tableName1.fieldName tableName1fieldName
+ earlyWarningServer.parseWarningContent(warnCondition, concatField, tableNameAndAlias, fieldAndAlias, fieldReference);
+ //鐢熸垚涓诲瓙琛ㄥ叧鑱擲QL
+ String relationSQL = earlyWarningServer.createTableRelation(tableNameAndAlias, mainTableName);
- //鐢熸垚涓诲瓙琛ㄥ叧鑱擲QL
- String relationSQL = earlyWarningServer.createTableRelation(tableNameAndAlias, mainTableName);
-
- StringBuilder serviceSQL = new StringBuilder();
- serviceSQL.append(" SELECT ");
- serviceSQL.append(concatField.subSequence(1, concatField.length()));
- serviceSQL.append(" FROM ");
- serviceSQL.append(relationSQL);
- serviceSQL.append(" WHERE ");
- serviceSQL.append(earlyWarningServer.parseWarnCondition(warnCondition, tableNameAndAlias));
- try {
- baseDao.listTable(serviceSQL.toString(), new Object[]{});
- return true;
- } catch (Exception e) {
- SpringMVCContextHolder.getSystemLogger().error(e.getMessage());
- return false;
- }
- }
+ StringBuilder serviceSQL = new StringBuilder();
+ serviceSQL.append(" SELECT ");
+ serviceSQL.append(concatField.subSequence(1, concatField.length()));
+ serviceSQL.append(" FROM ");
+ serviceSQL.append(relationSQL);
+ serviceSQL.append(" WHERE ");
+ serviceSQL.append(earlyWarningServer.parseWarnCondition(warnCondition, tableNameAndAlias));
+ try {
+ baseDao.listTable(serviceSQL.toString(), new Object[]{});
+ return true;
+ } catch (Exception e) {
+ SpringMVCContextHolder.getSystemLogger().error(e.getMessage());
+ return false;
+ }
+ }
- @Autowired
- StaffManagerService staffManagerService;
+ @Autowired
+ StaffManagerService staffManagerService;
- public void sendWarnFeedBackMessage(FieldSetEntity fse) throws BaseException {
- String parent_uuid = fse.getString("puuid");
- Set<String> receiverSet = this.getReceiver(fse.getString("parent_uuid"));
- if (StringUtils.isEmpty(parent_uuid)) {
- //鍙戦�佺粰鐩村睘棰嗗
- String leaderUserId = staffManagerService.getLeaderUserId();
- if (!StringUtils.isEmpty(leaderUserId)) {
- receiverSet.add(leaderUserId);
- }
- String userId = String.valueOf(SpringMVCContextHolder.getCurrentUser().getUser_id());
- receiverSet.remove(userId);
- if(receiverSet.isEmpty()){
- logger.error("鍙戦�佹秷鎭�,澶辫触");
- return;
- }
- WebsocketMesssageServiceThread.getInstance().appendMessage(
- SetUtils.set2String(receiverSet),
- "鎮ㄦ湁涓�鏉℃柊鐨勯璀﹀弽棣�,璇峰強鏃舵煡鐪�",
- "棰勮鍙嶉",
- fse.getInteger(CmnConst.USER_ID),
- String.valueOf(31),
- CmnConst.BUTTON_URL_WARN_MESSAGE_INFO + "?uuid=" + fse.getString("parent_uuid"),
- CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO,
- fse.getString("parent_uuid"),
- fse.getInteger(CmnConst.USER_ID), 1, 1);
- } else {
- FieldSetEntity fs = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO_FEEDBACK, parent_uuid, false);
- if (fs != null) {
- //鍙戦�佺粰琚洖澶嶄汉
- String user_id = fs.getString(CmnConst.USER_ID);
- if (user_id == null || user_id.equals(fse.getString(CmnConst.USER_ID))) {
+ public void sendWarnFeedBackMessage(FieldSetEntity fse) throws BaseException {
+ String parent_uuid = fse.getString("puuid");
+ Set<String> receiverSet = this.getReceiver(fse.getString("parent_uuid"));
+ if (StringUtils.isEmpty(parent_uuid)) {
+ //鍙戦�佺粰鐩村睘棰嗗
+ String leaderUserId = staffManagerService.getLeaderUserId();
+ if (!StringUtils.isEmpty(leaderUserId)) {
+ receiverSet.add(leaderUserId);
+ }
+ String userId = String.valueOf(SpringMVCContextHolder.getCurrentUser().getUser_id());
+ receiverSet.remove(userId);
+ if (receiverSet.isEmpty()) {
+ logger.error("鍙戦�佹秷鎭�,澶辫触");
+ return;
+ }
+ WebsocketMesssageServiceThread.getInstance().appendMessage(
+ SetUtils.set2String(receiverSet),
+ "鎮ㄦ湁涓�鏉℃柊鐨勯璀﹀弽棣�,璇峰強鏃舵煡鐪�",
+ "棰勮鍙嶉",
+ fse.getInteger(CmnConst.USER_ID),
+ String.valueOf(31),
+ CmnConst.BUTTON_URL_WARN_MESSAGE_INFO + "?uuid=" + fse.getString("parent_uuid"),
+ CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO,
+ fse.getString("parent_uuid"),
+ fse.getInteger(CmnConst.USER_ID), 1, 1);
+ } else {
+ FieldSetEntity fs = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO_FEEDBACK, parent_uuid, false);
+ if (fs != null) {
+ //鍙戦�佺粰琚洖澶嶄汉
+ String user_id = fs.getString(CmnConst.USER_ID);
+ if (user_id == null || user_id.equals(fse.getString(CmnConst.USER_ID))) {
// logger.error("棰勮鍙嶉鍥炲娑堟伅鍙戦�佸け璐ワ紝" + fse.getUUID());
- return;
- }
- WebsocketMesssageServiceThread.getInstance().appendMessage(
- user_id,
- "鎮ㄦ湁涓�鏉℃柊鐨勯璀﹀弽棣堝洖澶�,璇峰強鏃舵煡鐪�",
- "棰勮鍙嶉鍥炲",
- fse.getInteger(CmnConst.USER_ID),
- String.valueOf(31),
- CmnConst.BUTTON_URL_WARN_MESSAGE_INFO + "?uuid=" + fse.getString("parent_uuid"),
- CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO,
- fse.getString("parent_uuid"),
- fse.getInteger(CmnConst.USER_ID), 1, 1);
- }
- }
- }
+ return;
+ }
+ WebsocketMesssageServiceThread.getInstance().appendMessage(
+ user_id,
+ "鎮ㄦ湁涓�鏉℃柊鐨勯璀﹀弽棣堝洖澶�,璇峰強鏃舵煡鐪�",
+ "棰勮鍙嶉鍥炲",
+ fse.getInteger(CmnConst.USER_ID),
+ String.valueOf(31),
+ CmnConst.BUTTON_URL_WARN_MESSAGE_INFO + "?uuid=" + fse.getString("parent_uuid"),
+ CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO,
+ fse.getString("parent_uuid"),
+ fse.getInteger(CmnConst.USER_ID), 1, 1);
+ }
+ }
+ }
- /**
- * 鑾峰彇娑堟伅鎺ユ敹浜�
- * @param parent_uuid
- * @return
- */
- public Set<String> getReceiver(String parent_uuid){
- Set<String> receiverSet = Sets.newHashSet();
- FieldSetEntity fieldSetEntity = baseDao.getFieldSet("product_sys_early_warning_info", parent_uuid, false);
- String receiver = fieldSetEntity.getString("receiver");
- Collections.addAll(receiverSet, receiver.split(","));
- return receiverSet;
- }
+ /**
+ * 鑾峰彇娑堟伅鎺ユ敹浜�
+ *
+ * @param parent_uuid
+ * @return
+ */
+ public Set<String> getReceiver(String parent_uuid) {
+ Set<String> receiverSet = Sets.newHashSet();
+ FieldSetEntity fieldSetEntity = baseDao.getFieldSet("product_sys_early_warning_info", parent_uuid, false);
+ String receiver = fieldSetEntity.getString("receiver");
+ Collections.addAll(receiverSet, receiver.split(","));
+ return receiverSet;
+ }
- @Autowired
- FileManagerService fileManagerService;
+ @Autowired
+ FileManagerService fileManagerService;
- public DataTableEntity getWarnFeedBack(String parent_uuid) {
- DataTableEntity dt = baseDao.listTable("select a.*,b.thumbnail_img,b.user_name FROM product_sys_early_warning_info_feedback a\n" +
- "join product_sys_users b on a.created_by=b.user_id where a.parent_uuid=? order by createDate", new Object[]{parent_uuid});
- if (!BaseUtil.dataTableIsEmpty(dt)) {
- Map<String, Map<String, Object>> usersMap = Maps.newHashMap();
- for (int i = 0; i < dt.getRows(); i++) {
- String thumbnail_img = dt.getString(i, "thumbnail_img");
- String user_id = dt.getString(i, CmnConst.USER_ID);
- String user_name = dt.getString(i, CmnConst.USER_NAME);
- String puuid = dt.getString(i, "puuid");
- Map<String, Object> commentUser = Maps.newHashMap();
- dt.setFieldValue(i, "commentUser", commentUser);
- if (!StringUtils.isEmpty(puuid)) {
+ public DataTableEntity getWarnFeedBack(String parent_uuid) {
+ DataTableEntity dt = baseDao.listTable("select a.*,b.thumbnail_img,b.user_name FROM product_sys_early_warning_info_feedback a\n" +
+ "join product_sys_users b on a.created_by=b.user_id where a.parent_uuid=? order by createDate", new Object[]{parent_uuid});
+ if (!BaseUtil.dataTableIsEmpty(dt)) {
+ Map<String, Map<String, Object>> usersMap = Maps.newHashMap();
+ for (int i = 0; i < dt.getRows(); i++) {
+ String thumbnail_img = dt.getString(i, "thumbnail_img");
+ String user_id = dt.getString(i, CmnConst.USER_ID);
+ String user_name = dt.getString(i, CmnConst.USER_NAME);
+ String puuid = dt.getString(i, "puuid");
+ Map<String, Object> commentUser = Maps.newHashMap();
+ dt.setFieldValue(i, "commentUser", commentUser);
+ if (!StringUtils.isEmpty(puuid)) {
- dt.setFieldValue(i, "targetUser", new JSONObject(usersMap.get(puuid)));
- }
- usersMap.put(dt.getString(i, CmnConst.UUID), commentUser);
- commentUser.put("user_id", user_id);
- commentUser.put("id", user_id);
- commentUser.put("nickName", user_name);
- if (!StringUtils.isEmpty(thumbnail_img)) {
- // 鑾峰彇鍛樺伐澶村儚
- try {
- byte[] fileContent = fileManagerService.getFileContent(thumbnail_img);
- if (fileContent == null) {
- continue;
- }
- String bytes = Base64.encodeBase64String(fileContent);
- commentUser.put("avatar", "data:image/*;base64," + bytes);
- } catch (Exception e) {
+ dt.setFieldValue(i, "targetUser", new JSONObject(usersMap.get(puuid)));
+ }
+ usersMap.put(dt.getString(i, CmnConst.UUID), commentUser);
+ commentUser.put("user_id", user_id);
+ commentUser.put("id", user_id);
+ commentUser.put("nickName", user_name);
+ if (!StringUtils.isEmpty(thumbnail_img)) {
+ // 鑾峰彇鍛樺伐澶村儚
+ try {
+ byte[] fileContent = fileManagerService.getFileContent(thumbnail_img);
+ if (fileContent == null) {
+ continue;
+ }
+ String bytes = Base64.encodeBase64String(fileContent);
+ commentUser.put("avatar", "data:image/*;base64," + bytes);
+ } catch (Exception e) {
// e.printStackTrace();
- }
- }
- }
- }
- return dt;
- }
+ }
+ }
+ }
+ }
+ return dt;
+ }
- public FieldSetEntity findWarnInfo(FieldSetEntity fse) throws BaseException {
- FieldSetEntity fs = publicService.getFieldSetEntity(fse, false);
- if (fs != null) {
- // 宸叉煡鐪嬩汉
- String preReadedUsers = fs.getString(CmnConst.KNOWN_USER);
- String curUserID = SpringMVCContextHolder.getCurrentUserId();
- if (StringUtils.isEmpty(preReadedUsers)) {
- fs.setValue(CmnConst.KNOWN_USER, curUserID);
- } else {
- if (!("," + preReadedUsers + ",").contains("," + curUserID + ",")) {
- fs.setValue(CmnConst.KNOWN_USER, preReadedUsers + "," + curUserID);
- }
- }
- if (preReadedUsers == null || !preReadedUsers.equals(fs.getString(CmnConst.KNOWN_USER))) {
- baseDao.update(fs);
- }
+ public FieldSetEntity findWarnInfo(FieldSetEntity fse) throws BaseException {
+ FieldSetEntity fs = publicService.getFieldSetEntity(fse, false);
+ if (fs != null) {
+ // 宸叉煡鐪嬩汉
+ String preReadedUsers = fs.getString(CmnConst.KNOWN_USER);
+ String curUserID = SpringMVCContextHolder.getCurrentUserId();
+ if (StringUtils.isEmpty(preReadedUsers)) {
+ fs.setValue(CmnConst.KNOWN_USER, curUserID);
+ } else {
+ if (!("," + preReadedUsers + ",").contains("," + curUserID + ",")) {
+ fs.setValue(CmnConst.KNOWN_USER, preReadedUsers + "," + curUserID);
+ }
+ }
+ if (preReadedUsers == null || !preReadedUsers.equals(fs.getString(CmnConst.KNOWN_USER))) {
+ baseDao.update(fs);
+ }
- String uuid = fs.getUUID();
- DataTableEntity warnFeedBack = getWarnFeedBack(uuid);
- fs.addSubDataTable(warnFeedBack);
- }
- return fs;
- }
+ String uuid = fs.getUUID();
+ DataTableEntity warnFeedBack = getWarnFeedBack(uuid);
+ fs.addSubDataTable(warnFeedBack);
+ }
+ return fs;
+ }
- /**
- * 棰勮鍙嶉-鍒楄〃
- * @param fse
- * @return
- */
- public DataTableEntity listWarnInfo(FieldSetEntity fse) {
- StringBuilder sql = new StringBuilder(128);
- sql.append("\nselect distinct i.*");
- sql.append("\nfrom product_sys_early_warning_info i");
- sql.append("\ninner join (");
- sql.append("\n select user_id");
- sql.append("\n from product_sys_staffs s");
- sql.append("\n inner join (");
- sql.append("\n select org_level_code from product_sys_staffs sc inner join product_sys_org_levels c on sc.org_level_uuid=c.uuid and sc.is_org_manager=1 and user_id=?");
- sql.append("\n union all");
- sql.append("\n select org_level_code from product_sys_staffs sc inner join product_sys_org_levels d on sc.dept_uuid=d.uuid and sc.is_dept_manage=1 and user_id=?");
- sql.append("\n ) o on s.tricode like concat(o.org_level_code,'%')");
- sql.append("\n union all");
- sql.append("\n select ? from dual");
- sql.append("\n) u on concat(',',i.receiver,',') like concat('%,',u.user_id,',%')");
- sql.append("\nwhere early_warning_uuid is not null");
+ /**
+ * 棰勮鍙嶉-鍒楄〃
+ *
+ * @param fse
+ * @return
+ */
+ public DataTableEntity listWarnInfo(FieldSetEntity fse) {
+ StringBuilder sql = new StringBuilder(128);
+ sql.append("\nselect distinct i.*");
+ sql.append("\nfrom product_sys_early_warning_info i");
+ sql.append("\ninner join (");
+ sql.append("\n select user_id");
+ sql.append("\n from product_sys_staffs s");
+ sql.append("\n inner join (");
+ sql.append("\n select org_level_code from product_sys_staffs sc inner join product_sys_org_levels c on sc.org_level_uuid=c.uuid and sc.is_org_manager=1 and user_id=?");
+ sql.append("\n union all");
+ sql.append("\n select org_level_code from product_sys_staffs sc inner join product_sys_org_levels d on sc.dept_uuid=d.uuid and sc.is_dept_manage=1 and user_id=?");
+ sql.append("\n ) o on s.tricode like concat(o.org_level_code,'%')");
+ sql.append("\n union all");
+ sql.append("\n select ? from dual");
+ sql.append("\n) u on concat(',',i.receiver,',') like concat('%,',u.user_id,',%')");
+ sql.append("\nwhere early_warning_uuid is not null");
- SystemUser sysUser = SpringMVCContextHolder.getCurrentUser();
- int userID = sysUser.getUser_id();
+ SystemUser sysUser = SpringMVCContextHolder.getCurrentUser();
+ int userID = sysUser.getUser_id();
- if (!BaseUtil.dataTableIsEmpty(fse.getSubDataTable("systemSeniorQueryString"))) {
- sql.append("\nand (").append(queryFilterService.getQueryFilter(fse)).append(")");
- }
- sql.append("\norder by id desc");
- Integer cpage = fse.getInteger("cpage");
- Integer pageSize = fse.getInteger("pagesize");
- DataTableEntity dte = baseDao.listTable(sql.toString(), new Object[]{userID, userID, userID}, pageSize, cpage);
- if (!DataTableEntity.isEmpty(dte)) {
- baseDao.loadPromptData(dte);
- }
- return dte;
- }
+ if (!BaseUtil.dataTableIsEmpty(fse.getSubDataTable("systemSeniorQueryString"))) {
+ sql.append("\nand (").append(queryFilterService.getQueryFilter(fse)).append(")");
+ }
+ sql.append("\norder by id desc");
+ Integer cpage = fse.getInteger("cpage");
+ Integer pageSize = fse.getInteger("pagesize");
+ DataTableEntity dte = baseDao.listTable(sql.toString(), new Object[]{userID, userID, userID}, pageSize, cpage);
+ if (!DataTableEntity.isEmpty(dte)) {
+ baseDao.loadPromptData(dte);
+ }
+ return dte;
+ }
/**
* 杞彂
--
Gitblit v1.9.2