From 477da3d3a336dd4a99883c5a1c1525bd4596e462 Mon Sep 17 00:00:00 2001 From: zpl Date: Tue, 13 Jul 2021 22:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equip/consumer/ResourceMQConsume.java | 10 +- .../equip/consumer/ResourceMQProcess.java | 93 +- .../controller/EdcDataResourceController.java | 152 ++ .../ResourceFaultReceiveController.java | 123 ++ .../ResourceStatusReceiveController.java | 124 ++ .../mesnac/equip/dto/EdcDataResourceDto.java | 22 + .../equip/mapper/EdcDataResourceMapper.java | 43 + .../mapper/ResourceFaultReceiveMapper.java | 18 + .../mapper/ResourceStatusReceiveMapper.java | 22 + .../mesnac/equip/model/EdcDataResource.java | 912 +++++++++++ .../equip/model/ResourceFaultReceive.java | 185 +++ .../equip/model/ResourceStatusReceive.java | 233 +++ .../equip/service/EdcDataResourceService.java | 31 + .../service/ResourceFaultReceiveService.java | 32 + .../service/ResourceStatusReceiveService.java | 37 + .../impl/EdcDataResourceServiceImpl.java | 135 ++ .../impl/ResourceFaultReceiveServiceImpl.java | 106 ++ .../ResourceStatusReceiveServiceImpl.java | 133 ++ .../mapper/EdcDataResourceMapper.xml | 1343 +++++++++++++++++ .../mapper/ResourceFaultReceiveMapper.xml | 386 +++++ .../mapper/ResourceRepairTaskMapper.xml | 1 - .../mapper/ResourceStatusReceiveMapper.xml | 447 ++++++ .../meapi/controller/DcGroupController.java | 134 ++ .../controller/DcParameterController.java | 152 ++ .../meapi/controller/ItemController.java | 2 + .../controller/ResourceTypeController.java | 2 + .../meapi/controller/ResrceController.java | 1 - .../mesnac/meapi/mapper/DcGroupMapper.java | 18 + .../meapi/mapper/DcParameterMapper.java | 32 + .../mesnac/meapi/model/DcGroup.java | 300 ++++ .../mesnac/meapi/model/DcParameter.java | 585 +++++++ .../mesnac/meapi/service/DcGroupService.java | 28 + .../meapi/service/DcParameterService.java | 28 + .../service/impl/DcGroupServiceImpl.java | 46 + .../service/impl/DcParameterServiceImpl.java | 46 + .../main/resources/mapper/DcGroupMapper.xml | 500 ++++++ .../resources/mapper/DcParameterMapper.xml | 815 ++++++++++ 37 files changed, 7233 insertions(+), 44 deletions(-) create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/controller/EdcDataResourceController.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceFaultReceiveController.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceStatusReceiveController.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/dto/EdcDataResourceDto.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EdcDataResourceMapper.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceFaultReceiveMapper.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceStatusReceiveMapper.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/model/EdcDataResource.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceFaultReceive.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceStatusReceive.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/service/EdcDataResourceService.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceFaultReceiveService.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceStatusReceiveService.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java create mode 100644 equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java create mode 100644 equip/src/main/resources/mapper/EdcDataResourceMapper.xml create mode 100644 equip/src/main/resources/mapper/ResourceFaultReceiveMapper.xml create mode 100644 equip/src/main/resources/mapper/ResourceStatusReceiveMapper.xml create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcGroupController.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcParameterController.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DcGroupMapper.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DcParameterMapper.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DcGroup.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DcParameter.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DcGroupService.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DcParameterService.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DcGroupServiceImpl.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DcParameterServiceImpl.java create mode 100644 meapi/src/main/resources/mapper/DcGroupMapper.xml create mode 100644 meapi/src/main/resources/mapper/DcParameterMapper.xml diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java b/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java index 78ae622e..12bd2021 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java @@ -42,19 +42,19 @@ public class ResourceMQConsume { String resultString = resourceMQProcess.resourceStatusProcess(text); //返回设备处理结果 - template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString); + //template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString); } @JmsListener(destination = "resource.alarm.process", containerFactory = "defaultFactory") public void resourceAlarmProcess(String text, MessageHeaders headers) { logger.info("接收设备报警数据：" + text); - - template.convertAndSend((Queue) headers.get("jms_replyTo"), ""); + resourceMQProcess.resourceFaultProcess(text); + //template.convertAndSend((Queue) headers.get("jms_replyTo"), ""); } - @JmsListener(destination = "resource.edc.process", containerFactory = "defaultFactory") + @JmsListener(destination = "resource.edc.process", containerFactory = "defaultFactory", concurrency = "5") public void resourceEdcProcess(String text) { logger.info("接收设备参数数据：" + text); - + resourceMQProcess.resourceParamProcess(text); } } diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQProcess.java b/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQProcess.java index 16e59113..7b16ceb4 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQProcess.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQProcess.java @@ -1,13 +1,22 @@ package com.foreverwin.mesnac.equip.consumer; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.equip.dto.MQResponseDto; -import com.foreverwin.mesnac.meapi.service.ResrceService; +import com.foreverwin.mesnac.equip.model.ResourceFaultReceive; +import com.foreverwin.mesnac.equip.service.EdcDataResourceService; +import com.foreverwin.mesnac.equip.service.ResourceFaultReceiveService; +import com.foreverwin.mesnac.equip.service.ResourceStatusReceiveService; import com.foreverwin.modular.core.exception.BusinessException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + /** * 设备接口业务处理 * @@ -18,62 +27,72 @@ import org.springframework.stereotype.Component; @Component public class ResourceMQProcess { + @Autowired + private ResourceStatusReceiveService resourceStatusReceiveService; @Autowired - private ResrceService resrceService; + private ResourceFaultReceiveService resourceFaultReceiveService; + + @Autowired + private EdcDataResourceService edcDataResourceService; /** * 设备状态变更 * - * - * 设备状态：运行/RUN(301|已启用)；停机/DOW(302|已禁用);维修/REPAIR(4/预定停机);封存/SEAL(303|保留);空闲/FREE(2|备用) * @param text * @return */ public String resourceStatusProcess(String text) { MQResponseDto mqResponseDto = new MQResponseDto(); - try { - JSONObject jsonObject = JSONObject.parseObject(text); - String handle = jsonObject.getString("TRANID"); + String handle = resourceStatusReceiveService.updateResourceStatusByMq(text); mqResponseDto.setHANDLE(handle); + mqResponseDto.setSTATUS("Success"); + mqResponseDto.setMESSAGE("设备状态修改成功！"); + } catch (Exception e) { + mqResponseDto.setSTATUS("Error"); + mqResponseDto.setMESSAGE("设备状态修改失败：" + e.getMessage()); + } + return JSONObject.toJSONString(mqResponseDto); + } - String site = jsonObject.getString("SITE"); - String resource = jsonObject.getString("RESOURCE"); - String status = jsonObject.getString("STATUS"); - if (StringUtil.isBlank(site)) { - throw BusinessException.build("站点不能为空！"); - } - if (StringUtil.isBlank(resource)) { - throw BusinessException.build("设备编号不能为空！"); - } - if (StringUtil.isBlank(status)) { - throw BusinessException.build("设备状态不能为空！"); - } - - String meStatus = "301"; - //设备状态转换 - switch (status) { - case "RUN" : - meStatus = "301"; break; - case "DOW" : - meStatus = "302"; break; - case "SEAL" : - meStatus = "303"; break; - case "FREE" : - meStatus = "2"; break; - case "REPAIR" : - meStatus = "4"; break; - } + /** + * 设备故障信息记录 + * @param text + * @return + */ + public String resourceFaultProcess(String text){ + MQResponseDto mqResponseDto = new MQResponseDto(); + try { + String handle = resourceFaultReceiveService.parseResourceFaultInfo(text); + mqResponseDto.setHANDLE(handle); + mqResponseDto.setSTATUS("Success"); + mqResponseDto.setMESSAGE("设备状态修改成功！"); + } catch (Exception e) { + mqResponseDto.setSTATUS("Error"); + mqResponseDto.setMESSAGE("设备状态修改失败：" + e.getMessage()); + } - resrceService.updateResourceStatus(site, resource, meStatus); - mqResponseDto.setSTATUS("S"); + return JSONObject.toJSONString(mqResponseDto); + } + /** + * 设备参数信息记录 + * @param text + * @return + */ + public String resourceParamProcess(String text){ + MQResponseDto mqResponseDto = new MQResponseDto(); + try { + String handle = edcDataResourceService.saveResourceParamByMq(text); + mqResponseDto.setHANDLE(handle); + mqResponseDto.setSTATUS("Success"); mqResponseDto.setMESSAGE("设备状态修改成功！"); } catch (Exception e) { - mqResponseDto.setSTATUS("E"); + mqResponseDto.setSTATUS("Error"); mqResponseDto.setMESSAGE("设备状态修改失败：" + e.getMessage()); } return JSONObject.toJSONString(mqResponseDto); } + } diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EdcDataResourceController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EdcDataResourceController.java new file mode 100644 index 00000000..403c67cf --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EdcDataResourceController.java @@ -0,0 +1,152 @@ +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.EdcDataResourceService; +import com.foreverwin.mesnac.equip.model.EdcDataResource; +import java.util.List; + +/** + * + * @author pavel.liu + * @since 2021-07-13 + */ +@RestController +@RequestMapping("/Z-EDC-DATA-RESOURCE") +public class EdcDataResourceController { + + @Autowired + public EdcDataResourceService edcDataResourceService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getEdcDataResourceById(@PathVariable String id) { + return R.ok( edcDataResourceService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getEdcDataResourceList(EdcDataResource edcDataResource){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(edcDataResource); + result = edcDataResourceService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, EdcDataResource edcDataResource){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(edcDataResource); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(EdcDataResource::getHandle, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getSite, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getResrce, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getDcGroupBo, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getCreateUser, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS1, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS2, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS3, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS4, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS5, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS6, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS7, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS8, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS9, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS10, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS11, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS12, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS13, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS14, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS15, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS16, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS17, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS18, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS19, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS20, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS21, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS22, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS23, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS24, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS25, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS26, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS27, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS28, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS29, frontPage.getGlobalQuery()) + .or().like(EdcDataResource::getS30, frontPage.getGlobalQuery()) + ); + } + result = edcDataResourceService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param edcDataResource 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody EdcDataResource edcDataResource) { + return R.ok(edcDataResourceService.save(edcDataResource)); + } + + /** + * 修改 + * @param edcDataResource 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody EdcDataResource edcDataResource) { + return R.ok(edcDataResourceService.updateById(edcDataResource)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(edcDataResourceService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(edcDataResourceService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceFaultReceiveController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceFaultReceiveController.java new file mode 100644 index 00000000..4d79e3a3 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceFaultReceiveController.java @@ -0,0 +1,123 @@ +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.ResourceFaultReceiveService; +import com.foreverwin.mesnac.equip.model.ResourceFaultReceive; +import java.util.List; + +/** + * + * @author pavel.Liu + * @since 2021-07-13 + */ +@RestController +@RequestMapping("/Z-RESOURCE-FAULT-RECEIVE") +public class ResourceFaultReceiveController { + + @Autowired + public ResourceFaultReceiveService resourceFaultReceiveService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getResourceFaultReceiveById(@PathVariable String id) { + return R.ok( resourceFaultReceiveService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getResourceFaultReceiveList(ResourceFaultReceive resourceFaultReceive){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceFaultReceive); + result = resourceFaultReceiveService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, ResourceFaultReceive resourceFaultReceive){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceFaultReceive); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(ResourceFaultReceive::getHandle, frontPage.getGlobalQuery()) + .or().like(ResourceFaultReceive::getSite, frontPage.getGlobalQuery()) + .or().like(ResourceFaultReceive::getResrce, frontPage.getGlobalQuery()) + .or().like(ResourceFaultReceive::getFaultCode, frontPage.getGlobalQuery()) + .or().like(ResourceFaultReceive::getCreateUser, frontPage.getGlobalQuery()) + .or().like(ResourceFaultReceive::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = resourceFaultReceiveService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param resourceFaultReceive 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody ResourceFaultReceive resourceFaultReceive) { + return R.ok(resourceFaultReceiveService.save(resourceFaultReceive)); + } + + /** + * 修改 + * @param resourceFaultReceive 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody ResourceFaultReceive resourceFaultReceive) { + return R.ok(resourceFaultReceiveService.updateById(resourceFaultReceive)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(resourceFaultReceiveService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(resourceFaultReceiveService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceStatusReceiveController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceStatusReceiveController.java new file mode 100644 index 00000000..c3bcde88 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceStatusReceiveController.java @@ -0,0 +1,124 @@ +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.ResourceStatusReceiveService; +import com.foreverwin.mesnac.equip.model.ResourceStatusReceive; +import java.util.List; + +/** + * + * @author pavel.Liu + * @since 2021-07-13 + */ +@RestController +@RequestMapping("/Z-RESOURCE-STATUS-RECEIVE") +public class ResourceStatusReceiveController { + + @Autowired + public ResourceStatusReceiveService resourceStatusReceiveService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getResourceStatusReceiveById(@PathVariable String id) { + return R.ok( resourceStatusReceiveService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getResourceStatusReceiveList(ResourceStatusReceive resourceStatusReceive){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceStatusReceive); + result = resourceStatusReceiveService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, ResourceStatusReceive resourceStatusReceive){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceStatusReceive); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(ResourceStatusReceive::getHandle, frontPage.getGlobalQuery()) + .or().like(ResourceStatusReceive::getSite, frontPage.getGlobalQuery()) + .or().like(ResourceStatusReceive::getResrce, frontPage.getGlobalQuery()) + .or().like(ResourceStatusReceive::getStatus, frontPage.getGlobalQuery()) + .or().like(ResourceStatusReceive::getChangeStatus, frontPage.getGlobalQuery()) + .or().like(ResourceStatusReceive::getCreateUser, frontPage.getGlobalQuery()) + .or().like(ResourceStatusReceive::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = resourceStatusReceiveService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param resourceStatusReceive 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody ResourceStatusReceive resourceStatusReceive) { + return R.ok(resourceStatusReceiveService.save(resourceStatusReceive)); + } + + /** + * 修改 + * @param resourceStatusReceive 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody ResourceStatusReceive resourceStatusReceive) { + return R.ok(resourceStatusReceiveService.updateById(resourceStatusReceive)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(resourceStatusReceiveService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(resourceStatusReceiveService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/EdcDataResourceDto.java b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/EdcDataResourceDto.java new file mode 100644 index 00000000..75236734 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/EdcDataResourceDto.java @@ -0,0 +1,22 @@ +package com.foreverwin.mesnac.equip.dto; + +public class EdcDataResourceDto { + private String param; + private String paramVal; + + public String getParam() { + return param; + } + + public void setParam(String param) { + this.param = param; + } + + public String getParamVal() { + return paramVal; + } + + public void setParamVal(String paramVal) { + this.paramVal = paramVal; + } +} diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EdcDataResourceMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EdcDataResourceMapper.java new file mode 100644 index 00000000..8a6d9192 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EdcDataResourceMapper.java @@ -0,0 +1,43 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.EdcDataResource; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author pavel.liu + * @since 2021-07-13 + */ +@Repository +public interface EdcDataResourceMapper extends BaseMapper { + + /** + * 设备HANDLE，获取维护好的数据收集组 + * @param resourceBo + * @return + */ + String getDcGroupBoByResourceBo(@Param("resourceBo")String resourceBo); + + String getDcGroupBoByResourceBo2(@Param("resourceBo")String resourceBo); + + /** + * 数据插入 + * @param + */ + void insertOneResourceParam(@Param("tableName")String tableName,EdcDataResource edcDataResource); +// void insertOneResourceParam(@Param("entity")EdcDataResource entity); + + /** + * 执行新增SQL + * + * @param sqlStr + * @return + */ + int insertBySql(@Param(value="sqlStr") String sqlStr); + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceFaultReceiveMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceFaultReceiveMapper.java new file mode 100644 index 00000000..1bfdcf5b --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceFaultReceiveMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.ResourceFaultReceive; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 设备故障信息接收表-接口 Mapper 接口 + *

+ * + * @author pavel.Liu + * @since 2021-07-13 + */ +@Repository +public interface ResourceFaultReceiveMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceStatusReceiveMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceStatusReceiveMapper.java new file mode 100644 index 00000000..1c74ed01 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceStatusReceiveMapper.java @@ -0,0 +1,22 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.ResourceStatusReceive; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +/** + *

+ * 设备状态表-接口 Mapper 接口 + *

+ * + * @author pavel.Liu + * @since 2021-07-13 + */ +@Repository +public interface ResourceStatusReceiveMapper extends BaseMapper { + + // 获取最新的记录 + ResourceStatusReceive getOneByMaxCreateDateTime(@Param("site") String site); + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/EdcDataResource.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/EdcDataResource.java new file mode 100644 index 00000000..7a40d510 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/EdcDataResource.java @@ -0,0 +1,912 @@ +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-07-13 + */ + +@TableName("Z_EDC_DATA_RESOURCE") + +public class EdcDataResource extends Model { + + private static final long serialVersionUID = 1L; + + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + @TableField("SITE") + private String site; + @TableField("RESRCE") + private String resrce; + @TableField("DC_GROUP_BO") + private String dcGroupBo; + @TableField("DATE_TIME") + private LocalDateTime dateTime; + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + @TableField("CREATE_USER") + private String createUser; + @TableField("S1") + private String s1; + @TableField("S2") + private String s2; + @TableField("S3") + private String s3; + @TableField("S4") + private String s4; + @TableField("S5") + private String s5; + @TableField("S6") + private String s6; + @TableField("S7") + private String s7; + @TableField("S8") + private String s8; + @TableField("S9") + private String s9; + @TableField("S10") + private String s10; + @TableField("S11") + private String s11; + @TableField("S12") + private String s12; + @TableField("S13") + private String s13; + @TableField("S14") + private String s14; + @TableField("S15") + private String s15; + @TableField("S16") + private String s16; + @TableField("S17") + private String s17; + @TableField("S18") + private String s18; + @TableField("S19") + private String s19; + @TableField("S20") + private String s20; + @TableField("S21") + private String s21; + @TableField("S22") + private String s22; + @TableField("S23") + private String s23; + @TableField("S24") + private String s24; + @TableField("S25") + private String s25; + @TableField("S26") + private String s26; + @TableField("S27") + private String s27; + @TableField("S28") + private String s28; + @TableField("S29") + private String s29; + @TableField("S30") + private String s30; + @TableField("N1") + private Double n1; + @TableField("N2") + private Double n2; + @TableField("N3") + private Double n3; + @TableField("N4") + private Double n4; + @TableField("N5") + private Double n5; + @TableField("N6") + private Double n6; + @TableField("N7") + private Double n7; + @TableField("N8") + private Double n8; + @TableField("N9") + private Double n9; + @TableField("N10") + private Double n10; + @TableField("N11") + private Double n11; + @TableField("N12") + private Double n12; + @TableField("N13") + private Double n13; + @TableField("N14") + private Double n14; + @TableField("N15") + private Double n15; + @TableField("N16") + private Double n16; + @TableField("N17") + private Double n17; + @TableField("N18") + private Double n18; + @TableField("N19") + private Double n19; + @TableField("N20") + private Double n20; + @TableField("N21") + private Double n21; + @TableField("N22") + private Double n22; + @TableField("N23") + private Double n23; + @TableField("N24") + private Double n24; + @TableField("N25") + private Double n25; + @TableField("N26") + private Double n26; + @TableField("N27") + private Double n27; + @TableField("N28") + private Double n28; + @TableField("N29") + private Double n29; + @TableField("N30") + private Double n30; + + + 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 getResrce() { + return resrce; + } + + public void setResrce(String resrce) { + this.resrce = resrce; + } + + public String getDcGroupBo() { + return dcGroupBo; + } + + public void setDcGroupBo(String dcGroupBo) { + this.dcGroupBo = dcGroupBo; + } + + public LocalDateTime getDateTime() { + return dateTime; + } + + public void setDateTime(LocalDateTime dateTime) { + this.dateTime = dateTime; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getS1() { + return s1; + } + + public void setS1(String s1) { + this.s1 = s1; + } + + public String getS2() { + return s2; + } + + public void setS2(String s2) { + this.s2 = s2; + } + + public String getS3() { + return s3; + } + + public void setS3(String s3) { + this.s3 = s3; + } + + public String getS4() { + return s4; + } + + public void setS4(String s4) { + this.s4 = s4; + } + + public String getS5() { + return s5; + } + + public void setS5(String s5) { + this.s5 = s5; + } + + public String getS6() { + return s6; + } + + public void setS6(String s6) { + this.s6 = s6; + } + + public String getS7() { + return s7; + } + + public void setS7(String s7) { + this.s7 = s7; + } + + public String getS8() { + return s8; + } + + public void setS8(String s8) { + this.s8 = s8; + } + + public String getS9() { + return s9; + } + + public void setS9(String s9) { + this.s9 = s9; + } + + public String getS10() { + return s10; + } + + public void setS10(String s10) { + this.s10 = s10; + } + + public String getS11() { + return s11; + } + + public void setS11(String s11) { + this.s11 = s11; + } + + public String getS12() { + return s12; + } + + public void setS12(String s12) { + this.s12 = s12; + } + + public String getS13() { + return s13; + } + + public void setS13(String s13) { + this.s13 = s13; + } + + public String getS14() { + return s14; + } + + public void setS14(String s14) { + this.s14 = s14; + } + + public String getS15() { + return s15; + } + + public void setS15(String s15) { + this.s15 = s15; + } + + public String getS16() { + return s16; + } + + public void setS16(String s16) { + this.s16 = s16; + } + + public String getS17() { + return s17; + } + + public void setS17(String s17) { + this.s17 = s17; + } + + public String getS18() { + return s18; + } + + public void setS18(String s18) { + this.s18 = s18; + } + + public String getS19() { + return s19; + } + + public void setS19(String s19) { + this.s19 = s19; + } + + public String getS20() { + return s20; + } + + public void setS20(String s20) { + this.s20 = s20; + } + + public String getS21() { + return s21; + } + + public void setS21(String s21) { + this.s21 = s21; + } + + public String getS22() { + return s22; + } + + public void setS22(String s22) { + this.s22 = s22; + } + + public String getS23() { + return s23; + } + + public void setS23(String s23) { + this.s23 = s23; + } + + public String getS24() { + return s24; + } + + public void setS24(String s24) { + this.s24 = s24; + } + + public String getS25() { + return s25; + } + + public void setS25(String s25) { + this.s25 = s25; + } + + public String getS26() { + return s26; + } + + public void setS26(String s26) { + this.s26 = s26; + } + + public String getS27() { + return s27; + } + + public void setS27(String s27) { + this.s27 = s27; + } + + public String getS28() { + return s28; + } + + public void setS28(String s28) { + this.s28 = s28; + } + + public String getS29() { + return s29; + } + + public void setS29(String s29) { + this.s29 = s29; + } + + public String getS30() { + return s30; + } + + public void setS30(String s30) { + this.s30 = s30; + } + + public Double getN1() { + return n1; + } + + public void setN1(Double n1) { + this.n1 = n1; + } + + public Double getN2() { + return n2; + } + + public void setN2(Double n2) { + this.n2 = n2; + } + + public Double getN3() { + return n3; + } + + public void setN3(Double n3) { + this.n3 = n3; + } + + public Double getN4() { + return n4; + } + + public void setN4(Double n4) { + this.n4 = n4; + } + + public Double getN5() { + return n5; + } + + public void setN5(Double n5) { + this.n5 = n5; + } + + public Double getN6() { + return n6; + } + + public void setN6(Double n6) { + this.n6 = n6; + } + + public Double getN7() { + return n7; + } + + public void setN7(Double n7) { + this.n7 = n7; + } + + public Double getN8() { + return n8; + } + + public void setN8(Double n8) { + this.n8 = n8; + } + + public Double getN9() { + return n9; + } + + public void setN9(Double n9) { + this.n9 = n9; + } + + public Double getN10() { + return n10; + } + + public void setN10(Double n10) { + this.n10 = n10; + } + + public Double getN11() { + return n11; + } + + public void setN11(Double n11) { + this.n11 = n11; + } + + public Double getN12() { + return n12; + } + + public void setN12(Double n12) { + this.n12 = n12; + } + + public Double getN13() { + return n13; + } + + public void setN13(Double n13) { + this.n13 = n13; + } + + public Double getN14() { + return n14; + } + + public void setN14(Double n14) { + this.n14 = n14; + } + + public Double getN15() { + return n15; + } + + public void setN15(Double n15) { + this.n15 = n15; + } + + public Double getN16() { + return n16; + } + + public void setN16(Double n16) { + this.n16 = n16; + } + + public Double getN17() { + return n17; + } + + public void setN17(Double n17) { + this.n17 = n17; + } + + public Double getN18() { + return n18; + } + + public void setN18(Double n18) { + this.n18 = n18; + } + + public Double getN19() { + return n19; + } + + public void setN19(Double n19) { + this.n19 = n19; + } + + public Double getN20() { + return n20; + } + + public void setN20(Double n20) { + this.n20 = n20; + } + + public Double getN21() { + return n21; + } + + public void setN21(Double n21) { + this.n21 = n21; + } + + public Double getN22() { + return n22; + } + + public void setN22(Double n22) { + this.n22 = n22; + } + + public Double getN23() { + return n23; + } + + public void setN23(Double n23) { + this.n23 = n23; + } + + public Double getN24() { + return n24; + } + + public void setN24(Double n24) { + this.n24 = n24; + } + + public Double getN25() { + return n25; + } + + public void setN25(Double n25) { + this.n25 = n25; + } + + public Double getN26() { + return n26; + } + + public void setN26(Double n26) { + this.n26 = n26; + } + + public Double getN27() { + return n27; + } + + public void setN27(Double n27) { + this.n27 = n27; + } + + public Double getN28() { + return n28; + } + + public void setN28(Double n28) { + this.n28 = n28; + } + + public Double getN29() { + return n29; + } + + public void setN29(Double n29) { + this.n29 = n29; + } + + public Double getN30() { + return n30; + } + + public void setN30(Double n30) { + this.n30 = n30; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String RESRCE = "RESRCE"; + +public static final String DC_GROUP_BO = "DC_GROUP_BO"; + +public static final String DATE_TIME = "DATE_TIME"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String S1 = "S1"; + +public static final String S2 = "S2"; + +public static final String S3 = "S3"; + +public static final String S4 = "S4"; + +public static final String S5 = "S5"; + +public static final String S6 = "S6"; + +public static final String S7 = "S7"; + +public static final String S8 = "S8"; + +public static final String S9 = "S9"; + +public static final String S10 = "S10"; + +public static final String S11 = "S11"; + +public static final String S12 = "S12"; + +public static final String S13 = "S13"; + +public static final String S14 = "S14"; + +public static final String S15 = "S15"; + +public static final String S16 = "S16"; + +public static final String S17 = "S17"; + +public static final String S18 = "S18"; + +public static final String S19 = "S19"; + +public static final String S20 = "S20"; + +public static final String S21 = "S21"; + +public static final String S22 = "S22"; + +public static final String S23 = "S23"; + +public static final String S24 = "S24"; + +public static final String S25 = "S25"; + +public static final String S26 = "S26"; + +public static final String S27 = "S27"; + +public static final String S28 = "S28"; + +public static final String S29 = "S29"; + +public static final String S30 = "S30"; + +public static final String N1 = "N1"; + +public static final String N2 = "N2"; + +public static final String N3 = "N3"; + +public static final String N4 = "N4"; + +public static final String N5 = "N5"; + +public static final String N6 = "N6"; + +public static final String N7 = "N7"; + +public static final String N8 = "N8"; + +public static final String N9 = "N9"; + +public static final String N10 = "N10"; + +public static final String N11 = "N11"; + +public static final String N12 = "N12"; + +public static final String N13 = "N13"; + +public static final String N14 = "N14"; + +public static final String N15 = "N15"; + +public static final String N16 = "N16"; + +public static final String N17 = "N17"; + +public static final String N18 = "N18"; + +public static final String N19 = "N19"; + +public static final String N20 = "N20"; + +public static final String N21 = "N21"; + +public static final String N22 = "N22"; + +public static final String N23 = "N23"; + +public static final String N24 = "N24"; + +public static final String N25 = "N25"; + +public static final String N26 = "N26"; + +public static final String N27 = "N27"; + +public static final String N28 = "N28"; + +public static final String N29 = "N29"; + +public static final String N30 = "N30"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "EdcDataResource{" + + "handle = " + handle + + ", site = " + site + + ", resrce = " + resrce + + ", dcGroupBo = " + dcGroupBo + + ", dateTime = " + dateTime + + ", createdDateTime = " + createdDateTime + + ", createUser = " + createUser + + ", s1 = " + s1 + + ", s2 = " + s2 + + ", s3 = " + s3 + + ", s4 = " + s4 + + ", s5 = " + s5 + + ", s6 = " + s6 + + ", s7 = " + s7 + + ", s8 = " + s8 + + ", s9 = " + s9 + + ", s10 = " + s10 + + ", s11 = " + s11 + + ", s12 = " + s12 + + ", s13 = " + s13 + + ", s14 = " + s14 + + ", s15 = " + s15 + + ", s16 = " + s16 + + ", s17 = " + s17 + + ", s18 = " + s18 + + ", s19 = " + s19 + + ", s20 = " + s20 + + ", s21 = " + s21 + + ", s22 = " + s22 + + ", s23 = " + s23 + + ", s24 = " + s24 + + ", s25 = " + s25 + + ", s26 = " + s26 + + ", s27 = " + s27 + + ", s28 = " + s28 + + ", s29 = " + s29 + + ", s30 = " + s30 + + ", n1 = " + n1 + + ", n2 = " + n2 + + ", n3 = " + n3 + + ", n4 = " + n4 + + ", n5 = " + n5 + + ", n6 = " + n6 + + ", n7 = " + n7 + + ", n8 = " + n8 + + ", n9 = " + n9 + + ", n10 = " + n10 + + ", n11 = " + n11 + + ", n12 = " + n12 + + ", n13 = " + n13 + + ", n14 = " + n14 + + ", n15 = " + n15 + + ", n16 = " + n16 + + ", n17 = " + n17 + + ", n18 = " + n18 + + ", n19 = " + n19 + + ", n20 = " + n20 + + ", n21 = " + n21 + + ", n22 = " + n22 + + ", n23 = " + n23 + + ", n24 = " + n24 + + ", n25 = " + n25 + + ", n26 = " + n26 + + ", n27 = " + n27 + + ", n28 = " + n28 + + ", n29 = " + n29 + + ", n30 = " + n30 + + "}"; + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceFaultReceive.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceFaultReceive.java new file mode 100644 index 00000000..e59fe868 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceFaultReceive.java @@ -0,0 +1,185 @@ +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-07-13 + */ + +@TableName("Z_RESOURCE_FAULT_RECEIVE") + +public class ResourceFaultReceive extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 设备编号 + */ + @TableField("RESRCE") + private String resrce; + /** + * 设备故障编码 + */ + @TableField("FAULT_CODE") + private String faultCode; + /** + * 故障接收时间 + */ + @TableField("FAULT_DATE") + private LocalDateTime faultDate; + /** + * 创建人 + */ + @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 getResrce() { + return resrce; + } + + public void setResrce(String resrce) { + this.resrce = resrce; + } + + public String getFaultCode() { + return faultCode; + } + + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public LocalDateTime getFaultDate() { + return faultDate; + } + + public void setFaultDate(LocalDateTime faultDate) { + this.faultDate = faultDate; + } + + 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 RESRCE = "RESRCE"; + +public static final String FAULT_CODE = "FAULT_CODE"; + +public static final String FAULT_DATE = "FAULT_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 "ResourceFaultReceive{" + + "handle = " + handle + + ", site = " + site + + ", resrce = " + resrce + + ", faultCode = " + faultCode + + ", faultDate = " + faultDate + + ", 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/ResourceStatusReceive.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceStatusReceive.java new file mode 100644 index 00000000..2e3bf6d9 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceStatusReceive.java @@ -0,0 +1,233 @@ +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-07-13 + */ + +@TableName("Z_RESOURCE_STATUS_RECEIVE") + +public class ResourceStatusReceive extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 设备编号 + */ + @TableField("RESRCE") + private String resrce; + /** + * 当前状态 + */ + @TableField("STATUS") + private String status; + /** + * 当前状态获取时间 + */ + @TableField("DATE_TIME") + private LocalDateTime dateTime; + /** + * 接收的状态 + */ + @TableField("CHANGE_STATUS") + private String changeStatus; + /** + * 接收时间 + */ + @TableField("CHANGE_DATE_TIME") + private LocalDateTime changeDateTime; + /** + * 间隔时间 + */ + @TableField("INTERVAL_TIME") + private Double intervalTime; + /** + * 创建人 + */ + @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 getResrce() { + return resrce; + } + + public void setResrce(String resrce) { + this.resrce = resrce; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public LocalDateTime getDateTime() { + return dateTime; + } + + public void setDateTime(LocalDateTime dateTime) { + this.dateTime = dateTime; + } + + public String getChangeStatus() { + return changeStatus; + } + + public void setChangeStatus(String changeStatus) { + this.changeStatus = changeStatus; + } + + public LocalDateTime getChangeDateTime() { + return changeDateTime; + } + + public void setChangeDateTime(LocalDateTime changeDateTime) { + this.changeDateTime = changeDateTime; + } + + public Double getIntervalTime() { + return intervalTime; + } + + public void setIntervalTime(Double intervalTime) { + this.intervalTime = intervalTime; + } + + 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 RESRCE = "RESRCE"; + +public static final String STATUS = "STATUS"; + +public static final String DATE_TIME = "DATE_TIME"; + +public static final String CHANGE_STATUS = "CHANGE_STATUS"; + +public static final String CHANGE_DATE_TIME = "CHANGE_DATE_TIME"; + +public static final String INTERVAL_TIME = "INTERVAL_TIME"; + +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 "ResourceStatusReceive{" + + "handle = " + handle + + ", site = " + site + + ", resrce = " + resrce + + ", status = " + status + + ", dateTime = " + dateTime + + ", changeStatus = " + changeStatus + + ", changeDateTime = " + changeDateTime + + ", intervalTime = " + intervalTime + + ", 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/EdcDataResourceService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EdcDataResourceService.java new file mode 100644 index 00000000..62fb7e29 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EdcDataResourceService.java @@ -0,0 +1,31 @@ +package com.foreverwin.mesnac.equip.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.EdcDataResource; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author pavel.liu + * @since 2021-07-13 + */ +public interface EdcDataResourceService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, EdcDataResource edcDataResource); + + List selectList(EdcDataResource edcDataResource); + + String saveResourceParamByMq(String text); + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceFaultReceiveService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceFaultReceiveService.java new file mode 100644 index 00000000..342215de --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceFaultReceiveService.java @@ -0,0 +1,32 @@ +package com.foreverwin.mesnac.equip.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceFaultReceive; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 设备故障信息接收表-接口 服务类 + *

+ * + * @author pavel.Liu + * @since 2021-07-13 + */ +public interface ResourceFaultReceiveService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, ResourceFaultReceive resourceFaultReceive); + + List selectList(ResourceFaultReceive resourceFaultReceive); + + String parseResourceFaultInfo(String text); + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceStatusReceiveService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceStatusReceiveService.java new file mode 100644 index 00000000..80115fdf --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceStatusReceiveService.java @@ -0,0 +1,37 @@ +package com.foreverwin.mesnac.equip.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.equip.model.ResourceStatusReceive; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.time.LocalDateTime; +import java.util.List; + +/** + *

+ * 设备状态表-接口 服务类 + *

+ * + * @author pavel.Liu + * @since 2021-07-13 + */ +public interface ResourceStatusReceiveService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, ResourceStatusReceive resourceStatusReceive); + + List selectList(ResourceStatusReceive resourceStatusReceive); + + /** + * 插入新数据、更新数据、更新设备状态 + * @param text + */ + String updateResourceStatusByMq(String text); + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java new file mode 100644 index 00000000..69ed90b5 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java @@ -0,0 +1,135 @@ +package com.foreverwin.mesnac.equip.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.equip.dto.EdcDataResourceDto; +import com.foreverwin.mesnac.meapi.mapper.DcParameterMapper; +import com.foreverwin.mesnac.meapi.model.DcParameter; +import com.foreverwin.modular.core.exception.BusinessException; +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.EdcDataResource; +import com.foreverwin.mesnac.equip.mapper.EdcDataResourceMapper; +import com.foreverwin.mesnac.equip.service.EdcDataResourceService; +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.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +/** + *

+ * 服务实现类 + *

+ * + * @author pavel.liu + * @since 2021-07-13 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class EdcDataResourceServiceImpl extends ServiceImpl implements EdcDataResourceService { + + + @Autowired + private EdcDataResourceMapper edcDataResourceMapper; + @Autowired + private DcParameterMapper dcParameterMapper; + + @Override + public IPage selectPage(FrontPage frontPage, EdcDataResource edcDataResource) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(edcDataResource); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(EdcDataResource edcDataResource) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(edcDataResource); + return super.list(queryWrapper); + } + + @Override + public String saveResourceParamByMq(String text) { + JSONObject jsonObject = JSONObject.parseObject(text); + + String handle = jsonObject.getString("TRANID"); + String site = jsonObject.getString("SITE"); + String resource = jsonObject.getString("RESOURCE"); + // 发送时间 + String sendTime = jsonObject.getString("SEND_TIME"); + /*DateTimeFormatter dataFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime dateTime = LocalDateTime.parse(sendTime, dataFormatter); + String dateString = dateTime.toString(); + String dateStr = dateString.replace('T', ' ').substring(0, 19);*/ + // 参数 + String paramList = jsonObject.getString("PARAM_LIST"); + JSONArray jsonArray = JSON.parseArray(paramList); + Map map = new HashMap<>(); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jsonObj = (JSONObject) jsonArray.get(i); + String paramVal = jsonObj.getString("PARAM_VAL"); + String param = jsonObj.getString("PARAM"); + map.put(param,paramVal); + } + // 获取数据收集组HANDLE + String resourceBo = HandleEnum.RESOURCE.getHandle(site, resource); + String dcGroupBo = edcDataResourceMapper.getDcGroupBoByResourceBo(resourceBo); + if (dcGroupBo == null){ + dcGroupBo = edcDataResourceMapper.getDcGroupBoByResourceBo2(resourceBo); + if (dcGroupBo == null){ + throw BusinessException.build("设备未维护数据收集组！"); + } + } + // 获取数据收集组的字段配置信息 + StringBuilder columnValSql = new StringBuilder(); + StringBuilder columnSql = new StringBuilder(); + List getParamList = dcParameterMapper.getDcParameterByDcGroupBo(dcGroupBo); + for (DcParameter dcParam:getParamList) { + String parameterName = dcParam.getParameterName(); + // 数据收集组---值-列 + String dcValueMask = dcParam.getDcValueMask(); + // json值 + String value = map.get(parameterName); + if (value == null){ + continue; + } + columnSql.append(dcValueMask); + columnSql.append(","); + columnValSql.append("'").append(value).append("'"); + columnValSql.append(","); + } + StringBuilder sqlStr = new StringBuilder(); + String nowString = LocalDateTime.now().toString(); + String nowDate = nowString.substring(0, 19).replace('T', ' '); + sqlStr.append("INSERT INTO Z_EDC_DATA_") + .append(resource.replace("-","_")) + .append(" (HANDLE,SITE,RESRCE,DC_GROUP_BO,DATE_TIME,CREATED_DATE_TIME,CREATE_USER,") + .append(columnSql.substring(0,columnSql.length()-1)) + .append(") ") + .append(" VALUES ('") + .append(UUID.randomUUID()).append("','") + .append(site).append("','") + .append(resource).append("','") + .append(dcGroupBo).append("',") + .append("TO_DATE('").append(sendTime).append("','yyyy-MM-dd hh24:mi-ss') ,") + .append("TO_DATE('").append(nowDate).append("','yyyy-MM-dd hh24:mi-ss') ,'") + .append("SITE_ADMIN").append("',") + .append(columnValSql.substring(0,columnValSql.length()-1)) + .append(" )"); + System.out.println(sqlStr); + return handle; + } + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java new file mode 100644 index 00000000..54e699fe --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java @@ -0,0 +1,106 @@ +package com.foreverwin.mesnac.equip.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.modular.core.exception.BusinessException; +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.ResourceFaultReceive; +import com.foreverwin.mesnac.equip.mapper.ResourceFaultReceiveMapper; +import com.foreverwin.mesnac.equip.service.ResourceFaultReceiveService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.joda.time.LocalDate; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +/** + *

+ * 设备故障信息接收表-接口 服务实现类 + *

+ * + * @author pavel.Liu + * @since 2021-07-13 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ResourceFaultReceiveServiceImpl extends ServiceImpl implements ResourceFaultReceiveService { + + + @Autowired + private ResourceFaultReceiveMapper resourceFaultReceiveMapper; + @Autowired + private ResourceFaultReceiveService resourceFaultReceiveService; + + @Override + public IPage selectPage(FrontPage frontPage, ResourceFaultReceive resourceFaultReceive) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceFaultReceive); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(ResourceFaultReceive resourceFaultReceive) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceFaultReceive); + return super.list(queryWrapper); + } + + @Override + public String parseResourceFaultInfo(String text) { + JSONObject jsonObject = JSONObject.parseObject(text); + + String handle = jsonObject.getString("TRANID"); + String site = jsonObject.getString("SITE"); + String resource = jsonObject.getString("RESOURCE"); + String faultList = jsonObject.getString("FAULT_LIST"); + + String sendTime = jsonObject.getString("SEND_TIME"); + DateTimeFormatter dataFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime sendDate = LocalDateTime.parse(sendTime, dataFormatter); + + if (StringUtil.isBlank(handle)) { + throw BusinessException.build("唯一标识不能为空！"); + } + if (StringUtil.isBlank(site)) { + throw BusinessException.build("站点不能为空！"); + } + if (StringUtil.isBlank(resource)) { + throw BusinessException.build("设备编号不能为空！"); + } + List list = new ArrayList<>(); + // 故障编码及故障时间 + JSONArray jsonArray = JSON.parseArray(faultList); + for (int i = 0; i < jsonArray.size(); i++) { + ResourceFaultReceive resourceFaultReceive = new ResourceFaultReceive(); + // 设备编号、站点、创建时间-使用SEND_TIME、创建用户 + resourceFaultReceive.setResrce(resource); + resourceFaultReceive.setSite(site); + resourceFaultReceive.setCreatedDateTime(sendDate); + resourceFaultReceive.setCreateUser("SITE_ADMIN"); + + JSONObject jsonObj = (JSONObject) jsonArray.get(i); + String faultCode = jsonObj.getString("FAULT_CODE"); + resourceFaultReceive.setFaultCode(faultCode); + String dateTime = jsonObj.getString("DATE_TIME"); + LocalDateTime faultDate = LocalDateTime.parse(dateTime, dataFormatter); + resourceFaultReceive.setFaultDate(faultDate); + resourceFaultReceive.setHandle(UUID.randomUUID().toString()); + list.add(resourceFaultReceive); + } + resourceFaultReceiveService.saveBatch(list); + return handle; + } + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java new file mode 100644 index 00000000..e9c31253 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java @@ -0,0 +1,133 @@ +package com.foreverwin.mesnac.equip.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.mesnac.meapi.model.Resrce; +import com.foreverwin.mesnac.meapi.service.ResrceService; +import com.foreverwin.modular.core.exception.BusinessException; +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.ResourceStatusReceive; +import com.foreverwin.mesnac.equip.mapper.ResourceStatusReceiveMapper; +import com.foreverwin.mesnac.equip.service.ResourceStatusReceiveService; +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.Duration; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 设备状态表-接口 服务实现类 + *

+ * + * @author pavel.Liu + * @since 2021-07-13 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ResourceStatusReceiveServiceImpl extends ServiceImpl implements ResourceStatusReceiveService { + + + @Autowired + private ResourceStatusReceiveMapper resourceStatusReceiveMapper; + @Autowired + private ResrceService resrceService; + + @Override + public IPage selectPage(FrontPage frontPage, ResourceStatusReceive resourceStatusReceive) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceStatusReceive); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(ResourceStatusReceive resourceStatusReceive) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceStatusReceive); + return super.list(queryWrapper); + } + + /** + * 设备状态：运行/RUN(301|已启用)；停机/DOW(302|已禁用);维修/REPAIR(4/预定停机);封存/SEAL(303|保留);空闲/FREE(2|备用) + * @param text + * @return + */ + @Override + public String updateResourceStatusByMq(String text) { + JSONObject jsonObject = JSONObject.parseObject(text); + // 传输数据的唯一标识HANDLE，站点、设备编号、状态 + String handle = jsonObject.getString("TRANID"); + String site = jsonObject.getString("SITE"); + String resource = jsonObject.getString("RESOURCE"); + String sendStatus = jsonObject.getString("STATUS"); + // 数据传输时间 + String sendTime = jsonObject.getString("SEND_TIME"); + DateTimeFormatter dataFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime dateTime = LocalDateTime.parse(sendTime,dataFormatter); + + if (StringUtil.isBlank(handle)) { + throw BusinessException.build("唯一标识不能为空！"); + } + if (StringUtil.isBlank(site)) { + throw BusinessException.build("站点不能为空！"); + } + if (StringUtil.isBlank(resource)) { + throw BusinessException.build("设备编号不能为空！"); + } + if (StringUtil.isBlank(sendStatus)) { + throw BusinessException.build("设备状态不能为空！"); + } + + String status = "301"; + //设备状态转换 + switch (sendStatus) { + case "RUN" : + status = "301"; break; + case "DOW" : + status = "302"; break; + case "SEAL" : + status = "303"; break; + case "FREE" : + status = "2"; break; + case "REPAIR" : + status = "4"; break; + } + + // 获取最新数据 + ResourceStatusReceive resourceStatus = resourceStatusReceiveMapper.getOneByMaxCreateDateTime(site); + LocalDateTime oldDate = resourceStatus.getDateTime(); + resourceStatus.setChangeStatus(status); + resourceStatus.setChangeDateTime(dateTime); + Duration between = Duration.between(oldDate, dateTime); + Long intervalTime = between.toMinutes(); + resourceStatus.setIntervalTime(intervalTime.doubleValue()); + resourceStatus.setModifiedDateTime(LocalDateTime.now()); + resourceStatus.setModifyUser("SITE_ADMIN"); + resourceStatusReceiveMapper.updateById(resourceStatus); + // 数据库录入新数据 + ResourceStatusReceive resourceStatusReceive = new ResourceStatusReceive(); + resourceStatusReceive.setHandle(UUID.randomUUID().toString()); + resourceStatusReceive.setSite(site); + resourceStatusReceive.setResrce(resource); + resourceStatusReceive.setStatus(status); + resourceStatusReceive.setDateTime(dateTime); + resourceStatusReceive.setCreateUser("SITE_ADMIN"); + resourceStatusReceive.setCreatedDateTime(LocalDateTime.now()); + resourceStatusReceiveMapper.insert(resourceStatusReceive); + // 修改设备状态 + Resrce resrce = resrceService.getById(HandleEnum.RESOURCE.getHandle(site, resource)); + resrce.setStatusBo(HandleEnum.STATUS.getHandle(site,status)); +// resrce.setModifiedDateTime(LocalDateTime.now()); + resrceService.updateById(resrce); + return handle; + } + +} \ No newline at end of file diff --git a/equip/src/main/resources/mapper/EdcDataResourceMapper.xml b/equip/src/main/resources/mapper/EdcDataResourceMapper.xml new file mode 100644 index 00000000..486e3071 --- /dev/null +++ b/equip/src/main/resources/mapper/EdcDataResourceMapper.xml @@ -0,0 +1,1343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, RESRCE, DC_GROUP_BO, DATE_TIME, CREATED_DATE_TIME, CREATE_USER, S1, S2, S3, S4, S5, S6, S7, S8, S9, S10, S11, S12, S13, S14, S15, S16, S17, S18, S19, S20, S21, S22, S23, S24, S25, S26, S27, S28, S29, S30, N1, N2, N3, N4, N5, N6, N7, N8, N9, N10, N11, N12, N13, N14, N15, N16, N17, N18, N19, N20, N21, N22, N23, N24, N25, N26, N27, N28, N29, N30 + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_EDC_DATA_RESOURCE + + HANDLE, + SITE, + RESRCE, + DC_GROUP_BO, + DATE_TIME, + CREATED_DATE_TIME, + CREATE_USER, + S1, + S2, + S3, + S4, + S5, + S6, + S7, + S8, + S9, + S10, + S11, + S12, + S13, + S14, + S15, + S16, + S17, + S18, + S19, + S20, + S21, + S22, + S23, + S24, + S25, + S26, + S27, + S28, + S29, + S30, + N1, + N2, + N3, + N4, + N5, + N6, + N7, + N8, + N9, + N10, + N11, + N12, + N13, + N14, + N15, + N16, + N17, + N18, + N19, + N20, + N21, + N22, + N23, + N24, + N25, + N26, + N27, + N28, + N29, + N30, + VALUES + + #{handle}, + #{site}, + #{resrce}, + #{dcGroupBo}, + #{dateTime}, + #{createdDateTime}, + #{createUser}, + #{s1}, + #{s2}, + #{s3}, + #{s4}, + #{s5}, + #{s6}, + #{s7}, + #{s8}, + #{s9}, + #{s10}, + #{s11}, + #{s12}, + #{s13}, + #{s14}, + #{s15}, + #{s16}, + #{s17}, + #{s18}, + #{s19}, + #{s20}, + #{s21}, + #{s22}, + #{s23}, + #{s24}, + #{s25}, + #{s26}, + #{s27}, + #{s28}, + #{s29}, + #{s30}, + #{n1}, + #{n2}, + #{n3}, + #{n4}, + #{n5}, + #{n6}, + #{n7}, + #{n8}, + #{n9}, + #{n10}, + #{n11}, + #{n12}, + #{n13}, + #{n14}, + #{n15}, + #{n16}, + #{n17}, + #{n18}, + #{n19}, + #{n20}, + #{n21}, + #{n22}, + #{n23}, + #{n24}, + #{n25}, + #{n26}, + #{n27}, + #{n28}, + #{n29}, + #{n30}, + + + + + INSERT INTO Z_EDC_DATA_RESOURCE + + + VALUES + + #{handle}, + #{site}, + #{resrce}, + #{dcGroupBo}, + #{dateTime}, + #{createdDateTime}, + #{createUser}, + #{s1}, + #{s2}, + #{s3}, + #{s4}, + #{s5}, + #{s6}, + #{s7}, + #{s8}, + #{s9}, + #{s10}, + #{s11}, + #{s12}, + #{s13}, + #{s14}, + #{s15}, + #{s16}, + #{s17}, + #{s18}, + #{s19}, + #{s20}, + #{s21}, + #{s22}, + #{s23}, + #{s24}, + #{s25}, + #{s26}, + #{s27}, + #{s28}, + #{s29}, + #{s30}, + #{n1}, + #{n2}, + #{n3}, + #{n4}, + #{n5}, + #{n6}, + #{n7}, + #{n8}, + #{n9}, + #{n10}, + #{n11}, + #{n12}, + #{n13}, + #{n14}, + #{n15}, + #{n16}, + #{n17}, + #{n18}, + #{n19}, + #{n20}, + #{n21}, + #{n22}, + #{n23}, + #{n24}, + #{n25}, + #{n26}, + #{n27}, + #{n28}, + #{n29}, + #{n30}, + + + + + + UPDATE Z_EDC_DATA_RESOURCE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + DC_GROUP_BO=#{et.dcGroupBo}, + DATE_TIME=#{et.dateTime}, + CREATED_DATE_TIME=#{et.createdDateTime}, + CREATE_USER=#{et.createUser}, + S1=#{et.s1}, + S2=#{et.s2}, + S3=#{et.s3}, + S4=#{et.s4}, + S5=#{et.s5}, + S6=#{et.s6}, + S7=#{et.s7}, + S8=#{et.s8}, + S9=#{et.s9}, + S10=#{et.s10}, + S11=#{et.s11}, + S12=#{et.s12}, + S13=#{et.s13}, + S14=#{et.s14}, + S15=#{et.s15}, + S16=#{et.s16}, + S17=#{et.s17}, + S18=#{et.s18}, + S19=#{et.s19}, + S20=#{et.s20}, + S21=#{et.s21}, + S22=#{et.s22}, + S23=#{et.s23}, + S24=#{et.s24}, + S25=#{et.s25}, + S26=#{et.s26}, + S27=#{et.s27}, + S28=#{et.s28}, + S29=#{et.s29}, + S30=#{et.s30}, + N1=#{et.n1}, + N2=#{et.n2}, + N3=#{et.n3}, + N4=#{et.n4}, + N5=#{et.n5}, + N6=#{et.n6}, + N7=#{et.n7}, + N8=#{et.n8}, + N9=#{et.n9}, + N10=#{et.n10}, + N11=#{et.n11}, + N12=#{et.n12}, + N13=#{et.n13}, + N14=#{et.n14}, + N15=#{et.n15}, + N16=#{et.n16}, + N17=#{et.n17}, + N18=#{et.n18}, + N19=#{et.n19}, + N20=#{et.n20}, + N21=#{et.n21}, + N22=#{et.n22}, + N23=#{et.n23}, + N24=#{et.n24}, + N25=#{et.n25}, + N26=#{et.n26}, + N27=#{et.n27}, + N28=#{et.n28}, + N29=#{et.n29}, + N30=#{et.n30}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_EDC_DATA_RESOURCE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + DC_GROUP_BO=#{et.dcGroupBo}, + DATE_TIME=#{et.dateTime}, + CREATED_DATE_TIME=#{et.createdDateTime}, + CREATE_USER=#{et.createUser}, + S1=#{et.s1}, + S2=#{et.s2}, + S3=#{et.s3}, + S4=#{et.s4}, + S5=#{et.s5}, + S6=#{et.s6}, + S7=#{et.s7}, + S8=#{et.s8}, + S9=#{et.s9}, + S10=#{et.s10}, + S11=#{et.s11}, + S12=#{et.s12}, + S13=#{et.s13}, + S14=#{et.s14}, + S15=#{et.s15}, + S16=#{et.s16}, + S17=#{et.s17}, + S18=#{et.s18}, + S19=#{et.s19}, + S20=#{et.s20}, + S21=#{et.s21}, + S22=#{et.s22}, + S23=#{et.s23}, + S24=#{et.s24}, + S25=#{et.s25}, + S26=#{et.s26}, + S27=#{et.s27}, + S28=#{et.s28}, + S29=#{et.s29}, + S30=#{et.s30}, + N1=#{et.n1}, + N2=#{et.n2}, + N3=#{et.n3}, + N4=#{et.n4}, + N5=#{et.n5}, + N6=#{et.n6}, + N7=#{et.n7}, + N8=#{et.n8}, + N9=#{et.n9}, + N10=#{et.n10}, + N11=#{et.n11}, + N12=#{et.n12}, + N13=#{et.n13}, + N14=#{et.n14}, + N15=#{et.n15}, + N16=#{et.n16}, + N17=#{et.n17}, + N18=#{et.n18}, + N19=#{et.n19}, + N20=#{et.n20}, + N21=#{et.n21}, + N22=#{et.n22}, + N23=#{et.n23}, + N24=#{et.n24}, + N25=#{et.n25}, + N26=#{et.n26}, + N27=#{et.n27}, + N28=#{et.n28}, + N29=#{et.n29}, + N30=#{et.n30}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_EDC_DATA_RESOURCE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + DC_GROUP_BO=#{et.dcGroupBo}, + DATE_TIME=#{et.dateTime}, + CREATED_DATE_TIME=#{et.createdDateTime}, + CREATE_USER=#{et.createUser}, + S1=#{et.s1}, + S2=#{et.s2}, + S3=#{et.s3}, + S4=#{et.s4}, + S5=#{et.s5}, + S6=#{et.s6}, + S7=#{et.s7}, + S8=#{et.s8}, + S9=#{et.s9}, + S10=#{et.s10}, + S11=#{et.s11}, + S12=#{et.s12}, + S13=#{et.s13}, + S14=#{et.s14}, + S15=#{et.s15}, + S16=#{et.s16}, + S17=#{et.s17}, + S18=#{et.s18}, + S19=#{et.s19}, + S20=#{et.s20}, + S21=#{et.s21}, + S22=#{et.s22}, + S23=#{et.s23}, + S24=#{et.s24}, + S25=#{et.s25}, + S26=#{et.s26}, + S27=#{et.s27}, + S28=#{et.s28}, + S29=#{et.s29}, + S30=#{et.s30}, + N1=#{et.n1}, + N2=#{et.n2}, + N3=#{et.n3}, + N4=#{et.n4}, + N5=#{et.n5}, + N6=#{et.n6}, + N7=#{et.n7}, + N8=#{et.n8}, + N9=#{et.n9}, + N10=#{et.n10}, + N11=#{et.n11}, + N12=#{et.n12}, + N13=#{et.n13}, + N14=#{et.n14}, + N15=#{et.n15}, + N16=#{et.n16}, + N17=#{et.n17}, + N18=#{et.n18}, + N19=#{et.n19}, + N20=#{et.n20}, + N21=#{et.n21}, + N22=#{et.n22}, + N23=#{et.n23}, + N24=#{et.n24}, + N25=#{et.n25}, + N26=#{et.n26}, + N27=#{et.n27}, + N28=#{et.n28}, + N29=#{et.n29}, + N30=#{et.n30}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND RESRCE=#{ew.entity.resrce} + AND DC_GROUP_BO=#{ew.entity.dcGroupBo} + AND DATE_TIME=#{ew.entity.dateTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND CREATE_USER=#{ew.entity.createUser} + AND S1=#{ew.entity.s1} + AND S2=#{ew.entity.s2} + AND S3=#{ew.entity.s3} + AND S4=#{ew.entity.s4} + AND S5=#{ew.entity.s5} + AND S6=#{ew.entity.s6} + AND S7=#{ew.entity.s7} + AND S8=#{ew.entity.s8} + AND S9=#{ew.entity.s9} + AND S10=#{ew.entity.s10} + AND S11=#{ew.entity.s11} + AND S12=#{ew.entity.s12} + AND S13=#{ew.entity.s13} + AND S14=#{ew.entity.s14} + AND S15=#{ew.entity.s15} + AND S16=#{ew.entity.s16} + AND S17=#{ew.entity.s17} + AND S18=#{ew.entity.s18} + AND S19=#{ew.entity.s19} + AND S20=#{ew.entity.s20} + AND S21=#{ew.entity.s21} + AND S22=#{ew.entity.s22} + AND S23=#{ew.entity.s23} + AND S24=#{ew.entity.s24} + AND S25=#{ew.entity.s25} + AND S26=#{ew.entity.s26} + AND S27=#{ew.entity.s27} + AND S28=#{ew.entity.s28} + AND S29=#{ew.entity.s29} + AND S30=#{ew.entity.s30} + AND N1=#{ew.entity.n1} + AND N2=#{ew.entity.n2} + AND N3=#{ew.entity.n3} + AND N4=#{ew.entity.n4} + AND N5=#{ew.entity.n5} + AND N6=#{ew.entity.n6} + AND N7=#{ew.entity.n7} + AND N8=#{ew.entity.n8} + AND N9=#{ew.entity.n9} + AND N10=#{ew.entity.n10} + AND N11=#{ew.entity.n11} + AND N12=#{ew.entity.n12} + AND N13=#{ew.entity.n13} + AND N14=#{ew.entity.n14} + AND N15=#{ew.entity.n15} + AND N16=#{ew.entity.n16} + AND N17=#{ew.entity.n17} + AND N18=#{ew.entity.n18} + AND N19=#{ew.entity.n19} + AND N20=#{ew.entity.n20} + AND N21=#{ew.entity.n21} + AND N22=#{ew.entity.n22} + AND N23=#{ew.entity.n23} + AND N24=#{ew.entity.n24} + AND N25=#{ew.entity.n25} + AND N26=#{ew.entity.n26} + AND N27=#{ew.entity.n27} + AND N28=#{ew.entity.n28} + AND N29=#{ew.entity.n29} + AND N30=#{ew.entity.n30} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_EDC_DATA_RESOURCE WHERE HANDLE=#{handle} + + + + DELETE FROM Z_EDC_DATA_RESOURCE + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_EDC_DATA_RESOURCE + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND RESRCE=#{ew.entity.resrce} + AND DC_GROUP_BO=#{ew.entity.dcGroupBo} + AND DATE_TIME=#{ew.entity.dateTime} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND CREATE_USER=#{ew.entity.createUser} + AND S1=#{ew.entity.s1} + AND S2=#{ew.entity.s2} + AND S3=#{ew.entity.s3} + AND S4=#{ew.entity.s4} + AND S5=#{ew.entity.s5} + AND S6=#{ew.entity.s6} + AND S7=#{ew.entity.s7} + AND S8=#{ew.entity.s8} + AND S9=#{ew.entity.s9} + AND S10=#{ew.entity.s10} + AND S11=#{ew.entity.s11} + AND S12=#{ew.entity.s12} + AND S13=#{ew.entity.s13} + AND S14=#{ew.entity.s14} + AND S15=#{ew.entity.s15} + AND S16=#{ew.entity.s16} + AND S17=#{ew.entity.s17} + AND S18=#{ew.entity.s18} + AND S19=#{ew.entity.s19} + AND S20=#{ew.entity.s20} + AND S21=#{ew.entity.s21} + AND S22=#{ew.entity.s22} + AND S23=#{ew.entity.s23} + AND S24=#{ew.entity.s24} + AND S25=#{ew.entity.s25} + AND S26=#{ew.entity.s26} + AND S27=#{ew.entity.s27} + AND S28=#{ew.entity.s28} + AND S29=#{ew.entity.s29} + AND S30=#{ew.entity.s30} + AND N1=#{ew.entity.n1} + AND N2=#{ew.entity.n2} + AND N3=#{ew.entity.n3} + AND N4=#{ew.entity.n4} + AND N5=#{ew.entity.n5} + AND N6=#{ew.entity.n6} + AND N7=#{ew.entity.n7} + AND N8=#{ew.entity.n8} + AND N9=#{ew.entity.n9} + AND N10=#{ew.entity.n10} + AND N11=#{ew.entity.n11} + AND N12=#{ew.entity.n12} + AND N13=#{ew.entity.n13} + AND N14=#{ew.entity.n14} + AND N15=#{ew.entity.n15} + AND N16=#{ew.entity.n16} + AND N17=#{ew.entity.n17} + AND N18=#{ew.entity.n18} + AND N19=#{ew.entity.n19} + AND N20=#{ew.entity.n20} + AND N21=#{ew.entity.n21} + AND N22=#{ew.entity.n22} + AND N23=#{ew.entity.n23} + AND N24=#{ew.entity.n24} + AND N25=#{ew.entity.n25} + AND N26=#{ew.entity.n26} + AND N27=#{ew.entity.n27} + AND N28=#{ew.entity.n28} + AND N29=#{ew.entity.n29} + AND N30=#{ew.entity.n30} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_EDC_DATA_RESOURCE WHERE HANDLE IN ( + #{item} + ) + + + + + + + + + + + ${sqlStr} + + + + + + + diff --git a/equip/src/main/resources/mapper/ResourceFaultReceiveMapper.xml b/equip/src/main/resources/mapper/ResourceFaultReceiveMapper.xml new file mode 100644 index 00000000..1070a125 --- /dev/null +++ b/equip/src/main/resources/mapper/ResourceFaultReceiveMapper.xml @@ -0,0 +1,386 @@ + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, RESRCE, FAULT_CODE, FAULT_DATE, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_RESOURCE_FAULT_RECEIVE + + HANDLE, + SITE, + RESRCE, + FAULT_CODE, + FAULT_DATE, + CREATE_USER, + CREATED_DATE_TIME, + MODIFY_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{resrce}, + #{faultCode}, + #{faultDate}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_RESOURCE_FAULT_RECEIVE + + + VALUES + + #{handle}, + #{site}, + #{resrce}, + #{faultCode}, + #{faultDate}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + + UPDATE Z_RESOURCE_FAULT_RECEIVE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + FAULT_CODE=#{et.faultCode}, + FAULT_DATE=#{et.faultDate}, + 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_FAULT_RECEIVE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + FAULT_CODE=#{et.faultCode}, + FAULT_DATE=#{et.faultDate}, + 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_FAULT_RECEIVE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + FAULT_CODE=#{et.faultCode}, + FAULT_DATE=#{et.faultDate}, + 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 RESRCE=#{ew.entity.resrce} + AND FAULT_CODE=#{ew.entity.faultCode} + AND FAULT_DATE=#{ew.entity.faultDate} + 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_FAULT_RECEIVE WHERE HANDLE=#{handle} + + + + DELETE FROM Z_RESOURCE_FAULT_RECEIVE + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_RESOURCE_FAULT_RECEIVE + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND RESRCE=#{ew.entity.resrce} + AND FAULT_CODE=#{ew.entity.faultCode} + AND FAULT_DATE=#{ew.entity.faultDate} + 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_FAULT_RECEIVE WHERE HANDLE IN ( + #{item} + ) + + + + diff --git a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml index 1ddfdec2..cfc4630a 100644 --- a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml @@ -896,7 +896,6 @@ LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE WHERE RRT.SITE = #{site} - --AND WCT.LOCALE = 'zh' AND RRT.RESOURCE_BO = #{resourceBo} diff --git a/equip/src/main/resources/mapper/ResourceStatusReceiveMapper.xml b/equip/src/main/resources/mapper/ResourceStatusReceiveMapper.xml new file mode 100644 index 00000000..01a964ee --- /dev/null +++ b/equip/src/main/resources/mapper/ResourceStatusReceiveMapper.xml @@ -0,0 +1,447 @@ + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, RESRCE, STATUS, DATE_TIME, CHANGE_STATUS, CHANGE_DATE_TIME, INTERVAL_TIME, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_RESOURCE_STATUS_RECEIVE + + HANDLE, + SITE, + RESRCE, + STATUS, + DATE_TIME, + CHANGE_STATUS, + CHANGE_DATE_TIME, + INTERVAL_TIME, + CREATE_USER, + CREATED_DATE_TIME, + MODIFY_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{resrce}, + #{status}, + #{dateTime}, + #{changeStatus}, + #{changeDateTime}, + #{intervalTime}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_RESOURCE_STATUS_RECEIVE + + + VALUES + + #{handle}, + #{site}, + #{resrce}, + #{status}, + #{dateTime}, + #{changeStatus}, + #{changeDateTime}, + #{intervalTime}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + + UPDATE Z_RESOURCE_STATUS_RECEIVE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + STATUS=#{et.status}, + DATE_TIME=#{et.dateTime}, + CHANGE_STATUS=#{et.changeStatus}, + CHANGE_DATE_TIME=#{et.changeDateTime}, + INTERVAL_TIME=#{et.intervalTime}, + 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_STATUS_RECEIVE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + STATUS=#{et.status}, + DATE_TIME=#{et.dateTime}, + CHANGE_STATUS=#{et.changeStatus}, + CHANGE_DATE_TIME=#{et.changeDateTime}, + INTERVAL_TIME=#{et.intervalTime}, + 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_STATUS_RECEIVE + SITE=#{et.site}, + RESRCE=#{et.resrce}, + STATUS=#{et.status}, + DATE_TIME=#{et.dateTime}, + CHANGE_STATUS=#{et.changeStatus}, + CHANGE_DATE_TIME=#{et.changeDateTime}, + INTERVAL_TIME=#{et.intervalTime}, + 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 RESRCE=#{ew.entity.resrce} + AND STATUS=#{ew.entity.status} + AND DATE_TIME=#{ew.entity.dateTime} + AND CHANGE_STATUS=#{ew.entity.changeStatus} + AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime} + AND INTERVAL_TIME=#{ew.entity.intervalTime} + 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_STATUS_RECEIVE WHERE HANDLE=#{handle} + + + + DELETE FROM Z_RESOURCE_STATUS_RECEIVE + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_RESOURCE_STATUS_RECEIVE + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND RESRCE=#{ew.entity.resrce} + AND STATUS=#{ew.entity.status} + AND DATE_TIME=#{ew.entity.dateTime} + AND CHANGE_STATUS=#{ew.entity.changeStatus} + AND CHANGE_DATE_TIME=#{ew.entity.changeDateTime} + AND INTERVAL_TIME=#{ew.entity.intervalTime} + 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_STATUS_RECEIVE WHERE HANDLE IN ( + #{item} + ) + + + + + + + + + + diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcGroupController.java new file mode 100644 index 00000000..654497b9 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcGroupController.java @@ -0,0 +1,134 @@ +package com.foreverwin.mesnac.meapi.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.meapi.service.DcGroupService; +import com.foreverwin.mesnac.meapi.model.DcGroup; +import java.util.List; + +/** + * + * @author pavel.liu + * @since 2021-07-13 + */ +@RestController +@RequestMapping("/DC-GROUP") +public class DcGroupController { + + @Autowired + public DcGroupService dcGroupService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getDcGroupById(@PathVariable String id) { + return R.ok( dcGroupService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getDcGroupList(DcGroup dcGroup){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dcGroup); + result = dcGroupService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, DcGroup dcGroup){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dcGroup); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(DcGroup::getHandle, frontPage.getGlobalQuery()) + .or().like(DcGroup::getDcGroup, frontPage.getGlobalQuery()) + .or().like(DcGroup::getDescription, frontPage.getGlobalQuery()) + .or().like(DcGroup::getSite, frontPage.getGlobalQuery()) + .or().like(DcGroup::getCollectDataAt, frontPage.getGlobalQuery()) + .or().like(DcGroup::getCustomButtonId, frontPage.getGlobalQuery()) + .or().like(DcGroup::getPassFailGroup, frontPage.getGlobalQuery()) + .or().like(DcGroup::getRevision, frontPage.getGlobalQuery()) + .or().like(DcGroup::getCurrentRevision, frontPage.getGlobalQuery()) + .or().like(DcGroup::getStatusBo, frontPage.getGlobalQuery()) + .or().like(DcGroup::getAuthenticationRequired, frontPage.getGlobalQuery()) + .or().like(DcGroup::getErp, frontPage.getGlobalQuery()) + .or().like(DcGroup::getCollectMethod, frontPage.getGlobalQuery()) + .or().like(DcGroup::getCollectionType, frontPage.getGlobalQuery()) + .or().like(DcGroup::getErpInspection, frontPage.getGlobalQuery()) + .or().like(DcGroup::getErpWholeGroupInspection, frontPage.getGlobalQuery()) + .or().like(DcGroup::getMeEvalInspection, frontPage.getGlobalQuery()) + ); + } + result = dcGroupService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param dcGroup 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody DcGroup dcGroup) { + return R.ok(dcGroupService.save(dcGroup)); + } + + /** + * 修改 + * @param dcGroup 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody DcGroup dcGroup) { + return R.ok(dcGroupService.updateById(dcGroup)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(dcGroupService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(dcGroupService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcParameterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcParameterController.java new file mode 100644 index 00000000..939a37ee --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcParameterController.java @@ -0,0 +1,152 @@ +package com.foreverwin.mesnac.meapi.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.meapi.service.DcParameterService; +import com.foreverwin.mesnac.meapi.model.DcParameter; +import java.util.List; + +/** + * + * @author pavel.liu + * @since 2021-07-13 + */ +@RestController +@RequestMapping("/DC-PARAMETER") +public class DcParameterController { + + @Autowired + public DcParameterService dcParameterService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getDcParameterById(@PathVariable String id) { + return R.ok( dcParameterService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getDcParameterList(DcParameter dcParameter){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dcParameter); + result = dcParameterService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, DcParameter dcParameter){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dcParameter); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(DcParameter::getHandle, frontPage.getGlobalQuery()) + .or().like(DcParameter::getDcGroupBo, frontPage.getGlobalQuery()) + .or().like(DcParameter::getParameterName, frontPage.getGlobalQuery()) + .or().like(DcParameter::getDataType, frontPage.getGlobalQuery()) + .or().like(DcParameter::getStatus, frontPage.getGlobalQuery()) + .or().like(DcParameter::getAllowMissingValue, frontPage.getGlobalQuery()) + .or().like(DcParameter::getPerformSpc, frontPage.getGlobalQuery()) + .or().like(DcParameter::getDisplayChart, frontPage.getGlobalQuery()) + .or().like(DcParameter::getDescription, frontPage.getGlobalQuery()) + .or().like(DcParameter::getUnits, frontPage.getGlobalQuery()) + .or().like(DcParameter::getSpcChartBo, frontPage.getGlobalQuery()) + .or().like(DcParameter::getDisplayDataInformation, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOverrideMinMax, frontPage.getGlobalQuery()) + .or().like(DcParameter::getDcValueMask, frontPage.getGlobalQuery()) + .or().like(DcParameter::getExpressionBuilder, frontPage.getGlobalQuery()) + .or().like(DcParameter::getShortRun, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcAcquireAt, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcServer, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcDevice, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcTag, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcServerHostname, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcServerModel, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcServerProgid, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcServerClsid, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcDeviceId, frontPage.getGlobalQuery()) + .or().like(DcParameter::getOpcTagId, frontPage.getGlobalQuery()) + .or().like(DcParameter::getScriptBo, frontPage.getGlobalQuery()) + .or().like(DcParameter::getBooleanZeroValue, frontPage.getGlobalQuery()) + .or().like(DcParameter::getBooleanOneValue, frontPage.getGlobalQuery()) + .or().like(DcParameter::getErpQmCharType, frontPage.getGlobalQuery()) + .or().like(DcParameter::getErpIsQmCritical, frontPage.getGlobalQuery()) + .or().like(DcParameter::getSoftLimitCheck, frontPage.getGlobalQuery()) + .or().like(DcParameter::getAutoLogNc, frontPage.getGlobalQuery()) + .or().like(DcParameter::getNcCodeBo, frontPage.getGlobalQuery()) + .or().like(DcParameter::getDataFieldBo, frontPage.getGlobalQuery()) + ); + } + result = dcParameterService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param dcParameter 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody DcParameter dcParameter) { + return R.ok(dcParameterService.save(dcParameter)); + } + + /** + * 修改 + * @param dcParameter 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody DcParameter dcParameter) { + return R.ok(dcParameterService.updateById(dcParameter)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(dcParameterService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(dcParameterService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java index 04cc4158..f75cf356 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java @@ -31,6 +31,8 @@ public class ItemController { @ResponseBody @GetMapping("") public R getItemList(Item item) { + String site = CommonMethods.getSite(); + item.setSite(site); List result; item.setSite(CommonMethods.getSite()); QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResourceTypeController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResourceTypeController.java index 4ff5481e..bc4ef16c 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResourceTypeController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResourceTypeController.java @@ -34,6 +34,8 @@ public class ResourceTypeController { @ResponseBody @GetMapping("") public R getResourceTypeList(ResourceType resourceType){ + String site = CommonMethods.getSite(); + resourceType.setSite(site); List result; QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(resourceType); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java index c4cb717b..62506810 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java @@ -36,7 +36,6 @@ public class ResrceController { public R getResourceList(Resrce resrce){ List result; String site = CommonMethods.getSite(); - QueryWrapper queryWrapper = new QueryWrapper<>(); resrce.setSite(site); queryWrapper.setEntity(resrce); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DcGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DcGroupMapper.java new file mode 100644 index 00000000..3a519290 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DcGroupMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.DcGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author pavel.liu + * @since 2021-07-13 + */ +@Repository +public interface DcGroupMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DcParameterMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DcParameterMapper.java new file mode 100644 index 00000000..0ba23612 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DcParameterMapper.java @@ -0,0 +1,32 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.DcParameter; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + *

+ * Mapper 接口 + *

+ * + * @author pavel.liu + * @since 2021-07-13 + */ +@Repository +public interface DcParameterMapper extends BaseMapper { + + /** + * 获取数据收集组下的字段关联关系-为参数接口服务 + * @param dcGroupBo + * @return + */ + List getDcParameterByDcGroupBo(@Param("dcGroupBo")String dcGroupBo); + + + + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DcGroup.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DcGroup.java new file mode 100644 index 00000000..b6d2864a --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DcGroup.java @@ -0,0 +1,300 @@ +package com.foreverwin.mesnac.meapi.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-07-13 + */ + +@TableName("DC_GROUP") + +public class DcGroup extends Model { + + private static final long serialVersionUID = 1L; + + @TableField("HANDLE") + private String handle; + @TableField("DC_GROUP") + private String dcGroup; + @TableField("DESCRIPTION") + private String description; + @TableField("SITE") + private String site; + @TableField("COLLECT_DATA_AT") + private String collectDataAt; + @TableField("CUSTOM_BUTTON_ID") + private String customButtonId; + @TableField("PASS_FAIL_GROUP") + private String passFailGroup; + @TableField("REVISION") + private String revision; + @TableField("CURRENT_REVISION") + private String currentRevision; + @TableField("STATUS_BO") + private String statusBo; + @TableField("AUTHENTICATION_REQUIRED") + private String authenticationRequired; + @TableField("ERP") + private String erp; + @TableField("COLLECT_METHOD") + private String collectMethod; + @TableField("COLLECTION_TYPE") + private String collectionType; + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + @TableField("ERP_INSPECTION") + private String erpInspection; + @TableField("ERP_WHOLE_GROUP_INSPECTION") + private String erpWholeGroupInspection; + @TableField("ME_EVAL_INSPECTION") + private String meEvalInspection; + @TableField("PASS_FAIL_NUMBER") + private Long passFailNumber; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getDcGroup() { + return dcGroup; + } + + public void setDcGroup(String dcGroup) { + this.dcGroup = dcGroup; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getCollectDataAt() { + return collectDataAt; + } + + public void setCollectDataAt(String collectDataAt) { + this.collectDataAt = collectDataAt; + } + + public String getCustomButtonId() { + return customButtonId; + } + + public void setCustomButtonId(String customButtonId) { + this.customButtonId = customButtonId; + } + + public String getPassFailGroup() { + return passFailGroup; + } + + public void setPassFailGroup(String passFailGroup) { + this.passFailGroup = passFailGroup; + } + + 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 String getStatusBo() { + return statusBo; + } + + public void setStatusBo(String statusBo) { + this.statusBo = statusBo; + } + + public String getAuthenticationRequired() { + return authenticationRequired; + } + + public void setAuthenticationRequired(String authenticationRequired) { + this.authenticationRequired = authenticationRequired; + } + + public String getErp() { + return erp; + } + + public void setErp(String erp) { + this.erp = erp; + } + + public String getCollectMethod() { + return collectMethod; + } + + public void setCollectMethod(String collectMethod) { + this.collectMethod = collectMethod; + } + + public String getCollectionType() { + return collectionType; + } + + public void setCollectionType(String collectionType) { + this.collectionType = collectionType; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + + public String getErpInspection() { + return erpInspection; + } + + public void setErpInspection(String erpInspection) { + this.erpInspection = erpInspection; + } + + public String getErpWholeGroupInspection() { + return erpWholeGroupInspection; + } + + public void setErpWholeGroupInspection(String erpWholeGroupInspection) { + this.erpWholeGroupInspection = erpWholeGroupInspection; + } + + public String getMeEvalInspection() { + return meEvalInspection; + } + + public void setMeEvalInspection(String meEvalInspection) { + this.meEvalInspection = meEvalInspection; + } + + public Long getPassFailNumber() { + return passFailNumber; + } + + public void setPassFailNumber(Long passFailNumber) { + this.passFailNumber = passFailNumber; + } + +public static final String HANDLE = "HANDLE"; + +public static final String DC_GROUP = "DC_GROUP"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String SITE = "SITE"; + +public static final String COLLECT_DATA_AT = "COLLECT_DATA_AT"; + +public static final String CUSTOM_BUTTON_ID = "CUSTOM_BUTTON_ID"; + +public static final String PASS_FAIL_GROUP = "PASS_FAIL_GROUP"; + +public static final String REVISION = "REVISION"; + +public static final String CURRENT_REVISION = "CURRENT_REVISION"; + +public static final String STATUS_BO = "STATUS_BO"; + +public static final String AUTHENTICATION_REQUIRED = "AUTHENTICATION_REQUIRED"; + +public static final String ERP = "ERP"; + +public static final String COLLECT_METHOD = "COLLECT_METHOD"; + +public static final String COLLECTION_TYPE = "COLLECTION_TYPE"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + +public static final String ERP_INSPECTION = "ERP_INSPECTION"; + +public static final String ERP_WHOLE_GROUP_INSPECTION = "ERP_WHOLE_GROUP_INSPECTION"; + +public static final String ME_EVAL_INSPECTION = "ME_EVAL_INSPECTION"; + +public static final String PASS_FAIL_NUMBER = "PASS_FAIL_NUMBER"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "DcGroup{" + + "handle = " + handle + + ", dcGroup = " + dcGroup + + ", description = " + description + + ", site = " + site + + ", collectDataAt = " + collectDataAt + + ", customButtonId = " + customButtonId + + ", passFailGroup = " + passFailGroup + + ", revision = " + revision + + ", currentRevision = " + currentRevision + + ", statusBo = " + statusBo + + ", authenticationRequired = " + authenticationRequired + + ", erp = " + erp + + ", collectMethod = " + collectMethod + + ", collectionType = " + collectionType + + ", createdDateTime = " + createdDateTime + + ", modifiedDateTime = " + modifiedDateTime + + ", erpInspection = " + erpInspection + + ", erpWholeGroupInspection = " + erpWholeGroupInspection + + ", meEvalInspection = " + meEvalInspection + + ", passFailNumber = " + passFailNumber + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DcParameter.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DcParameter.java new file mode 100644 index 00000000..1fe35c2b --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DcParameter.java @@ -0,0 +1,585 @@ +package com.foreverwin.mesnac.meapi.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * + *

+ * + * @author pavel.liu + * @since 2021-07-13 + */ + +@TableName("DC_PARAMETER") + +public class DcParameter extends Model { + + private static final long serialVersionUID = 1L; + + @TableField("HANDLE") + private String handle; + @TableField("DC_GROUP_BO") + private String dcGroupBo; + @TableField("PARAMETER_NAME") + private String parameterName; + @TableField("DATA_TYPE") + private String dataType; + @TableField("STATUS") + private String status; + @TableField("ALLOW_MISSING_VALUE") + private String allowMissingValue; + @TableField("MIN_VALUE") + private Double minValue; + @TableField("MAX_VALUE") + private Double maxValue; + @TableField("SEQUENCE") + private Long sequence; + @TableField("PERFORM_SPC") + private String performSpc; + @TableField("DISPLAY_CHART") + private String displayChart; + @TableField("DESCRIPTION") + private String description; + @TableField("UNITS") + private String units; + @TableField("SPC_CHART_BO") + private String spcChartBo; + @TableField("DISPLAY_DATA_INFORMATION") + private String displayDataInformation; + @TableField("OVERRIDE_MIN_MAX") + private String overrideMinMax; + @TableField("DC_VALUE_MASK") + private String dcValueMask; + @TableField("EXPRESSION_BUILDER") + private String expressionBuilder; + @TableField("REQUIRED_DATA_ENTRIES") + private Long requiredDataEntries; + @TableField("OPTIONAL_DATA_ENTRIES") + private Long optionalDataEntries; + @TableField("SHORT_RUN") + private String shortRun; + @TableField("OPC_ACQUIRE_AT") + private String opcAcquireAt; + @TableField("OPC_SERVER") + private String opcServer; + @TableField("OPC_DEVICE") + private String opcDevice; + @TableField("OPC_TAG") + private String opcTag; + @TableField("OPC_SERVER_HOSTNAME") + private String opcServerHostname; + @TableField("OPC_SERVER_MODEL") + private String opcServerModel; + @TableField("OPC_SERVER_PROGID") + private String opcServerProgid; + @TableField("OPC_SERVER_CLSID") + private String opcServerClsid; + @TableField("OPC_DEVICE_ID") + private String opcDeviceId; + @TableField("OPC_TAG_ID") + private String opcTagId; + @TableField("SCRIPT_BO") + private String scriptBo; + @TableField("BOOLEAN_ZERO_VALUE") + private String booleanZeroValue; + @TableField("BOOLEAN_ONE_VALUE") + private String booleanOneValue; + @TableField("ERP_QM_CHAR_TYPE") + private String erpQmCharType; + @TableField("ERP_IS_QM_CRITICAL") + private String erpIsQmCritical; + @TableField("SOFT_LIMIT_CHECK") + private String softLimitCheck; + @TableField("AUTO_LOG_NC") + private String autoLogNc; + @TableField("NC_CODE_BO") + private String ncCodeBo; + @TableField("DATA_FIELD_BO") + private String dataFieldBo; + @TableField("INSPECTION_SAMPLE_SIZE") + private Long inspectionSampleSize; + @TableField("TARGET_VALUE") + private Double targetValue; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getDcGroupBo() { + return dcGroupBo; + } + + public void setDcGroupBo(String dcGroupBo) { + this.dcGroupBo = dcGroupBo; + } + + public String getParameterName() { + return parameterName; + } + + public void setParameterName(String parameterName) { + this.parameterName = parameterName; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getAllowMissingValue() { + return allowMissingValue; + } + + public void setAllowMissingValue(String allowMissingValue) { + this.allowMissingValue = allowMissingValue; + } + + 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 Long getSequence() { + return sequence; + } + + public void setSequence(Long sequence) { + this.sequence = sequence; + } + + public String getPerformSpc() { + return performSpc; + } + + public void setPerformSpc(String performSpc) { + this.performSpc = performSpc; + } + + public String getDisplayChart() { + return displayChart; + } + + public void setDisplayChart(String displayChart) { + this.displayChart = displayChart; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getUnits() { + return units; + } + + public void setUnits(String units) { + this.units = units; + } + + public String getSpcChartBo() { + return spcChartBo; + } + + public void setSpcChartBo(String spcChartBo) { + this.spcChartBo = spcChartBo; + } + + public String getDisplayDataInformation() { + return displayDataInformation; + } + + public void setDisplayDataInformation(String displayDataInformation) { + this.displayDataInformation = displayDataInformation; + } + + public String getOverrideMinMax() { + return overrideMinMax; + } + + public void setOverrideMinMax(String overrideMinMax) { + this.overrideMinMax = overrideMinMax; + } + + public String getDcValueMask() { + return dcValueMask; + } + + public void setDcValueMask(String dcValueMask) { + this.dcValueMask = dcValueMask; + } + + public String getExpressionBuilder() { + return expressionBuilder; + } + + public void setExpressionBuilder(String expressionBuilder) { + this.expressionBuilder = expressionBuilder; + } + + public Long getRequiredDataEntries() { + return requiredDataEntries; + } + + public void setRequiredDataEntries(Long requiredDataEntries) { + this.requiredDataEntries = requiredDataEntries; + } + + public Long getOptionalDataEntries() { + return optionalDataEntries; + } + + public void setOptionalDataEntries(Long optionalDataEntries) { + this.optionalDataEntries = optionalDataEntries; + } + + public String getShortRun() { + return shortRun; + } + + public void setShortRun(String shortRun) { + this.shortRun = shortRun; + } + + public String getOpcAcquireAt() { + return opcAcquireAt; + } + + public void setOpcAcquireAt(String opcAcquireAt) { + this.opcAcquireAt = opcAcquireAt; + } + + public String getOpcServer() { + return opcServer; + } + + public void setOpcServer(String opcServer) { + this.opcServer = opcServer; + } + + public String getOpcDevice() { + return opcDevice; + } + + public void setOpcDevice(String opcDevice) { + this.opcDevice = opcDevice; + } + + public String getOpcTag() { + return opcTag; + } + + public void setOpcTag(String opcTag) { + this.opcTag = opcTag; + } + + public String getOpcServerHostname() { + return opcServerHostname; + } + + public void setOpcServerHostname(String opcServerHostname) { + this.opcServerHostname = opcServerHostname; + } + + public String getOpcServerModel() { + return opcServerModel; + } + + public void setOpcServerModel(String opcServerModel) { + this.opcServerModel = opcServerModel; + } + + public String getOpcServerProgid() { + return opcServerProgid; + } + + public void setOpcServerProgid(String opcServerProgid) { + this.opcServerProgid = opcServerProgid; + } + + public String getOpcServerClsid() { + return opcServerClsid; + } + + public void setOpcServerClsid(String opcServerClsid) { + this.opcServerClsid = opcServerClsid; + } + + public String getOpcDeviceId() { + return opcDeviceId; + } + + public void setOpcDeviceId(String opcDeviceId) { + this.opcDeviceId = opcDeviceId; + } + + public String getOpcTagId() { + return opcTagId; + } + + public void setOpcTagId(String opcTagId) { + this.opcTagId = opcTagId; + } + + public String getScriptBo() { + return scriptBo; + } + + public void setScriptBo(String scriptBo) { + this.scriptBo = scriptBo; + } + + public String getBooleanZeroValue() { + return booleanZeroValue; + } + + public void setBooleanZeroValue(String booleanZeroValue) { + this.booleanZeroValue = booleanZeroValue; + } + + public String getBooleanOneValue() { + return booleanOneValue; + } + + public void setBooleanOneValue(String booleanOneValue) { + this.booleanOneValue = booleanOneValue; + } + + public String getErpQmCharType() { + return erpQmCharType; + } + + public void setErpQmCharType(String erpQmCharType) { + this.erpQmCharType = erpQmCharType; + } + + public String getErpIsQmCritical() { + return erpIsQmCritical; + } + + public void setErpIsQmCritical(String erpIsQmCritical) { + this.erpIsQmCritical = erpIsQmCritical; + } + + public String getSoftLimitCheck() { + return softLimitCheck; + } + + public void setSoftLimitCheck(String softLimitCheck) { + this.softLimitCheck = softLimitCheck; + } + + public String getAutoLogNc() { + return autoLogNc; + } + + public void setAutoLogNc(String autoLogNc) { + this.autoLogNc = autoLogNc; + } + + public String getNcCodeBo() { + return ncCodeBo; + } + + public void setNcCodeBo(String ncCodeBo) { + this.ncCodeBo = ncCodeBo; + } + + public String getDataFieldBo() { + return dataFieldBo; + } + + public void setDataFieldBo(String dataFieldBo) { + this.dataFieldBo = dataFieldBo; + } + + public Long getInspectionSampleSize() { + return inspectionSampleSize; + } + + public void setInspectionSampleSize(Long inspectionSampleSize) { + this.inspectionSampleSize = inspectionSampleSize; + } + + public Double getTargetValue() { + return targetValue; + } + + public void setTargetValue(Double targetValue) { + this.targetValue = targetValue; + } + +public static final String HANDLE = "HANDLE"; + +public static final String DC_GROUP_BO = "DC_GROUP_BO"; + +public static final String PARAMETER_NAME = "PARAMETER_NAME"; + +public static final String DATA_TYPE = "DATA_TYPE"; + +public static final String STATUS = "STATUS"; + +public static final String ALLOW_MISSING_VALUE = "ALLOW_MISSING_VALUE"; + +public static final String MIN_VALUE = "MIN_VALUE"; + +public static final String MAX_VALUE = "MAX_VALUE"; + +public static final String SEQUENCE = "SEQUENCE"; + +public static final String PERFORM_SPC = "PERFORM_SPC"; + +public static final String DISPLAY_CHART = "DISPLAY_CHART"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String UNITS = "UNITS"; + +public static final String SPC_CHART_BO = "SPC_CHART_BO"; + +public static final String DISPLAY_DATA_INFORMATION = "DISPLAY_DATA_INFORMATION"; + +public static final String OVERRIDE_MIN_MAX = "OVERRIDE_MIN_MAX"; + +public static final String DC_VALUE_MASK = "DC_VALUE_MASK"; + +public static final String EXPRESSION_BUILDER = "EXPRESSION_BUILDER"; + +public static final String REQUIRED_DATA_ENTRIES = "REQUIRED_DATA_ENTRIES"; + +public static final String OPTIONAL_DATA_ENTRIES = "OPTIONAL_DATA_ENTRIES"; + +public static final String SHORT_RUN = "SHORT_RUN"; + +public static final String OPC_ACQUIRE_AT = "OPC_ACQUIRE_AT"; + +public static final String OPC_SERVER = "OPC_SERVER"; + +public static final String OPC_DEVICE = "OPC_DEVICE"; + +public static final String OPC_TAG = "OPC_TAG"; + +public static final String OPC_SERVER_HOSTNAME = "OPC_SERVER_HOSTNAME"; + +public static final String OPC_SERVER_MODEL = "OPC_SERVER_MODEL"; + +public static final String OPC_SERVER_PROGID = "OPC_SERVER_PROGID"; + +public static final String OPC_SERVER_CLSID = "OPC_SERVER_CLSID"; + +public static final String OPC_DEVICE_ID = "OPC_DEVICE_ID"; + +public static final String OPC_TAG_ID = "OPC_TAG_ID"; + +public static final String SCRIPT_BO = "SCRIPT_BO"; + +public static final String BOOLEAN_ZERO_VALUE = "BOOLEAN_ZERO_VALUE"; + +public static final String BOOLEAN_ONE_VALUE = "BOOLEAN_ONE_VALUE"; + +public static final String ERP_QM_CHAR_TYPE = "ERP_QM_CHAR_TYPE"; + +public static final String ERP_IS_QM_CRITICAL = "ERP_IS_QM_CRITICAL"; + +public static final String SOFT_LIMIT_CHECK = "SOFT_LIMIT_CHECK"; + +public static final String AUTO_LOG_NC = "AUTO_LOG_NC"; + +public static final String NC_CODE_BO = "NC_CODE_BO"; + +public static final String DATA_FIELD_BO = "DATA_FIELD_BO"; + +public static final String INSPECTION_SAMPLE_SIZE = "INSPECTION_SAMPLE_SIZE"; + +public static final String TARGET_VALUE = "TARGET_VALUE"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "DcParameter{" + + "handle = " + handle + + ", dcGroupBo = " + dcGroupBo + + ", parameterName = " + parameterName + + ", dataType = " + dataType + + ", status = " + status + + ", allowMissingValue = " + allowMissingValue + + ", minValue = " + minValue + + ", maxValue = " + maxValue + + ", sequence = " + sequence + + ", performSpc = " + performSpc + + ", displayChart = " + displayChart + + ", description = " + description + + ", units = " + units + + ", spcChartBo = " + spcChartBo + + ", displayDataInformation = " + displayDataInformation + + ", overrideMinMax = " + overrideMinMax + + ", dcValueMask = " + dcValueMask + + ", expressionBuilder = " + expressionBuilder + + ", requiredDataEntries = " + requiredDataEntries + + ", optionalDataEntries = " + optionalDataEntries + + ", shortRun = " + shortRun + + ", opcAcquireAt = " + opcAcquireAt + + ", opcServer = " + opcServer + + ", opcDevice = " + opcDevice + + ", opcTag = " + opcTag + + ", opcServerHostname = " + opcServerHostname + + ", opcServerModel = " + opcServerModel + + ", opcServerProgid = " + opcServerProgid + + ", opcServerClsid = " + opcServerClsid + + ", opcDeviceId = " + opcDeviceId + + ", opcTagId = " + opcTagId + + ", scriptBo = " + scriptBo + + ", booleanZeroValue = " + booleanZeroValue + + ", booleanOneValue = " + booleanOneValue + + ", erpQmCharType = " + erpQmCharType + + ", erpIsQmCritical = " + erpIsQmCritical + + ", softLimitCheck = " + softLimitCheck + + ", autoLogNc = " + autoLogNc + + ", ncCodeBo = " + ncCodeBo + + ", dataFieldBo = " + dataFieldBo + + ", inspectionSampleSize = " + inspectionSampleSize + + ", targetValue = " + targetValue + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DcGroupService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DcGroupService.java new file mode 100644 index 00000000..d7cbdac6 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DcGroupService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.DcGroup; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author pavel.liu + * @since 2021-07-13 + */ +public interface DcGroupService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, DcGroup dcGroup); + + List selectList(DcGroup dcGroup); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DcParameterService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DcParameterService.java new file mode 100644 index 00000000..a7b76c06 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DcParameterService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.DcParameter; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author pavel.liu + * @since 2021-07-13 + */ +public interface DcParameterService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, DcParameter dcParameter); + + List selectList(DcParameter dcParameter); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DcGroupServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DcGroupServiceImpl.java new file mode 100644 index 00000000..7761408b --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DcGroupServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.meapi.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.meapi.model.DcGroup; +import com.foreverwin.mesnac.meapi.mapper.DcGroupMapper; +import com.foreverwin.mesnac.meapi.service.DcGroupService; +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-07-13 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class DcGroupServiceImpl extends ServiceImpl implements DcGroupService { + + + @Autowired + private DcGroupMapper dcGroupMapper; + + @Override + public IPage selectPage(FrontPage frontPage, DcGroup dcGroup) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dcGroup); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(DcGroup dcGroup) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dcGroup); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DcParameterServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DcParameterServiceImpl.java new file mode 100644 index 00000000..cec48c4d --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DcParameterServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.meapi.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.meapi.model.DcParameter; +import com.foreverwin.mesnac.meapi.mapper.DcParameterMapper; +import com.foreverwin.mesnac.meapi.service.DcParameterService; +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-07-13 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class DcParameterServiceImpl extends ServiceImpl implements DcParameterService { + + + @Autowired + private DcParameterMapper dcParameterMapper; + + @Override + public IPage selectPage(FrontPage frontPage, DcParameter dcParameter) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dcParameter); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(DcParameter dcParameter) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(dcParameter); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/DcGroupMapper.xml b/meapi/src/main/resources/mapper/DcGroupMapper.xml new file mode 100644 index 00000000..0f833511 --- /dev/null +++ b/meapi/src/main/resources/mapper/DcGroupMapper.xml @@ -0,0 +1,500 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, DC_GROUP, DESCRIPTION, SITE, COLLECT_DATA_AT, CUSTOM_BUTTON_ID, PASS_FAIL_GROUP, REVISION, CURRENT_REVISION, STATUS_BO, AUTHENTICATION_REQUIRED, ERP, COLLECT_METHOD, COLLECTION_TYPE, CREATED_DATE_TIME, MODIFIED_DATE_TIME, ERP_INSPECTION, ERP_WHOLE_GROUP_INSPECTION, ME_EVAL_INSPECTION, PASS_FAIL_NUMBER + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO DC_GROUP + + HANDLE, + DC_GROUP, + DESCRIPTION, + SITE, + COLLECT_DATA_AT, + CUSTOM_BUTTON_ID, + PASS_FAIL_GROUP, + REVISION, + CURRENT_REVISION, + STATUS_BO, + AUTHENTICATION_REQUIRED, + ERP, + COLLECT_METHOD, + COLLECTION_TYPE, + CREATED_DATE_TIME, + MODIFIED_DATE_TIME, + ERP_INSPECTION, + ERP_WHOLE_GROUP_INSPECTION, + ME_EVAL_INSPECTION, + PASS_FAIL_NUMBER, + VALUES + + #{handle}, + #{dcGroup}, + #{description}, + #{site}, + #{collectDataAt}, + #{customButtonId}, + #{passFailGroup}, + #{revision}, + #{currentRevision}, + #{statusBo}, + #{authenticationRequired}, + #{erp}, + #{collectMethod}, + #{collectionType}, + #{createdDateTime}, + #{modifiedDateTime}, + #{erpInspection}, + #{erpWholeGroupInspection}, + #{meEvalInspection}, + #{passFailNumber}, + + + + + INSERT INTO DC_GROUP + + + VALUES + + #{handle}, + #{dcGroup}, + #{description}, + #{site}, + #{collectDataAt}, + #{customButtonId}, + #{passFailGroup}, + #{revision}, + #{currentRevision}, + #{statusBo}, + #{authenticationRequired}, + #{erp}, + #{collectMethod}, + #{collectionType}, + #{createdDateTime}, + #{modifiedDateTime}, + #{erpInspection}, + #{erpWholeGroupInspection}, + #{meEvalInspection}, + #{passFailNumber}, + + + + + + + + + + UPDATE DC_GROUP + HANDLE=#{et.handle}, + DC_GROUP=#{et.dcGroup}, + DESCRIPTION=#{et.description}, + SITE=#{et.site}, + COLLECT_DATA_AT=#{et.collectDataAt}, + CUSTOM_BUTTON_ID=#{et.customButtonId}, + PASS_FAIL_GROUP=#{et.passFailGroup}, + REVISION=#{et.revision}, + CURRENT_REVISION=#{et.currentRevision}, + STATUS_BO=#{et.statusBo}, + AUTHENTICATION_REQUIRED=#{et.authenticationRequired}, + ERP=#{et.erp}, + COLLECT_METHOD=#{et.collectMethod}, + COLLECTION_TYPE=#{et.collectionType}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + ERP_INSPECTION=#{et.erpInspection}, + ERP_WHOLE_GROUP_INSPECTION=#{et.erpWholeGroupInspection}, + ME_EVAL_INSPECTION=#{et.meEvalInspection}, + PASS_FAIL_NUMBER=#{et.passFailNumber}, + + + + + HANDLE=#{ew.entity.handle} + AND DC_GROUP=#{ew.entity.dcGroup} + AND DESCRIPTION=#{ew.entity.description} + AND SITE=#{ew.entity.site} + AND COLLECT_DATA_AT=#{ew.entity.collectDataAt} + AND CUSTOM_BUTTON_ID=#{ew.entity.customButtonId} + AND PASS_FAIL_GROUP=#{ew.entity.passFailGroup} + AND REVISION=#{ew.entity.revision} + AND CURRENT_REVISION=#{ew.entity.currentRevision} + AND STATUS_BO=#{ew.entity.statusBo} + AND AUTHENTICATION_REQUIRED=#{ew.entity.authenticationRequired} + AND ERP=#{ew.entity.erp} + AND COLLECT_METHOD=#{ew.entity.collectMethod} + AND COLLECTION_TYPE=#{ew.entity.collectionType} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND ERP_INSPECTION=#{ew.entity.erpInspection} + AND ERP_WHOLE_GROUP_INSPECTION=#{ew.entity.erpWholeGroupInspection} + AND ME_EVAL_INSPECTION=#{ew.entity.meEvalInspection} + AND PASS_FAIL_NUMBER=#{ew.entity.passFailNumber} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM DC_GROUP + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM DC_GROUP + + + + + HANDLE=#{ew.entity.handle} + + AND DC_GROUP=#{ew.entity.dcGroup} + AND DESCRIPTION=#{ew.entity.description} + AND SITE=#{ew.entity.site} + AND COLLECT_DATA_AT=#{ew.entity.collectDataAt} + AND CUSTOM_BUTTON_ID=#{ew.entity.customButtonId} + AND PASS_FAIL_GROUP=#{ew.entity.passFailGroup} + AND REVISION=#{ew.entity.revision} + AND CURRENT_REVISION=#{ew.entity.currentRevision} + AND STATUS_BO=#{ew.entity.statusBo} + AND AUTHENTICATION_REQUIRED=#{ew.entity.authenticationRequired} + AND ERP=#{ew.entity.erp} + AND COLLECT_METHOD=#{ew.entity.collectMethod} + AND COLLECTION_TYPE=#{ew.entity.collectionType} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND ERP_INSPECTION=#{ew.entity.erpInspection} + AND ERP_WHOLE_GROUP_INSPECTION=#{ew.entity.erpWholeGroupInspection} + AND ME_EVAL_INSPECTION=#{ew.entity.meEvalInspection} + AND PASS_FAIL_NUMBER=#{ew.entity.passFailNumber} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + diff --git a/meapi/src/main/resources/mapper/DcParameterMapper.xml b/meapi/src/main/resources/mapper/DcParameterMapper.xml new file mode 100644 index 00000000..f0a43b8e --- /dev/null +++ b/meapi/src/main/resources/mapper/DcParameterMapper.xml @@ -0,0 +1,815 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, DC_GROUP_BO, PARAMETER_NAME, DATA_TYPE, STATUS, ALLOW_MISSING_VALUE, MIN_VALUE, MAX_VALUE, SEQUENCE, PERFORM_SPC, DISPLAY_CHART, DESCRIPTION, UNITS, SPC_CHART_BO, DISPLAY_DATA_INFORMATION, OVERRIDE_MIN_MAX, DC_VALUE_MASK, EXPRESSION_BUILDER, REQUIRED_DATA_ENTRIES, OPTIONAL_DATA_ENTRIES, SHORT_RUN, OPC_ACQUIRE_AT, OPC_SERVER, OPC_DEVICE, OPC_TAG, OPC_SERVER_HOSTNAME, OPC_SERVER_MODEL, OPC_SERVER_PROGID, OPC_SERVER_CLSID, OPC_DEVICE_ID, OPC_TAG_ID, SCRIPT_BO, BOOLEAN_ZERO_VALUE, BOOLEAN_ONE_VALUE, ERP_QM_CHAR_TYPE, ERP_IS_QM_CRITICAL, SOFT_LIMIT_CHECK, AUTO_LOG_NC, NC_CODE_BO, DATA_FIELD_BO, INSPECTION_SAMPLE_SIZE, TARGET_VALUE + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO DC_PARAMETER + + HANDLE, + DC_GROUP_BO, + PARAMETER_NAME, + DATA_TYPE, + STATUS, + ALLOW_MISSING_VALUE, + MIN_VALUE, + MAX_VALUE, + SEQUENCE, + PERFORM_SPC, + DISPLAY_CHART, + DESCRIPTION, + UNITS, + SPC_CHART_BO, + DISPLAY_DATA_INFORMATION, + OVERRIDE_MIN_MAX, + DC_VALUE_MASK, + EXPRESSION_BUILDER, + REQUIRED_DATA_ENTRIES, + OPTIONAL_DATA_ENTRIES, + SHORT_RUN, + OPC_ACQUIRE_AT, + OPC_SERVER, + OPC_DEVICE, + OPC_TAG, + OPC_SERVER_HOSTNAME, + OPC_SERVER_MODEL, + OPC_SERVER_PROGID, + OPC_SERVER_CLSID, + OPC_DEVICE_ID, + OPC_TAG_ID, + SCRIPT_BO, + BOOLEAN_ZERO_VALUE, + BOOLEAN_ONE_VALUE, + ERP_QM_CHAR_TYPE, + ERP_IS_QM_CRITICAL, + SOFT_LIMIT_CHECK, + AUTO_LOG_NC, + NC_CODE_BO, + DATA_FIELD_BO, + INSPECTION_SAMPLE_SIZE, + TARGET_VALUE, + VALUES + + #{handle}, + #{dcGroupBo}, + #{parameterName}, + #{dataType}, + #{status}, + #{allowMissingValue}, + #{minValue}, + #{maxValue}, + #{sequence}, + #{performSpc}, + #{displayChart}, + #{description}, + #{units}, + #{spcChartBo}, + #{displayDataInformation}, + #{overrideMinMax}, + #{dcValueMask}, + #{expressionBuilder}, + #{requiredDataEntries}, + #{optionalDataEntries}, + #{shortRun}, + #{opcAcquireAt}, + #{opcServer}, + #{opcDevice}, + #{opcTag}, + #{opcServerHostname}, + #{opcServerModel}, + #{opcServerProgid}, + #{opcServerClsid}, + #{opcDeviceId}, + #{opcTagId}, + #{scriptBo}, + #{booleanZeroValue}, + #{booleanOneValue}, + #{erpQmCharType}, + #{erpIsQmCritical}, + #{softLimitCheck}, + #{autoLogNc}, + #{ncCodeBo}, + #{dataFieldBo}, + #{inspectionSampleSize}, + #{targetValue}, + + + + + INSERT INTO DC_PARAMETER + + + VALUES + + #{handle}, + #{dcGroupBo}, + #{parameterName}, + #{dataType}, + #{status}, + #{allowMissingValue}, + #{minValue}, + #{maxValue}, + #{sequence}, + #{performSpc}, + #{displayChart}, + #{description}, + #{units}, + #{spcChartBo}, + #{displayDataInformation}, + #{overrideMinMax}, + #{dcValueMask}, + #{expressionBuilder}, + #{requiredDataEntries}, + #{optionalDataEntries}, + #{shortRun}, + #{opcAcquireAt}, + #{opcServer}, + #{opcDevice}, + #{opcTag}, + #{opcServerHostname}, + #{opcServerModel}, + #{opcServerProgid}, + #{opcServerClsid}, + #{opcDeviceId}, + #{opcTagId}, + #{scriptBo}, + #{booleanZeroValue}, + #{booleanOneValue}, + #{erpQmCharType}, + #{erpIsQmCritical}, + #{softLimitCheck}, + #{autoLogNc}, + #{ncCodeBo}, + #{dataFieldBo}, + #{inspectionSampleSize}, + #{targetValue}, + + + + + + + + + + UPDATE DC_PARAMETER + HANDLE=#{et.handle}, + DC_GROUP_BO=#{et.dcGroupBo}, + PARAMETER_NAME=#{et.parameterName}, + DATA_TYPE=#{et.dataType}, + STATUS=#{et.status}, + ALLOW_MISSING_VALUE=#{et.allowMissingValue}, + MIN_VALUE=#{et.minValue}, + MAX_VALUE=#{et.maxValue}, + SEQUENCE=#{et.sequence}, + PERFORM_SPC=#{et.performSpc}, + DISPLAY_CHART=#{et.displayChart}, + DESCRIPTION=#{et.description}, + UNITS=#{et.units}, + SPC_CHART_BO=#{et.spcChartBo}, + DISPLAY_DATA_INFORMATION=#{et.displayDataInformation}, + OVERRIDE_MIN_MAX=#{et.overrideMinMax}, + DC_VALUE_MASK=#{et.dcValueMask}, + EXPRESSION_BUILDER=#{et.expressionBuilder}, + REQUIRED_DATA_ENTRIES=#{et.requiredDataEntries}, + OPTIONAL_DATA_ENTRIES=#{et.optionalDataEntries}, + SHORT_RUN=#{et.shortRun}, + OPC_ACQUIRE_AT=#{et.opcAcquireAt}, + OPC_SERVER=#{et.opcServer}, + OPC_DEVICE=#{et.opcDevice}, + OPC_TAG=#{et.opcTag}, + OPC_SERVER_HOSTNAME=#{et.opcServerHostname}, + OPC_SERVER_MODEL=#{et.opcServerModel}, + OPC_SERVER_PROGID=#{et.opcServerProgid}, + OPC_SERVER_CLSID=#{et.opcServerClsid}, + OPC_DEVICE_ID=#{et.opcDeviceId}, + OPC_TAG_ID=#{et.opcTagId}, + SCRIPT_BO=#{et.scriptBo}, + BOOLEAN_ZERO_VALUE=#{et.booleanZeroValue}, + BOOLEAN_ONE_VALUE=#{et.booleanOneValue}, + ERP_QM_CHAR_TYPE=#{et.erpQmCharType}, + ERP_IS_QM_CRITICAL=#{et.erpIsQmCritical}, + SOFT_LIMIT_CHECK=#{et.softLimitCheck}, + AUTO_LOG_NC=#{et.autoLogNc}, + NC_CODE_BO=#{et.ncCodeBo}, + DATA_FIELD_BO=#{et.dataFieldBo}, + INSPECTION_SAMPLE_SIZE=#{et.inspectionSampleSize}, + TARGET_VALUE=#{et.targetValue}, + + + + + HANDLE=#{ew.entity.handle} + AND DC_GROUP_BO=#{ew.entity.dcGroupBo} + AND PARAMETER_NAME=#{ew.entity.parameterName} + AND DATA_TYPE=#{ew.entity.dataType} + AND STATUS=#{ew.entity.status} + AND ALLOW_MISSING_VALUE=#{ew.entity.allowMissingValue} + AND MIN_VALUE=#{ew.entity.minValue} + AND MAX_VALUE=#{ew.entity.maxValue} + AND SEQUENCE=#{ew.entity.sequence} + AND PERFORM_SPC=#{ew.entity.performSpc} + AND DISPLAY_CHART=#{ew.entity.displayChart} + AND DESCRIPTION=#{ew.entity.description} + AND UNITS=#{ew.entity.units} + AND SPC_CHART_BO=#{ew.entity.spcChartBo} + AND DISPLAY_DATA_INFORMATION=#{ew.entity.displayDataInformation} + AND OVERRIDE_MIN_MAX=#{ew.entity.overrideMinMax} + AND DC_VALUE_MASK=#{ew.entity.dcValueMask} + AND EXPRESSION_BUILDER=#{ew.entity.expressionBuilder} + AND REQUIRED_DATA_ENTRIES=#{ew.entity.requiredDataEntries} + AND OPTIONAL_DATA_ENTRIES=#{ew.entity.optionalDataEntries} + AND SHORT_RUN=#{ew.entity.shortRun} + AND OPC_ACQUIRE_AT=#{ew.entity.opcAcquireAt} + AND OPC_SERVER=#{ew.entity.opcServer} + AND OPC_DEVICE=#{ew.entity.opcDevice} + AND OPC_TAG=#{ew.entity.opcTag} + AND OPC_SERVER_HOSTNAME=#{ew.entity.opcServerHostname} + AND OPC_SERVER_MODEL=#{ew.entity.opcServerModel} + AND OPC_SERVER_PROGID=#{ew.entity.opcServerProgid} + AND OPC_SERVER_CLSID=#{ew.entity.opcServerClsid} + AND OPC_DEVICE_ID=#{ew.entity.opcDeviceId} + AND OPC_TAG_ID=#{ew.entity.opcTagId} + AND SCRIPT_BO=#{ew.entity.scriptBo} + AND BOOLEAN_ZERO_VALUE=#{ew.entity.booleanZeroValue} + AND BOOLEAN_ONE_VALUE=#{ew.entity.booleanOneValue} + AND ERP_QM_CHAR_TYPE=#{ew.entity.erpQmCharType} + AND ERP_IS_QM_CRITICAL=#{ew.entity.erpIsQmCritical} + AND SOFT_LIMIT_CHECK=#{ew.entity.softLimitCheck} + AND AUTO_LOG_NC=#{ew.entity.autoLogNc} + AND NC_CODE_BO=#{ew.entity.ncCodeBo} + AND DATA_FIELD_BO=#{ew.entity.dataFieldBo} + AND INSPECTION_SAMPLE_SIZE=#{ew.entity.inspectionSampleSize} + AND TARGET_VALUE=#{ew.entity.targetValue} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM DC_PARAMETER + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM DC_PARAMETER + + + + + HANDLE=#{ew.entity.handle} + + AND DC_GROUP_BO=#{ew.entity.dcGroupBo} + AND PARAMETER_NAME=#{ew.entity.parameterName} + AND DATA_TYPE=#{ew.entity.dataType} + AND STATUS=#{ew.entity.status} + AND ALLOW_MISSING_VALUE=#{ew.entity.allowMissingValue} + AND MIN_VALUE=#{ew.entity.minValue} + AND MAX_VALUE=#{ew.entity.maxValue} + AND SEQUENCE=#{ew.entity.sequence} + AND PERFORM_SPC=#{ew.entity.performSpc} + AND DISPLAY_CHART=#{ew.entity.displayChart} + AND DESCRIPTION=#{ew.entity.description} + AND UNITS=#{ew.entity.units} + AND SPC_CHART_BO=#{ew.entity.spcChartBo} + AND DISPLAY_DATA_INFORMATION=#{ew.entity.displayDataInformation} + AND OVERRIDE_MIN_MAX=#{ew.entity.overrideMinMax} + AND DC_VALUE_MASK=#{ew.entity.dcValueMask} + AND EXPRESSION_BUILDER=#{ew.entity.expressionBuilder} + AND REQUIRED_DATA_ENTRIES=#{ew.entity.requiredDataEntries} + AND OPTIONAL_DATA_ENTRIES=#{ew.entity.optionalDataEntries} + AND SHORT_RUN=#{ew.entity.shortRun} + AND OPC_ACQUIRE_AT=#{ew.entity.opcAcquireAt} + AND OPC_SERVER=#{ew.entity.opcServer} + AND OPC_DEVICE=#{ew.entity.opcDevice} + AND OPC_TAG=#{ew.entity.opcTag} + AND OPC_SERVER_HOSTNAME=#{ew.entity.opcServerHostname} + AND OPC_SERVER_MODEL=#{ew.entity.opcServerModel} + AND OPC_SERVER_PROGID=#{ew.entity.opcServerProgid} + AND OPC_SERVER_CLSID=#{ew.entity.opcServerClsid} + AND OPC_DEVICE_ID=#{ew.entity.opcDeviceId} + AND OPC_TAG_ID=#{ew.entity.opcTagId} + AND SCRIPT_BO=#{ew.entity.scriptBo} + AND BOOLEAN_ZERO_VALUE=#{ew.entity.booleanZeroValue} + AND BOOLEAN_ONE_VALUE=#{ew.entity.booleanOneValue} + AND ERP_QM_CHAR_TYPE=#{ew.entity.erpQmCharType} + AND ERP_IS_QM_CRITICAL=#{ew.entity.erpIsQmCritical} + AND SOFT_LIMIT_CHECK=#{ew.entity.softLimitCheck} + AND AUTO_LOG_NC=#{ew.entity.autoLogNc} + AND NC_CODE_BO=#{ew.entity.ncCodeBo} + AND DATA_FIELD_BO=#{ew.entity.dataFieldBo} + AND INSPECTION_SAMPLE_SIZE=#{ew.entity.inspectionSampleSize} + AND TARGET_VALUE=#{ew.entity.targetValue} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + + + + + +