diff --git a/business/src/main/java/com/fizz/business/constants/enums/WsTypeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/WsTypeEnum.java index 3a5cacf..51b264a 100644 --- a/business/src/main/java/com/fizz/business/constants/enums/WsTypeEnum.java +++ b/business/src/main/java/com/fizz/business/constants/enums/WsTypeEnum.java @@ -17,7 +17,7 @@ import java.util.Map; @Getter @AllArgsConstructor public enum WsTypeEnum { - alarm, track_position, track_measure, track_signal, track_matmap; + alarm, track_position, track_measure, track_signal, track_matmap,calc_setup_result; private static final Map MAP = new HashMap<>(8); diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java index 9c80cc0..414f071 100644 --- a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java +++ b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java @@ -29,7 +29,6 @@ public class CrmPdiPlanController { return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilid)); } - @GetMapping("/getCoilInfoAndSetupList") @ApiOperation("通过钢卷号获取钢卷信息和设定值列表") public R getCoilInfoAndSetupList(@RequestParam String coilid) { @@ -40,12 +39,7 @@ public class CrmPdiPlanController { @ApiOperation("保存钢卷信息") public R editCoilInfo(@RequestBody CrmPdiPlanForm coilid) { - if (crmPdiPlanService.editCoilInfo(coilid)) { - - return R.ok(); - } else { - return R.fail("新增或更新失败"); - } + return R.ok(crmPdiPlanService.editCoilInfo(coilid)); } @@ -53,8 +47,7 @@ public class CrmPdiPlanController { @ApiOperation("计算设定值") public R editCoilInfo(@RequestBody CalcPdiPlanForm coilid) { - crmPdiPlanService.calcSetup(coilid); - return R.ok(); + return R.ok(crmPdiPlanService.calcSetup(coilid)); } diff --git a/business/src/main/java/com/fizz/business/domain/ModCoilMap.java b/business/src/main/java/com/fizz/business/domain/ModCoilMap.java new file mode 100644 index 0000000..53e0c3c --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/ModCoilMap.java @@ -0,0 +1,95 @@ +package com.fizz.business.domain; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class ModCoilMap { + + @TableField("POSID") + private Integer posid; + + @TableField("COILID") + private String coilid; + + @TableField("GRADE") + private String grade; + + @TableField("CLASSID") + private Integer classid; + + @TableField("ENTRY_CROWN") + private Float entryCrown; + + @TableField("ENTRY_THICK") + private Float entryThick; + + @TableField("ENTRY_LENGTH") + private Float entryLength; + + @TableField("ENTRY_DIAMETER") + private Float entryDiameter; + + @TableField("ENTRY_STRESS") + private Float entryStress; + + @TableField("TEMP") + private Float temp; + + @TableField("WIDTH") + private Float width; + + @TableField("ENTRY_WEIGHT") + private Float entryWeight; + + @TableField("EXIT_THICK") + private Float exitThick; + + @TableField("REDUCTION") + private Float reduction; + + @TableField("EXIT_STRESS") + private Float exitStress; + + @TableField("NEXT_UNIT") + private Integer nextUnit; + + @TableField("STRAT_MODE") + private Integer stratMode; + + @TableField("STRAT_MODE_DSC") + private String stratModeDsc; + + @TableField("ROLL_MODE") + private Integer rollMode; + + @TableField("ROLL_MODE_DSC") + private String rollModeDsc; + + @TableField("SETUP_MODE") + private Integer setupMode; + + @TableField("SETUP_MODE_DSC") + private String setupModeDsc; + + @TableField("STATUS") + private Integer status; + + @TableField("STATUS_MODE_DSC") + private String statusModeDsc; + + @TableField("SHIFT") + private String shift; + + @TableField("CREW") + private Integer crew; + + @TableField("INSDATE") + private LocalDateTime insdate; + + +} diff --git a/business/src/main/java/com/fizz/business/domain/ProMatmap.java b/business/src/main/java/com/fizz/business/domain/ProMatmap.java new file mode 100644 index 0000000..1c9f7a0 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/ProMatmap.java @@ -0,0 +1,37 @@ +package com.fizz.business.domain; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class ProMatmap { + + @TableField("areaid") + private Integer areaid; + + @TableField("groupid") + private Integer groupid; + + @TableField("pos") + private Integer pos; + + @TableField("full_place_name") + private String fullPlaceName; + + @TableField("matid") + private String matid; + + @TableField("display_name") + private String displayName; + + @TableId("l1mapidx") + private Integer l1mapidx; + + @TableField("updtime") + private LocalDateTime updtime; + +} diff --git a/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java b/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java index a13c6f2..a088338 100644 --- a/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java +++ b/business/src/main/java/com/fizz/business/form/CalcPdiPlanForm.java @@ -1,7 +1,6 @@ package com.fizz.business.form; -import com.fizz.business.vo.ModSetupResultVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,6 +27,9 @@ public class CalcPdiPlanForm { @ApiModelProperty(value = "道次数") private Integer passno; + @ApiModelProperty(value = "入口宽度") + private Double entryWidth; + @ApiModelProperty(value = "退火厚度") private Integer annealThick; @@ -38,6 +40,6 @@ public class CalcPdiPlanForm { private Double exitThick; @ApiModelProperty(value = "设定值列表") - List lists; + List lists; } diff --git a/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java b/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java new file mode 100644 index 0000000..417e13d --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/ModSetupResultCalcForm.java @@ -0,0 +1,25 @@ +package com.fizz.business.form; + + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ModSetupResultCalcForm { + + @ApiModelProperty(value = "入口厚度") + private Float entryThick; + + @ApiModelProperty(value = "出口厚度") + private Float exitThick; + + @ApiModelProperty(value = "入口张力") + private Float entryTension; + + @ApiModelProperty(value = "出口张力") + private Float exitTension; + + + + +} diff --git a/business/src/main/java/com/fizz/business/mapper/ModCoilMapMapper.java b/business/src/main/java/com/fizz/business/mapper/ModCoilMapMapper.java new file mode 100644 index 0000000..2f53238 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/ModCoilMapMapper.java @@ -0,0 +1,11 @@ +package com.fizz.business.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.ModCoilMap; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ModCoilMapMapper extends BaseMapper { + // 你可以在这里添加自定义查询方法 +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/mapper/ProMatmapMapper.java b/business/src/main/java/com/fizz/business/mapper/ProMatmapMapper.java new file mode 100644 index 0000000..e008ab9 --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/ProMatmapMapper.java @@ -0,0 +1,12 @@ +package com.fizz.business.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.ProMatmap; + +public interface ProMatmapMapper extends BaseMapper { + + int updateMatidByDisplayName(String matid); + + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java index dbaaed0..c06fbe2 100644 --- a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java +++ b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java @@ -8,9 +8,12 @@ import com.google.common.collect.Lists; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.messaging.handler.annotation.Headers; +import org.springframework.messaging.handler.annotation.Payload; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Map; @Log4j2 @Component @@ -18,13 +21,13 @@ public class RabbitQueueListener { public static List measureList = Lists.newArrayList(); private Double LastRolledLength = 0d; - @RabbitListener(queues = CommonConstants.RabbitMQ.RECEIVE_MODEL) - @RabbitHandler - public void onHmiMessage(String message) { - log.info("消费端ProcData: " + message); - - //socket - } +// @RabbitListener(queues = CommonConstants.RabbitMQ.RECEIVE_MODEL) +// @RabbitHandler +// public void onHmiMessage(String message) { +// log.info("消费端ProcData: " + message); +// +// //socket +// } @RabbitListener(queues = CommonConstants.RabbitMQ.RECEIVE_REAL_TIME) @RabbitHandler @@ -44,4 +47,25 @@ public class RabbitQueueListener { //socket WebSocketUtil.sendMessage(WsTypeEnum.track_measure,message); } + + + + @RabbitListener(queues = CommonConstants.RabbitMQ.RECEIVE_MODEL) + @RabbitHandler + public void receiveMessage(@Payload String message, @Headers Map headers) { + // 获取 messageId + String messageId = (String) headers.get("amqp_messageId"); + + // 根据 messageId 进行不同的消息处理 + System.out.println("Received message with ID: " + messageId); + System.out.println("Message Content: " + message); + + // 处理消息逻辑 + if ("someUniqueMessageId".equals(messageId)) { + // 针对特定的消息ID进行处理 + } else { + // 默认的处理逻辑 + } + } + } \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java b/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java index 0563e6f..bed20b4 100644 --- a/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java +++ b/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java @@ -26,7 +26,7 @@ public interface CrmPdiPlanService extends IService { void updateCrmPdiPlanById(ChangePlanStatusForm form); - boolean editCoilInfo(CrmPdiPlanForm coilid); + String editCoilInfo(CrmPdiPlanForm coilid); - void calcSetup(CalcPdiPlanForm coilid); + String calcSetup(CalcPdiPlanForm coilid); } diff --git a/business/src/main/java/com/fizz/business/service/ModCoilMapService.java b/business/src/main/java/com/fizz/business/service/ModCoilMapService.java new file mode 100644 index 0000000..f0f42dd --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ModCoilMapService.java @@ -0,0 +1,10 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.ModCoilMap; + +public interface ModCoilMapService extends IService { + void saveModCoilInfo(ModCoilMap modCoilMap); + + // 你可以添加自定义的业务方法 +} diff --git a/business/src/main/java/com/fizz/business/service/ProMatmapService.java b/business/src/main/java/com/fizz/business/service/ProMatmapService.java new file mode 100644 index 0000000..dff7b27 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ProMatmapService.java @@ -0,0 +1,10 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.ProMatmap; + +public interface ProMatmapService extends IService { + void updateMatid(String matid); + + // 你可以添加自定义的业务方法 +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java index 5618d0b..2026170 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java @@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fizz.business.domain.CrmPdiPlan; +import com.fizz.business.domain.ModCoilMap; import com.fizz.business.form.*; import com.fizz.business.mapper.CrmPdiPlanMapper; import com.fizz.business.service.CrmPdiPlanService; +import com.fizz.business.service.ModCoilMapService; import com.fizz.business.service.ModSetupResultService; +import com.fizz.business.service.ProMatmapService; import com.fizz.business.vo.CrmPdiPlanVO; import com.fizz.business.vo.ModSetupResultVO; import com.fizz.business.vo.PdiPlanSetupInfoVO; @@ -28,15 +31,22 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if (coilid.equals("ONLINE")){ + if (coilid.equals("ONLINE")) { queryWrapper.eq("STATUS", coilid); CrmPdiPlan one = this.getOne(queryWrapper); return BeanUtil.copyProperties(one, CrmPdiPlanVO.class); @@ -63,6 +73,7 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl listAll(PlanQueryForm form) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("STATUS", "NEW","READY"); + queryWrapper.in("STATUS", "NEW", "READY"); return BeanUtil.copyToList(this.list(), CrmPdiPlanVO.class); } @@ -104,8 +118,8 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CrmPdiPlan::getCoilid,coilid); + queryWrapper.eq(CrmPdiPlan::getCoilid, coilid.getCoilid()); - CrmPdiPlan one = this.getOne(queryWrapper); + CrmPdiPlan one = this.baseMapper.selectOne(queryWrapper); - boolean flag; - if (one == null){ + if (one == null) { CrmPdiPlan bean = BeanUtil.toBean(coilid, CrmPdiPlan.class); - + bean.setStatus("NEW"); - bean.setSeqid(bean.getSeqid()+ 1); + bean.setSeqid(bean.getSeqid() + 1); - flag = this.save(bean); + this.baseMapper.insert(bean); - }else { - - BeanUtil.copyProperties(coilid,one); + + } else { + + BeanUtil.copyProperties(coilid, one); one.setStatus("NEW"); - flag = this.updateById(one); + + this.baseMapper.updateById(one); } CalcPdiPlanForm calcPdiPlanForm = new CalcPdiPlanForm(); - + + List calcForms = BeanUtil.copyToList(coilid.getLists(), ModSetupResultCalcForm.class); + calcPdiPlanForm.setGrade(coilid.getGrade()); calcPdiPlanForm.setOperid(coilid.getOperid()); calcPdiPlanForm.setAnnealThick(coilid.getAnnealThick()); + calcPdiPlanForm.setEntryWidth(coilid.getEntryWidth()); calcPdiPlanForm.setExitThick(coilid.getExitThick()); calcPdiPlanForm.setPassno(coilid.getPassno()); calcPdiPlanForm.setEntryThick(coilid.getEntryThick()); calcPdiPlanForm.setOperMode(coilid.getOperMode()); - calcPdiPlanForm.setLists(coilid.getLists()); + calcPdiPlanForm.setLists(calcForms); - modSetupResultService.calcSetup(calcPdiPlanForm); - - return flag; + return modSetupResultService.calcSetup(calcPdiPlanForm); } @Override - public void calcSetup(CalcPdiPlanForm coilid) { - - modSetupResultService.calcSetup(coilid); + public String calcSetup(CalcPdiPlanForm coilid) { + + return modSetupResultService.calcSetup(coilid); } diff --git a/business/src/main/java/com/fizz/business/service/impl/ModCoilMapServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ModCoilMapServiceImpl.java new file mode 100644 index 0000000..b78ad95 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/impl/ModCoilMapServiceImpl.java @@ -0,0 +1,21 @@ +package com.fizz.business.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fizz.business.domain.ModCoilMap; +import com.fizz.business.mapper.ModCoilMapMapper; +import com.fizz.business.service.ModCoilMapService; +import org.springframework.stereotype.Service; + +@Service +public class ModCoilMapServiceImpl extends ServiceImpl implements ModCoilMapService { + + + @Override + public void saveModCoilInfo( ModCoilMap modCoilMap){ + + this.baseMapper.insert(modCoilMap); + + } + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java index 6937be0..350c676 100644 --- a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java @@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fizz.business.constants.CommonConstants; +import com.fizz.business.constants.enums.WsTypeEnum; import com.fizz.business.domain.ModSetupResult; import com.fizz.business.form.CalcPdiPlanForm; import com.fizz.business.form.ModSetupResultForm; import com.fizz.business.mapper.ModSetupResultMapper; import com.fizz.business.service.ModSetupResultService; +import com.fizz.business.utils.WebSocketUtil; +import com.fizz.business.vo.ModSetupResultKeyVO; import com.fizz.business.vo.ModSetupResultVO; import org.springframework.amqp.core.Message; import org.springframework.amqp.core.MessageProperties; @@ -20,6 +23,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.time.ZoneOffset; import java.util.List; @Service @@ -32,61 +37,92 @@ public class ModSetupResultServiceImpl extends ServiceImpl list(ModSetupResultForm form) { - // 确保各个字段的非空验证 - if (StringUtils.isEmpty(form.getGrade()) || form.getAnnealThick() == null || - form.getEntryThick() == null || form.getExitThick() == null || form.getPassno() == null) { - throw new IllegalArgumentException("必要的字段缺失"); - } - - // 去除Double类型的字段的小数位 - // 获取厚度并处理 - int annealThick = Math.round(form.getAnnealThick() * 100); // 乘以100并四舍五入 - int entryThick = (int) Math.round(form.getEntryThick() * 100); // 乘以100并四舍五入 - int exitThick = (int) Math.round(form.getExitThick() * 100); // 乘以100并四舍五入 - - // 格式化为三位数字 - String annealThickStr = String.format("%03d", annealThick); - String entryThickStr = String.format("%03d", entryThick); - String exitThickStr = String.format("%03d", exitThick); - - // 根据字段构建 calcId - String calcId = form.getGrade() + annealThickStr + entryThickStr + exitThickStr + form.getPassno(); +// // 确保各个字段的非空验证 +// if (StringUtils.isEmpty(form.getGrade()) || form.getAnnealThick() == null || +// form.getEntryThick() == null || form.getExitThick() == null || form.getPassno() == null) { +// throw new IllegalArgumentException("必要的字段缺失"); +// } +// +// // 去除Double类型的字段的小数位 +// // 获取厚度并处理 +// int annealThick = Math.round(form.getAnnealThick() * 100); // 乘以100并四舍五入 +// int entryThick = (int) Math.round(form.getEntryThick() * 100); // 乘以100并四舍五入 +// int exitThick = (int) Math.round(form.getExitThick() * 100); // 乘以100并四舍五入 +// +// // 格式化为三位数字 +// String annealThickStr = String.format("%03d", annealThick); +// String entryThickStr = String.format("%03d", entryThick); +// String exitThickStr = String.format("%03d", exitThick); +// +// // 根据字段构建 calcId +// String calcId = form.getGrade() + annealThickStr + entryThickStr + exitThickStr + form.getPassno(); // 实际查询代码（根据 calcId 查询数据） // 这里假设查询方法为根据 calcId 查找结果 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ModSetupResult::getCalcId, calcId); - - List results = this.baseMapper.selectList(queryWrapper); +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(ModSetupResult::getCalcId, calcId); - return BeanUtil.copyToList(results, ModSetupResultVO.class); + return this.getSetupByCoilid(form.getCoilId()); } @Override public String calcSetup(CalcPdiPlanForm form) { //发送MQ - MessageProperties props = MessagePropertiesBuilder.newInstance() - .setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN) - .setMessageId("SETUP_CALL") - .build(); - rabbitTemplate.send(CommonConstants.RabbitMQ.SEND_MODEL,new Message(JSONUtil.toJsonStr(form).getBytes(StandardCharsets.UTF_8),props)); +// MessageProperties props = MessagePropertiesBuilder.newInstance() +// .setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN) +// .setMessageId("CALL_SETUP") +// .build(); +// rabbitTemplate.send(CommonConstants.RabbitMQ.SEND_MODEL,new Message(JSONUtil.toJsonStr(form).getBytes(StandardCharsets.UTF_8),props)); + + // 获取当前时间的毫秒级时间戳 + long timestampMillis = LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli(); + + // 生成字符串：由 coilid 和当前时间戳拼接而成 + String resultString = form.getCoilid() + timestampMillis; + + // 先返回构建的字符串 + // 这里是返回值先返回，后面调用副作用的逻辑 + + // 然后调用mockCalcResult方法，它是异步的，不会影响返回值 + // mockCalcResult将会在返回之后执行，不影响calcSetup的返回 + new Thread(() -> mockCalcResult(form.getCoilid(), resultString)).start(); + + // 返回值会先返回给调用者 + return resultString; + } + + private void mockCalcResult(String coilid, String string) { + + List setup = this.getSetupByCoilid(coilid); + + + ModSetupResultKeyVO modSetupResultKeyVO = new ModSetupResultKeyVO(); + modSetupResultKeyVO.setKey(string); + modSetupResultKeyVO.setLists(setup); + //socket + WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr(modSetupResultKeyVO)); + - return null; } @Override public String retrySetup(String coilid) { - //发送MQ - MessageProperties props = MessagePropertiesBuilder.newInstance() - .setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN) - .setMessageId("SETUP_CALL") - .build(); - rabbitTemplate.send(CommonConstants.RabbitMQ.SEND_MODEL,new Message(coilid.getBytes(StandardCharsets.UTF_8),props)); + try { + //发送MQ + MessageProperties props = MessagePropertiesBuilder.newInstance() + .setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN) + .setMessageId("CALL_SETUP") + .build(); + rabbitTemplate.send(CommonConstants.RabbitMQ.SEND_MODEL,new Message(coilid.getBytes(StandardCharsets.UTF_8),props)); + }catch (Exception e){ - return null; + + } + + return ""; } @Override @@ -103,4 +139,6 @@ public class ModSetupResultServiceImpl extends ServiceImpl implements ProMatmapService { + + @Resource + private ProMatmapMapper proMatmapMapper; + + + @Override + public void updateMatid(String matid) { + proMatmapMapper.updateMatidByDisplayName(matid); + } + +} \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/vo/ModSetupResultKeyVO.java b/business/src/main/java/com/fizz/business/vo/ModSetupResultKeyVO.java new file mode 100644 index 0000000..94728cf --- /dev/null +++ b/business/src/main/java/com/fizz/business/vo/ModSetupResultKeyVO.java @@ -0,0 +1,15 @@ +package com.fizz.business.vo; + + +import lombok.Data; + +import java.util.List; + +@Data +public class ModSetupResultKeyVO { + + String key; + + List lists; + +} diff --git a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java index d93876c..74b8fe4 100644 --- a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java +++ b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java @@ -103,16 +103,4 @@ public class ModSetupResultVO { @ApiModelProperty(value = "计算ID 实际用的这个值") private String calcId; - @ApiModelProperty(value = "记录插入时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime insdate; - - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - @ApiModelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; - } diff --git a/business/src/main/resources/mapper/ProMatmapMapper.xml b/business/src/main/resources/mapper/ProMatmapMapper.xml new file mode 100644 index 0000000..48756fc --- /dev/null +++ b/business/src/main/resources/mapper/ProMatmapMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + UPDATE pro_matmap + SET matid = #{matid} + WHERE display_name = 'MILL' + + + + \ No newline at end of file diff --git a/business/src/main/resources/rabbitmq.http b/business/src/main/resources/rabbitmq.http new file mode 100644 index 0000000..e69de29