lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -5,9 +5,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; 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; @@ -154,13 +156,18 @@ */ @AutoLog(value = "扭矩配置管理-分页查询") @ApiOperation(value = "扭矩配置管理-分页查询",notes = "扭矩配置管理-分页查询") @GetMapping("/queryWrapper") public Result<?> queryWrapper(MdcTorqueConfig mdcTorqueConfig, @GetMapping("/pageList") public Result pageList(MdcTorqueConfig mdcTorqueConfig, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { Page<MdcTorqueConfig> page=new Page<>(pageNo,pageSize); IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.queryPageList(page,req); if (mdcTorqueConfig==null){ return Result.error("请传递有效参数"); } LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId= user.getId(); Page page=new Page(pageNo,pageSize); IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.pageList(userId,page,req,mdcTorqueConfig); return Result.ok(mdcTorqueConfigIPage); } } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
@@ -1,6 +1,7 @@ package org.jeecg.modules.mdc.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -14,6 +15,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; /** * @Description: 扭矩配置管理 @@ -100,4 +102,22 @@ @Excel(name = "更新人",width = 15) @ApiModelProperty("更新人") private String updateBy; /** * 前台传入，判断每个id */ @TableField(exist = false) private String parentId; /** * 前台传入 车间层级：1，部门层级：2 */ @TableField(exist = false) private String typeTree; /** * 部门parentId 关联子集id */ @TableField(exist = false) private List<String> mdcSectionIds; } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
@@ -23,11 +23,12 @@ */ List<MdcTorqueConfig> findSpindleRunningCurve(@Param("torqueValue") float torqueValue,@Param("equipmentId") String equipmentId); /** * 分页查询 * @param pageData * @param equipmentId * @param mdcTorqueConfig * @return */ IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData,@Param("equipmentId") String equipmentId); IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData,@Param("mdcTorqueConfig") MdcTorqueConfig mdcTorqueConfig); } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
@@ -7,5 +7,17 @@ </select> <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig"> select mtc.* from mdc_torque_config mtc,mdc_equipment me where mtc.equipment_id=me.equipment_id <if test="mdcTorqueConfig.equipmentName !=null and mdcTorqueConfig.equipmentName !='' "> and mtc.equipment_name like concat(concat('%',#{mdcTorqueConfig.equipmentName}),'%') </if> <if test="mdcTorqueConfig.equipmentId !=null and mdcTorqueConfig.equipmentId !='' "> and mtc.equipment_id like concat(concat('%',#{mdcTorqueConfig.equipmentId}),'%') </if> <if test="mdcTorqueConfig.mdcSectionIds !=null || mdcTorqueConfig.mdcSectionIds.size() > 0 "> and mtc.equipment_id in <foreach collection="mdcTorqueConfig.mdcSectionIds" item="id" index="index" open="(" close=")" separator=","> #{id} </foreach> </if> </select> </mapper> lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
@@ -57,11 +57,14 @@ */ List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue,String equipmentId); /** * 分页查询 * @param userId * @param page * @param req * @param mdcTorqueConfig * @return */ IPage<MdcTorqueConfig> queryPageList(Page page,HttpServletRequest req); IPage<MdcTorqueConfig> pageList(String userId,Page page,HttpServletRequest req,MdcTorqueConfig mdcTorqueConfig); } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
@@ -9,13 +9,16 @@ import org.apache.poi.util.StringUtil; 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.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; /** @@ -26,6 +29,8 @@ @Service public class MdcTorqueConfigServiceImpl extends ServiceImpl<MdcTorqueConfigMapper, MdcTorqueConfig> implements IMdcTorqueConfigService{ @Autowired private IMdcEquipmentService mdcEquipmentService; @Override public MdcTorqueConfig queryById(String id) { @@ -58,14 +63,34 @@ } @Override public IPage<MdcTorqueConfig> queryPageList(Page page, HttpServletRequest req) { QueryWrapper<MdcTorqueConfig> queryWrapper=new QueryWrapper(); //检查请求体中是否有设备编号字段，存在则返回true if (req.getParameterMap().containsKey("equipmentId")){ //获取设备编号的值，不为空则添加到查询 String equipmentId=req.getParameterMap().get("equipmentId")[0]; queryWrapper.eq(StringUtils.isNotBlank(equipmentId),"equipment_id",equipmentId); public IPage<MdcTorqueConfig> pageList(String userId, Page page, HttpServletRequest req, MdcTorqueConfig mdcTorqueConfig) { List<String> equipmentIds=new ArrayList<>(); if (StringUtils.isNotEmpty(mdcTorqueConfig.getParentId())&&StringUtils.isEmpty(mdcTorqueConfig.getEquipmentId())){ if ("2".equals(mdcTorqueConfig.getTypeTree())){ //部门层级 equipmentIds=mdcEquipmentService.getEquipmentIdsByDepart(userId,mdcTorqueConfig.getParentId()); }else { //产线层级 equipmentIds=mdcEquipmentService.getEquipmentIdsProduction(userId,mdcTorqueConfig.getParentId()); } }else if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())){ //单台设备信息 mdcTorqueConfig.setMdcSectionIds(Collections.singletonList(mdcTorqueConfig.getEquipmentId())); }else { //查询用户所拥有的所有设备信息 if ("2".equals(mdcTorqueConfig.getTypeTree())){ //部门层级 equipmentIds=mdcEquipmentService.getEquipmentIdsByDepart(userId,null); }else { equipmentIds=mdcEquipmentService.getEquipmentIdsProduction(userId,null); } } return this.page(page,queryWrapper); if (mdcTorqueConfig.getMdcSectionIds()==null||mdcTorqueConfig.getMdcSectionIds().isEmpty()){ mdcTorqueConfig.setMdcSectionIds(equipmentIds); } if (mdcTorqueConfig.getMdcSectionIds()==null||mdcTorqueConfig.getMdcSectionIds().isEmpty()){ return null; } return this.baseMapper.pageList(page,mdcTorqueConfig); } }
