Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-12 032f7c07e272dae9a857ed76b480dc391dc4073f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java

@@ -78,6 +78,8 @@
    private TOperatorService tOperatorService;
    @Autowired
    private ITSiteService siteService;
    @Autowired
    private IUserService userService;

    /**
     * 跳转到优惠券管理首页
@@ -231,16 +233,28 @@
        Gate byId = gateService.getById(id);
        model.addAttribute("id",id);
        model.addAttribute("data",byId);
        TStore byId2 = storeService.getById(byId.getStoreId());
        model.addAttribute("type",byId2.getType());
        Integer objectType = UserExt.getUser().getObjectType();
        model.addAttribute("userType",objectType);
        System.out.println(objectType);
        List<TOperator> list1 = tOperatorService.list();
        List<TOperator> list1 = tOperatorService.list(new QueryWrapper<TOperator>()
                .eq("state", 1));
        model.addAttribute("yysList",list1);
        if (UserExt.getUser().getObjectType()==1) {
            List<TStore> list = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", 0)
                    .ne("state", 3));
            model.addAttribute("storeList",list);
            List<TStore> tStores = new ArrayList<>();
            if (byId.getOperatorId()==0){
                tStores = storeService.list(new QueryWrapper<TStore>()
                        .eq("operatorId", 0)
                        .eq("type", 1)
                        .ne("state", 3));
            }else{
                tStores = storeService.list(new QueryWrapper<TStore>()
                        .eq("operatorId", 0)
                        .eq("type", 2)
                        .ne("state", 3));
            }
            model.addAttribute("storeList",tStores);
            List<TSite> siteList = siteService.list(new QueryWrapper<TSite>()
                    .eq("storeId", byId.getStoreId())
                    .ne("state",3));
@@ -281,7 +295,17 @@
        return PREFIX + "gate_edit.html";
    }

    /**
     * 获取运营商列表
     */
    @RequestMapping(value = "/getOperatorList")
    @ResponseBody
    public List<TOperator> getOperatorList() {
        List<TOperator> list = tOperatorService.list(new QueryWrapper<TOperator>()
                .eq("state", 1));
        return list;

    }
    /**
     * 获取闸机列表
     */
@@ -306,6 +330,24 @@
            storeIds.add(UserExt.getUser().getObjectId());
        }
        List<Map<String,Object>> res = gateService.listAll(name,device,operatorName,storeName,storeIds,page);
        for (Map<String, Object> re : res) {
            Integer integer = Integer.valueOf(re.get("type").toString());
            if (integer==1){
                re.put("operatorName","平台闸机");
            }else{
                TStore storeId = storeService.getById(Integer.valueOf(re.get("storeId").toString()));
                if (storeId!=null){
                    Integer operatorId = storeId.getOperatorId();
                    TOperator byId = tOperatorService.getById(operatorId);
                    if (byId!=null){
                        User byId1 = userService.getById(byId.getUserId());
                        if (byId1!=null){
                            re.put("operatorName",byId1.getName()+"-"+byId1.getPhone());
                        }
                    }
                }
            }
        }
        return res;
    }
    /**
@@ -314,10 +356,19 @@
    @RequestMapping(value = "/getStore")
    @ResponseBody
    public List<TStore> getStore(Integer operatorId) {
        List<TStore> list = storeService.list(new QueryWrapper<TStore>()
                .eq("operatorId", operatorId)
                .ne("state", 3));
        return list;
        List<TStore> tStores = new ArrayList<>();
        if (operatorId==0){
            tStores = storeService.list(new QueryWrapper<TStore>()
                    .eq("type", 1)
                    .ne("state", 3));
        }else{
            tStores = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", operatorId)
                    .eq("type", 2)
                    .ne("state", 3));
        }

        return tStores;

    }
    /**