Commit c37454d9 by 弓厶

Merge remote-tracking branch 'origin/master'

parents 1cc48362 e3f48121
...@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.mapper.Wrapper; ...@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.annotion.Permission; import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Package;
import com.winsun.bean.PackageUpgrade; import com.winsun.bean.PackageUpgrade;
import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.PackageUpgradeMapper; import com.winsun.mapper.PackageUpgradeMapper;
import com.winsun.utils.MessageUtil; import com.winsun.utils.MessageUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -32,13 +34,16 @@ import java.util.concurrent.TimeUnit; ...@@ -32,13 +34,16 @@ import java.util.concurrent.TimeUnit;
public class PackageUpgradeController extends BaseController { public class PackageUpgradeController extends BaseController {
private static PackageUpgradeMapper packageUpgradeMapper; private static PackageUpgradeMapper packageUpgradeMapper;
private static PackageMapper packageMapper;
@Autowired @Autowired
@Qualifier("redisStringTemplate") @Qualifier("redisStringTemplate")
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
@Autowired @Autowired
public PackageUpgradeController(PackageUpgradeMapper packageUpgradeMapper) { public PackageUpgradeController(PackageUpgradeMapper packageUpgradeMapper,PackageMapper packageMapper) {
PackageUpgradeController.packageUpgradeMapper = packageUpgradeMapper; PackageUpgradeController.packageUpgradeMapper = packageUpgradeMapper;
PackageUpgradeController.packageMapper = packageMapper;
} }
@Permission(menuname = "发送验证码", value = "sendVerificationCode", method = RequestMethod.POST) @Permission(menuname = "发送验证码", value = "sendVerificationCode", method = RequestMethod.POST)
...@@ -78,23 +83,46 @@ public class PackageUpgradeController extends BaseController { ...@@ -78,23 +83,46 @@ public class PackageUpgradeController extends BaseController {
} }
@Permission(menuname = "查询宽带信息", value = "selectPackage", method = RequestMethod.POST) @Permission(menuname = "查询宽带信息", value = "selectPackage", method = RequestMethod.POST)
public ResponseData<List<Map<String,Object>>> selectPackage(@RequestParam("selectOrder") String selectOrder,@RequestParam("verificationCode") String verificationCode) { public ResponseData<Map<String,Object>> selectPackage(@RequestParam("selectOrder") String selectOrder,@RequestParam("verificationCode") String verificationCode) {
if(redisTemplate.opsForValue().get(selectOrder).toString().equals(verificationCode)){ if(redisTemplate.opsForValue().get(selectOrder).toString().equals(verificationCode)){
Wrapper<PackageUpgrade> wrapper = new EntityWrapper(); Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
Wrapper<Package> wrapper1 = new EntityWrapper();
Wrapper<Package> wrapper2 = new EntityWrapper();
if(selectOrder.contains("@")){ if(selectOrder.contains("@")){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder); wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper); List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
return ResponseData.success(packageUpgrade); wrapper1.eq("name",packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("name",packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper1);
Map<String,Object> map=packageUpgrade.get(0);
map.put("newPackage",packages1.get(0));
map.put("oldPackage",packages2.get(0));
return ResponseData.success(map);
} }
if(selectOrder.length() == 18){ if(selectOrder.length() == 18){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder); wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper); List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
return ResponseData.success(packageUpgrade); wrapper1.eq("name",packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("name",packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper1);
Map<String,Object> map=packageUpgrade.get(0);
map.put("newPackage",packages1.get(0));
map.put("oldPackage",packages2.get(0));
return ResponseData.success(map);
} }
if(selectOrder.length() == 11){ if(selectOrder.length() == 11){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder); wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper); List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
return ResponseData.success(packageUpgrade); wrapper1.eq("name",packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("name",packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper1);
Map<String,Object> map=packageUpgrade.get(0);
map.put("newPackage",packages1.get(0));
map.put("oldPackage",packages2.get(0));
return ResponseData.success(map);
} }
} }
return ResponseData.error("验证码有误!"); return ResponseData.error("验证码有误!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment