路径初始化异常修复

chen.llin

9 天以前 17a71449244e966206e3f24102fd9e56fa3199e4

 src/main/java/com/zy/asrs/controller/StaDescController.java

@@ -5,19 +5,15 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.param.StaDescInitParam;
import com.zy.asrs.mapper.StaDescMapper;
import com.zy.asrs.service.StaDescService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.param.StaDescInitParam;
import com.zy.asrs.service.StaDescService;
import com.zy.common.web.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,24 +27,33 @@
    private static final Logger log = LoggerFactory.getLogger(StaDescController.class);
    @Autowired
    private StaDescService staDescService;
    @Autowired
    private SqlSessionFactory sqlSessionFactory;

    @RequestMapping(value = "/staDesc/init/auth")
    @ManagerAuth(memo = "初始化站点路径")
    public R init(StaDescInitParam param) {
        try{
            if (param.getTypeDesc()==1){
                staDescService.delete(new EntityWrapper<>());
        try {
            // 参数校验：确保堆垛机号不为空
            if (Cools.isEmpty(param.getCrnNo())) {
                return R.error("堆垛机号不能为空");
            }
            
            // 格式化开关：只删除当前堆垛机号的数据，而不是全部数据
            if (param.getTypeDesc() == 1) {
                staDescService.delete(new EntityWrapper<StaDesc>()
                        .eq("crn_no", param.getCrnNo())
                );
            }
            String[] startStaList = param.getStartStaList().split(";");
            String[] endStaList = param.getEndStaList().split(";");
            List<StaDesc> staDescList = new ArrayList<>();
            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
            StaDescMapper sqlSessionMapper = sqlSession.getMapper(StaDescMapper.class);
            for (String startSta : startStaList){
                for (String endSta : endStaList){
                    for (Integer type:param.getType()){
            Date currentTime = new Date();
            Long userId = getUserId();
            int insertCount = 0;
            
            // SQL Server 批量插入时无法获取自增主键，改为循环单个插入
            for (String startSta : startStaList) {
                for (String endSta : endStaList) {
                    for (Integer type : param.getType()) {
                        // 检查是否已存在
                        int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
                                .eq("type_no", type)
                                .eq("stn_no", Integer.parseInt(startSta))
@@ -57,31 +62,30 @@
                        if (sameRes > 0) {
                            continue;
                        }
                        
                        // 创建并插入单条记录
                        StaDesc staDesc = new StaDesc();
                        staDesc.setCrnNo(param.getCrnNo());
                        staDesc.setTypeNo(type);
                        staDesc.setStnNo(Integer.parseInt(startSta));
                        staDesc.setCrnStn(Integer.parseInt(endSta));
                        staDesc.setModiUser(getUserId());
                        staDesc.setModiTime(new Date());
                        staDesc.setAppeUser(getUserId());
                        staDesc.setAppeTime(new Date());
//                        staDescList.add(staDesc);
                        sqlSessionMapper.insert(staDesc);

                        staDesc.setModiUser(userId);
                        staDesc.setModiTime(currentTime);
                        staDesc.setAppeUser(userId);
                        staDesc.setAppeTime(currentTime);
                        
                        // 单个插入，确保能正确获取自增主键
                        if (staDescService.insert(staDesc)) {
                            insertCount++;
                        }
                    }
                }
            }
            try{
                sqlSession.commit();
                sqlSession.close();
            }catch (Exception e){
                log.error("初始化站点路径异常===>sql异常：{}",e.getMessage());
            }
//            staDescService.insertBatch(staDescList);
        }catch (Exception e){
            log.error("初始化站点路径异常：{}",e.getMessage());
            return R.error("初始化站点路径异常："+e.getMessage());
            
            log.info("初始化站点路径完成，共插入 {} 条记录", insertCount);
        } catch (Exception e) {
            log.error("初始化站点路径异常：{}", e.getMessage());
            return R.error("初始化站点路径异常：" + e.getMessage());
        }

        return R.ok("ok1").add("ok2");
@@ -95,22 +99,24 @@

    @RequestMapping(value = "/staDesc/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        excludeTrash(param);
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -139,10 +145,10 @@
        return R.ok();
    }

   @RequestMapping(value = "/staDesc/update/auth")
   @ManagerAuth(memo = "站点路径修改")
    public R update(StaDesc staDesc){
        if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
    @RequestMapping(value = "/staDesc/update/auth")
    @ManagerAuth(memo = "站点路径修改")
    public R update(StaDesc staDesc) {
        if (Cools.isEmpty(staDesc) || null == staDesc.getTypeId()) {
            return R.error();
        }
        staDesc.setModiUser(getUserId());
@@ -153,12 +159,12 @@

    @RequestMapping(value = "/staDesc/delete/auth")
    @ManagerAuth(memo = "站点路径删除")
    public R delete(@RequestParam String param){
    public R delete(@RequestParam String param) {
        List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
        if (Cools.isEmpty(list)){
        if (Cools.isEmpty(list)) {
            return R.error();
        }
        for (StaDesc entity : list){
        for (StaDesc entity : list) {
            staDescService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
@@ -166,7 +172,7 @@

    @RequestMapping(value = "/staDesc/export/auth")
    @ManagerAuth(memo = "站点路径导出")
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("staDesc"));
@@ -182,7 +188,7 @@
        wrapper.like("crn_no", condition);
        Page<StaDesc> page = staDescService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (StaDesc staDesc : page.getRecords()){
        for (StaDesc staDesc : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", staDesc.getCrnNo());
            map.put("value", staDesc.getCrnNo());
@@ -195,7 +201,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != staDescService.selectOne(wrapper)){
        if (null != staDescService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(StaDesc.class, String.valueOf(param.get("key"))));
        }
        return R.ok();