Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2024-01-31 9cc00de219965372f23708fa08d04347745668f9

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java

@@ -8,10 +8,13 @@
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.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;
@@ -27,6 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: 大屏车间信息
@@ -165,6 +169,7 @@

    /**
     * 获取设备列表
     *
     * @return
     */
    @AutoLog(value = "大屏车间信息-根据大屏车间id查询设备列表")
@@ -204,7 +209,7 @@
    @ApiOperation(value = "大屏车间信息-批量删除指定大屏车间和设备关系", notes = "大屏车间信息-批量删除指定大屏车间和设备关系")
    @DeleteMapping(value = "/deleteWorkshopEquipmentBatch")
    public Result deleteWorkshopEquipmentBatch(@RequestParam(name = "workshopId") String workshopId,
                                          @RequestParam(name = "equipmentIds", required = true) String equipmentIds) {
                                               @RequestParam(name = "equipmentIds", required = true) String equipmentIds) {
        try {
            LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).in(MdcWorkshopEquipment::getEquipmentId, Arrays.asList(equipmentIds.split(",")));
@@ -221,22 +226,25 @@
    @AutoLog(value = "大屏车间信息-新增大屏车间与设备关系")
    @ApiOperation(value = "大屏车间信息-新增大屏车间与设备关系", notes = "大屏车间信息-新增大屏车间与设备关系")
    @PostMapping(value = "/addWorkshopEquipment")
    public Result addWorkshopEquipment(MdcWorkshopEquipmentVo mdcWorkshopEquipmentVo) {
    public Result addWorkshopEquipment(@RequestBody MdcWorkshopEquipmentVo mdcWorkshopEquipmentVo) {
        try {
            String workshopId = mdcWorkshopEquipmentVo.getWorkshopId();
            for (String equipmentId : mdcWorkshopEquipmentVo.getEquipmentIdList()) {
                MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
                mdcWorkshopEquipment.setWorkshopId(workshopId);
                mdcWorkshopEquipment.setEquipmentId(equipmentId);
                mdcWorkshopEquipment.setCoordinateLeft(0);
                mdcWorkshopEquipment.setCoordinateTop(0);
                mdcWorkshopEquipment.setVw(100);
                mdcWorkshopEquipment.setVh(100);
                LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
                queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
                MdcWorkshopEquipment one = mdcWorkshopEquipmentService.getOne(queryWrapper);
                if (one == null) {
                    mdcWorkshopEquipmentService.save(mdcWorkshopEquipment);
                List<MdcEquipment> list = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
                if (list != null && !list.isEmpty()) {
                    MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
                    mdcWorkshopEquipment.setWorkshopId(workshopId);
                    mdcWorkshopEquipment.setEquipmentId(equipmentId);
                    mdcWorkshopEquipment.setCoordinateLeft(0);
                    mdcWorkshopEquipment.setCoordinateTop(0);
                    mdcWorkshopEquipment.setVw(100);
                    mdcWorkshopEquipment.setVh(100);
                    LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
                    queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
                    MdcWorkshopEquipment one = mdcWorkshopEquipmentService.getOne(queryWrapper);
                    if (one == null) {
                        mdcWorkshopEquipmentService.save(mdcWorkshopEquipment);
                    }
                }
            }
            return Result.OK("添加成功！");
@@ -245,4 +253,43 @@
        }
    }

    /**
     * 新增大屏车间与设备关系
     */
    @AutoLog(value = "大屏车间信息-首页获取大屏入口列表")
    @ApiOperation(value = "大屏车间信息-首页获取大屏入口列表", notes = "大屏车间信息-首页获取大屏入口列表")
    @GetMapping(value = "/getWorkshopList")
    public Result<List<MdcWorkshopInfo>> getWorkshopList() {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        List<MdcWorkshopInfo> list = mdcWorkshopInfoService.listByUser(userId);
        return Result.OK(list);
    }

    /**
     * 大屏
     */
    @AutoLog(value = "大屏车间信息-大屏信息")
    @ApiOperation(value = "大屏车间信息-大屏信息", notes = "大屏车间信息-大屏信息")
    @GetMapping(value = "/getBigScreenInfo")
    public Result getBigScreenInfo(@RequestParam(name = "workshopId", required = true) String workshopId) {
        List<MdcBigScreenEquipmentDto> result = mdcWorkshopInfoService.getBigScreenInfo(workshopId);
        return Result.OK(result);
    }

    /**
     * 大屏
     */
    @AutoLog(value = "大屏车间信息-保存设备坐标大小信息")
    @ApiOperation(value = "大屏车间信息-保存设备坐标大小信息", notes = "大屏车间信息-保存设备坐标大小信息")
    @PutMapping(value = "/saveEquipmentCoordinate")
    public Result saveEquipmentCoordinate(@RequestBody List<MdcWorkshopEquipment> workshopEquipmentList) {
        try {
            mdcWorkshopEquipmentService.updateBatchById(workshopEquipmentList);
            return Result.OK("保存成功！");
        } catch (Exception e) {
            return Result.error("保存失败！");
        }
    }

}