diff --git a/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/add.html b/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/add.html new file mode 100644 index 000000000..c01515116 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/add.html @@ -0,0 +1,182 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/duty_schedule.html b/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/duty_schedule.html new file mode 100644 index 000000000..20141ec7b --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/duty_schedule.html @@ -0,0 +1,176 @@ + + + + + + +
+
+
+
+
+
    +
  • +

    任务名称：

    + +
    • +
  • +

    机型，多个用;分割，为空表示不设限制：

    + +
    • +
  • +

    对应版本：

    + +
    • +
  • +

    开始日期，为空表示不设限制：

    + + - + +
    • +
  • +

    结束日期，为空表示不设限制：

    + + - + +
    • +
  • +

    任务描述：

    + +
    • +
  • +

    具体任务的执行状态：

    + +
    • +
  • +

    任务状态，正常/异常/：

    + +
    • +
  • +

    创建时间：

    + + - + +
    • +
  • +

    更新时间：

    + + - + +
    • +
  • +

    备注：

    + +
    • +
  • +

    job配置id：

    + +
    • +
  • +

    程序执行状态,-2,定时器停止；-1，定时器执行；：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/edit.html b/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/edit.html new file mode 100644 index 000000000..d1bd63e40 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/duty_schedule/edit.html @@ -0,0 +1,171 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/add.html b/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/add.html new file mode 100644 index 000000000..2d52f55dd --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/add.html @@ -0,0 +1,153 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/edit.html b/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/edit.html new file mode 100644 index 000000000..6319cc8df --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/edit.html @@ -0,0 +1,148 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/parameter_computed.html b/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/parameter_computed.html new file mode 100644 index 000000000..e199ced61 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/parameter_computed/parameter_computed.html @@ -0,0 +1,109 @@ + + + + + + +
+
+
+
+
+
    +
  • +

    版本id：

    + +
    • +
  • +

    参数名：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/resource-manage/edit.html b/infosouth-admin/src/main/resources/templates/arj21/resource-manage/edit.html index f4f464436..70e83f703 100644 --- a/infosouth-admin/src/main/resources/templates/arj21/resource-manage/edit.html +++ b/infosouth-admin/src/main/resources/templates/arj21/resource-manage/edit.html @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@
- +
@@ -19,25 +19,25 @@
- +
- +
- +
- +
@@ -46,7 +46,7 @@
- +
@@ -55,67 +55,67 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -124,7 +124,7 @@
- +
@@ -163,10 +163,10 @@ autoclose: true }); - /*资源目录-新增-选择父部门树*/ + /*璧勬簮鐩綍-鏂板-閫夋嫨鐖堕儴闂ㄦ爲*/ function selectResourceTree() { var options = { - title: '资源目录选择', + title: '璧勬簮鐩綍閫夋嫨', width: "380", url: prefix + "/selectResourceTree/" + $("#treeId").val(), callBack: doSubmit diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/parameter/InfoParameterComputedController.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/parameter/InfoParameterComputedController.java new file mode 100644 index 000000000..d7763f7ab --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/parameter/InfoParameterComputedController.java @@ -0,0 +1,126 @@ +package cn.com.infosouth.arj21.controller.parameter; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import cn.com.infosouth.common.annotation.Log; +import cn.com.infosouth.common.enums.BusinessType; +import cn.com.infosouth.arj21.domain.InfoParameterComputed; +import cn.com.infosouth.arj21.service.IInfoParameterComputedService; +import cn.com.infosouth.common.core.controller.BaseController; +import cn.com.infosouth.common.core.domain.AjaxResult; +import cn.com.infosouth.common.utils.poi.ExcelUtil; +import cn.com.infosouth.common.core.page.TableDataInfo; + +/** + * 计算参数Controller + * + * @author kxnf + * @date 2020-03-05 + */ +@Controller +@RequestMapping("/arj21/parameter_computed") +public class InfoParameterComputedController extends BaseController +{ + private String prefix = "arj21/parameter_computed"; + + @Autowired + private IInfoParameterComputedService infoParameterComputedService; + + @RequiresPermissions("arj21:parameter_computed:view") + @GetMapping() + public String parameter_computed() + { + return prefix + "/parameter_computed"; + } + + /** + * 查询计算参数列表 + */ + @RequiresPermissions("arj21:parameter_computed:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(InfoParameterComputed infoParameterComputed) + { + startPage(); + List list = infoParameterComputedService.selectInfoParameterComputedList(infoParameterComputed); + return getDataTable(list); + } + + /** + * 导出计算参数列表 + */ + @RequiresPermissions("arj21:parameter_computed:export") + @Log(title = "计算参数", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(InfoParameterComputed infoParameterComputed) + { + List list = infoParameterComputedService.selectInfoParameterComputedList(infoParameterComputed); + ExcelUtil util = new ExcelUtil(InfoParameterComputed.class); + return util.exportExcel(list, "parameter_computed"); + } + + /** + * 新增计算参数 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存计算参数 + */ + @RequiresPermissions("arj21:parameter_computed:add") + @Log(title = "计算参数", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(InfoParameterComputed infoParameterComputed) + { + return toAjax(infoParameterComputedService.insertInfoParameterComputed(infoParameterComputed)); + } + + /** + * 修改计算参数 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + InfoParameterComputed infoParameterComputed = infoParameterComputedService.selectInfoParameterComputedById(id); + mmap.put("infoParameterComputed", infoParameterComputed); + return prefix + "/edit"; + } + + /** + * 修改保存计算参数 + */ + @RequiresPermissions("arj21:parameter_computed:edit") + @Log(title = "计算参数", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(InfoParameterComputed infoParameterComputed) + { + return toAjax(infoParameterComputedService.updateInfoParameterComputed(infoParameterComputed)); + } + + /** + * 删除计算参数 + */ + @RequiresPermissions("arj21:parameter_computed:remove") + @Log(title = "计算参数", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(infoParameterComputedService.deleteInfoParameterComputedByIds(ids)); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/schedule/InfoDutyScheduleController.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/schedule/InfoDutyScheduleController.java new file mode 100644 index 000000000..3892fc37e --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/schedule/InfoDutyScheduleController.java @@ -0,0 +1,126 @@ +package cn.com.infosouth.arj21.controller.schedule; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import cn.com.infosouth.common.annotation.Log; +import cn.com.infosouth.common.enums.BusinessType; +import cn.com.infosouth.arj21.domain.InfoDutySchedule; +import cn.com.infosouth.arj21.service.IInfoDutyScheduleService; +import cn.com.infosouth.common.core.controller.BaseController; +import cn.com.infosouth.common.core.domain.AjaxResult; +import cn.com.infosouth.common.utils.poi.ExcelUtil; +import cn.com.infosouth.common.core.page.TableDataInfo; + +/** + * 任务调度Controller + * + * @author kxnf + * @date 2020-03-05 + */ +@Controller +@RequestMapping("/arj21/duty_schedule") +public class InfoDutyScheduleController extends BaseController +{ + private String prefix = "arj21/duty_schedule"; + + @Autowired + private IInfoDutyScheduleService infoDutyScheduleService; + + @RequiresPermissions("arj21:duty_schedule:view") + @GetMapping() + public String duty_schedule() + { + return prefix + "/duty_schedule"; + } + + /** + * 查询任务调度列表 + */ + @RequiresPermissions("arj21:duty_schedule:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(InfoDutySchedule infoDutySchedule) + { + startPage(); + List list = infoDutyScheduleService.selectInfoDutyScheduleList(infoDutySchedule); + return getDataTable(list); + } + + /** + * 导出任务调度列表 + */ + @RequiresPermissions("arj21:duty_schedule:export") + @Log(title = "任务调度", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(InfoDutySchedule infoDutySchedule) + { + List list = infoDutyScheduleService.selectInfoDutyScheduleList(infoDutySchedule); + ExcelUtil util = new ExcelUtil(InfoDutySchedule.class); + return util.exportExcel(list, "duty_schedule"); + } + + /** + * 新增任务调度 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存任务调度 + */ + @RequiresPermissions("arj21:duty_schedule:add") + @Log(title = "任务调度", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(InfoDutySchedule infoDutySchedule) + { + return toAjax(infoDutyScheduleService.insertInfoDutySchedule(infoDutySchedule)); + } + + /** + * 修改任务调度 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + InfoDutySchedule infoDutySchedule = infoDutyScheduleService.selectInfoDutyScheduleById(id); + mmap.put("infoDutySchedule", infoDutySchedule); + return prefix + "/edit"; + } + + /** + * 修改保存任务调度 + */ + @RequiresPermissions("arj21:duty_schedule:edit") + @Log(title = "任务调度", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(InfoDutySchedule infoDutySchedule) + { + return toAjax(infoDutyScheduleService.updateInfoDutySchedule(infoDutySchedule)); + } + + /** + * 删除任务调度 + */ + @RequiresPermissions("arj21:duty_schedule:remove") + @Log(title = "任务调度", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(infoDutyScheduleService.deleteInfoDutyScheduleByIds(ids)); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoDutySchedule.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoDutySchedule.java new file mode 100644 index 000000000..35842dfb5 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoDutySchedule.java @@ -0,0 +1,277 @@ +package cn.com.infosouth.arj21.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import cn.com.infosouth.common.annotation.Excel; +import cn.com.infosouth.common.core.domain.BaseEntity; +import java.util.Date; + +/** + * 任务调度对象 info_duty_schedule + * + * @author kxnf + * @date 2020-03-05 + */ +public class InfoDutySchedule extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** null */ + private String id; + + /** 任务名称 */ + @Excel(name = "任务名称") + private String jobName; + + /** 模型名称，多个用;分割 */ + @Excel(name = "模型名称，多个用;分割") + private String modelName; + + /** 机型，多个用;分割，为空表示不设限制 */ + @Excel(name = "机型，多个用;分割，为空表示不设限制") + private String acType; + + /** 飞机号，多个用;分割，为空表示不设限制 */ + @Excel(name = "飞机号，多个用;分割，为空表示不设限制") + private String acReg; + + /** 对应版本 */ + @Excel(name = "对应版本") + private Long versionId; + + /** 开始日期，为空表示不设限制 */ + @Excel(name = "开始日期，为空表示不设限制", width = 30, dateFormat = "yyyy-MM-dd") + private Date startDate; + + /** 结束日期，为空表示不设限制 */ + @Excel(name = "结束日期，为空表示不设限制", width = 30, dateFormat = "yyyy-MM-dd") + private Date endDate; + + /** 任务描述 */ + @Excel(name = "任务描述") + private String jobDesc; + + /** 具体任务的执行状态 */ + @Excel(name = "具体任务的执行状态") + private Integer isExcute; + + /** 任务状态，正常/异常/ */ + @Excel(name = "任务状态，正常/异常/") + private String jobStatus; + + /** 执行周期 */ + @Excel(name = "执行周期") + private String excuteFreq; + + /** 创建时间 */ + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** 更新时间 */ + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + /** 备注 */ + @Excel(name = "备注") + private String remarks; + + /** 删除标志 */ + private String delFlag; + + /** job配置id */ + @Excel(name = "job配置id") + private String jobConf; + + /** 程序执行状态,-2,定时器停止；-1，定时器执行； */ + @Excel(name = "程序执行状态,-2,定时器停止；-1，定时器执行；") + private Integer executeStatus; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobName() + { + return jobName; + } + public void setModelName(String modelName) + { + this.modelName = modelName; + } + + public String getModelName() + { + return modelName; + } + public void setAcType(String acType) + { + this.acType = acType; + } + + public String getAcType() + { + return acType; + } + public void setAcReg(String acReg) + { + this.acReg = acReg; + } + + public String getAcReg() + { + return acReg; + } + public void setVersionId(Long versionId) + { + this.versionId = versionId; + } + + public Long getVersionId() + { + return versionId; + } + public void setStartDate(Date startDate) + { + this.startDate = startDate; + } + + public Date getStartDate() + { + return startDate; + } + public void setEndDate(Date endDate) + { + this.endDate = endDate; + } + + public Date getEndDate() + { + return endDate; + } + public void setJobDesc(String jobDesc) + { + this.jobDesc = jobDesc; + } + + public String getJobDesc() + { + return jobDesc; + } + public void setIsExcute(Integer isExcute) + { + this.isExcute = isExcute; + } + + public Integer getIsExcute() + { + return isExcute; + } + public void setJobStatus(String jobStatus) + { + this.jobStatus = jobStatus; + } + + public String getJobStatus() + { + return jobStatus; + } + public void setExcuteFreq(String excuteFreq) + { + this.excuteFreq = excuteFreq; + } + + public String getExcuteFreq() + { + return excuteFreq; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setJobConf(String jobConf) + { + this.jobConf = jobConf; + } + + public String getJobConf() + { + return jobConf; + } + public void setExecuteStatus(Integer executeStatus) + { + this.executeStatus = executeStatus; + } + + public Integer getExecuteStatus() + { + return executeStatus; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("jobName", getJobName()) + .append("modelName", getModelName()) + .append("acType", getAcType()) + .append("acReg", getAcReg()) + .append("versionId", getVersionId()) + .append("startDate", getStartDate()) + .append("endDate", getEndDate()) + .append("jobDesc", getJobDesc()) + .append("isExcute", getIsExcute()) + .append("jobStatus", getJobStatus()) + .append("excuteFreq", getExcuteFreq()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .append("remarks", getRemarks()) + .append("delFlag", getDelFlag()) + .append("jobConf", getJobConf()) + .append("executeStatus", getExecuteStatus()) + .toString(); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoParameterComputed.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoParameterComputed.java new file mode 100644 index 000000000..d7626be62 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoParameterComputed.java @@ -0,0 +1,266 @@ +package cn.com.infosouth.arj21.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import cn.com.infosouth.common.annotation.Excel; +import cn.com.infosouth.common.core.domain.BaseEntity; +import java.util.Date; + +/** + * 计算参数对象 info_parameter_computed + * + * @author kxnf + * @date 2020-03-05 + */ +public class InfoParameterComputed extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** null */ + private String id; + + /** 参数主表id */ + private String prmId; + + /** 版本id */ + @Excel(name = "版本id") + private String infoVersion; + + /** 类型：1:参数,2:平滑处理,(通用方法)3:模型 */ + private Integer infoType; + + /** 参数名 */ + @Excel(name = "参数名") + private String prmName; + + /** 参数描述 */ + @Excel(name = "参数描述") + private String prmDesc; + + /** null */ + private String prmLanguage; + + /** 脚本代码 */ + private String scriptCode; + + /** 脚本代码(python) */ + private String pythonCode; + + /** 编译顺序 */ + @Excel(name = "编译顺序") + private Integer order; + + /** 引用的参数 */ + private String preferenceParams; + + /** 模型需要导出的参数 */ + private String exportParams; + + /** 导出数据起始点 */ + private Integer exportFrom; + + /** 导出数据结束点 */ + private Integer exportTo; + + /** 创建时间 */ + private Date createDate; + + /** 更新时间 */ + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + /** 备注 */ + private String remarks; + + /** 删除标志 */ + private String delFlag; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setPrmId(String prmId) + { + this.prmId = prmId; + } + + public String getPrmId() + { + return prmId; + } + public void setInfoVersion(String infoVersion) + { + this.infoVersion = infoVersion; + } + + public String getInfoVersion() + { + return infoVersion; + } + public void setInfoType(Integer infoType) + { + this.infoType = infoType; + } + + public Integer getInfoType() + { + return infoType; + } + public void setPrmName(String prmName) + { + this.prmName = prmName; + } + + public String getPrmName() + { + return prmName; + } + public void setPrmDesc(String prmDesc) + { + this.prmDesc = prmDesc; + } + + public String getPrmDesc() + { + return prmDesc; + } + public void setPrmLanguage(String prmLanguage) + { + this.prmLanguage = prmLanguage; + } + + public String getPrmLanguage() + { + return prmLanguage; + } + public void setScriptCode(String scriptCode) + { + this.scriptCode = scriptCode; + } + + public String getScriptCode() + { + return scriptCode; + } + public void setPythonCode(String pythonCode) + { + this.pythonCode = pythonCode; + } + + public String getPythonCode() + { + return pythonCode; + } + public void setOrder(Integer order) + { + this.order = order; + } + + public Integer getOrder() + { + return order; + } + public void setPreferenceParams(String preferenceParams) + { + this.preferenceParams = preferenceParams; + } + + public String getPreferenceParams() + { + return preferenceParams; + } + public void setExportParams(String exportParams) + { + this.exportParams = exportParams; + } + + public String getExportParams() + { + return exportParams; + } + public void setExportFrom(Integer exportFrom) + { + this.exportFrom = exportFrom; + } + + public Integer getExportFrom() + { + return exportFrom; + } + public void setExportTo(Integer exportTo) + { + this.exportTo = exportTo; + } + + public Integer getExportTo() + { + return exportTo; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("prmId", getPrmId()) + .append("infoVersion", getInfoVersion()) + .append("infoType", getInfoType()) + .append("prmName", getPrmName()) + .append("prmDesc", getPrmDesc()) + .append("prmLanguage", getPrmLanguage()) + .append("scriptCode", getScriptCode()) + .append("pythonCode", getPythonCode()) + .append("order", getOrder()) + .append("preferenceParams", getPreferenceParams()) + .append("exportParams", getExportParams()) + .append("exportFrom", getExportFrom()) + .append("exportTo", getExportTo()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .append("remarks", getRemarks()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoDutyScheduleMapper.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoDutyScheduleMapper.java new file mode 100644 index 000000000..2558a61b5 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoDutyScheduleMapper.java @@ -0,0 +1,76 @@ +package cn.com.infosouth.arj21.mapper; + +import java.util.List; +import java.util.Map; + +import cn.com.infosouth.arj21.domain.InfoDutySchedule; + +/** + * 任务调度Mapper接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface InfoDutyScheduleMapper +{ + /** + * 查询任务调度 + * + * @param id 任务调度ID + * @return 任务调度 + */ + public InfoDutySchedule selectInfoDutyScheduleById(String id); + + /** + * 查询任务调度列表 + * + * @param infoDutySchedule 任务调度 + * @return 任务调度集合 + */ + public List selectInfoDutyScheduleList(InfoDutySchedule infoDutySchedule); + + /** + * 新增任务调度 + * + * @param infoDutySchedule 任务调度 + * @return 结果 + */ + public int insertInfoDutySchedule(InfoDutySchedule infoDutySchedule); + + /** + * 修改任务调度 + * + * @param infoDutySchedule 任务调度 + * @return 结果 + */ + public int updateInfoDutySchedule(InfoDutySchedule infoDutySchedule); + + /** + * 删除任务调度 + * + * @param id 任务调度ID + * @return 结果 + */ + public int deleteInfoDutyScheduleById(String id); + + /** + * 批量删除任务调度 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoDutyScheduleByIds(String[] ids); + + /** + * 查找任务列表 + * @param static_acType_B737 + * @return + */ + public List> findInfoDutyScheduleMapList(String static_acType_B737); + + /** + * 查找job数量 + * @return + */ + public String findJobCount(); +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoParameterComputedMapper.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoParameterComputedMapper.java new file mode 100644 index 000000000..ce2f0f230 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoParameterComputedMapper.java @@ -0,0 +1,61 @@ +package cn.com.infosouth.arj21.mapper; + +import java.util.List; +import cn.com.infosouth.arj21.domain.InfoParameterComputed; + +/** + * 计算参数Mapper接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface InfoParameterComputedMapper +{ + /** + * 查询计算参数 + * + * @param id 计算参数ID + * @return 计算参数 + */ + public InfoParameterComputed selectInfoParameterComputedById(String id); + + /** + * 查询计算参数列表 + * + * @param infoParameterComputed 计算参数 + * @return 计算参数集合 + */ + public List selectInfoParameterComputedList(InfoParameterComputed infoParameterComputed); + + /** + * 新增计算参数 + * + * @param infoParameterComputed 计算参数 + * @return 结果 + */ + public int insertInfoParameterComputed(InfoParameterComputed infoParameterComputed); + + /** + * 修改计算参数 + * + * @param infoParameterComputed 计算参数 + * @return 结果 + */ + public int updateInfoParameterComputed(InfoParameterComputed infoParameterComputed); + + /** + * 删除计算参数 + * + * @param id 计算参数ID + * @return 结果 + */ + public int deleteInfoParameterComputedById(String id); + + /** + * 批量删除计算参数 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoParameterComputedByIds(String[] ids); +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoDutyScheduleService.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoDutyScheduleService.java index c4245c5ee..fa14e3df3 100644 --- a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoDutyScheduleService.java +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoDutyScheduleService.java @@ -3,14 +3,75 @@ package cn.com.infosouth.arj21.service; import java.util.List; import java.util.Map; -public interface IInfoDutyScheduleService { +import cn.com.infosouth.arj21.domain.InfoDutySchedule; - List> findInfoDutyScheduleMapList(String static_acType_B737); +/** + * 任务调度Service接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface IInfoDutyScheduleService +{ + /** + * 查询任务调度 + * + * @param id 任务调度ID + * @return 任务调度 + */ + public InfoDutySchedule selectInfoDutyScheduleById(String id); + + /** + * 查询任务调度列表 + * + * @param infoDutySchedule 任务调度 + * @return 任务调度集合 + */ + public List selectInfoDutyScheduleList(InfoDutySchedule infoDutySchedule); + + /** + * 新增任务调度 + * + * @param infoDutySchedule 任务调度 + * @return 结果 + */ + public int insertInfoDutySchedule(InfoDutySchedule infoDutySchedule); + + /** + * 修改任务调度 + * + * @param infoDutySchedule 任务调度 + * @return 结果 + */ + public int updateInfoDutySchedule(InfoDutySchedule infoDutySchedule); + + /** + * 批量删除任务调度 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoDutyScheduleByIds(String ids); + + /** + * 删除任务调度信息 + * + * @param id 任务调度ID + * @return 结果 + */ + public int deleteInfoDutyScheduleById(String id); + + /** + * 查找调度任务列表 + * @param static_acType_B737 + * @return + */ + List> findInfoDutyScheduleMapList(String static_acType_B737); /** * 任务数量 * @return */ String findJobCount(); - } + diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoParameterComputedService.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoParameterComputedService.java new file mode 100644 index 000000000..70e52b797 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoParameterComputedService.java @@ -0,0 +1,61 @@ +package cn.com.infosouth.arj21.service; + +import java.util.List; +import cn.com.infosouth.arj21.domain.InfoParameterComputed; + +/** + * 计算参数Service接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface IInfoParameterComputedService +{ + /** + * 查询计算参数 + * + * @param id 计算参数ID + * @return 计算参数 + */ + public InfoParameterComputed selectInfoParameterComputedById(String id); + + /** + * 查询计算参数列表 + * + * @param infoParameterComputed 计算参数 + * @return 计算参数集合 + */ + public List selectInfoParameterComputedList(InfoParameterComputed infoParameterComputed); + + /** + * 新增计算参数 + * + * @param infoParameterComputed 计算参数 + * @return 结果 + */ + public int insertInfoParameterComputed(InfoParameterComputed infoParameterComputed); + + /** + * 修改计算参数 + * + * @param infoParameterComputed 计算参数 + * @return 结果 + */ + public int updateInfoParameterComputed(InfoParameterComputed infoParameterComputed); + + /** + * 批量删除计算参数 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoParameterComputedByIds(String ids); + + /** + * 删除计算参数信息 + * + * @param id 计算参数ID + * @return 结果 + */ + public int deleteInfoParameterComputedById(String id); +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoDutyScheduleServiceImpl.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoDutyScheduleServiceImpl.java index 50da364bf..300d5619c 100644 --- a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoDutyScheduleServiceImpl.java +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoDutyScheduleServiceImpl.java @@ -3,30 +3,104 @@ package cn.com.infosouth.arj21.service.impl; import java.util.List; import java.util.Map; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - +import cn.com.infosouth.arj21.mapper.InfoDutyScheduleMapper; +import cn.com.infosouth.arj21.domain.InfoDutySchedule; import cn.com.infosouth.arj21.service.IInfoDutyScheduleService; - +import cn.com.infosouth.common.core.text.Convert; /** - * 任务调度管理Service - * @author zy - * @version 2018-01-05 + * 任务调度Service业务层处理 + * + * @author kxnf + * @date 2020-03-05 */ @Service -@Transactional(readOnly = true) -public class IInfoDutyScheduleServiceImpl implements IInfoDutyScheduleService{ +public class InfoDutyScheduleServiceImpl implements IInfoDutyScheduleService +{ + @Autowired + private InfoDutyScheduleMapper infoDutyScheduleMapper; + + /** + * 查询任务调度 + * + * @param id 任务调度ID + * @return 任务调度 + */ + @Override + public InfoDutySchedule selectInfoDutyScheduleById(String id) + { + return infoDutyScheduleMapper.selectInfoDutyScheduleById(id); + } + + /** + * 查询任务调度列表 + * + * @param infoDutySchedule 任务调度 + * @return 任务调度 + */ + @Override + public List selectInfoDutyScheduleList(InfoDutySchedule infoDutySchedule) + { + return infoDutyScheduleMapper.selectInfoDutyScheduleList(infoDutySchedule); + } + + /** + * 新增任务调度 + * + * @param infoDutySchedule 任务调度 + * @return 结果 + */ + @Override + public int insertInfoDutySchedule(InfoDutySchedule infoDutySchedule) + { + return infoDutyScheduleMapper.insertInfoDutySchedule(infoDutySchedule); + } + + /** + * 修改任务调度 + * + * @param infoDutySchedule 任务调度 + * @return 结果 + */ + @Override + public int updateInfoDutySchedule(InfoDutySchedule infoDutySchedule) + { + return infoDutyScheduleMapper.updateInfoDutySchedule(infoDutySchedule); + } + + /** + * 删除任务调度对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteInfoDutyScheduleByIds(String ids) + { + return infoDutyScheduleMapper.deleteInfoDutyScheduleByIds(Convert.toStrArray(ids)); + } + + /** + * 删除任务调度信息 + * + * @param id 任务调度ID + * @return 结果 + */ + @Override + public int deleteInfoDutyScheduleById(String id) + { + return infoDutyScheduleMapper.deleteInfoDutyScheduleById(id); + } - @Override public List> findInfoDutyScheduleMapList(String static_acType_B737) { - return null; + return infoDutyScheduleMapper.findInfoDutyScheduleMapList(static_acType_B737); } @Override public String findJobCount() { - return null; + return infoDutyScheduleMapper.findJobCount(); } - } diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoParameterComputedServiceImpl.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoParameterComputedServiceImpl.java new file mode 100644 index 000000000..16d860bad --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoParameterComputedServiceImpl.java @@ -0,0 +1,94 @@ +package cn.com.infosouth.arj21.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import cn.com.infosouth.arj21.mapper.InfoParameterComputedMapper; +import cn.com.infosouth.arj21.domain.InfoParameterComputed; +import cn.com.infosouth.arj21.service.IInfoParameterComputedService; +import cn.com.infosouth.common.core.text.Convert; + +/** + * 计算参数Service业务层处理 + * + * @author kxnf + * @date 2020-03-05 + */ +@Service +public class InfoParameterComputedServiceImpl implements IInfoParameterComputedService +{ + @Autowired + private InfoParameterComputedMapper infoParameterComputedMapper; + + /** + * 查询计算参数 + * + * @param id 计算参数ID + * @return 计算参数 + */ + @Override + public InfoParameterComputed selectInfoParameterComputedById(String id) + { + return infoParameterComputedMapper.selectInfoParameterComputedById(id); + } + + /** + * 查询计算参数列表 + * + * @param infoParameterComputed 计算参数 + * @return 计算参数 + */ + @Override + public List selectInfoParameterComputedList(InfoParameterComputed infoParameterComputed) + { + return infoParameterComputedMapper.selectInfoParameterComputedList(infoParameterComputed); + } + + /** + * 新增计算参数 + * + * @param infoParameterComputed 计算参数 + * @return 结果 + */ + @Override + public int insertInfoParameterComputed(InfoParameterComputed infoParameterComputed) + { + return infoParameterComputedMapper.insertInfoParameterComputed(infoParameterComputed); + } + + /** + * 修改计算参数 + * + * @param infoParameterComputed 计算参数 + * @return 结果 + */ + @Override + public int updateInfoParameterComputed(InfoParameterComputed infoParameterComputed) + { + return infoParameterComputedMapper.updateInfoParameterComputed(infoParameterComputed); + } + + /** + * 删除计算参数对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteInfoParameterComputedByIds(String ids) + { + return infoParameterComputedMapper.deleteInfoParameterComputedByIds(Convert.toStrArray(ids)); + } + + /** + * 删除计算参数信息 + * + * @param id 计算参数ID + * @return 结果 + */ + @Override + public int deleteInfoParameterComputedById(String id) + { + return infoParameterComputedMapper.deleteInfoParameterComputedById(id); + } +} diff --git a/infosouth-arj21/src/main/resources/mapper/InfoDutyScheduleMapper.xml b/infosouth-arj21/src/main/resources/mapper/InfoDutyScheduleMapper.xml new file mode 100644 index 000000000..ff5c07587 --- /dev/null +++ b/infosouth-arj21/src/main/resources/mapper/InfoDutyScheduleMapper.xml @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, job_name, model_name, ac_type, ac_reg, version_id, start_date, end_date, job_desc, is_excute, job_status, excute_freq, create_by, create_date, update_by, update_date, remarks, del_flag, job_conf, execute_status from info_duty_schedule + + + + + + + + insert into info_duty_schedule + + id, + job_name, + model_name, + ac_type, + ac_reg, + version_id, + start_date, + end_date, + job_desc, + is_excute, + job_status, + excute_freq, + create_by, + create_date, + update_by, + update_date, + remarks, + del_flag, + job_conf, + execute_status, + + + #{id}, + #{jobName}, + #{modelName}, + #{acType}, + #{acReg}, + #{versionId}, + #{startDate}, + #{endDate}, + #{jobDesc}, + #{isExcute}, + #{jobStatus}, + #{excuteFreq}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + #{remarks}, + #{delFlag}, + #{jobConf}, + #{executeStatus}, + + + + + update info_duty_schedule + + job_name = #{jobName}, + model_name = #{modelName}, + ac_type = #{acType}, + ac_reg = #{acReg}, + version_id = #{versionId}, + start_date = #{startDate}, + end_date = #{endDate}, + job_desc = #{jobDesc}, + is_excute = #{isExcute}, + job_status = #{jobStatus}, + excute_freq = #{excuteFreq}, + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + remarks = #{remarks}, + del_flag = #{delFlag}, + job_conf = #{jobConf}, + execute_status = #{executeStatus}, + + where id = #{id} + + + + delete from info_duty_schedule where id = #{id} + + + + delete from info_duty_schedule where id in + + #{id} + + + + + + + + + + + \ No newline at end of file diff --git a/infosouth-arj21/src/main/resources/mapper/InfoParameterComputedMapper.xml b/infosouth-arj21/src/main/resources/mapper/InfoParameterComputedMapper.xml new file mode 100644 index 000000000..fdb0203cd --- /dev/null +++ b/infosouth-arj21/src/main/resources/mapper/InfoParameterComputedMapper.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, prm_id, info_version, info_type, prm_name, prm_desc, prm_language, script_code, python_code, order, preference_params, export_params, export_from, export_to, create_by, create_date, update_by, update_date, remarks, del_flag from info_parameter_computed + + + + + + + + insert into info_parameter_computed + + id, + prm_id, + info_version, + info_type, + prm_name, + prm_desc, + prm_language, + script_code, + python_code, + order, + preference_params, + export_params, + export_from, + export_to, + create_by, + create_date, + update_by, + update_date, + remarks, + del_flag, + + + #{id}, + #{prmId}, + #{infoVersion}, + #{infoType}, + #{prmName}, + #{prmDesc}, + #{prmLanguage}, + #{scriptCode}, + #{pythonCode}, + #{order}, + #{preferenceParams}, + #{exportParams}, + #{exportFrom}, + #{exportTo}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + #{remarks}, + #{delFlag}, + + + + + update info_parameter_computed + + prm_id = #{prmId}, + info_version = #{infoVersion}, + info_type = #{infoType}, + prm_name = #{prmName}, + prm_desc = #{prmDesc}, + prm_language = #{prmLanguage}, + script_code = #{scriptCode}, + python_code = #{pythonCode}, + order = #{order}, + preference_params = #{preferenceParams}, + export_params = #{exportParams}, + export_from = #{exportFrom}, + export_to = #{exportTo}, + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + remarks = #{remarks}, + del_flag = #{delFlag}, + + where id = #{id} + + + + delete from info_parameter_computed where id = #{id} + + + + delete from info_parameter_computed where id in + + #{id} + + + + \ No newline at end of file