diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java index 365a73f4..d644562f 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java @@ -60,7 +60,19 @@ public enum HandleEnum { INSPECTION_ITEM("InspectionItemBO:","InspectionItemBO:{0},{1},{2}"), /**编码规则*/ - NEXT_NUMBER_CODE("NextNumberCodeBO:","NextNumberCodeBO:{0},{1},{2}"); + NEXT_NUMBER_CODE("NextNumberCodeBO:","NextNumberCodeBO:{0},{1},{2}"), + + /**设备检验计划**/ + RESOURCE_INSPECT_PLAN("ResourceInspectPlanBo","ResourceInspectPlanBo:{0},{1},{2}"), + + /**设备检验计划的设备清单**/ + RESOURCE_INSPECT_RESOURCE("ResourceInspectResourceBo","ResourceInspectResourceBo:{0},{1}"), + + /**设备检验任务**/ + RESOURCE_INSPECT_TASK("ResourceInspectTaskBo","ResourceInspectTaskBo:{0},{1}"), + + /**设备检验任务的检验项**/ + RESOURCE_INSPECT_TASK_PARAM("ResourceInspectTaskParamBo","ResourceInspectTaskParamBo:{0},{1}"); diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java new file mode 100644 index 00000000..427d74e1 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java @@ -0,0 +1,182 @@ +package com.foreverwin.mesnac.equip.controller; + +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.model.InspectionItem; +import com.foreverwin.mesnac.common.model.InspectionItemDetail; +import com.foreverwin.mesnac.common.service.InspectionItemDetailService; +import com.foreverwin.mesnac.common.service.InspectionItemService; +import com.foreverwin.mesnac.equip.model.ResourceInspectResource; +import com.foreverwin.mesnac.equip.service.ResourceInspectResourceService; +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService; +import com.foreverwin.mesnac.equip.model.ResourceInspectPlan; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * + * @author pavel.Liu + * @since 2021-06-10 + */ +@RestController +@RequestMapping("/Z-RESOURCE-INSPECT-PLAN") +public class ResourceInspectPlanController { + + @Autowired + public ResourceInspectPlanService resourceInspectPlanService; + + @Autowired + public InspectionItemService inspectionItemService; + + @Autowired + public InspectionItemDetailService inspectionItemDetailService; + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getResourceInspectPlanById(@PathVariable String id) { + return R.ok( resourceInspectPlanService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getResourceInspectPlanList(ResourceInspectPlan resourceInspectPlan){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectPlan); + result = resourceInspectPlanService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, ResourceInspectPlan resourceInspectPlan){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectPlan); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(ResourceInspectPlan::getHandle, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getSite, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getPlanNo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getRevision, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getCurrentRevision, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getDescription, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getStatus, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getCategory, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getScheduleType, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getFrequencyUnit, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getInspectionItemBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getCreateUser, frontPage.getGlobalQuery()) + .or().like(ResourceInspectPlan::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = resourceInspectPlanService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param resourceInspectPlan 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping("/save") + public R save(@RequestBody ResourceInspectPlan resourceInspectPlan) { + return R.ok(resourceInspectPlanService.save(resourceInspectPlan)); + } + + /** + * 修改 + * @param resourceInspectPlan 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping() + public R updateById(@RequestBody ResourceInspectPlan resourceInspectPlan) { + return R.ok(resourceInspectPlanService.updateById(resourceInspectPlan)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(resourceInspectPlanService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(resourceInspectPlanService.removeByIds(ids)); + } + + + /** + * 新增或更新：依据handle是否存在，存在即更新数据，否则新增 + * @param resourceInspectPlan 传递的实体 + * @return + */ + @PostMapping(value = "/saveOrUpdate") + public R saveOrUpdate(@RequestBody ResourceInspectPlan resourceInspectPlan) { + return R.ok(resourceInspectPlanService.saveResourcePlanData(resourceInspectPlan)); + } + + /** + * 依据项目清单handle获取检验项 + * @param inspectionItem + * @return + */ + @ResponseBody + @RequestMapping("/getAddItemDetailList") + public R getInspectItem(InspectionItem inspectionItem){ + String handle = inspectionItem.getHandle(); +// String site = CommonMethods.getSite(); +// String inspectionItemHandle = HandleEnum.INSPECTION_ITEM.getHandle(site,inspectionType); + QueryWrapper itemQueryWrapper = new QueryWrapper<>(); + itemQueryWrapper.setEntity(inspectionItem); + List inspectionItems = inspectionItemService.list(itemQueryWrapper); + if (inspectionItems.size()<1 || inspectionItems.equals(null)){ + return null; //检验编号错误 + } + QueryWrapper inspectionItemDetail = new QueryWrapper<>(); + InspectionItemDetail inspectionItemDetail1 = new InspectionItemDetail(); + inspectionItemDetail1.setInspectionItemBo(handle); + inspectionItemDetail.setEntity(inspectionItemDetail1); + List inspectionItemDetailList = inspectionItemDetailService.list(inspectionItemDetail); + return R.ok(inspectionItemDetailList); + } + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectResourceController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectResourceController.java new file mode 100644 index 00000000..a5c22c40 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectResourceController.java @@ -0,0 +1,182 @@ +package com.foreverwin.mesnac.equip.controller; + +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.equip.model.Equip; +import com.foreverwin.mesnac.equip.model.EquipType; +import com.foreverwin.mesnac.equip.model.EquipTypeEquip; +import com.foreverwin.mesnac.equip.service.EquipService; +import com.foreverwin.mesnac.equip.service.EquipTypeEquipService; +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.equip.service.ResourceInspectResourceService; +import com.foreverwin.mesnac.equip.model.ResourceInspectResource; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * @author pavel.Liu + * @since 2021-06-11 + */ +@RestController +@RequestMapping("/Z-RESOURCE-INSPECT-RESOURCE") +public class ResourceInspectResourceController { + + @Autowired + public ResourceInspectResourceService resourceInspectResourceService; + + @Autowired + public EquipService equipService; + + @Autowired + public EquipTypeEquipService equipTypeEquipService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getResourceInspectResourceById(@PathVariable String id) { + return R.ok( resourceInspectResourceService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getResourceInspectResourceList(ResourceInspectResource resourceInspectResource){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectResource); + result = resourceInspectResourceService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, ResourceInspectResource resourceInspectResource){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectResource); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(ResourceInspectResource::getHandle, frontPage.getGlobalQuery()) + .or().like(ResourceInspectResource::getResourceInspectPlanBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectResource::getResourceBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectResource::getResourceNo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectResource::getDescription, frontPage.getGlobalQuery()) + .or().like(ResourceInspectResource::getStatus, frontPage.getGlobalQuery()) + .or().like(ResourceInspectResource::getCreateUser, frontPage.getGlobalQuery()) + .or().like(ResourceInspectResource::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = resourceInspectResourceService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param resourceInspectResource 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody ResourceInspectResource resourceInspectResource) { + return R.ok(resourceInspectResourceService.save(resourceInspectResource)); + } + + /** + * 修改 + * @param resourceInspectResource 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody ResourceInspectResource resourceInspectResource) { + return R.ok(resourceInspectResourceService.updateById(resourceInspectResource)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(resourceInspectResourceService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(resourceInspectResourceService.removeByIds(ids)); + } + + /** + * 获取同一类型的所有设备信息 + * @param resourceType + * @return + */ + @ResponseBody + @RequestMapping(value = "/addEquipList") + public R addEquipList(EquipType resourceType){ + String equipType = resourceType.getEquipType(); + String site = CommonMethods.getSite(); + List resourceList = new ArrayList<>(); + String equipTypeBo = HandleEnum.RESOURCE_TYPE.getHandle(site,equipType); + EquipTypeEquip equipTypeEquip = new EquipTypeEquip(); + equipTypeEquip.setEquipTypeBo( equipTypeBo ); +// List equipTypeEquips = equipTypeEquipService.selectList( equipTypeEquip ); + QueryWrapper equipTypeEquipQueryWrapper = new QueryWrapper<>(); + equipTypeEquipQueryWrapper.setEntity(equipTypeEquip); + List equipTypeEquips = equipTypeEquipService.list(equipTypeEquipQueryWrapper); + for (EquipTypeEquip ete :equipTypeEquips) { + String equipBo = ete.getEquipBo(); + Equip equip = equipService.getById( equipBo ); + ResourceInspectResource resourceInspectResource = new ResourceInspectResource(); + resourceInspectResource.setResourceNo( equip.getResrce() ); + resourceInspectResource.setDescription( equip.getDescription() ); + resourceInspectResource.setResourceBo(equip.getHandle()); + resourceList.add( resourceInspectResource ); + } + return R.ok(resourceList); + } + + /** + * 新增或修改 + * @param resourceInspectResource 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping("/saveOrUpdate") + public R saveOrUpdate(@RequestBody ResourceInspectResource resourceInspectResource) { + + return R.ok(resourceInspectResourceService.save(resourceInspectResource)); + } + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java new file mode 100644 index 00000000..bc336077 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java @@ -0,0 +1,131 @@ +package com.foreverwin.mesnac.equip.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskService; +import com.foreverwin.mesnac.equip.model.ResourceInspectTask; +import java.util.List; + +/** + * + * @author pavel.Liu + * @since 2021-06-10 + */ +@RestController +@RequestMapping("/Z-RESOURCE-INSPECT-TASK") +public class ResourceInspectTaskController { + + @Autowired + public ResourceInspectTaskService resourceInspectTaskService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getResourceInspectTaskById(@PathVariable String id) { + return R.ok( resourceInspectTaskService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getResourceInspectTaskList(ResourceInspectTask resourceInspectTask){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTask); + result = resourceInspectTaskService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, ResourceInspectTask resourceInspectTask){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTask); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(ResourceInspectTask::getHandle, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getSite, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getTaskNo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getCategory, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getDescription, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getStatus, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getResourceInspectPlanBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getInspectionItemBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getResourceBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getResult, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getExecutor, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getRemark, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getCreateUser, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTask::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = resourceInspectTaskService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param resourceInspectTask 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody ResourceInspectTask resourceInspectTask) { + return R.ok(resourceInspectTaskService.save(resourceInspectTask)); + } + + /** + * 修改 + * @param resourceInspectTask 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody ResourceInspectTask resourceInspectTask) { + return R.ok(resourceInspectTaskService.updateById(resourceInspectTask)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(resourceInspectTaskService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(resourceInspectTaskService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskParamController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskParamController.java new file mode 100644 index 00000000..254c7b2b --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskParamController.java @@ -0,0 +1,132 @@ +package com.foreverwin.mesnac.equip.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskParamService; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskParam; +import java.util.List; + +/** + * + * @author pavel.Liu + * @since 2021-06-10 + */ +@RestController +@RequestMapping("/Z-RESOURCE-INSPECT-TASK-PARAM") +public class ResourceInspectTaskParamController { + + @Autowired + public ResourceInspectTaskParamService resourceInspectTaskParamService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getResourceInspectTaskParamById(@PathVariable String id) { + return R.ok( resourceInspectTaskParamService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getResourceInspectTaskParamList(ResourceInspectTaskParam resourceInspectTaskParam){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskParam); + result = resourceInspectTaskParamService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, ResourceInspectTaskParam resourceInspectTaskParam){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskParam); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(ResourceInspectTaskParam::getHandle, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getResourceInspectTaskBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getResourceBo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getInspectNo, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getDescription, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getInspectMethod, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getInspectDataType, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getRequired, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getStandardValue, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getResrceValue, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getParamUnit, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getResrce, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getRemark, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getCreateUser, frontPage.getGlobalQuery()) + .or().like(ResourceInspectTaskParam::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = resourceInspectTaskParamService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param resourceInspectTaskParam 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody ResourceInspectTaskParam resourceInspectTaskParam) { + return R.ok(resourceInspectTaskParamService.save(resourceInspectTaskParam)); + } + + /** + * 修改 + * @param resourceInspectTaskParam 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody ResourceInspectTaskParam resourceInspectTaskParam) { + return R.ok(resourceInspectTaskParamService.updateById(resourceInspectTaskParam)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(resourceInspectTaskParamService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(resourceInspectTaskParamService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectPlanMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectPlanMapper.java new file mode 100644 index 00000000..a47cc5db --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectPlanMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.ResourceInspectPlan; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 设备检验计划表 Mapper 接口 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +@Repository +public interface ResourceInspectPlanMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectResourceMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectResourceMapper.java new file mode 100644 index 00000000..09234dbf --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectResourceMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.ResourceInspectResource; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 设备检验计划从表 Mapper 接口 + *

+ * + * @author pavel.Liu + * @since 2021-06-11 + */ +@Repository +public interface ResourceInspectResourceMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java new file mode 100644 index 00000000..4727d3f6 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.ResourceInspectTask; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 设备检验任务表 Mapper 接口 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +@Repository +public interface ResourceInspectTaskMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskParamMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskParamMapper.java new file mode 100644 index 00000000..7f860924 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskParamMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskParam; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 设备检验任务从表 Mapper 接口 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +@Repository +public interface ResourceInspectTaskParamMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectPlan.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectPlan.java new file mode 100644 index 00000000..1bc74d3b --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectPlan.java @@ -0,0 +1,410 @@ +package com.foreverwin.mesnac.equip.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.foreverwin.mesnac.common.model.InspectionItemDetail; +//import com.foreverwin.mesnac.quality.model.InspectionItem; + +/** + *

+ * 设备检验计划表 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ + +@TableName("Z_RESOURCE_INSPECT_PLAN") +@JsonIgnoreProperties(ignoreUnknown = true) +public class ResourceInspectPlan extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 设备检验计划编号 + */ + @TableField("PLAN_NO") + private String planNo; + /** + * 版本 + */ + @TableField("REVISION") + private String revision; + /** + * 是否当前版本(true/false) + */ + @TableField("CURRENT_REVISION") + private String currentRevision; + /** + * 任务数量 + */ + @TableField("PLAN_TASK_COUNT") + private Long planTaskCount; + /** + * 设备检验计划描述 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 检验计划状态(新建、启动、禁用) + */ + @TableField("STATUS") + private String status; + /** + * 保养类别(日常保养/一级保养/二级保养/日点检/周点检/月点检/年点检) + */ + @TableField("CATEGORY") + private String category; + /** + * 排程方式（周期/执行间隔时间） + */ + @TableField("SCHEDULE_TYPE") + private String scheduleType; + /** + * 频率 + */ + @TableField("FREQUENCY") + private Double frequency; + /** + * 频率单位(M月W周D日H时F分S秒) + */ + @TableField("FREQUENCY_UNIT") + private String frequencyUnit; + /** + * 前容差时间 + */ + @TableField("BEFORE_TOLERANCE") + private Long beforeTolerance; + /** + * 后容差时间 + */ + @TableField("AFTER_TOLERANCE") + private Long afterTolerance; + /** + * 检验计划有效期(开始时间) + */ + @TableField("INDATE_START") + private LocalDateTime indateStart; + /** + * 检验计划有效期(结束时间) + */ + @TableField("INDATE_END") + private LocalDateTime indateEnd; + /** + * 检验项目清单HANDLE + */ + @TableField("INSPECTION_ITEM_BO") + private String inspectionItemBo; + /** + * 创建人 + */ + @TableField("CREATE_USER") + private String createUser; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + /** + * 修改人 + */ + @TableField("MODIFY_USER") + private String modifyUser; + /** + * 修改时间 + */ + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + /** + * 设备清单 + */ + @TableField(exist = false) + private List maintainPlanEquipList = new ArrayList<>(); + /** + * 检验项目清单（检验项清单，与inspectionItemBo对应） + * 因为会出现模块之间的循环依赖，故不提供该字段 + */ + @TableField(exist = false) + private List inspectionItemDetailList = new ArrayList<>(); + + + public List getMaintainPlanEquipList() { + return maintainPlanEquipList; + } + + public void setMaintainPlanEquips(List maintainPlanEquipList) { + this.maintainPlanEquipList = maintainPlanEquipList; + } + + public List getInspectionItemDetailList() { + return inspectionItemDetailList; + } + + public void setInspectionItemDetailList(List inspectionItemDetailList) { + this.inspectionItemDetailList = inspectionItemDetailList; + } + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + public String getRevision() { + return revision; + } + + public void setRevision(String revision) { + this.revision = revision; + } + + public String getCurrentRevision() { + return currentRevision; + } + + public void setCurrentRevision(String currentRevision) { + this.currentRevision = currentRevision; + } + + public Long getPlanTaskCount() { + return planTaskCount; + } + + public void setPlanTaskCount(Long planTaskCount) { + this.planTaskCount = planTaskCount; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getScheduleType() { + return scheduleType; + } + + public void setScheduleType(String scheduleType) { + this.scheduleType = scheduleType; + } + + public Double getFrequency() { + return frequency; + } + + public void setFrequency(Double frequency) { + this.frequency = frequency; + } + + public String getFrequencyUnit() { + return frequencyUnit; + } + + public void setFrequencyUnit(String frequencyUnit) { + this.frequencyUnit = frequencyUnit; + } + + public Long getBeforeTolerance() { + return beforeTolerance; + } + + public void setBeforeTolerance(Long beforeTolerance) { + this.beforeTolerance = beforeTolerance; + } + + public Long getAfterTolerance() { + return afterTolerance; + } + + public void setAfterTolerance(Long afterTolerance) { + this.afterTolerance = afterTolerance; + } + + public LocalDateTime getIndateStart() { + return indateStart; + } + + public void setIndateStart(LocalDateTime indateStart) { + this.indateStart = indateStart; + } + + public LocalDateTime getIndateEnd() { + return indateEnd; + } + + public void setIndateEnd(LocalDateTime indateEnd) { + this.indateEnd = indateEnd; + } + + public String getInspectionItemBo() { + return inspectionItemBo; + } + + public void setInspectionItemBo(String inspectionItemBo) { + this.inspectionItemBo = inspectionItemBo; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public String getModifyUser() { + return modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String PLAN_NO = "PLAN_NO"; + +public static final String REVISION = "REVISION"; + +public static final String CURRENT_REVISION = "CURRENT_REVISION"; + +public static final String PLAN_TASK_COUNT = "PLAN_TASK_COUNT"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String STATUS = "STATUS"; + +public static final String CATEGORY = "CATEGORY"; + +public static final String SCHEDULE_TYPE = "SCHEDULE_TYPE"; + +public static final String FREQUENCY = "FREQUENCY"; + +public static final String FREQUENCY_UNIT = "FREQUENCY_UNIT"; + +public static final String BEFORE_TOLERANCE = "BEFORE_TOLERANCE"; + +public static final String AFTER_TOLERANCE = "AFTER_TOLERANCE"; + +public static final String INDATE_START = "INDATE_START"; + +public static final String INDATE_END = "INDATE_END"; + +public static final String INSPECTION_ITEM_BO = "INSPECTION_ITEM_BO"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFY_USER = "MODIFY_USER"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "ResourceInspectPlan{" + + "handle = " + handle + + ", site = " + site + + ", planNo = " + planNo + + ", revision = " + revision + + ", currentRevision = " + currentRevision + + ", planTaskCount = " + planTaskCount + + ", description = " + description + + ", status = " + status + + ", category = " + category + + ", scheduleType = " + scheduleType + + ", frequency = " + frequency + + ", frequencyUnit = " + frequencyUnit + + ", beforeTolerance = " + beforeTolerance + + ", afterTolerance = " + afterTolerance + + ", indateStart = " + indateStart + + ", indateEnd = " + indateEnd + + ", inspectionItemBo = " + inspectionItemBo + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + ", modifyUser = " + modifyUser + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectResource.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectResource.java new file mode 100644 index 00000000..2ba2ce0b --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectResource.java @@ -0,0 +1,229 @@ +package com.foreverwin.mesnac.equip.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +/** + *

+ * 设备检验计划从表 + *

+ * + * @author pavel.Liu + * @since 2021-06-11 + */ + +@TableName("Z_RESOURCE_INSPECT_RESOURCE") +@JsonIgnoreProperties(ignoreUnknown = true) +public class ResourceInspectResource extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 设备检验计划HANDLE + */ + @TableField("RESOURCE_INSPECT_PLAN_BO") + private String resourceInspectPlanBo; + /** + * 设备HANDLE + */ + @TableField("RESOURCE_BO") + private String resourceBo; + /** + * 设备编号 + */ + @TableField("RESOURCE_NO") + private String resourceNo; + /** + * 设备描述 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 任务状态(启用/禁用) + */ + @TableField("STATUS") + private String status; + /** + * 任务生成时间 + */ + @TableField("TASK_CREATE_DATE") + private LocalDateTime taskCreateDate; + /** + * 创建人 + */ + @TableField("CREATE_USER") + private String createUser; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + /** + * 修改人 + */ + @TableField("MODIFY_USER") + private String modifyUser; + /** + * 修改时间 + */ + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + /** + * 序号 + */ + @TableField(exist = false) + private Integer itemSeq; + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getResourceInspectPlanBo() { + return resourceInspectPlanBo; + } + + public void setResourceInspectPlanBo(String resourceInspectPlanBo) { + this.resourceInspectPlanBo = resourceInspectPlanBo; + } + + public String getResourceBo() { + return resourceBo; + } + + public void setResourceBo(String resourceBo) { + this.resourceBo = resourceBo; + } + + public String getResourceNo() { + return resourceNo; + } + + public void setResourceNo(String resourceNo) { + this.resourceNo = resourceNo; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public LocalDateTime getTaskCreateDate() { + return taskCreateDate; + } + + public void setTaskCreateDate(LocalDateTime taskCreateDate) { + this.taskCreateDate = taskCreateDate; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public String getModifyUser() { + return modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + + public Integer getItemSeq() { return itemSeq; } + public void setItemSeq(Integer seq) { + this.itemSeq = itemSeq; + } + +public static final String HANDLE = "HANDLE"; + +public static final String RESOURCE_INSPECT_PLAN_BO = "RESOURCE_INSPECT_PLAN_BO"; + +public static final String RESOURCE_BO = "RESOURCE_BO"; + +public static final String RESOURCE_NO = "RESOURCE_NO"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String STATUS = "STATUS"; + +public static final String TASK_CREATE_DATE = "TASK_CREATE_DATE"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFY_USER = "MODIFY_USER"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "ResourceInspectResource{" + + "itemSeq"+ itemSeq + + "handle = " + handle + + ", resourceInspectPlanBo = " + resourceInspectPlanBo + + ", resourceBo = " + resourceBo + + ", resourceNo = " + resourceNo + + ", description = " + description + + ", status = " + status + + ", taskCreateDate = " + taskCreateDate + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + ", modifyUser = " + modifyUser + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java new file mode 100644 index 00000000..b8f1f239 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTask.java @@ -0,0 +1,361 @@ +package com.foreverwin.mesnac.equip.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * 设备检验任务表 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ + +@TableName("Z_RESOURCE_INSPECT_TASK") + +public class ResourceInspectTask extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 任务编号 + */ + @TableField("TASK_NO") + private String taskNo; + /** + * 类型(自动AUTO/手动) + */ + @TableField("CATEGORY") + private String category; + /** + * 任务描述 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 任务状态(新建/处理中/完成/关闭) + */ + @TableField("STATUS") + private String status; + /** + * 设备检验计划HANDLE + */ + @TableField("RESOURCE_INSPECT_PLAN_BO") + private String resourceInspectPlanBo; + /** + * 检验项目清单HANDLE + */ + @TableField("INSPECTION_ITEM_BO") + private String inspectionItemBo; + /** + * 设备HANDLE + */ + @TableField("RESOURCE_BO") + private String resourceBo; + /** + * 检验结果 + */ + @TableField("RESULT") + private String result; + /** + * 计划开始时间 + */ + @TableField("PLAN_START_DATE") + private LocalDateTime planStartDate; + /** + * 计划完成时间 + */ + @TableField("PLAN_COMPLETE_DATE") + private LocalDateTime planCompleteDate; + /** + * 实际开始时间 + */ + @TableField("ACTUAL_START_DATE") + private LocalDateTime actualStartDate; + /** + * 实际完成时间 + */ + @TableField("ACTUAL_COMPLETE_DATE") + private LocalDateTime actualCompleteDate; + /** + * 执行人 + */ + @TableField("EXECUTOR") + private String executor; + /** + * 备注 + */ + @TableField("REMARK") + private String remark; + /** + * 创建人 + */ + @TableField("CREATE_USER") + private String createUser; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + /** + * 修改人 + */ + @TableField("MODIFY_USER") + private String modifyUser; + /** + * 修改时间 + */ + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getTaskNo() { + return taskNo; + } + + public void setTaskNo(String taskNo) { + this.taskNo = taskNo; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getResourceInspectPlanBo() { + return resourceInspectPlanBo; + } + + public void setResourceInspectPlanBo(String resourceInspectPlanBo) { + this.resourceInspectPlanBo = resourceInspectPlanBo; + } + + public String getInspectionItemBo() { + return inspectionItemBo; + } + + public void setInspectionItemBo(String inspectionItemBo) { + this.inspectionItemBo = inspectionItemBo; + } + + public String getResourceBo() { + return resourceBo; + } + + public void setResourceBo(String resourceBo) { + this.resourceBo = resourceBo; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public LocalDateTime getPlanStartDate() { + return planStartDate; + } + + public void setPlanStartDate(LocalDateTime planStartDate) { + this.planStartDate = planStartDate; + } + + public LocalDateTime getPlanCompleteDate() { + return planCompleteDate; + } + + public void setPlanCompleteDate(LocalDateTime planCompleteDate) { + this.planCompleteDate = planCompleteDate; + } + + public LocalDateTime getActualStartDate() { + return actualStartDate; + } + + public void setActualStartDate(LocalDateTime actualStartDate) { + this.actualStartDate = actualStartDate; + } + + public LocalDateTime getActualCompleteDate() { + return actualCompleteDate; + } + + public void setActualCompleteDate(LocalDateTime actualCompleteDate) { + this.actualCompleteDate = actualCompleteDate; + } + + public String getExecutor() { + return executor; + } + + public void setExecutor(String executor) { + this.executor = executor; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public String getModifyUser() { + return modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String TASK_NO = "TASK_NO"; + +public static final String CATEGORY = "CATEGORY"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String STATUS = "STATUS"; + +public static final String RESOURCE_INSPECT_PLAN_BO = "RESOURCE_INSPECT_PLAN_BO"; + +public static final String INSPECTION_ITEM_BO = "INSPECTION_ITEM_BO"; + +public static final String RESOURCE_BO = "RESOURCE_BO"; + +public static final String RESULT = "RESULT"; + +public static final String PLAN_START_DATE = "PLAN_START_DATE"; + +public static final String PLAN_COMPLETE_DATE = "PLAN_COMPLETE_DATE"; + +public static final String ACTUAL_START_DATE = "ACTUAL_START_DATE"; + +public static final String ACTUAL_COMPLETE_DATE = "ACTUAL_COMPLETE_DATE"; + +public static final String EXECUTOR = "EXECUTOR"; + +public static final String REMARK = "REMARK"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFY_USER = "MODIFY_USER"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "ResourceInspectTask{" + + "handle = " + handle + + ", site = " + site + + ", taskNo = " + taskNo + + ", category = " + category + + ", description = " + description + + ", status = " + status + + ", resourceInspectPlanBo = " + resourceInspectPlanBo + + ", inspectionItemBo = " + inspectionItemBo + + ", resourceBo = " + resourceBo + + ", result = " + result + + ", planStartDate = " + planStartDate + + ", planCompleteDate = " + planCompleteDate + + ", actualStartDate = " + actualStartDate + + ", actualCompleteDate = " + actualCompleteDate + + ", executor = " + executor + + ", remark = " + remark + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + ", modifyUser = " + modifyUser + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskParam.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskParam.java new file mode 100644 index 00000000..50445978 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceInspectTaskParam.java @@ -0,0 +1,344 @@ +package com.foreverwin.mesnac.equip.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * 设备检验任务从表 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ + +@TableName("Z_RESOURCE_INSPECT_TASK_PARAM") + +public class ResourceInspectTaskParam extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableField("HANDLE") + private String handle; + /** + * 设备编号HANDLE + */ + @TableField("RESOURCE_INSPECT_TASK_BO") + private String resourceInspectTaskBo; + /** + * 检验项目编号 + */ + @TableField("RESOURCE_BO") + private String resourceBo; + /** + * 检验项目描述 + */ + @TableField("INSPECT_NO") + private String inspectNo; + /** + * 检验方法 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 检验数据类型（文本T、数字N、布尔值B） + */ + @TableField("INSPECT_METHOD") + private String inspectMethod; + /** + * 是否必填 + */ + @TableField("INSPECT_DATA_TYPE") + private String inspectDataType; + /** + * 最小值 + */ + @TableField("REQUIRED") + private String required; + /** + * 最大值 + */ + @TableField("MIN_VALUE") + private Double minValue; + /** + * 标准值 + */ + @TableField("MAX_VALUE") + private Double maxValue; + /** + * 检验值 + */ + @TableField("STANDARD_VALUE") + private String standardValue; + /** + * 参数单位 + */ + @TableField("RESRCE_VALUE") + private String resrceValue; + /** + * 检验结果【Y/N】 + */ + @TableField("PARAM_UNIT") + private String paramUnit; + /** + * 备注 + */ + @TableField("RESRCE") + private String resrce; + /** + * 执行人 + */ + @TableField("REMARK") + private String remark; + /** + * 创建人 + */ + @TableField("CREATE_USER") + private String createUser; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + /** + * 修改人 + */ + @TableField("MODIFY_USER") + private String modifyUser; + /** + * 修改时间 + */ + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getResourceInspectTaskBo() { + return resourceInspectTaskBo; + } + + public void setResourceInspectTaskBo(String resourceInspectTaskBo) { + this.resourceInspectTaskBo = resourceInspectTaskBo; + } + + public String getResourceBo() { + return resourceBo; + } + + public void setResourceBo(String resourceBo) { + this.resourceBo = resourceBo; + } + + public String getInspectNo() { + return inspectNo; + } + + public void setInspectNo(String inspectNo) { + this.inspectNo = inspectNo; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getInspectMethod() { + return inspectMethod; + } + + public void setInspectMethod(String inspectMethod) { + this.inspectMethod = inspectMethod; + } + + public String getInspectDataType() { + return inspectDataType; + } + + public void setInspectDataType(String inspectDataType) { + this.inspectDataType = inspectDataType; + } + + public String getRequired() { + return required; + } + + public void setRequired(String required) { + this.required = required; + } + + public Double getMinValue() { + return minValue; + } + + public void setMinValue(Double minValue) { + this.minValue = minValue; + } + + public Double getMaxValue() { + return maxValue; + } + + public void setMaxValue(Double maxValue) { + this.maxValue = maxValue; + } + + public String getStandardValue() { + return standardValue; + } + + public void setStandardValue(String standardValue) { + this.standardValue = standardValue; + } + + public String getResrceValue() { + return resrceValue; + } + + public void setResrceValue(String resrceValue) { + this.resrceValue = resrceValue; + } + + public String getParamUnit() { + return paramUnit; + } + + public void setParamUnit(String paramUnit) { + this.paramUnit = paramUnit; + } + + public String getResrce() { + return resrce; + } + + public void setResrce(String resrce) { + this.resrce = resrce; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public String getModifyUser() { + return modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String RESOURCE_INSPECT_TASK_BO = "RESOURCE_INSPECT_TASK_BO"; + +public static final String RESOURCE_BO = "RESOURCE_BO"; + +public static final String INSPECT_NO = "INSPECT_NO"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String INSPECT_METHOD = "INSPECT_METHOD"; + +public static final String INSPECT_DATA_TYPE = "INSPECT_DATA_TYPE"; + +public static final String REQUIRED = "REQUIRED"; + +public static final String MIN_VALUE = "MIN_VALUE"; + +public static final String MAX_VALUE = "MAX_VALUE"; + +public static final String STANDARD_VALUE = "STANDARD_VALUE"; + +public static final String RESRCE_VALUE = "RESRCE_VALUE"; + +public static final String PARAM_UNIT = "PARAM_UNIT"; + +public static final String RESRCE = "RESRCE"; + +public static final String REMARK = "REMARK"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFY_USER = "MODIFY_USER"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "ResourceInspectTaskParam{" + + "handle = " + handle + + ", resourceInspectTaskBo = " + resourceInspectTaskBo + + ", resourceBo = " + resourceBo + + ", inspectNo = " + inspectNo + + ", description = " + description + + ", inspectMethod = " + inspectMethod + + ", inspectDataType = " + inspectDataType + + ", required = " + required + + ", minValue = " + minValue + + ", maxValue = " + maxValue + + ", standardValue = " + standardValue + + ", resrceValue = " + resrceValue + + ", paramUnit = " + paramUnit + + ", resrce = " + resrce + + ", remark = " + remark + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + ", modifyUser = " + modifyUser + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java new file mode 100644 index 00000000..48bf3351 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java @@ -0,0 +1,30 @@ +package com.foreverwin.mesnac.equip.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectPlan; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 设备检验计划表 服务类 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +public interface ResourceInspectPlanService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, ResourceInspectPlan resourceInspectPlan); + + List selectList(ResourceInspectPlan resourceInspectPlan); + + boolean saveResourcePlanData(ResourceInspectPlan resourceInspectPlan); +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectResourceService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectResourceService.java new file mode 100644 index 00000000..4bae08ee --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectResourceService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.equip.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectResource; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 设备检验计划从表 服务类 + *

+ * + * @author pavel.Liu + * @since 2021-06-11 + */ +public interface ResourceInspectResourceService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, ResourceInspectResource resourceInspectResource); + + List selectList(ResourceInspectResource resourceInspectResource); +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskParamService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskParamService.java new file mode 100644 index 00000000..1eec60f6 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskParamService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.equip.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskParam; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 设备检验任务从表 服务类 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +public interface ResourceInspectTaskParamService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, ResourceInspectTaskParam resourceInspectTaskParam); + + List selectList(ResourceInspectTaskParam resourceInspectTaskParam); +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java new file mode 100644 index 00000000..03c2e395 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectTaskService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.equip.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectTask; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 设备检验任务表 服务类 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +public interface ResourceInspectTaskService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, ResourceInspectTask resourceInspectTask); + + List selectList(ResourceInspectTask resourceInspectTask); +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java new file mode 100644 index 00000000..868072f9 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java @@ -0,0 +1,117 @@ +package com.foreverwin.mesnac.equip.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.model.InspectionItem; +import com.foreverwin.mesnac.common.service.InspectionItemDetailService; +import com.foreverwin.mesnac.common.service.InspectionItemService; +import com.foreverwin.mesnac.equip.model.ResourceInspectResource; +import com.foreverwin.mesnac.equip.service.ResourceInspectResourceService; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectPlan; +import com.foreverwin.mesnac.equip.mapper.ResourceInspectPlanMapper; +import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +/** + *

+ * 设备检验计划表 服务实现类 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ResourceInspectPlanServiceImpl extends ServiceImpl implements ResourceInspectPlanService { + + + @Autowired + private ResourceInspectPlanMapper resourceInspectPlanMapper; + + @Autowired + public ResourceInspectPlanService resourceInspectPlanService; + + @Autowired + public InspectionItemService inspectionItemService; + @Autowired + public InspectionItemDetailService inspectionItemDetailService; + + @Autowired + public ResourceInspectResourceService resourceInspectResourceService; + + + + @Override + public IPage selectPage(FrontPage frontPage, ResourceInspectPlan resourceInspectPlan) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectPlan); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(ResourceInspectPlan resourceInspectPlan) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectPlan); + return super.list(queryWrapper); + } + + @Override + public boolean saveResourcePlanData(ResourceInspectPlan resourceInspectPlan) { + // 创建人员 + String user = CommonMethods.getUser(); + + //查询设备计划是否存在 + String site = CommonMethods.getSite(); + String planNo = resourceInspectPlan.getPlanNo(); + String revision = resourceInspectPlan.getRevision(); + String handle = HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site, planNo, revision); + ResourceInspectPlan resourceInspectPlanByBanlde = resourceInspectPlanService.getById(handle); + //计划是否已存在： 更新计划主表 + //1、计划不存在： 新增计划主表 + if (resourceInspectPlanByBanlde==null){ + + } + //2、计划存在： 更新计划主表 + + //保存计划下设备清单(全删全增) + // 1、全删 + ResourceInspectResource resourceInspect = new ResourceInspectResource(); + resourceInspect.setResourceInspectPlanBo(handle); + QueryWrapper resourceWrapper = new QueryWrapper<>(); + resourceWrapper.setEntity(resourceInspect); +// resourceInspectResourceService.remove(resourceWrapper); + // 2、全增 + List equips = resourceInspectPlan.getMaintainPlanEquipList(); + for (ResourceInspectResource equip: equips) { + equip.setResourceInspectPlanBo(handle); + equip.setCreateUser(user); + equip.setCreatedDateTime(LocalDateTime.now()); +// resourceInspectResourceService.save(equip); + } + + // 判断检验项目清单HANDLE是否存在 + String inspectionItemBo = resourceInspectPlan.getInspectionItemBo(); + InspectionItem inspectionItem = new InspectionItem(); + inspectionItem.setHandle(inspectionItemBo); + QueryWrapper inspectionItemWrapper = new QueryWrapper<>(); + inspectionItemWrapper.setEntity(inspectionItem); + List inspectionItems = inspectionItemService.list(inspectionItemWrapper); + // 如果不存在，则返回错误 + if (inspectionItems==null||inspectionItems.size()<1){ + return false; + } + resourceInspectPlanService.saveOrUpdate(resourceInspectPlan); + return false; + } + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectResourceServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectResourceServiceImpl.java new file mode 100644 index 00000000..7683467d --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectResourceServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.equip.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectResource; +import com.foreverwin.mesnac.equip.mapper.ResourceInspectResourceMapper; +import com.foreverwin.mesnac.equip.service.ResourceInspectResourceService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 设备检验计划从表 服务实现类 + *

+ * + * @author pavel.Liu + * @since 2021-06-11 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ResourceInspectResourceServiceImpl extends ServiceImpl implements ResourceInspectResourceService { + + + @Autowired + private ResourceInspectResourceMapper resourceInspectResourceMapper; + + @Override + public IPage selectPage(FrontPage frontPage, ResourceInspectResource resourceInspectResource) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectResource); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(ResourceInspectResource resourceInspectResource) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectResource); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskParamServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskParamServiceImpl.java new file mode 100644 index 00000000..378ee074 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskParamServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.equip.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskParam; +import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskParamMapper; +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskParamService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 设备检验任务从表 服务实现类 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ResourceInspectTaskParamServiceImpl extends ServiceImpl implements ResourceInspectTaskParamService { + + + @Autowired + private ResourceInspectTaskParamMapper resourceInspectTaskParamMapper; + + @Override + public IPage selectPage(FrontPage frontPage, ResourceInspectTaskParam resourceInspectTaskParam) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskParam); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(ResourceInspectTaskParam resourceInspectTaskParam) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTaskParam); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java new file mode 100644 index 00000000..9f2e3619 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.equip.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceInspectTask; +import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskMapper; +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 设备检验任务表 服务实现类 + *

+ * + * @author pavel.Liu + * @since 2021-06-10 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ResourceInspectTaskServiceImpl extends ServiceImpl implements ResourceInspectTaskService { + + + @Autowired + private ResourceInspectTaskMapper resourceInspectTaskMapper; + + @Override + public IPage selectPage(FrontPage frontPage, ResourceInspectTask resourceInspectTask) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTask); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(ResourceInspectTask resourceInspectTask) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceInspectTask); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/equip/src/main/resources/mapper/ResourceInspectPlanMapper.xml b/equip/src/main/resources/mapper/ResourceInspectPlanMapper.xml new file mode 100644 index 00000000..ef909142 --- /dev/null +++ b/equip/src/main/resources/mapper/ResourceInspectPlanMapper.xml @@ -0,0 +1,578 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, PLAN_NO, REVISION, CURRENT_REVISION, PLAN_TASK_COUNT, DESCRIPTION, STATUS, CATEGORY, SCHEDULE_TYPE, FREQUENCY, FREQUENCY_UNIT, BEFORE_TOLERANCE, AFTER_TOLERANCE, INDATE_START, INDATE_END, INSPECTION_ITEM_BO, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_RESOURCE_INSPECT_PLAN + + HANDLE, + SITE, + PLAN_NO, + REVISION, + CURRENT_REVISION, + PLAN_TASK_COUNT, + DESCRIPTION, + STATUS, + CATEGORY, + SCHEDULE_TYPE, + FREQUENCY, + FREQUENCY_UNIT, + BEFORE_TOLERANCE, + AFTER_TOLERANCE, + INDATE_START, + INDATE_END, + INSPECTION_ITEM_BO, + CREATE_USER, + CREATED_DATE_TIME, + MODIFY_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{planNo}, + #{revision}, + #{currentRevision}, + #{planTaskCount}, + #{description}, + #{status}, + #{category}, + #{scheduleType}, + #{frequency}, + #{frequencyUnit}, + #{beforeTolerance}, + #{afterTolerance}, + #{indateStart}, + #{indateEnd}, + #{inspectionItemBo}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_RESOURCE_INSPECT_PLAN + + + VALUES + + #{handle}, + #{site}, + #{planNo}, + #{revision}, + #{currentRevision}, + #{planTaskCount}, + #{description}, + #{status}, + #{category}, + #{scheduleType}, + #{frequency}, + #{frequencyUnit}, + #{beforeTolerance}, + #{afterTolerance}, + #{indateStart}, + #{indateEnd}, + #{inspectionItemBo}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + + UPDATE Z_RESOURCE_INSPECT_PLAN + SITE=#{et.site}, + PLAN_NO=#{et.planNo}, + REVISION=#{et.revision}, + CURRENT_REVISION=#{et.currentRevision}, + PLAN_TASK_COUNT=#{et.planTaskCount}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + CATEGORY=#{et.category}, + SCHEDULE_TYPE=#{et.scheduleType}, + FREQUENCY=#{et.frequency}, + FREQUENCY_UNIT=#{et.frequencyUnit}, + BEFORE_TOLERANCE=#{et.beforeTolerance}, + AFTER_TOLERANCE=#{et.afterTolerance}, + INDATE_START=#{et.indateStart}, + INDATE_END=#{et.indateEnd}, + INSPECTION_ITEM_BO=#{et.inspectionItemBo}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_INSPECT_PLAN + SITE=#{et.site}, + PLAN_NO=#{et.planNo}, + REVISION=#{et.revision}, + CURRENT_REVISION=#{et.currentRevision}, + PLAN_TASK_COUNT=#{et.planTaskCount}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + CATEGORY=#{et.category}, + SCHEDULE_TYPE=#{et.scheduleType}, + FREQUENCY=#{et.frequency}, + FREQUENCY_UNIT=#{et.frequencyUnit}, + BEFORE_TOLERANCE=#{et.beforeTolerance}, + AFTER_TOLERANCE=#{et.afterTolerance}, + INDATE_START=#{et.indateStart}, + INDATE_END=#{et.indateEnd}, + INSPECTION_ITEM_BO=#{et.inspectionItemBo}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_INSPECT_PLAN + SITE=#{et.site}, + PLAN_NO=#{et.planNo}, + REVISION=#{et.revision}, + CURRENT_REVISION=#{et.currentRevision}, + PLAN_TASK_COUNT=#{et.planTaskCount}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + CATEGORY=#{et.category}, + SCHEDULE_TYPE=#{et.scheduleType}, + FREQUENCY=#{et.frequency}, + FREQUENCY_UNIT=#{et.frequencyUnit}, + BEFORE_TOLERANCE=#{et.beforeTolerance}, + AFTER_TOLERANCE=#{et.afterTolerance}, + INDATE_START=#{et.indateStart}, + INDATE_END=#{et.indateEnd}, + INSPECTION_ITEM_BO=#{et.inspectionItemBo}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND PLAN_NO=#{ew.entity.planNo} + AND REVISION=#{ew.entity.revision} + AND CURRENT_REVISION=#{ew.entity.currentRevision} + AND PLAN_TASK_COUNT=#{ew.entity.planTaskCount} + AND DESCRIPTION=#{ew.entity.description} + AND STATUS=#{ew.entity.status} + AND CATEGORY=#{ew.entity.category} + AND SCHEDULE_TYPE=#{ew.entity.scheduleType} + AND FREQUENCY=#{ew.entity.frequency} + AND FREQUENCY_UNIT=#{ew.entity.frequencyUnit} + AND BEFORE_TOLERANCE=#{ew.entity.beforeTolerance} + AND AFTER_TOLERANCE=#{ew.entity.afterTolerance} + AND INDATE_START=#{ew.entity.indateStart} + AND INDATE_END=#{ew.entity.indateEnd} + AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_INSPECT_PLAN WHERE HANDLE=#{handle} + + + + DELETE FROM Z_RESOURCE_INSPECT_PLAN + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_RESOURCE_INSPECT_PLAN + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND PLAN_NO=#{ew.entity.planNo} + AND REVISION=#{ew.entity.revision} + AND CURRENT_REVISION=#{ew.entity.currentRevision} + AND PLAN_TASK_COUNT=#{ew.entity.planTaskCount} + AND DESCRIPTION=#{ew.entity.description} + AND STATUS=#{ew.entity.status} + AND CATEGORY=#{ew.entity.category} + AND SCHEDULE_TYPE=#{ew.entity.scheduleType} + AND FREQUENCY=#{ew.entity.frequency} + AND FREQUENCY_UNIT=#{ew.entity.frequencyUnit} + AND BEFORE_TOLERANCE=#{ew.entity.beforeTolerance} + AND AFTER_TOLERANCE=#{ew.entity.afterTolerance} + AND INDATE_START=#{ew.entity.indateStart} + AND INDATE_END=#{ew.entity.indateEnd} + AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_INSPECT_PLAN WHERE HANDLE IN ( + #{item} + ) + + + + diff --git a/equip/src/main/resources/mapper/ResourceInspectResourceMapper.xml b/equip/src/main/resources/mapper/ResourceInspectResourceMapper.xml new file mode 100644 index 00000000..d954a319 --- /dev/null +++ b/equip/src/main/resources/mapper/ResourceInspectResourceMapper.xml @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + HANDLE, RESOURCE_INSPECT_PLAN_BO, RESOURCE_BO, RESOURCE_NO, DESCRIPTION, STATUS, TASK_CREATE_DATE, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_RESOURCE_INSPECT_RESOURCE + + HANDLE, + RESOURCE_INSPECT_PLAN_BO, + RESOURCE_BO, + RESOURCE_NO, + DESCRIPTION, + STATUS, + TASK_CREATE_DATE, + CREATE_USER, + CREATED_DATE_TIME, + MODIFY_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{resourceInspectPlanBo}, + #{resourceBo}, + #{resourceNo}, + #{description}, + #{status}, + #{taskCreateDate}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_RESOURCE_INSPECT_RESOURCE + + + VALUES + + #{handle}, + #{resourceInspectPlanBo}, + #{resourceBo}, + #{resourceNo}, + #{description}, + #{status}, + #{taskCreateDate}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + + UPDATE Z_RESOURCE_INSPECT_RESOURCE + RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, + RESOURCE_BO=#{et.resourceBo}, + RESOURCE_NO=#{et.resourceNo}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + TASK_CREATE_DATE=#{et.taskCreateDate}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_INSPECT_RESOURCE + RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, + RESOURCE_BO=#{et.resourceBo}, + RESOURCE_NO=#{et.resourceNo}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + TASK_CREATE_DATE=#{et.taskCreateDate}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_INSPECT_RESOURCE + RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, + RESOURCE_BO=#{et.resourceBo}, + RESOURCE_NO=#{et.resourceNo}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + TASK_CREATE_DATE=#{et.taskCreateDate}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} + AND RESOURCE_BO=#{ew.entity.resourceBo} + AND RESOURCE_NO=#{ew.entity.resourceNo} + AND DESCRIPTION=#{ew.entity.description} + AND STATUS=#{ew.entity.status} + AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_INSPECT_RESOURCE WHERE HANDLE=#{handle} + + + + DELETE FROM Z_RESOURCE_INSPECT_RESOURCE + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_RESOURCE_INSPECT_RESOURCE + + + + + HANDLE=#{ew.entity.handle} + + AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} + AND RESOURCE_BO=#{ew.entity.resourceBo} + AND RESOURCE_NO=#{ew.entity.resourceNo} + AND DESCRIPTION=#{ew.entity.description} + AND STATUS=#{ew.entity.status} + AND TASK_CREATE_DATE=#{ew.entity.taskCreateDate} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_INSPECT_RESOURCE WHERE HANDLE IN ( + #{item} + ) + + + + diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml new file mode 100644 index 00000000..6fca8e59 --- /dev/null +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -0,0 +1,562 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, TASK_NO, CATEGORY, DESCRIPTION, STATUS, RESOURCE_INSPECT_PLAN_BO, INSPECTION_ITEM_BO, RESOURCE_BO, RESULT, PLAN_START_DATE, PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, EXECUTOR, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_RESOURCE_INSPECT_TASK + + HANDLE, + SITE, + TASK_NO, + CATEGORY, + DESCRIPTION, + STATUS, + RESOURCE_INSPECT_PLAN_BO, + INSPECTION_ITEM_BO, + RESOURCE_BO, + RESULT, + PLAN_START_DATE, + PLAN_COMPLETE_DATE, + ACTUAL_START_DATE, + ACTUAL_COMPLETE_DATE, + EXECUTOR, + REMARK, + CREATE_USER, + CREATED_DATE_TIME, + MODIFY_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{taskNo}, + #{category}, + #{description}, + #{status}, + #{resourceInspectPlanBo}, + #{inspectionItemBo}, + #{resourceBo}, + #{result}, + #{planStartDate}, + #{planCompleteDate}, + #{actualStartDate}, + #{actualCompleteDate}, + #{executor}, + #{remark}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_RESOURCE_INSPECT_TASK + + + VALUES + + #{handle}, + #{site}, + #{taskNo}, + #{category}, + #{description}, + #{status}, + #{resourceInspectPlanBo}, + #{inspectionItemBo}, + #{resourceBo}, + #{result}, + #{planStartDate}, + #{planCompleteDate}, + #{actualStartDate}, + #{actualCompleteDate}, + #{executor}, + #{remark}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + + UPDATE Z_RESOURCE_INSPECT_TASK + SITE=#{et.site}, + TASK_NO=#{et.taskNo}, + CATEGORY=#{et.category}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, + INSPECTION_ITEM_BO=#{et.inspectionItemBo}, + RESOURCE_BO=#{et.resourceBo}, + RESULT=#{et.result}, + PLAN_START_DATE=#{et.planStartDate}, + PLAN_COMPLETE_DATE=#{et.planCompleteDate}, + ACTUAL_START_DATE=#{et.actualStartDate}, + ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + EXECUTOR=#{et.executor}, + REMARK=#{et.remark}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_INSPECT_TASK + SITE=#{et.site}, + TASK_NO=#{et.taskNo}, + CATEGORY=#{et.category}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, + INSPECTION_ITEM_BO=#{et.inspectionItemBo}, + RESOURCE_BO=#{et.resourceBo}, + RESULT=#{et.result}, + PLAN_START_DATE=#{et.planStartDate}, + PLAN_COMPLETE_DATE=#{et.planCompleteDate}, + ACTUAL_START_DATE=#{et.actualStartDate}, + ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + EXECUTOR=#{et.executor}, + REMARK=#{et.remark}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_INSPECT_TASK + SITE=#{et.site}, + TASK_NO=#{et.taskNo}, + CATEGORY=#{et.category}, + DESCRIPTION=#{et.description}, + STATUS=#{et.status}, + RESOURCE_INSPECT_PLAN_BO=#{et.resourceInspectPlanBo}, + INSPECTION_ITEM_BO=#{et.inspectionItemBo}, + RESOURCE_BO=#{et.resourceBo}, + RESULT=#{et.result}, + PLAN_START_DATE=#{et.planStartDate}, + PLAN_COMPLETE_DATE=#{et.planCompleteDate}, + ACTUAL_START_DATE=#{et.actualStartDate}, + ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + EXECUTOR=#{et.executor}, + REMARK=#{et.remark}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND TASK_NO=#{ew.entity.taskNo} + AND CATEGORY=#{ew.entity.category} + AND DESCRIPTION=#{ew.entity.description} + AND STATUS=#{ew.entity.status} + AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} + AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} + AND RESOURCE_BO=#{ew.entity.resourceBo} + AND RESULT=#{ew.entity.result} + AND PLAN_START_DATE=#{ew.entity.planStartDate} + AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} + AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} + AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND EXECUTOR=#{ew.entity.executor} + AND REMARK=#{ew.entity.remark} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK WHERE HANDLE=#{handle} + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND TASK_NO=#{ew.entity.taskNo} + AND CATEGORY=#{ew.entity.category} + AND DESCRIPTION=#{ew.entity.description} + AND STATUS=#{ew.entity.status} + AND RESOURCE_INSPECT_PLAN_BO=#{ew.entity.resourceInspectPlanBo} + AND INSPECTION_ITEM_BO=#{ew.entity.inspectionItemBo} + AND RESOURCE_BO=#{ew.entity.resourceBo} + AND RESULT=#{ew.entity.result} + AND PLAN_START_DATE=#{ew.entity.planStartDate} + AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} + AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} + AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND EXECUTOR=#{ew.entity.executor} + AND REMARK=#{ew.entity.remark} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK WHERE HANDLE IN ( + #{item} + ) + + + + diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskParamMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskParamMapper.xml new file mode 100644 index 00000000..2d68640b --- /dev/null +++ b/equip/src/main/resources/mapper/ResourceInspectTaskParamMapper.xml @@ -0,0 +1,486 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, RESOURCE_INSPECT_TASK_BO, RESOURCE_BO, INSPECT_NO, DESCRIPTION, INSPECT_METHOD, INSPECT_DATA_TYPE, REQUIRED, MIN_VALUE, MAX_VALUE, STANDARD_VALUE, RESRCE_VALUE, PARAM_UNIT, RESRCE, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_RESOURCE_INSPECT_TASK_PARAM + + HANDLE, + RESOURCE_INSPECT_TASK_BO, + RESOURCE_BO, + INSPECT_NO, + DESCRIPTION, + INSPECT_METHOD, + INSPECT_DATA_TYPE, + REQUIRED, + MIN_VALUE, + MAX_VALUE, + STANDARD_VALUE, + RESRCE_VALUE, + PARAM_UNIT, + RESRCE, + REMARK, + CREATE_USER, + CREATED_DATE_TIME, + MODIFY_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{resourceInspectTaskBo}, + #{resourceBo}, + #{inspectNo}, + #{description}, + #{inspectMethod}, + #{inspectDataType}, + #{required}, + #{minValue}, + #{maxValue}, + #{standardValue}, + #{resrceValue}, + #{paramUnit}, + #{resrce}, + #{remark}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_RESOURCE_INSPECT_TASK_PARAM + + + VALUES + + #{handle}, + #{resourceInspectTaskBo}, + #{resourceBo}, + #{inspectNo}, + #{description}, + #{inspectMethod}, + #{inspectDataType}, + #{required}, + #{minValue}, + #{maxValue}, + #{standardValue}, + #{resrceValue}, + #{paramUnit}, + #{resrce}, + #{remark}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + + + + + + UPDATE Z_RESOURCE_INSPECT_TASK_PARAM + HANDLE=#{et.handle}, + RESOURCE_INSPECT_TASK_BO=#{et.resourceInspectTaskBo}, + RESOURCE_BO=#{et.resourceBo}, + INSPECT_NO=#{et.inspectNo}, + DESCRIPTION=#{et.description}, + INSPECT_METHOD=#{et.inspectMethod}, + INSPECT_DATA_TYPE=#{et.inspectDataType}, + REQUIRED=#{et.required}, + MIN_VALUE=#{et.minValue}, + MAX_VALUE=#{et.maxValue}, + STANDARD_VALUE=#{et.standardValue}, + RESRCE_VALUE=#{et.resrceValue}, + PARAM_UNIT=#{et.paramUnit}, + RESRCE=#{et.resrce}, + REMARK=#{et.remark}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND RESOURCE_INSPECT_TASK_BO=#{ew.entity.resourceInspectTaskBo} + AND RESOURCE_BO=#{ew.entity.resourceBo} + AND INSPECT_NO=#{ew.entity.inspectNo} + AND DESCRIPTION=#{ew.entity.description} + AND INSPECT_METHOD=#{ew.entity.inspectMethod} + AND INSPECT_DATA_TYPE=#{ew.entity.inspectDataType} + AND REQUIRED=#{ew.entity.required} + AND MIN_VALUE=#{ew.entity.minValue} + AND MAX_VALUE=#{ew.entity.maxValue} + AND STANDARD_VALUE=#{ew.entity.standardValue} + AND RESRCE_VALUE=#{ew.entity.resrceValue} + AND PARAM_UNIT=#{ew.entity.paramUnit} + AND RESRCE=#{ew.entity.resrce} + AND REMARK=#{ew.entity.remark} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK_PARAM + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_RESOURCE_INSPECT_TASK_PARAM + + + + + HANDLE=#{ew.entity.handle} + + AND RESOURCE_INSPECT_TASK_BO=#{ew.entity.resourceInspectTaskBo} + AND RESOURCE_BO=#{ew.entity.resourceBo} + AND INSPECT_NO=#{ew.entity.inspectNo} + AND DESCRIPTION=#{ew.entity.description} + AND INSPECT_METHOD=#{ew.entity.inspectMethod} + AND INSPECT_DATA_TYPE=#{ew.entity.inspectDataType} + AND REQUIRED=#{ew.entity.required} + AND MIN_VALUE=#{ew.entity.minValue} + AND MAX_VALUE=#{ew.entity.maxValue} + AND STANDARD_VALUE=#{ew.entity.standardValue} + AND RESRCE_VALUE=#{ew.entity.resrceValue} + AND PARAM_UNIT=#{ew.entity.paramUnit} + AND RESRCE=#{ew.entity.resrce} + AND REMARK=#{ew.entity.remark} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + diff --git a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java index d7493996..ccb0aadd 100644 --- a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java +++ b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java @@ -32,10 +32,10 @@ public class GeneratorApplication { dataSourceConfig.setPassword( "wip" ); dataSourceConfig.setTypeConvert( new OracleTypeConvert() ); MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig) -// .tablePrefix( "APS_", "DS_", "Z_" ) - .packageName( "com.foreverwin.mesnac.meapi" ) - .tables("SFC","ROUTER") - .author("Leon.L") + .tablePrefix( "APS_", "DS_", "Z_" ) + .packageName( "com.foreverwin.mesnac.equip" ) + .tables("Z_RESOURCE_INSPECT_PLAN","Z_RESOURCE_INSPECT_RESOURCE","Z_RESOURCE_INSPECT_TASK","Z_RESOURCE_INSPECT_TASK_PARAM") + .author("pavel.Liu") .uiAppId("com.foreverwin.me") .uiPackage("com.foreverwin.me.migration") .build();