Browse Source

feat: 可靠性项目管理

NickOooo 1 month ago
parent
commit
8961c77fd4

+ 25 - 0
nationrel-module-project-api/src/main/java/com/nationrel/modules/project/config/SysConfig.java

@@ -0,0 +1,25 @@
+// Copyright(c) 2013 ReliaBench. All rights reserved.
+package com.nationrel.modules.project.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 系统变量设置
+ */
+@Data
+@Component("sysConfig")
+@ConfigurationProperties(prefix = "reliabench")
+public class SysConfig {
+
+    private String sysName;
+
+    private String percentStatMethod;
+
+    private String percentScaleSwitch;
+
+    private String minPercent;
+
+    private String taskTreeMaxDeep;
+}

+ 0 - 1275
nationrel-module-project-api/src/main/java/com/nationrel/modules/project/jar/rb_common/bizcommon/util/SysConfig.java

@@ -1,1275 +0,0 @@
-// Copyright(c) 2013 ReliaBench. All rights reserved.
-package com.nationrel.modules.project.jar.rb_common.bizcommon.util;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * @version V1.0
- * @ClassName SysConfig
- * @Description 系统变量设置
- * @Author ted.liu
- * @CreateDate 2015-12-18
- */
-@Component
-public class SysConfig {
-
-    @Value("${reliabench.website:#{null}")
-    private String reliabenchWebsite;
-
-    @Value("${task.adjacent.days:#{null}")
-    private String adjacentDays;
-
-    @Value("${task.schedule.firstTime.hour:#{null}")
-    private String firstTimeHour;
-
-    @Value("${task.schedule.firstTime.minute:#{null}")
-    private String firstTimeMinute;
-
-    @Value("${task.schedule.firstTime.second:#{null}")
-    private String firstTimeSecond;
-
-    @Value("${task.schedule.cycletime.millisecond:#{null}")
-    private String cycletimeMillisecond;
-
-    @Value("${reliaframe.user.disableUserPrompts:#{null}")
-    private String userDisablePrompts;
-
-    @Value("${reliakits.user.template.file:#{null}")
-    private String userTemplateFile;
-
-    @Value("${reliaframe.user.fileImport.defaultPassword:#{null}")
-    private String userDefaultPassword;
-
-    @Value("${pfmea.custom.logo:#{null}")
-    private String fmeaTableLogo;
-
-    @Value("${reliaframe.user.passwordLevel:#{null}")
-    private String passwordLevel;
-
-    @Value("${baidu.transApiHost:#{null}")
-    private String transApiHost;
-
-    @Value("${baidu.ip:#{null}")
-    private String baiduIp;
-
-    @Value("${reliaBench.serverwhite:#{null}")
-    private String serverWhite;
-
-    @Value("${reliabase.customer.productspectrum.file:#{null}")
-    private String productspectrumFile;
-
-    @Value("${reliabase.customer.product.file:#{null}")
-    private String productFile;
-
-    @Value("${reliabase.customer.pc.file:#{null}")
-    private String pcFile;
-
-    @Value("${reliabase.customer.pctree.file:#{null}")
-    private String pctreeFile;
-
-    @Value("${reliabase.customer.part.file:#{null}")
-    private String partFile;
-
-    @Value("${reliabase.customer.partpc.file:#{null}")
-    private String partpcFile;
-
-    @Value("${reliabase.customer.customer.file:#{null}")
-    private String customerFile;
-
-    @Value("${reliabase.customer.failuremode.file:#{null}")
-    private String failuremodeFile;
-
-    @Value("${reliabase.customer.purchase.file:#{null}")
-    private String purchaseFile;
-
-    @Value("${reliabase.customer.vendor.file:#{null}")
-    private String vendorFile;
-
-    @Value("${reliabase.customer.population.file:#{null}")
-    private String populationFile;
-
-    @Value("${reliabase.customer.populationpart.file:#{null}")
-    private String populationpartFile;
-
-    @Value("${reliabase.customer.sales.file:#{null}")
-    private String salesFile;
-
-    @Value("${reliabase.customer.warranty.file:#{null}")
-    private String warrantyFile;
-
-    @Value("${reliabase.customer.project.file:#{null}")
-    private String projectFile;
-
-    @Value("${reliabase.customer.failure.file:#{null}")
-    private String failureFile;
-
-    @Value("${reliabase.customer.partbill.file:#{null}")
-    private String partbillFile;
-
-    @Value("${reliabase.customer.respondept.file:#{null}")
-    private String respondeptFile;
-
-    @Value("${reliabase.customer.serviceproject.file:#{null}")
-    private String serviceprojectFile;
-
-    @Value("${reliabase.customer.servicestation.file:#{null}")
-    private String servicestationFile;
-
-    @Value("${reliaBench.export.file:#{null}")
-    private String exportFile;
-
-    @Value("${reliabase.customer.back.file:#{null}")
-    private String backFile;
-
-    @Value("${reliabase.customer.import.table.type:#{null}")
-    private String imporTableType;
-
-    @Value("${reliaflow.task.minPercent:#{null}")
-    private String minPercent;
-
-    @Value("${reliaflow.tg.stage.switch:#{null}")
-    private String tgStageSwitch;
-
-    @Value("${reliaflow.task.stage.switch:#{null}")
-    private String taskStageSwitch;
-
-    @Value("${reliaflow.percent.stat.method:#{null}")
-    private String percentStatMethod;
-
-    @Value("${reliaflow.percent.scale.switch:#{null}")
-    private String percentScaleSwitch;
-
-    @Value("${reliaframe.doc.upload.dir:#{null}")
-    private String uploadDir;
-
-    @Value("${reliakits.wda.product.ctrlExtInfo1:#{null}")
-    private String ctrlExtInfo1;
-
-    @Value("${reliakits.wda.product.ctrlExtInfo2:#{null}")
-    private String ctrlExtInfo2;
-
-    @Value("${reliakits.wda.product.ctrlExtInfo3:#{null}")
-    private String ctrlExtInfo3;
-
-    /**
-     * 产品管理页面扩展字段1是否必填开关
-     */
-    @Value("${reliaframe.product.extInfo1Empty:#{null}")
-    private String productExtInfo1Empty;
-
-    /**
-     * 产品管理页面扩展字段2是否必填开关
-     */
-    @Value("${reliaframe.product.extInfo2Empty:#{null}")
-    private String productExtInfo2Empty;
-
-    /**
-     * 产品管理页面扩展字段3是否必填开关
-     */
-    @Value("${reliaframe.product.extInfo3Empty:#{null}")
-    private String productExtInfo3Empty;
-
-    /**
-     * 产品管理页面扩展字段4是否必填开关
-     */
-    @Value("${reliaframe.product.extInfo4Empty:#{null}")
-    private String productExtInfo4Empty;
-
-    /**
-     * 产品管理页面扩展字段5是否必填开关
-     */
-    @Value("${reliaframe.product.extInfo5Empty:#{null}")
-    private String productExtInfo5Empty;
-
-    /**
-     * 产品管理页面扩展字段1是否显示开关
-     */
-    @Value("${reliaframe.product.extInfo1Switch:#{null}")
-    private String productExtInfo1Switch;
-
-    /**
-     * 产品管理页面扩展字段2是否显示开关
-     */
-    @Value("${reliaframe.product.extInfo2Switch:#{null}")
-    private String productExtInfo2Switch;
-
-    /**
-     * 产品管理页面扩展字段3是否显示开关
-     */
-    @Value("${reliaframe.product.extInfo3Switch:#{null}")
-    private String productExtInfo3Switch;
-
-    /**
-     * 产品管理页面扩展字段4是否显示开关
-     */
-    @Value("${reliaframe.product.extInfo4Switch:#{null}")
-    private String productExtInfo4Switch;
-
-    /**
-     * 产品管理页面扩展字段5是否显示开关
-     */
-    @Value("${reliaframe.product.extInfo5Switch:#{null}")
-    private String productExtInfo5Switch;
-
-    /**
-     * 零部件管理页面扩展字段1是否显示开关
-     */
-    @Value("${reliaframe.part.extInfo1Switch:#{null}")
-    private String partExtInfo1Switch;
-
-    /**
-     * 零部件管理页面扩展字段2是否显示开关
-     */
-    @Value("${reliaframe.part.extInfo2Switch:#{null}")
-    private String partExtInfo2Switch;
-
-    /**
-     * 零部件管理页面扩展字段3是否显示开关
-     */
-    @Value("${reliaframe.part.extInfo3Switch:#{null}")
-    private String partExtInfo3Switch;
-
-    /**
-     * 零部件管理页面扩展字段4是否显示开关
-     */
-    @Value("${reliaframe.part.extInfo4Switch:#{null}")
-    private String partExtInfo4Switch;
-
-    /**
-     * 零部件管理页面扩展字段5是否显示开关
-     */
-    @Value("${reliaframe.part.extInfo5Switch:#{null}")
-    private String partExtInfo5Switch;
-
-    /**
-     * 可靠性流程中任务列表树显示 不能超过的树深度
-     */
-    @Value("${flow.task.treeMaxDeep:#{null}")
-    private String taskTreeMaxDeep;
-
-    /**
-     * 寿命数据作图抽取分析秩的最大数据量
-     */
-    @Value("${reliakits.ld.rank.maximum:#{null}")
-    private String rankMaximum;
-
-    /**
-     * 分析 寿命数据导入模板文件路径
-     */
-    @Value("${reliakits.lda.template.file:#{null}")
-    private String ldaTemplateFile;
-
-    /**
-     * 分组 寿命数据导入模板文件路径
-     */
-    @Value("${reliakits.ldg.template.file:#{null}")
-    private String ldgTemplateFile;
-
-    /**
-     * 闭环阶段是否自动迁移
-     */
-    @Value("${fracas.phase.stage.switch:#{null}")
-    private String phaseStageSwitch;
-
-    /**
-     * 闭环项目完成度计算方式
-     */
-    @Value("${fracas.percent.stat.method:#{null}")
-    private String percentStatMethodFracas;
-
-    /**
-     * 闭环项目时间整合性开关
-     */
-    @Value("${fracas.time.validate:#{null}")
-    private String fracasTimeValidate;
-
-    /**
-     * 闭环项目成员增加方式
-     */
-    @Value("${fracas.person.increase.mode:#{null}")
-    private String fracasPersonIncreaseMode;
-
-    /**
-     * R服务器IP
-     */
-    @Value("${ld.rserver.ip:#{null}")
-    private String rIp;
-
-    @Value("${ld.excel.sheetname:#{null}")
-    private String ldSheetName;
-
-    @Value("${reliakits.fmea.icon.file.dir:#{null}")
-    private String fmeaIconFileDir;
-
-    /**
-     * rfm导入模板
-     */
-    @Value("${rfm.template.file:#{null}")
-    private String rfmTemplateFile;
-
-    @Value("${dfmea.vda86.template.file:#{null}")
-    private String dfmeaVda86TemplateFile;
-
-    @Value("${dfmea.vda42.template.file:#{null}")
-    private String dfmeaVda42TemplateFile;
-
-    @Value("${dfmea.aiagd.template.file:#{null}")
-    private String dfmeaAiagdTemplateFile;
-    /**
-     * --------添加多语言模板 begin wcq--------
-     */
-    //dfmea
-    @Value("${dfmea.vda42.template.en.file:#{null}")
-    private String dfmeaVda42TemplateENFile;
-
-    @Value("${dfmea.vda42.template.tw.file:#{null}")
-    private String dfmeaVda42TemplateTWFile;
-
-    @Value("${dfmea.aiagd.template.en.file:#{null}")
-    private String dfmeaAiagdTemplateENFile;
-
-    @Value("${dfmea.aiagd.template.tw.file:#{null}")
-    private String dfmeaAiagdTemplateTWFile;
-
-    @Value("${dfmea.new.template.en.file:#{null}")
-    private String dfmeaNewTemplateENFile;
-
-    @Value("${dfmea.new.template.tw.file:#{null}")
-    private String dfmeaNewTemplateTWFile;
-
-    @Value("${dfmea.vda42.template.en.zh.file:#{null}")
-    private String dfmeaVda42TemplateEN_ZHFile;
-
-    @Value("${dfmea.vda42.template.en.tw.file:#{null}")
-    private String dfmeaVda42TemplateEN_TWFile;
-
-    @Value("${dfmea.aiagd.template.en.zh.file:#{null}")
-    private String dfmeaAiagdTemplateEN_ZHFile;
-
-    @Value("${dfmea.aiagd.template.en.tw.file:#{null}")
-    private String dfmeaAiagdTemplateEN_TWFile;
-
-    @Value("${dfmea.new.template.en.zh.file:#{null}")
-    private String dfmeaNewTemplateEN_ZHFile;
-
-    @Value("${dfmea.new.template.en.tw.file:#{null}")
-    private String dfmeaNewTemplateEN_TWFile;
-
-    @Value("${pfmea.vda42.template.en.file:#{null}")
-    private String pfmeaVda42TemplateENFile;
-    //pfmea
-    @Value("${pfmea.vda42.template.tw.file:#{null}")
-    private String pfmeaVda42TemplateTWFile;
-
-    @Value("${pfmea.aiagp.template.en.file:#{null}")
-    private String pfmeaAiagpTemplateENFile;
-
-    @Value("${pfmea.aiagp.template.tw.file:#{null}")
-    private String pfmeaAiagpTemplateTWFile;
-
-    @Value("${pfmea.new.template.en.file:#{null}")
-    private String pfmeaNewTemplateENFile;
-
-    @Value("${pfmea.new.template.tw.file:#{null}")
-    private String pfmeaNewTemplateTWFile;
-
-    @Value("${pfmea.vda42.template.en.zh.file:#{null}")
-    private String pfmeaVda42TemplateEN_ZHFile;
-
-    @Value("${pfmea.vda42.template.en.tw.file:#{null}")
-    private String pfmeaVda42TemplateEN_TWFile;
-
-    @Value("${pfmea.aiagp.template.en.zh.file:#{null}")
-    private String pfmeaAiagpTemplateEN_ZHFile;
-
-    @Value("${pfmea.aiagp.template.en.tw.file:#{null}")
-    private String pfmeaAiagpTemplateEN_TWFile;
-
-    @Value("${pfmea.new.template.en.zh.file:#{null}")
-    private String pfmeaNewTemplateEN_ZHFile;
-
-    @Value("${pfmea.new.template.en.tw.file:#{null}")
-    private String pfmeaNewTemplateEN_TWFile;
-    /**
-     * --------添加多语言模板 end wcq--------
-     */
-
-    @Value("${dfmea.aiage.template.file:#{null}")
-    private String dfmeaAiageTemplateFile;
-
-    @Value("${dfmea.vdan.template.file:#{null}")
-    private String dfmeaVdanTemplateFile;
-
-    @Value("${dfmea.drbfm.template.file:#{null}")
-    private String dfmeaDrbfmTemplateFile;
-
-    @Value("${dfmea.dvpr.template.file:#{null}")
-    private String dfmeaDvprTemplateFile;
-
-    @Value("${dfmea.product.feature.file:#{null}")
-    private String dfmeaProdFeatureTemplateFile;
-
-    @Value("${dfmea.excel.import.tmpl:#{null}")
-    private String dfmeaExcelImportTmpl;
-
-    @Value("${dfmea.excel.import.tmpl.4thtonew:#{null}")
-    private String dfmeaExcelImportTmpl4thToNew;
-
-    @Value("${dfmea.excel.import.tmpl.vdan:#{null}")
-    private String dfmeaExcelImportTmplVdan;
-
-    @Value("${pfmea.vda86.template.file:#{null}")
-    private String pfmeaVda86TemplateFile;
-
-    @Value("${pfmea.vda42.template.file:#{null}")
-    private String pfmeaVda42TemplateFile;
-
-    @Value("${pfmea.aiagd.template.file:#{null}")
-    private String pfmeaAiagdTemplateFile;
-
-    @Value("${pfmea.aiagp.template.file:#{null}")
-    private String pfmeaAiagpTemplateFile;
-
-    @Value("${pfmea.vdan.template.file:#{null}")
-    private String pfmeaVdanTemplateFile;
-
-    @Value("${pfmea.custom.template.file:#{null}")
-    private String pfmeaCustomTemplateFile;
-
-    @Value("${cron.trigger.expression.failureRate:#{null}")
-    private String cronTriggerExpFailRate;
-
-    @Value("${cron.trigger.expression.amends:#{null}")
-    private String cronTriggerExpAmends;
-
-    @Value("${kettle.resoure.base.path:#{null}")
-    private String kettleRbasePath;
-
-    @Value("${kettle.log.level:#{null}")
-    private int kettleLogLevel;
-
-    @Value("${activiti.mail.from:#{null}")
-    private String mailfrom;
-
-    @Value("${reliakits.wda.failure.template.file:#{null}")
-    private String wdaFailureTemplateFile;
-
-    @Value("${xfracas.flownode.template.file:#{null}")
-    private String xfracasFlownodeTemplateFile;
-
-    @Value("${festival.calendar:#{null}")
-    private String festivalCalendar;
-
-    @Value("${weekend.workday:#{null}")
-    private String weekendWorkday;
-
-    @Value("${xfracas.correct.template.file:#{null}")
-    private String xfracasCorrectTemplateFile;
-
-    @Value("${pfmea.control.plan.template.file:#{null}")
-    private String pfmContorlPlanTemplateFile;
-
-    @Value("${pfmea.check.plan.template.file:#{null}")
-    private String pfmCheckPlanTemplateFile;
-
-    @Value("${pfmea.control.plan.custon.templage.file:#{null}")
-    private String pfmeaControlPlanCustonTemplageFile;
-
-    @Value("${pfmea.process.flow.diagram.template.file:#{null}")
-    private String pfmeaProcessFlowDiagramTemplateFile;
-
-    @Value("${pfmea.product.feature.file:#{null}")
-    private String pfmeaProdFeatureTemplateFile;
-
-    @Value("${pfmea.excel.import.tmpl:#{null}")
-    private String pfmeaExcelImportTmpl;
-
-    @Value("${pfmea.excel.import.tmpl.4thtonew:#{null}")
-    private String pfmeaExcelImportTmpl4thToNew;
-
-    @Value("${pfmea.excel.import.tmpl.Vdan:#{null}")
-    private String pfmeaExcelImportTmplVdan;
-
-    @Value("${mapperPath:#{null}")
-    private String mapperPath;
-
-    @Value("${reliakits.chart.api.type:#{null}")
-    private String chartApiType; // 边界图接口的类型(P:物理接触 E:能量传递 I:信息交换 M:物质传递 HM:人机交互)
-
-    @Value("${reliakits.chart.api.property:#{null}")
-    private String chartApiProperty; // 性质(1:必要的 2:期望的 3:无关紧要的 4:不希望的 5:有害的)
-
-    @Value("${rfmea.export.import.file.format:#{null}")
-    private String rfmeaExportImportFileFormat; // rfmea导出/导入文件格式
-
-    @Value("${rfmea.export.import.file.dfmea.name:#{null}")
-    private String rdfmeaExportImportFileName; // dfmea导出/导入文件名称
-
-    @Value("${rfmea.export.import.file.pfmra.name:#{null}")
-    private String rpfmeaExportImportFileName; // pfmea导出/导入文件名称
-
-    public String getMapperPath() {
-        return mapperPath;
-    }
-
-    public String getPfmeaProcessFlowDiagramTemplateFile() {
-        return pfmeaProcessFlowDiagramTemplateFile;
-    }
-
-    public String getPfmContorlPlanTemplateFile() {
-        return pfmContorlPlanTemplateFile;
-    }
-
-    public String getFestivalCalendar() {
-        return festivalCalendar;
-    }
-
-    public String getWeekendWorkday() {
-        return weekendWorkday;
-    }
-
-    public String getMailfrom() {
-        return mailfrom;
-    }
-
-    public void setMailfrom(String mailfrom) {
-        this.mailfrom = mailfrom;
-    }
-
-    public int getKettleLogLevel() {
-        return kettleLogLevel;
-    }
-
-    public String getKettleRbasePath() {
-        return kettleRbasePath;
-    }
-
-    public String getCronTriggerExpFailRate() {
-        return cronTriggerExpFailRate;
-    }
-
-    public String getCronTriggerExpAmends() {
-        return cronTriggerExpAmends;
-    }
-
-    /**
-     * @return the fracasTimeValidate
-     */
-    public String getFracasTimeValidate() {
-        return fracasTimeValidate;
-    }
-
-    /**
-     * @return the fracasPersonIncreaseMode
-     */
-    public String getFracasPersonIncreaseMode() {
-        return fracasPersonIncreaseMode;
-    }
-
-    /**
-     * @return the minPercent
-     */
-    public String getMinPercent() {
-        return minPercent;
-    }
-
-    /**
-     * @param minPercent the minPercent to set
-     */
-    public void setMinPercent(String minPercent) {
-        this.minPercent = minPercent;
-    }
-
-    /**
-     * @return the tgStageSwitch
-     */
-    public String getTgStageSwitch() {
-        return tgStageSwitch;
-    }
-
-    /**
-     * @param tgStageSwitch the tgStageSwitch to set
-     */
-    public void setTgStageSwitch(String tgStageSwitch) {
-        this.tgStageSwitch = tgStageSwitch;
-    }
-
-    /**
-     * @return the taskStageSwitch
-     */
-    public String getTaskStageSwitch() {
-        return taskStageSwitch;
-    }
-
-    /**
-     * @param taskStageSwitch the taskStageSwitch to set
-     */
-    public void setTaskStageSwitch(String taskStageSwitch) {
-        this.taskStageSwitch = taskStageSwitch;
-    }
-
-    /**
-     * @return the percentStatMethod
-     */
-    public String getPercentStatMethod() {
-        return percentStatMethod;
-    }
-
-    /**
-     * @return the percentScaleSwitch
-     */
-    public String getPercentScaleSwitch() {
-        return percentScaleSwitch;
-    }
-
-
-    /**
-     * @return the uploadDir
-     */
-    public String getUploadDir() {
-        return uploadDir;
-    }
-
-    /**
-     * @return the ctrlExtInfo1
-     */
-    public String getCtrlExtInfo1() {
-        return ctrlExtInfo1;
-    }
-
-    /**
-     * @return the ctrlExtInfo2
-     */
-    public String getCtrlExtInfo2() {
-        return ctrlExtInfo2;
-    }
-
-    /**
-     * @return the ctrlExtInfo3
-     */
-    public String getCtrlExtInfo3() {
-        return ctrlExtInfo3;
-    }
-
-    /**
-     * @return the productExtInfo1Switch
-     */
-    public String getProductExtInfo1Switch() {
-        return productExtInfo1Switch;
-    }
-
-    /**
-     * @return the productExtInfo2Switch
-     */
-    public String getProductExtInfo2Switch() {
-        return productExtInfo2Switch;
-    }
-
-    /**
-     * @return the productExtInfo3Switch
-     */
-    public String getProductExtInfo3Switch() {
-        return productExtInfo3Switch;
-    }
-
-    /**
-     * @return the productExtInfo4Switch
-     */
-    public String getProductExtInfo4Switch() {
-        return productExtInfo4Switch;
-    }
-
-    /**
-     * @return the productExtInfo5Switch
-     */
-    public String getProductExtInfo5Switch() {
-        return productExtInfo5Switch;
-    }
-
-    /**
-     * @return the partExtInfo1Switch
-     */
-    public String getPartExtInfo1Switch() {
-        return partExtInfo1Switch;
-    }
-
-    /**
-     * @return the partExtInfo2Switch
-     */
-    public String getPartExtInfo2Switch() {
-        return partExtInfo2Switch;
-    }
-
-    /**
-     * @return the partExtInfo3Switch
-     */
-    public String getPartExtInfo3Switch() {
-        return partExtInfo3Switch;
-    }
-
-    /**
-     * @return the partExtInfo4Switch
-     */
-    public String getPartExtInfo4Switch() {
-        return partExtInfo4Switch;
-    }
-
-    /**
-     * @return the partExtInfo5Switch
-     */
-    public String getPartExtInfo5Switch() {
-        return partExtInfo5Switch;
-    }
-
-    /**
-     * @return the taskTreeMaxDeep
-     */
-    public String getTaskTreeMaxDeep() {
-        return taskTreeMaxDeep;
-    }
-
-    /**
-     * @return the rankMaximum
-     */
-    public String getRankMaximum() {
-        return rankMaximum;
-    }
-
-    /**
-     * @param rankMaximum the rankMaximum to set
-     */
-    public void setRankMaximum(String rankMaximum) {
-        this.rankMaximum = rankMaximum;
-    }
-
-    /**
-     * @return String
-     * @Title: getrIp
-     * @Description: 获取R服务器IP
-     */
-    public String getrIp() {
-        return rIp;
-    }
-
-    /**
-     * @return the ldaTemplateFile
-     */
-    public String getLdaTemplateFile() {
-        return ldaTemplateFile;
-    }
-
-    /**
-     * @return the ldgTemplateFile
-     */
-    public String getLdgTemplateFile() {
-        return ldgTemplateFile;
-    }
-
-    /**
-     * @return String
-     * @Title: getLdSheetName
-     */
-    public String getLdSheetName() {
-        return ldSheetName;
-    }
-
-    /**
-     * @return the fmeaIconFileDir
-     */
-    public String getFmeaIconFileDir() {
-        return fmeaIconFileDir;
-    }
-
-    /**
-     * @param fmeaIconFileDir the fmeaIconFileDir to set
-     */
-    public void setFmeaIconFileDir(String fmeaIconFileDir) {
-        this.fmeaIconFileDir = fmeaIconFileDir;
-    }
-
-    /**
-     * @return the dfmeaVda86TemplateFile
-     */
-    public String getDfmeaVda86TemplateFile() {
-        return dfmeaVda86TemplateFile;
-    }
-
-    /**
-     * @return the dfmeaVda42TemplateFile
-     */
-    public String getDfmeaVda42TemplateFile() {
-        return dfmeaVda42TemplateFile;
-    }
-
-    /**
-     * @return the dfmeaAiagdTemplateFile
-     */
-    public String getDfmeaAiagdTemplateFile() {
-        return dfmeaAiagdTemplateFile;
-    }
-
-    /**
-     * @return the dfmeaAiageTemplateFile
-     */
-    public String getDfmeaAiageTemplateFile() {
-        return dfmeaAiageTemplateFile;
-    }
-
-    /**
-     * @return the pfmeaVda86TemplateFile
-     */
-    public String getPfmeaVda86TemplateFile() {
-        return pfmeaVda86TemplateFile;
-    }
-
-    /**
-     * @return the pfmeaAiagdTemplateFile
-     */
-    public String getPfmeaAiagdTemplateFile() {
-        return pfmeaAiagdTemplateFile;
-    }
-
-    /**
-     * @return the pfmeaVda42TemplateFile
-     */
-    public String getPfmeaVda42TemplateFile() {
-        return pfmeaVda42TemplateFile;
-    }
-
-    /**
-     * @return the pfmeaAiagpTemplateFile
-     */
-    public String getPfmeaAiagpTemplateFile() {
-        return pfmeaAiagpTemplateFile;
-    }
-
-    /**
-     * @return the phaseStageSwitch
-     */
-    public String getPhaseStageSwitch() {
-        return phaseStageSwitch;
-    }
-
-    /**
-     * @return the percentStatMethodFracas
-     */
-    public String getPercentStatMethodFracas() {
-        return percentStatMethodFracas;
-    }
-
-    public String getProductExtInfo1Empty() {
-        return productExtInfo1Empty;
-    }
-
-    public String getProductExtInfo2Empty() {
-        return productExtInfo2Empty;
-    }
-
-    public String getProductExtInfo3Empty() {
-        return productExtInfo3Empty;
-    }
-
-    public String getProductExtInfo4Empty() {
-        return productExtInfo4Empty;
-    }
-
-    public String getProductExtInfo5Empty() {
-        return productExtInfo5Empty;
-    }
-
-    /**
-     * @return the xfracasCorrectTemplateFile
-     */
-    public String getXfracasCorrectTemplateFile() {
-        return xfracasCorrectTemplateFile;
-    }
-
-    /**
-     * @return the xfracasFlownodeTemplateFile
-     */
-    public String getXfracasFlownodeTemplateFile() {
-        return xfracasFlownodeTemplateFile;
-    }
-
-    public String getWdaFailureTemplateFile() {
-        return wdaFailureTemplateFile;
-    }
-
-    public String getPartFile() {
-        return partFile;
-    }
-
-    public String getImporTableType() {
-        return imporTableType;
-    }
-
-    public String getPartbillFile() {
-        return partbillFile;
-    }
-
-    public String getFailureFile() {
-        return failureFile;
-    }
-
-    public String getSalesFile() {
-        return salesFile;
-    }
-
-    public String getPopulationFile() {
-        return populationFile;
-    }
-
-    public String getBackFile() {
-        return backFile;
-    }
-
-    public String getDfmeaVdanTemplateFile() {
-        return dfmeaVdanTemplateFile;
-    }
-
-    public String getDfmeaDrbfmTemplateFile() {
-        return dfmeaDrbfmTemplateFile;
-    }
-
-    public String getPfmeaVdanTemplateFile() {
-        return pfmeaVdanTemplateFile;
-    }
-
-    public String getExportFile() {
-        return exportFile;
-    }
-
-    public String getProductspectrumFile() {
-        return productspectrumFile;
-    }
-
-    public String getProductFile() {
-        return productFile;
-    }
-
-    public String getPcFile() {
-        return pcFile;
-    }
-
-    public String getPctreeFile() {
-        return pctreeFile;
-    }
-
-    public String getPartpcFile() {
-        return partpcFile;
-    }
-
-    public String getCustomerFile() {
-        return customerFile;
-    }
-
-    public String getFailuremodeFile() {
-        return failuremodeFile;
-    }
-
-    public String getPurchaseFile() {
-        return purchaseFile;
-    }
-
-    public String getVendorFile() {
-        return vendorFile;
-    }
-
-    public String getPopulationpartFile() {
-        return populationpartFile;
-    }
-
-    public String getWarrantyFile() {
-        return warrantyFile;
-    }
-
-    public String getProjectFile() {
-        return projectFile;
-    }
-
-    public String getRespondeptFile() {
-        return respondeptFile;
-    }
-
-    public String getServiceprojectFile() {
-        return serviceprojectFile;
-    }
-
-    public String getServicestationFile() {
-        return servicestationFile;
-    }
-
-    public String getDfmeaDvprTemplateFile() {
-        return dfmeaDvprTemplateFile;
-    }
-
-    public String getServerWhite() {
-        return serverWhite;
-    }
-
-    public String getBaiduIp() {
-        return baiduIp;
-    }
-
-    public String getPasswordLevel() {
-        return passwordLevel;
-    }
-
-    public String getPfmeaControlPlanCustonTemplageFile() {
-        return pfmeaControlPlanCustonTemplageFile;
-    }
-
-    public String getPfmeaCustomTemplateFile() {
-        return pfmeaCustomTemplateFile;
-    }
-
-    public String getFmeaTableLogo() {
-        return fmeaTableLogo;
-    }
-
-    public String getDfmeaProdFeatureTemplateFile() {
-        return dfmeaProdFeatureTemplateFile;
-    }
-
-    public String getPfmeaProdFeatureTemplateFile() {
-        return pfmeaProdFeatureTemplateFile;
-    }
-
-    public String getPfmCheckPlanTemplateFile() {
-        return pfmCheckPlanTemplateFile;
-    }
-
-    public String getDfmeaExcelImportTmpl() {
-        return dfmeaExcelImportTmpl;
-    }
-
-    public String getDfmeaExcelImportTmpl4thToNew() {
-        return dfmeaExcelImportTmpl4thToNew;
-    }
-
-    public String getDfmeaExcelImportTmplVdan() {
-        return dfmeaExcelImportTmplVdan;
-    }
-
-    public String getPfmeaExcelImportTmpl() {
-        return pfmeaExcelImportTmpl;
-    }
-
-    public String getPfmeaExcelImportTmpl4thToNew() {
-        return pfmeaExcelImportTmpl4thToNew;
-    }
-
-    public String getPfmeaExcelImportTmplVdan() {
-        return pfmeaExcelImportTmplVdan;
-    }
-
-    public String getTransApiHost() {
-        return transApiHost;
-    }
-
-    public String getUserDefaultPassword() {
-        return userDefaultPassword;
-    }
-
-    public String getUserTemplateFile() {
-        return userTemplateFile;
-    }
-
-    public String getUserDisablePrompts() {
-        return userDisablePrompts;
-    }
-
-    public String getDfmeaVda42TemplateENFile() {
-        return dfmeaVda42TemplateENFile;
-    }
-
-    public String getDfmeaAiagdTemplateENFile() {
-        return dfmeaAiagdTemplateENFile;
-    }
-
-    public String getDfmeaVda42TemplateTWFile() {
-        return dfmeaVda42TemplateTWFile;
-    }
-
-    public String getDfmeaAiagdTemplateTWFile() {
-        return dfmeaAiagdTemplateTWFile;
-    }
-
-    public String getDfmeaNewTemplateENFile() {
-        return dfmeaNewTemplateENFile;
-    }
-
-    public String getDfmeaNewTemplateTWFile() {
-        return dfmeaNewTemplateTWFile;
-    }
-
-    public String getPfmeaVda42TemplateENFile() {
-        return pfmeaVda42TemplateENFile;
-    }
-
-    public String getPfmeaVda42TemplateTWFile() {
-        return pfmeaVda42TemplateTWFile;
-    }
-
-    public String getPfmeaAiagpTemplateENFile() {
-        return pfmeaAiagpTemplateENFile;
-    }
-
-    public String getPfmeaAiagpTemplateTWFile() {
-        return pfmeaAiagpTemplateTWFile;
-    }
-
-    public String getPfmeaNewTemplateENFile() {
-        return pfmeaNewTemplateENFile;
-    }
-
-    public String getPfmeaNewTemplateTWFile() {
-        return pfmeaNewTemplateTWFile;
-    }
-
-    public String getChartApiType() {
-        return chartApiType;
-    }
-
-    public String getChartApiProperty() {
-        return chartApiProperty;
-    }
-
-
-    public String getRfmTemplateFile() {
-        return rfmTemplateFile;
-    }
-
-    public String getReliabenchWebsite() {
-        return reliabenchWebsite;
-    }
-
-    public String getAdjacentDays() {
-        return adjacentDays;
-    }
-
-    public String getFirstTimeHour() {
-        return firstTimeHour;
-    }
-
-    public String getFirstTimeMinute() {
-        return firstTimeMinute;
-    }
-
-    public String getFirstTimeSecond() {
-        return firstTimeSecond;
-    }
-
-    public String getCycletimeMillisecond() {
-        return cycletimeMillisecond;
-    }
-
-    public String getDfmeaVda42TemplateEN_ZHFile() {
-        return dfmeaVda42TemplateEN_ZHFile;
-    }
-
-    public void setDfmeaVda42TemplateEN_ZHFile(String dfmeaVda42TemplateEN_ZHFile) {
-        this.dfmeaVda42TemplateEN_ZHFile = dfmeaVda42TemplateEN_ZHFile;
-    }
-
-    public String getDfmeaVda42TemplateEN_TWFile() {
-        return dfmeaVda42TemplateEN_TWFile;
-    }
-
-    public void setDfmeaVda42TemplateEN_TWFile(String dfmeaVda42TemplateEN_TWFile) {
-        this.dfmeaVda42TemplateEN_TWFile = dfmeaVda42TemplateEN_TWFile;
-    }
-
-    public String getDfmeaAiagdTemplateEN_ZHFile() {
-        return dfmeaAiagdTemplateEN_ZHFile;
-    }
-
-    public void setDfmeaAiagdTemplateEN_ZHFile(String dfmeaAiagdTemplateEN_ZHFile) {
-        this.dfmeaAiagdTemplateEN_ZHFile = dfmeaAiagdTemplateEN_ZHFile;
-    }
-
-    public String getDfmeaAiagdTemplateEN_TWFile() {
-        return dfmeaAiagdTemplateEN_TWFile;
-    }
-
-    public void setDfmeaAiagdTemplateEN_TWFile(String dfmeaAiagdTemplateEN_TWFile) {
-        this.dfmeaAiagdTemplateEN_TWFile = dfmeaAiagdTemplateEN_TWFile;
-    }
-
-    public String getDfmeaNewTemplateEN_ZHFile() {
-        return dfmeaNewTemplateEN_ZHFile;
-    }
-
-    public void setDfmeaNewTemplateEN_ZHFile(String dfmeaNewTemplateEN_ZHFile) {
-        this.dfmeaNewTemplateEN_ZHFile = dfmeaNewTemplateEN_ZHFile;
-    }
-
-    public String getDfmeaNewTemplateEN_TWFile() {
-        return dfmeaNewTemplateEN_TWFile;
-    }
-
-    public void setDfmeaNewTemplateEN_TWFile(String dfmeaNewTemplateEN_TWFile) {
-        this.dfmeaNewTemplateEN_TWFile = dfmeaNewTemplateEN_TWFile;
-    }
-
-    public String getPfmeaVda42TemplateEN_ZHFile() {
-        return pfmeaVda42TemplateEN_ZHFile;
-    }
-
-    public void setPfmeaVda42TemplateEN_ZHFile(String pfmeaVda42TemplateEN_ZHFile) {
-        this.pfmeaVda42TemplateEN_ZHFile = pfmeaVda42TemplateEN_ZHFile;
-    }
-
-    public String getPfmeaVda42TemplateEN_TWFile() {
-        return pfmeaVda42TemplateEN_TWFile;
-    }
-
-    public void setPfmeaVda42TemplateEN_TWFile(String pfmeaVda42TemplateEN_TWFile) {
-        this.pfmeaVda42TemplateEN_TWFile = pfmeaVda42TemplateEN_TWFile;
-    }
-
-    public String getPfmeaAiagpTemplateEN_ZHFile() {
-        return pfmeaAiagpTemplateEN_ZHFile;
-    }
-
-    public void setPfmeaAiagdTemplateEN_ZHFile(String pfmeaAiagpTemplateEN_ZHFile) {
-        this.pfmeaAiagpTemplateEN_ZHFile = pfmeaAiagpTemplateEN_ZHFile;
-    }
-
-    public String getPfmeaAiagpTemplateEN_TWFile() {
-        return pfmeaAiagpTemplateEN_TWFile;
-    }
-
-    public void setPfmeaAiagpTemplateEN_TWFile(String pfmeaAiagpTemplateEN_TWFile) {
-        this.pfmeaAiagpTemplateEN_TWFile = pfmeaAiagpTemplateEN_TWFile;
-    }
-
-    public String getPfmeaNewTemplateEN_ZHFile() {
-        return pfmeaNewTemplateEN_ZHFile;
-    }
-
-    public void setPfmeaNewTemplateEN_ZHFile(String pfmeaNewTemplateEN_ZHFile) {
-        this.pfmeaNewTemplateEN_ZHFile = pfmeaNewTemplateEN_ZHFile;
-    }
-
-    public String getPfmeaNewTemplateEN_TWFile() {
-        return pfmeaNewTemplateEN_TWFile;
-    }
-
-    public void setPfmeaNewTemplateEN_TWFile(String pfmeaNewTemplateEN_TWFile) {
-        this.pfmeaNewTemplateEN_TWFile = pfmeaNewTemplateEN_TWFile;
-    }
-
-    public String getRfmeaExportImportFileFormat() {
-        return rfmeaExportImportFileFormat;
-    }
-
-    public String getRdfmeaExportImportFileName() {
-        return rdfmeaExportImportFileName;
-    }
-
-    public String getRpfmeaExportImportFileName() {
-        return rpfmeaExportImportFileName;
-    }
-}

+ 2 - 2
nationrel-module-project-biz/src/main/java/com/nationrel/modules/project/mapper/xml/SysToolMapper.xml

@@ -51,7 +51,7 @@
     </sql>
 
     <!-- 插入新记录 insert -->
-    <insert id="insert" parameterType="com.nationrel.modules.project.entity.SysTool" >
+    <insert id="insert" parameterType="com.nationrel.modules.project.jar.rb_platform.entity.SysTool" >
         insert into T_SYS_TOOL (
             TOOL_ID,
             TOOL_NAME,
@@ -84,7 +84,7 @@
     </delete>
 
      <!-- 更新记录 updateByPrimaryKey -->
-    <update id="updateByPrimaryKey" parameterType="com.nationrel.modules.project.entity.SysTool" >
+    <update id="updateByPrimaryKey" parameterType="com.nationrel.modules.project.jar.rb_platform.entity.SysTool" >
         update T_SYS_TOOL
         set
             TOOL_NAME = #{toolName,jdbcType=VARCHAR},

+ 1 - 1
nationrel-module-project-biz/src/main/java/com/nationrel/modules/project/service/impl/PmPercentStatServiceImpl.java

@@ -1,6 +1,6 @@
 package com.nationrel.modules.project.service.impl;
 
-import com.nationrel.modules.project.jar.rb_common.bizcommon.util.SysConfig;
+import com.nationrel.modules.project.config.SysConfig;
 import com.nationrel.modules.project.jar.rb_common.common.constant.Constants;
 import com.nationrel.modules.project.jar.rb_common.common.constant.PmMapKeySet;
 import com.nationrel.modules.project.jar.rb_common.common.constant.ReliaFlowConstants;

+ 1 - 1
nationrel-module-project-biz/src/main/java/com/nationrel/modules/project/service/impl/PmStageCtrlServiceImpl.java

@@ -3,7 +3,7 @@ package com.nationrel.modules.project.service.impl;
 import com.nationrel.modules.project.entity.PmProject;
 import com.nationrel.modules.project.entity.PmTask;
 import com.nationrel.modules.project.entity.PmTg;
-import com.nationrel.modules.project.jar.rb_common.bizcommon.util.SysConfig;
+import com.nationrel.modules.project.config.SysConfig;
 import com.nationrel.modules.project.jar.rb_common.common.constant.Constants;
 import com.nationrel.modules.project.jar.rb_common.common.constant.MessageId;
 import com.nationrel.modules.project.jar.rb_common.common.constant.PmMapKeySet;

+ 1 - 1
nationrel-module-project-biz/src/main/java/com/nationrel/modules/project/service/impl/Rb0300220InitServiceImpl.java

@@ -4,7 +4,7 @@ import com.nationrel.modules.project.dto.input.Rb0300220InitInput;
 import com.nationrel.modules.project.dto.output.Rb0300220InitOutput;
 import com.nationrel.modules.project.entity.TaskPageModel;
 import com.nationrel.modules.project.entity.TaskToolModel;
-import com.nationrel.modules.project.jar.rb_common.bizcommon.util.SysConfig;
+import com.nationrel.modules.project.config.SysConfig;
 import com.nationrel.modules.project.jar.rb_common.common.constant.Constants;
 import com.nationrel.modules.project.jar.rb_common.common.constant.PmMapKeySet;
 import com.nationrel.modules.project.jar.rb_common.common.constant.ReliaFlowConstants;

+ 15 - 15
nationrel-module-project-biz/src/main/java/com/nationrel/modules/project/service/impl/RedisServiceImpl.java

@@ -1,11 +1,12 @@
 package com.nationrel.modules.project.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.nationrel.modules.project.config.SysConfig;
 import com.nationrel.modules.project.service.RedisService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
@@ -27,9 +28,8 @@ public class RedisServiceImpl implements RedisService {
     private final static String prefix = "%C2%AC%C3%AD%00%05";
     @Resource
     private RedisTemplate redisTemplate;
-
-    @Value("${sysName}")
-    private String sysName;
+    @Autowired
+    private SysConfig sysConfig;
 
     /**
      * @param val1
@@ -42,7 +42,7 @@ public class RedisServiceImpl implements RedisService {
     @Override
     public Object getObject(String key, Class clazz) {
         ValueOperations<String, String> ops = redisTemplate.opsForValue();
-        String k = sysName + key;
+        String k = sysConfig.getSysName() + key;
         log.debug(String.format("getObject key=%s", k));
         String res = ops.get(k);
         Object ret = objectDeserialization(res);
@@ -60,7 +60,7 @@ public class RedisServiceImpl implements RedisService {
     @Override
     public void putObject(String key, Object value, long timeout) {
         ValueOperations<String, String> ops = redisTemplate.opsForValue();
-        String k = sysName + key;
+        String k = sysConfig.getSysName() + key;
         log.debug(String.format("putObject key=%s", k));
         log.debug(String.format("putObject value=%s", value != null ? JSON.toJSONString(value) : null));
         String v = objectSerialiable(value);
@@ -75,7 +75,7 @@ public class RedisServiceImpl implements RedisService {
      **/
     @Override
     public void delete(String key) {
-        redisTemplate.delete(sysName + key);
+        redisTemplate.delete(sysConfig.getSysName() + key);
     }
 
     /**
@@ -88,7 +88,7 @@ public class RedisServiceImpl implements RedisService {
      **/
     @Override
     public Object getObject(String val1, String val2) {
-        return redisTemplate.opsForHash().get(sysName + val1, val2);
+        return redisTemplate.opsForHash().get(sysConfig.getSysName() + val1, val2);
     }
 
     /**
@@ -102,7 +102,7 @@ public class RedisServiceImpl implements RedisService {
      **/
     @Override
     public void setObject(String val1, String val2, Object value) {
-        redisTemplate.opsForHash().put(sysName + val1, val2, value);
+        redisTemplate.opsForHash().put(sysConfig.getSysName() + val1, val2, value);
     }
 
     /**
@@ -116,7 +116,7 @@ public class RedisServiceImpl implements RedisService {
      **/
     @Override
     public void setMap(String val1, String val2, Map<String, String> value) {
-        redisTemplate.opsForHash().put(sysName + val1, val2, value);
+        redisTemplate.opsForHash().put(sysConfig.getSysName() + val1, val2, value);
     }
 
     /**
@@ -129,7 +129,7 @@ public class RedisServiceImpl implements RedisService {
      **/
     @Override
     public Map<String, String> getMap(String val1, String val2) {
-        return (Map) redisTemplate.opsForHash().get(sysName + val1, val2);
+        return (Map) redisTemplate.opsForHash().get(sysConfig.getSysName() + val1, val2);
     }
 
     /**
@@ -142,7 +142,7 @@ public class RedisServiceImpl implements RedisService {
      **/
     @Override
     public void delMap(String val1, String val2) {
-        redisTemplate.opsForHash().delete(sysName + val1, val2);
+        redisTemplate.opsForHash().delete(sysConfig.getSysName() + val1, val2);
     }
 
     /**
@@ -154,17 +154,17 @@ public class RedisServiceImpl implements RedisService {
      **/
     @Override
     public void delMap(String val1) {
-        redisTemplate.delete(sysName + val1);
+        redisTemplate.delete(sysConfig.getSysName() + val1);
     }
 
     @Override
     public Boolean hasMap(String val1) {
-        return redisTemplate.opsForHash().getOperations().hasKey(sysName + val1);
+        return redisTemplate.opsForHash().getOperations().hasKey(sysConfig.getSysName() + val1);
     }
 
     @Override
     public Boolean setHashExpire(String val1, Long keepTime, TimeUnit timeUnit) {
-        return redisTemplate.expire(sysName + val1, keepTime, timeUnit);
+        return redisTemplate.expire(sysConfig.getSysName() + val1, keepTime, timeUnit);
     }
 
     /**