lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -1,6 +1,7 @@ package org.jeecg.modules.mdc.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -12,7 +13,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.mdc.entity.MdcTorqueConfig; import org.jeecg.modules.mdc.service.IMdcTorqueConfigService; import org.jeecg.modules.mdc.service.impl.MdcTorqueConfigServiceImpl; import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -37,6 +38,7 @@ /** * æ ¹æ®idæ¥è¯¢ * * @param id * @return */ @@ -50,20 +52,28 @@ } /** * æ°å¢ * @param mdcTorqueConfig * æç©é 置管ç-æ°å¢ * * @param torqueVo * @return */ @AutoLog(value = "æç©é 置管ç-æ°å¢") @ApiOperation(value = "æç©é 置管ç-æ°å¢", notes = "æç©é 置管ç-æ°å¢") @PostMapping("/addMdcTorqueConfig") public Result<?> addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) { boolean flag = mdcTorqueConfigService.addTorque(mdcTorqueConfig); return flag ? Result.ok("æ°å¢æå") : Result.error("æ°å¢å¤±è´¥"); public Result addMdcTorqueConfig(@RequestBody MdcTorqueConfigVo torqueVo) { if (StringUtils.isBlank(torqueVo.getEquipmentIds())) { return Result.error("æªéæ©è®¾å¤ï¼è¯·ææ¥"); } boolean result = mdcTorqueConfigService.addTorque(torqueVo); if (!result) { return Result.error("æ¶é´æ®µæ°æ®å·²åå¨ï¼è¯·ææ¥"); } return Result.OK("æ°å¢æå"); } /** * ä¿®æ¹ * * @param mdcTorqueConfig * @return */ @@ -77,6 +87,7 @@ /** * æ ¹æ®idå é¤æç©é ç½® * * @param id * @return */ @@ -90,6 +101,7 @@ /** * æ¹éå é¤ * * @param ids * @return */ @@ -104,12 +116,13 @@ /** * 导åºexcel * * @param request * @param mdcTorqueConfig * @return */ @AutoLog(value = "æç©é 置管ç-导åº") @ApiOperation(value = "æç©é 置管ç-导åº",notes = "æç©é 置管ç-导åº") @ApiOperation(value = "æç©é 置管ç-导åº", notes = "æç©é 置管ç-导åº") @RequestMapping("/exportXls") public ModelAndView exportXls(HttpServletRequest request, MdcTorqueConfig mdcTorqueConfig) { return super.exportXls(request, mdcTorqueConfig, MdcTorqueConfig.class, "æç©é 置管ç导åº"); @@ -117,12 +130,13 @@ /** * å¯¼å ¥excel * * @param request * @param response * @return */ @AutoLog(value = "æç©é 置管ç-å¯¼å ¥") @ApiOperation(value = "æç©é 置管ç-å¯¼å ¥",notes = "æç©é 置管ç-å¯¼å ¥") @ApiOperation(value = "æç©é 置管ç-å¯¼å ¥", notes = "æç©é 置管ç-å¯¼å ¥") @RequestMapping("/importExcel") public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, MdcTorqueConfig.class); @@ -130,6 +144,7 @@ /** * æ ¹æ®æç©å¼çæ主轴è¿è¡æ²çº¿ * * @param torqueValue * @return */ @@ -144,6 +159,7 @@ /** * å页æ¥è¯¢ * * @param mdcTorqueConfig * @param pageNo * @param pageSize lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -52,6 +53,24 @@ private String equipmentName; /** * å¼å§æ¶é´ */ @Excel(name = "å¼å§æ¶é´", width = 15) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("å¼å§æ¶é´") private Date startTime; /** * ç»ææ¶é´ */ @Excel(name = "ç»ææ¶é´", width = 15) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("ç»ææ¶é´") private Date endTime; /** * æ¥æ */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.mdc.entity.MdcTorqueConfig; import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -17,20 +18,24 @@ /** * æ ¹æ®idæ¥è¯¢ * * @param id * @return */ MdcTorqueConfig queryById(String id); /** * æ°å¢æç©é ç½® * @param mdcTorqueConfig * æ·»å æç©é ç½® * * @param torqueVo * @return */ Boolean addTorque(MdcTorqueConfig mdcTorqueConfig); Boolean addTorque(MdcTorqueConfigVo torqueVo); /** * ç¼è¾æç©é ç½® * * @param mdcTorqueConfig * @return */ @@ -38,6 +43,7 @@ /** * æ ¹æ®idå é¤ * * @param id * @return */ @@ -45,6 +51,7 @@ /** * æ¹éå é¤ * * @param ids * @return */ @@ -52,6 +59,7 @@ /** * çæ主轴è¿è¡æ²çº¿ * * @param torqueValue * @return */ @@ -60,6 +68,7 @@ /** * å页æ¥è¯¢ * * @param userId * @param page * @param req lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
@@ -1,5 +1,6 @@ package org.jeecg.modules.mdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,19 +8,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.apache.poi.util.StringUtil; import org.jeecg.modules.mdc.entity.MdcEquipment; import org.jeecg.modules.mdc.entity.MdcTorqueConfig; import org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper; import org.jeecg.modules.mdc.service.IMdcEquipmentService; import org.jeecg.modules.mdc.service.IMdcTorqueConfigService; import org.jeecg.modules.mdc.util.DateUtils; import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.*; /** * @Description: æç©é 置管ç @@ -38,8 +39,30 @@ } @Override public Boolean addTorque(MdcTorqueConfig mdcTorqueConfig) { return this.save(mdcTorqueConfig); public Boolean addTorque(MdcTorqueConfigVo torqueVo) { boolean result = false; String[] equipmentIds = torqueVo.getEquipmentIds().split(","); List<MdcTorqueConfig> mdcTorqueConfigList = new ArrayList<>(); for (String equipmentId : equipmentIds) { Date startTime = DateUtils.getFormatDate(torqueVo.getStartTime(), DateUtils.STR_DATE_TIME_SMALL); Date endTime = DateUtils.getFormatDate(torqueVo.getEndTime(), DateUtils.STR_DATE_TIME_SMALL); MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId); //æ ¹æ®Idæ¥è¯¢æ¤è®¾å¤ä¿¡æ¯ LambdaQueryWrapper<MdcTorqueConfig> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MdcTorqueConfig::getEquipmentId, equipmentId); queryWrapper.orderByAsc(MdcTorqueConfig::getStartTime); List<MdcTorqueConfig> mdcTorqueConfigs = this.baseMapper.selectList(queryWrapper); MdcTorqueConfig mdcTorqueConfig = new MdcTorqueConfig(); mdcTorqueConfig.setStartTime(startTime); mdcTorqueConfig.setEndTime(endTime); mdcTorqueConfig.setEquipmentId(equipmentId); mdcTorqueConfig.setEquipmentName(mdcEquipment.getEquipmentName()); boolean b = super.save(mdcTorqueConfig); if (b) { result = true; } } return result; } @Override lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcTorqueConfigVo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,25 @@ package org.jeecg.modules.mdc.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @Data public class MdcTorqueConfigVo { private String id; private String startTime; /*ç»ææ¶é´*/ private String endTime; private String equipmentId; /*设å¤å称*/ private String equipmentName; /*设å¤ç»*/ private String equipmentIds; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date torqueDate; private float torqueValue; }
