删除无用代码

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/service/IHeatsActualsService.java

@@ -11,6 +11,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IHeatsActualsService extends IService<HeatsActuals> {
 
-    void addC(HeatsActuals heatsActuals);
-
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/service/impl/HeatsActualsServiceImpl.java

@@ -1,17 +1,11 @@
 package org.jeecg.modules.actualControl.heatsActuals.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.jeecg.common.util.oConvertUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.actualControl.heatsActuals.entity.HeatsActuals;
 import org.jeecg.modules.actualControl.heatsActuals.mapper.HeatsActualsMapper;
 import org.jeecg.modules.actualControl.heatsActuals.service.IHeatsActualsService;
-import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
-import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 炉次实绩
  * @Author: jeecg-boot
@@ -21,23 +15,4 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class HeatsActualsServiceImpl extends ServiceImpl<HeatsActualsMapper, HeatsActuals> implements IHeatsActualsService {
 
-    @Autowired
-    private IRulerDefaultConfigService rulerDefaultConfigService;
-
-    @Override
-    public void addC(HeatsActuals heatsActuals) {
-        LambdaQueryWrapper<HeatsActuals> queryWrapper = new LambdaQueryWrapper<HeatsActuals>().eq(HeatsActuals::getHeatsCode, heatsActuals.getHeatsCode())
-                .eq(HeatsActuals::getCasterCode, heatsActuals.getCasterCode())
-                .eq(HeatsActuals::getLadleCode, heatsActuals.getLadleCode());
-        HeatsActuals actuals = baseMapper.selectOne(queryWrapper);
-        if(oConvertUtils.isNotEmpty(actuals)&&oConvertUtils.isNotEmpty(actuals.getId())){
-            heatsActuals.setId(actuals.getId());
-            baseMapper.updateById(heatsActuals);
-        }else {
-            baseMapper.insert(heatsActuals);
-            RulerDefaultConfig last = rulerDefaultConfigService.getLast(heatsActuals.getCasterCode());
-            last.setPourHeats(heatsActuals.getHeatsCode());
-            rulerDefaultConfigService.updateById(last);
-        }
-    }
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/controller/RulerDefaultConfigController.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.billet.billetHotsend.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -11,11 +10,8 @@ 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.util.oConvertUtils;
 import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
 import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
-import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingAndLoadingVehicles;
-import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingAndLoadingVehiclesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -23,7 +19,6 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
-import java.util.List;
 
 /**
 * @Description: 定尺默认配置
@@ -36,11 +31,9 @@ import java.util.List;
 @RequestMapping("/rulerDefaultConfig/rulerDefaultConfig")
 @Slf4j
 public class RulerDefaultConfigController extends JeecgController<RulerDefaultConfig, IRulerDefaultConfigService> {
-   @Autowired
-   private IRulerDefaultConfigService rulerDefaultConfigService;
 
-   @Autowired
-   private IStackingAndLoadingVehiclesService savService;
+    @Autowired
+    private IRulerDefaultConfigService rulerDefaultConfigService;
 
    /**
     * 分页列表查询
@@ -64,38 +57,6 @@ public class RulerDefaultConfigController extends JeecgController<RulerDefaultCo
        return Result.OK(pageList);
    }
 
-   /**
-    *   添加
-    *
-    * @param rulerDefaultConfig
-    * @return
-    */
-   @AutoLog(value = "定尺默认配置-添加")
-   @ApiOperation(value="定尺默认配置-添加", notes="定尺默认配置-添加")
-   @PostMapping(value = "/add")
-   public Result<?> add(@RequestBody RulerDefaultConfig rulerDefaultConfig) {
-       RulerDefaultConfig last = rulerDefaultConfigService.getLast(rulerDefaultConfig.getCastMachine());
-       if(last!=null&& oConvertUtils.isNotEmpty(last.getId())){
-           rulerDefaultConfig.setId(last.getId());
-           if(oConvertUtils.isNotEmpty(rulerDefaultConfig.getCarNum())
-                   &&!rulerDefaultConfig.getCarNum().equals(last.getCarNum())){
-               List<StackingAndLoadingVehicles> lastList = savService.getListByCarNum(last.getCarNum());
-               List<StackingAndLoadingVehicles> newList = savService.getListByCarNum(rulerDefaultConfig.getCarNum());
-               if(oConvertUtils.listIsEmpty(newList)){
-                   if(oConvertUtils.listIsNotEmpty(lastList)){
-                       LambdaUpdateWrapper<StackingAndLoadingVehicles> lambdaUpdateWrapper = new LambdaUpdateWrapper<StackingAndLoadingVehicles>();
-//                       lambdaUpdateWrapper.eq(StackingAndLoadingVehicles::getCarNum, last.getCarNum()).set(StackingAndLoadingVehicles::getCarNum, rulerDefaultConfig.getCarNum());
-                       savService.update(lambdaUpdateWrapper);
-                   }
-               }else{
-                   return Result.error("该车正在装车!");
-               }
-           }
-       }
-       rulerDefaultConfigService.saveOrUpdate(rulerDefaultConfig);
-       return Result.OK("修改成功！");
-   }
-
    /**
     *  编辑
     *
@@ -178,11 +139,4 @@ public class RulerDefaultConfigController extends JeecgController<RulerDefaultCo
        return super.importExcel(request, response, RulerDefaultConfig.class);
    }
 
-    @AutoLog(value = "获取最新定尺默认配置")
-    @ApiOperation(value="获取最新定尺默认配置", notes="获取最新定尺默认配置")
-    @PostMapping(value = "/queryById")
-    public Result<?> getLast(@RequestParam(name = "castMachine",defaultValue = "5") String castMachine) {
-        return Result.OK(rulerDefaultConfigService.getLast(castMachine));
-    }
-
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/IRulerDefaultConfigService.java

@@ -11,6 +11,4 @@ import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
  */
 public interface IRulerDefaultConfigService extends IService<RulerDefaultConfig> {
 
-    public RulerDefaultConfig getLast(String castMachine);
-
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/RulerDefaultConfigServiceImpl.java

@@ -1,13 +1,11 @@
 package org.jeecg.modules.billet.billetHotsend.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
 import org.jeecg.modules.billet.billetHotsend.mapper.RulerDefaultConfigMapper;
 import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 定尺默认配置
  * @Author: jeecg-boot
@@ -17,16 +15,4 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class RulerDefaultConfigServiceImpl extends ServiceImpl<RulerDefaultConfigMapper, RulerDefaultConfig> implements IRulerDefaultConfigService {
 
-    @Override
-    public RulerDefaultConfig getLast(String castMachine) {
-        LambdaQueryWrapper<RulerDefaultConfig> queryWrapper = new LambdaQueryWrapper<RulerDefaultConfig>()
-                        .eq(RulerDefaultConfig::getCastMachine,castMachine)
-                        .orderByDesc(RulerDefaultConfig::getCreateTime).last("limit 1");
-        RulerDefaultConfig rulerDefaultConfig = baseMapper.selectOne(queryWrapper);
-        if(rulerDefaultConfig==null){
-            rulerDefaultConfig = new RulerDefaultConfig();
-            rulerDefaultConfig.setCastMachine(castMachine);
-        }
-        return rulerDefaultConfig;
-    }
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/controller/StackingAndLoadingVehiclesController.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.billet.stackingAndLoadingVehicles.controller;
 
 import com.alibaba.fastjson.JSONObject;
-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;
@@ -13,15 +12,10 @@ 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.util.oConvertUtils;
-import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
-import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
-import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
-import org.jeecg.modules.billet.operateLog.service.IOperateLogService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingAndLoadingVehicles;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.UpdateBatchParams;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingAndLoadingVehiclesService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
-import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.SavVo;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,10 +23,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
  /**
  * @Description: 垛位装车
@@ -45,15 +36,10 @@ import java.util.Set;
 @RequestMapping("/billet/stackingAndLoadingVehicles")
 @Slf4j
 public class StackingAndLoadingVehiclesController extends JeecgController<StackingAndLoadingVehicles, IStackingAndLoadingVehiclesService> {
+
 	@Autowired
 	private IStackingAndLoadingVehiclesService stackingAndLoadingVehiclesService;
-	 @Autowired
-	 private IRulerDefaultConfigService rulerDefaultConfigService;
-	 @Autowired
-	 private IBilletHotsendBaseService billetHotsendBaseService;
-	 @Autowired
-	 private IOperateLogService operateLogService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -76,14 +62,6 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 		return Result.OK(pageList);
 	}
 
-
-	@ApiOperation(value="根据垛位查询堆垛列表", notes="根据垛位查询堆垛列表")
-	@GetMapping(value = "/getListBySatck")
-	public Result<?> getListBySatck(@RequestParam(name="typeConfigId") String typeConfigId){
-		List<List<StackingAndLoadingVehicles>> res =  stackingAndLoadingVehiclesService.getListBySatck(typeConfigId);
-		return Result.OK(res);
-	}
-
 	 @ApiOperation(value="基础类型堆垛ID查询堆垛信息", notes="基础类型堆垛ID查询堆垛信息")
 	 @GetMapping(value = "/getListByTypeConfigId")
 	 public Result<?> getListByTypeConfigId(@RequestParam(name="typeConfigId") String typeConfigId){
@@ -94,7 +72,7 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 	/**
 	 *   添加
 	 *
-	 * @param stackingAndLoadingVehicles
+	 * @param loadingParams
 	 * @return
 	 */
 	@AutoLog(value = "钢坯上垛-添加")
@@ -133,20 +111,6 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 		});
 	 	return Result.OK("保存成功！");
 	 }
-
-	 /**
-	  *   批量添加
-	  *
-	  * @return
-	  */
-	 @AutoLog(value = "垛位装车-批量添加")
-	 @ApiOperation(value="垛位装车-批量添加", notes="垛位装车-批量添加")
-	 @PostMapping(value = "/addBatch")
-	 public Result<String> addBatch(@RequestBody SavVo savVo) {
-		 stackingAndLoadingVehiclesService.addBatch(savVo);
-		 return Result.OK("添加成功！");
-	 }
-
 	
 	/**
 	 *  编辑
@@ -161,81 +125,6 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 		stackingAndLoadingVehiclesService.updateById(stackingAndLoadingVehicles);
 		return Result.OK("编辑成功!");
 	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "垛位装车-通过id删除")
-	@ApiOperation(value="垛位装车-通过id删除", notes="垛位装车-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		LambdaQueryWrapper<StackingAndLoadingVehicles> eq = new LambdaQueryWrapper<StackingAndLoadingVehicles>().eq(StackingAndLoadingVehicles::getId, id);
-		List<StackingAndLoadingVehicles> list = stackingAndLoadingVehiclesService.list(eq);
-		stackingAndLoadingVehiclesService.removeById(id);
-		stackingAndLoadingVehiclesService.addBilletHotsend(list,"0",null,null,"5");
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @return
-	 */
-	@AutoLog(value = "垛位装车-批量删除")
-	@ApiOperation(value="垛位装车-批量删除", notes="垛位装车-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestBody LoadingParams loadingParams) {
-		if(oConvertUtils.listIsNotEmpty(loadingParams.getStackingAndLoadingVehiclesList())){
-			List<String> ids = new ArrayList<>();
-			for (StackingAndLoadingVehicles sav : loadingParams.getStackingAndLoadingVehiclesList()) {
-				if(oConvertUtils.isNotEmpty(sav.getId()))ids.add(sav.getId());
-				if(oConvertUtils.isNotEmpty(sav.getStackAddr())){
-					sav.setStackAddr(sav.getStackAddr().substring(0,sav.getStackAddr().indexOf(",")));
-				}
-			}
-			this.stackingAndLoadingVehiclesService.removeByIds(ids);
-//			stackingAndLoadingVehiclesService.addBilletHotsend(loadingParams.getStackingAndLoadingVehiclesList(),"0",loadingParams.getCarNum(),loadingParams.getCastMachine(),"5");
-		}
-		return Result.OK("批量删除成功!");
-	}
-
-	 /**
-	  *  批量删除
-	  *
-	  * @return
-	  */
-	 @AutoLog(value = "垛位装车-批量返回")
-	 @ApiOperation(value="垛位装车-批量返回", notes="垛位装车-批量返回")
-	 @DeleteMapping(value = "/rollbackBatch")
-	 public Result<String> rollbackBatch(@RequestBody LoadingParams loadingParams) {
-		 if(oConvertUtils.listIsNotEmpty(loadingParams.getStackingAndLoadingVehiclesList())){
-			 String castMachine = null;
-			 Integer rollBack = 0;
-			 for (StackingAndLoadingVehicles sav : loadingParams.getStackingAndLoadingVehiclesList()) {
-				 if(oConvertUtils.isNotEmpty(sav.getId())&&oConvertUtils.isNotEmpty(sav.getStackAddr())){
-					 String[] strings = sav.getStackAddr().split(",");
-					 stackingAndLoadingVehiclesService.removeById(sav.getId());
-					 sav.setStackAddr(strings[0]);
-					 sav.setLayer(strings[1]);
-					 sav.setAddress(strings[2]);
-//					 sav.setCarNum(null);
-					 sav.setId(null);
-					 stackingAndLoadingVehiclesService.save(sav);
-					 if(oConvertUtils.isEmpty(castMachine)){
-					 	castMachine = sav.getStackAddr().contains("5")?"5":"6";
-					 }
-					 rollBack++;
-				 }
-			 }
-			 RulerDefaultConfig last = rulerDefaultConfigService.getLast(castMachine);
-			 if(oConvertUtils.isNotEmpty(last.getOutAmount()))last.setOutAmount(last.getOutAmount()-rollBack*4>0?last.getOutAmount()-rollBack*4:0);
-		 }
-		 return Result.OK("批量返回成功!");
-	 }
-
 
 	/**
 	 * 通过id查询
@@ -330,45 +219,6 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
 		 return Result.OK((String) jsonObject.get("success"));
 	 }
 
-     @ApiOperation(value="堆垛-发车", notes="堆垛-发车")
-     @PostMapping(value = "/startCar")
-     public Result<?> startCar(@RequestBody SavVo savVo){
-		 Integer maxAmount = stackingAndLoadingVehiclesService.startCar(savVo);
-		 if(maxAmount>=0){
-		 	return Result.error("该车最多可装入"+maxAmount+"夹");
-		 }
-		 return Result.OK("发车成功");
-     }
-
-	 @ApiOperation(value="垛位装车-保存", notes="垛位装车-保存")
-	 @PostMapping(value = "/stackCarSave")
-	 public Result<?> stackCarSave(@RequestBody LoadingParams loadingParams){
-		 stackingAndLoadingVehiclesService.stackCarSave(loadingParams);
-		 return Result.OK("保存成功");
-	 }
-
-
-	 @ApiOperation(value="获取车辆装车情况", notes="获取车辆装车情况")
-	 @PostMapping(value = "/getCarLoad")
-	 public Result<?> getCarLoad(@RequestParam String carNum){
-		 LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
-//		 wrapper.eq(StackingAndLoadingVehicles::getCarNum, carNum);
-		 List<List<StackingAndLoadingVehicles>> res =  stackingAndLoadingVehiclesService.getCarLoad(wrapper);
-		 return Result.OK(res);
-	 }
-
-	 @ApiOperation(value="堆垛-高线", notes="堆垛-高线")
-	 @PostMapping(value = "/startHeight")
-	 public Result<?> startHeight(@RequestBody SavVo savVo){
-		 Set<String> heats = new HashSet<>();
-		 for (StackingAndLoadingVehicles sav : savVo.getSavs()) {
-			heats.add(sav.getHeatNo());
-		 }
-		 if(heats.size()>3)return Result.error("一次只能选择三种炉次的钢坯");
-		 stackingAndLoadingVehiclesService.startHeight(savVo);
-		 return Result.OK("操作成功");
-	 }
-
 	 @ApiOperation(value="钢坯叛废", notes="钢坯叛废")
 	 @PostMapping(value = "/judgeDiscard")
 	 public Result<?> judgeDiscardHandle(@RequestBody LoadingParams loadingParams){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/IStackingAndLoadingVehiclesService.java

@@ -1,11 +1,9 @@
 package org.jeecg.modules.billet.stackingAndLoadingVehicles.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingAndLoadingVehicles;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingAndLoadingVehicles;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
-import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.SavVo;
 
 import java.util.List;
 
@@ -17,24 +15,6 @@ import java.util.List;
  */
 public interface IStackingAndLoadingVehiclesService extends IService<StackingAndLoadingVehicles> {
 
-    List<List<StackingAndLoadingVehicles>> getListBySatck(String typeConfigId);
-
-    void addBatch(SavVo savVo);
-
-    void loading(LoadingParams loadingParams);
-
-    Integer startCar(SavVo savVo);
-
-    List<List<StackingAndLoadingVehicles>> getCarLoad(LambdaQueryWrapper<StackingAndLoadingVehicles> eq);
-
-    void stackCarSave(LoadingParams loadingParams);
-
-    void addBilletHotsend(List<StackingAndLoadingVehicles> savs,String type,String carNum,String castMachine,String destination);
-
-    void startHeight(SavVo savVo);
-
-    List<StackingAndLoadingVehicles> getListByCarNum(String carNum);
-
     void saveUpperStacking(LoadingParams loadingParams);
 
     List<StackingAndLoadingVehicles> getListByTypeConfigId(String typeConfigId);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -13,9 +13,7 @@ import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBa
 import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
 import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsend;
 import org.jeecg.modules.billet.billetHotsend.entity.RollClubCommon;
-import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
 import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
-import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
 import org.jeecg.modules.billet.billetHotsendAbandons.entity.BilletHotsendAbandons;
 import org.jeecg.modules.billet.billetHotsendAbandons.service.IBilletHotsendAbandonsService;
 import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
@@ -47,7 +45,6 @@ import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingAndL
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingDownLogService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingUpLogService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
-import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.SavVo;
 import org.jeecg.modules.billet.storageBill.entity.ShiftEnum;
 import org.jeecg.modules.billet.storageBill.entity.ShiftGroupEnum;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
@@ -62,8 +59,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -76,8 +71,6 @@ import java.util.stream.Collectors;
 @Slf4j
 public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingAndLoadingVehiclesMapper, StackingAndLoadingVehicles> implements IStackingAndLoadingVehiclesService {
 
-    @Autowired
-    private IRulerDefaultConfigService rulerDefaultConfigService;
     @Autowired
     private IBilletHotsendBaseService billetHotsendBaseService;
     @Autowired
@@ -118,349 +111,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
     private IRollHeightService rollHeightService;
     @Autowired
     private IRollHeightDetailsService rollHeightDetailsService;
-    @Override
-    public List<List<StackingAndLoadingVehicles>> getListBySatck(String typeConfigId) {
-        LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StackingAndLoadingVehicles::getTypeConfigId, typeConfigId);
-        List<StackingAndLoadingVehicles> list = baseMapper.selectList(wrapper);
-        Boolean isNotNull = oConvertUtils.listIsNotEmpty(list);
-        List<List<StackingAndLoadingVehicles>> res = new ArrayList<>();
-        for (int i = 1; i < 21; i++) {
-            List<StackingAndLoadingVehicles> savs = new ArrayList<>();
-            for (int j = 1; j < 10; j++) {
-                AtomicReference<StackingAndLoadingVehicles> sav = new AtomicReference<>();
-                String layer = i+"";
-                String adddress = j+"";
-                if(isNotNull){
-                    list.forEach(item->{
-                        if(item.getLayer().equals(layer)&&item.getAddress().equals(adddress)){
-                            sav.set(item);
-                        }
-                    });
-                }
-                if(sav.get()==null||oConvertUtils.isEmpty(sav.get().getId())){
-                    sav.set(new StackingAndLoadingVehicles());
-                    sav.get().setLayer(layer);
-                    sav.get().setAddress(adddress);
-                    sav.get().setStackAddr(typeConfigId);
-                }
-                savs.add(sav.get());
-            }
-            res.add(savs);
-        }
-        return res;
-    }
-
-    @Override
-    public void addBatch(SavVo savVo) {
-//        if(oConvertUtils.listIsNotEmpty(savVo.getSavs())){
-//            RulerDefaultConfig last = rulerDefaultConfigService.getLast(savVo.getCastMachine());
-//            String furnace = null;
-//            if(last!=null){
-//                furnace = last.getPourHeats();
-//                last.setShiftProduct((last.getShiftProduct()==null?0:last.getShiftProduct())+4*savVo.getSavs().size());
-//                rulerDefaultConfigMapper.updateById(last);
-//            }
-//
-//            String finalFurnace = furnace;
-//            savVo.getSavs().forEach(item->{
-//                if(oConvertUtils.isEmpty(item.getHeatNo()))item.setHeatNo(finalFurnace);
-//            });
-//            this.addBilletHotsend(savVo.getSavs(),"1",null,savVo.getCastMachine(),"5");
-//            String destination = "";
-//            switch (savVo.getSavs().get(0).getStackAddr()){
-//                case "601":
-//                    destination = "601堆垛";
-//                    break;
-//                case "602":
-//                    destination = "602堆垛";
-//                    break;
-//                case "604":
-//                    destination = "604堆垛";
-//                    break;
-//                case "6":
-//                    destination = "步进冷床";
-//                    break;
-//                case "501":
-//                    destination = "501堆垛";
-//                    break;
-//            }
-//            addStorageBill(savVo.getSavs(),savVo.getCastMachine(),"默认",destination);
-//
-//        }
-    }
-
-    @Override
-    public void loading(LoadingParams loadingParams) {
-//        RulerDefaultConfig last = rulerDefaultConfigService.getLast(loadingParams.getCastMachine());
-//        if(loadingParams.getStackingAndLoadingVehiclesList()!=null&&loadingParams.getSavs().size()>0){
-//            String carNum = loadingParams.getCarNum();
-//            LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
-////            wrapper.eq(StackingAndLoadingVehicles::getCarNum, carNum);
-//            Long old = baseMapper.selectCount(wrapper);
-//            int amount = loadingParams.getSavs().size();
-//            if(old>0){
-//                amount -= old;
-//            }
-//            if(last!=null){
-//                if(last.getShiftProduct()==null)last.setShiftProduct(0);
-//                last.setShiftProduct(last.getShiftProduct()+4*amount);
-//                int times = StringUtil.isNullOrEmpty(last.getCureentCarTimes())?0:Integer.parseInt(last.getCureentCarTimes());
-//                last.setCureentCarTimes(times+1+"");
-//                last.setCureentCarTimese(times+1+"");
-//                rulerDefaultConfigMapper.updateById(last);
-//            }
-//            List<StackingAndLoadingVehicles> hotList = new ArrayList<>();
-//            HashMap<String, List<StackingAndLoadingVehicles>> coldListMap = new HashMap<>();
-//
-//            for (StackingAndLoadingVehicles sav : loadingParams.getStackingAndLoadingVehiclesList()) {
-//                if(!StringUtil.isNullOrEmpty(sav.getStackAddr())){
-//                    sav.setStackAddr(sav.getStackAddr().substring(0,sav.getStackAddr().indexOf(",")));
-//                    List<StackingAndLoadingVehicles> coldList = coldListMap.get(sav.getStackAddr());
-//                    if(coldList == null){
-//                        coldList = new ArrayList<StackingAndLoadingVehicles>();
-//                        coldListMap.put(sav.getStackAddr(),coldList);
-//                    }
-//                    coldList.add(sav);
-//                }else{
-//                    hotList.add(sav);
-//                }
-//                if(oConvertUtils.isNotEmpty(sav.getId()))baseMapper.deleteById(sav.getId());
-//            }
-//            this.addBilletHotsend(hotList,"2",loadingParams.getCarNum(),loadingParams.getCastMachine(),loadingParams.getDestination());
-//            Set<Map.Entry<String, List<StackingAndLoadingVehicles>>> entries = coldListMap.entrySet();
-//            for (Map.Entry<String, List<StackingAndLoadingVehicles>> entry : entries) {
-//                this.addBilletHotsend(entry.getValue(),"3",loadingParams.getCarNum(),loadingParams.getCastMachine(),loadingParams.getDestination());
-//            }
-//            String destination = "";
-//            switch (loadingParams.getDestination()){
-//                case "1":
-//                    destination = "0";
-//                    break;
-//                case "2":
-//                    destination = "1";
-//                    break;
-//                case "4":
-//                    destination = "3";
-//                    break;
-//            }
-//            addStorageBill(loadingParams.getSavs(),loadingParams.getCastMachine(),loadingParams.getCarNum(),destination);
-//            addRolling(loadingParams);
-//
-//        }
-    }
-
-    @Override
-    public Integer startCar(SavVo savVo) {
-        LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<StackingAndLoadingVehicles>();
-//        wrapper.eq(StackingAndLoadingVehicles::getCarNum, savVo.getCarNum());
-        List<StackingAndLoadingVehicles> list = baseMapper.selectList(wrapper);
-        RulerDefaultConfig last = rulerDefaultConfigService.getLast(savVo.getCastMachine());
-        last.setOutAmount((oConvertUtils.isEmpty(last.getOutAmount())?0:last.getOutAmount())+savVo.getSavs().size()*4);
-        if(oConvertUtils.listIsNotEmpty(savVo.getSavs())){
-            if(list!=null&&oConvertUtils.listIsNotEmpty(list)){
-                if((list.size()+savVo.getSavs().size())>7){
-                    return 7-list.size();
-                }
-            }
-            if(savVo.getSavs().size()>7)return 7;
-            int index = 0;
-            for (int i = 1; i <= 4; i++) {
-                int number = 3;
-                if(i == 4)number = 2;
-                for (int j = 1; j < number; j++) {
-                    String layer = String.valueOf(i);
-                    String adddress = String.valueOf(j);
-                    AtomicBoolean isExist = new AtomicBoolean(true);
-                    list.forEach(item->{
-                        if(item.getLayer().equals(layer)&&item.getAddress().equals(adddress)){
-                            isExist.set(false);
-                        }
-                    });
-                    if(isExist.get()&&index<savVo.getSavs().size()){
-                        StackingAndLoadingVehicles sav = new StackingAndLoadingVehicles();
-                        BeanUtils.copyProperties(savVo.getSavs().get(index), sav);
-                        sav.setId(null);
-//                        sav.setCarNum(savVo.getCarNum());
-                        sav.setAddress(adddress);
-                        sav.setLayer(layer);
-                        sav.setStackAddr(savVo.getSavs().get(index).getStackAddr()+","+savVo.getSavs().get(index).getLayer()+","+savVo.getSavs().get(index).getAddress());
-                        baseMapper.insert(sav);
-                        baseMapper.deleteById(savVo.getSavs().get(index).getId());
-                        index++;
-                    }
-
-                }
-            }
-        }
-        rulerDefaultConfigService.updateById(last);
-        return -1;
-    }
-
-    @Override
-    public List<List<StackingAndLoadingVehicles>> getCarLoad(LambdaQueryWrapper<StackingAndLoadingVehicles> eq) {
-        List<StackingAndLoadingVehicles> list = baseMapper.selectList(eq);
-        Boolean isNotNull = oConvertUtils.listIsNotEmpty(list);
-        List<List<StackingAndLoadingVehicles>> res = new ArrayList<>();
-        for (int i = 1; i <= 4; i++) {
-            List<StackingAndLoadingVehicles> savs = new ArrayList<>();
-            int number = 3;
-            if(i == 4)number = 2;
-            for (int j = 1; j < number; j++) {
-                AtomicReference<StackingAndLoadingVehicles> sav = new AtomicReference<>();
-                String layer = i+"";
-                String adddress = j+"";
-                if(isNotNull){
-                    list.forEach(item->{
-                        if(item.getLayer().equals(layer)&&item.getAddress().equals(adddress)){
-                            sav.set(item);
-                        }
-                    });
-                }
-                if(sav.get()==null||oConvertUtils.isEmpty(sav.get().getId())){
-                    sav.set(new StackingAndLoadingVehicles());
-                    sav.get().setLayer(layer);
-                    sav.get().setAddress(adddress);
-                }
-                savs.add(sav.get());
-            }
-            res.add(savs);
-        }
-        return res;
-    }
-
-    @Override
-    public void stackCarSave(LoadingParams loadingParams) {
-        if(oConvertUtils.listIsNotEmpty(loadingParams.getStackingAndLoadingVehiclesList())){
-            for (StackingAndLoadingVehicles sav : loadingParams.getStackingAndLoadingVehiclesList()) {
-                if(oConvertUtils.isEmpty(sav.getId())){
-//                    sav.setCarNum(loadingParams.getCarNum());
-                    baseMapper.insert(sav);
-                }else{
-                    baseMapper.updateById(sav);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void addBilletHotsend(List<StackingAndLoadingVehicles> savs,String type,String carNum,String castMachine,String destination){
-        if(savs!=null&&savs.size()>0){
-            String stackAddr = savs.get(0).getStackAddr();
-            if (oConvertUtils.isEmpty(castMachine)){
-                if(stackAddr.contains("5")){
-                    castMachine = "5";
-                }else{
-                    castMachine = "6";
-                }
-            }
-            RulerDefaultConfig last = rulerDefaultConfigService.getLast(castMachine);
-
-            HashMap<String, List<StackingAndLoadingVehicles>> map = new HashMap<>();
-            for (StackingAndLoadingVehicles sav : savs) {
-                List<StackingAndLoadingVehicles> list = map.get(sav.getHeatNo()+"-"+sav.getSteel()+"-"+sav.getSpec()+"-"+sav.getSize());
-                if(list==null){
-                    list = new ArrayList<StackingAndLoadingVehicles>();
-                    map.put(sav.getHeatNo()+"-"+sav.getSteel()+"-"+sav.getSpec()+"-"+sav.getSize(),list);
-                }
-                list.add(sav);
-            }
-
-            Set<Map.Entry<String, List<StackingAndLoadingVehicles>>> entries = map.entrySet();
-            for (Map.Entry<String, List<StackingAndLoadingVehicles>> entry : entries) {
-                BilletHotsend billetHotsend = new BilletHotsend();
-                int amount = entry.getValue().size();
-                if(last!=null){
-                    billetHotsend.setShiftGroup(last.getShiftGroup());
-                    billetHotsend.setShift(last.getShift());
-                    billetHotsend.setCreateDate(new Date());
-                }
-                billetHotsend.setAmountTotal(4*amount);
-                billetHotsend.setCcmNo(castMachine);
-                String[] msgs = entry.getKey().split("-");
-                billetHotsend.setHeatNo(oConvertUtils.isEmpty(msgs[0])?"":msgs[0]);
-                billetHotsend.setSteel(oConvertUtils.isEmpty(msgs[1])?"":msgs[1]);
-                switch (destination){
-                    case "0":
-//                        billetHotsend.setAmountOne(billetHotsend.getAmountTotal().toString());
-//                        billetHotsend.setCarNumOne(carNum);
-//                        billetHotsend.setSizeOne(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-//                        billetHotsend.setStackAddrOne(stackAddr);
-                        break;
-                    case "1":
-//                        billetHotsend.setAmountTwo(billetHotsend.getAmountTotal().toString());
-//                        billetHotsend.setCarNumTwo(carNum);
-//                        billetHotsend.setSizeTwo(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-//                        billetHotsend.setStackAddrTwo(stackAddr);
-                        break;
-                    case "2":
-//                        billetHotsend.setAmountThree(billetHotsend.getAmountTotal().toString());
-//                        billetHotsend.setCarNumThree(carNum);
-//                        billetHotsend.setSizeThree(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-//                        billetHotsend.setStackAddrThree(stackAddr);
-                        break;
-                    case "3":
-//                        billetHotsend.setAmountHeight(billetHotsend.getAmountTotal().toString());
-//                        billetHotsend.setStackAddrHeight(stackAddr);
-//                        billetHotsend.setSizeHeight(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-                        break;
-                    case "4":
-//                        billetHotsend.setAmountOut(billetHotsend.getAmountTotal().toString());
-//                        billetHotsend.setCarNumOut(carNum);
-//                        billetHotsend.setStackAddrOut(stackAddr);
-//                        billetHotsend.setSizeOut(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-                        break;
-                    case "5":
-//                        billetHotsend.setAmountStack(billetHotsend.getAmountTotal().toString());
-//                        billetHotsend.setStackAddr(stackAddr);
-//                        billetHotsend.setSizeStack(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
-                        break;
-                }
-//                billetHotsend.setBz(type);
-                billetHotsendBaseService.save(billetHotsend);
-                if(type.equals("1")){
-                    for (StackingAndLoadingVehicles stackingAndLoadingVehicles : entry.getValue()) {
-//                        stackingAndLoadingVehicles.setLogId(billetHotsend.getId());
-                        baseMapper.insert(stackingAndLoadingVehicles);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void startHeight(SavVo savVo) {
-//        if(oConvertUtils.listIsNotEmpty(savVo.getSavs())){
-//            addBilletHotsend(savVo.getSavs(),"5",null,null,"3");
-//            for (StackingAndLoadingVehicles sav : savVo.getSavs()) {
-//                baseMapper.deleteById(sav.getId());
-//            }
-//            String castMachine = "";
-//            if(savVo.getSavs().get(0).getStackAddr().contains("5")){
-//                castMachine = "5";
-//            }else{
-//                castMachine = "6";
-//            }
-//            addStorageBill(savVo.getSavs(),castMachine,"辊道","2");
-//            RulerDefaultConfig last = rulerDefaultConfigService.getLast("6");
-//            last.setOutAmount((oConvertUtils.isEmpty(last.getOutAmount())?0:last.getOutAmount())+savVo.getSavs().size()*4);
-//            LoadingParams loadingParams = new LoadingParams();
-//            loadingParams.setSavs(savVo.getSavs());
-//            loadingParams.setCastMachine("6");
-//            loadingParams.setDestination("3");
-//            addRolling(loadingParams);
-//            rulerDefaultConfigService.updateById(last);
-//        }
-
-    }
-
-    @Override
-    public List<StackingAndLoadingVehicles> getListByCarNum(String carNum) {
-        LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.eq(StackingAndLoadingVehicles::getCarNum, carNum);
-        List<StackingAndLoadingVehicles> stackingAndLoadingVehicles = baseMapper.selectList(wrapper);
-        return stackingAndLoadingVehicles;
-    }
 
     @Override
     public void saveUpperStacking(LoadingParams loadingParams) {