Merge remote-tracking branch 'origin/test' into test

src/main/java/com/szwl/controller/RabbitMqController.java

@@ -106,4 +106,37 @@ public class RabbitMqController {
         }
         return "success";
     }
+
+    /**
+     * 修改机型重新创建MQ队列
+     * @param
+     * @return
+     */
+    @GetMapping(value = "/updateEquipmentType")
+    @ResponseBody
+    public String updateEquipmentType(String clientId, String equipmentType){
+        if (StringUtils.isNotEmpty(clientId) && StringUtils.isNotEmpty(equipmentType)) {
+            // 删除MQ队列
+            amqpAdmin.deleteQueue(clientId);
+            // 重新创建队列
+            Map<String,Object> arg = new HashMap<>();
+            arg.put("x-message-ttl",1800000);
+            amqpAdmin.declareQueue(new Queue(clientId, true, false, false, arg));
+            HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+            amqpAdmin.declareBinding(new Binding(clientId,
+                    Binding.DestinationType.QUEUE,
+                    equipmentType, clientId, objectObjectHashMap));
+            LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+            query.eq(TEquipment::getClientId, clientId);
+            TEquipment equipment = tEquipmentService.getOne(query);
+            if(equipment != null){
+                equipment.setEquimentType(equipmentType);
+                tEquipmentService.updateById(equipment);
+                return "success";
+            }
+            return "找不到设备";
+        }
+
+        return "参数为空";
+    }
 }

src/main/java/com/szwl/controller/TAdController.java

@@ -70,10 +70,10 @@ public class TAdController {
             query.eq(TAd::getEquipmentType,type);
         }
         if(StringUtils.isNotEmpty(userName)){
-            query.eq(TAd::getUsername,userName);
+            query.like(TAd::getUsername,userName);
         }
         if(StringUtils.isNotEmpty(name)){
-            query.eq(TAd::getName,name);
+            query.like(TAd::getName,name);
         }
         if(StringUtils.isNotEmpty(screenType)){
             query.eq(TAd::getScreenType,screenType);

src/main/java/com/szwl/controller/TAdminController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -618,6 +619,30 @@ public class TAdminController {
         if (StringUtils.isEmpty(tAdmin.getManagerId())) {
             String managerId = AdminUtils.encrypt(false, tAdmin.getId());
             tAdmin.setManagerId(managerId);
+            tAdminService.updateById(tAdmin);
+        }
+        UserDetailBO userDetailBO = tAdminService.getUserDetailBO(tAdmin);
+        return R.ok(userDetailBO);
+    }
+
+    @ApiOperation(value = "切换自动登录")
+    @GetMapping("/autoLogin")
+    @Audit(type = AuditEnum.LOGIN, content = "切换登录'")
+    public ResponseModel<UserDetailBO> autoLogin(@RequestParam String id) {
+        if (StringUtils.isEmpty(id)) {
+            return R.fail(ResponseCodesEnum.A0001, "参数有空");
+        }
+
+        //验证用户名登录
+        Integer adminId = Integer.valueOf(id);
+        TAdmin admin = tAdminService.getById(adminId);
+        TAdmin tAdmin = Optional.ofNullable(admin)
+                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0002));
+
+        // 添加系统id
+        if (StringUtils.isEmpty(tAdmin.getManagerId())) {
+            String managerId = AdminUtils.encrypt(false, tAdmin.getId());
+            tAdmin.setManagerId(managerId);
             tAdminService.getById(tAdmin);
         }
         UserDetailBO userDetailBO = tAdminService.getUserDetailBO(tAdmin);
@@ -924,5 +949,23 @@ public class TAdminController {
         }
         return R.ok();
     }
+
+    @ApiOperation(value = "批量修改支付平台")
+    @GetMapping("/updatePayPlatform")
+    public ResponseModel<?> updatePayPlatform(@RequestParam String id, @RequestParam String payPlatform) {
+        Integer adminId = Integer.valueOf(id);
+        UpdateWrapper<TAdmin> updateWrapper = new UpdateWrapper<>();
+        // 申泽管理员
+        if (adminId == 2738) {
+            updateWrapper.isNull("company_type").or().eq("company_type", 0);
+        }
+        // 七云管理员
+        if (adminId == 2739) {
+            updateWrapper.eq("company_type", 1);
+        }
+        updateWrapper.set("pay_platform",payPlatform);
+        tAdminService.update(null, updateWrapper);
+        return R.ok();
+    }
 }
 

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -4,8 +4,6 @@ package com.szwl.controller;
 import cn.com.crbank.ommo.bean.ResultMessage;
 import cn.com.crbank.ommo.esUtil.BeanUtils;
 //import org.apache.commons.beanutils.BeanUtils;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bean.*;
-import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.*;
@@ -135,7 +132,7 @@ public class TEquipmentController {
             }
         }
         if (StringUtils.isNotEmpty(equipmentName)) {
-            query.eq(TEquipment::getName, equipmentName);
+            query.like(TEquipment::getName, equipmentName);
         }
         if (StringUtils.isNotEmpty(areaName)) {
             query.like(TEquipment::getFullName, areaName);

src/main/java/com/szwl/controller/THuifuMchController.java

@@ -54,6 +54,27 @@ public class THuifuMchController {
         if (tHuifuMchCheck.getAdminId() == null) {
             return R.fail(ResponseCodesEnum.A0001);
         }
+        LambdaQueryWrapper<THuifuMchCheck> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(THuifuMchCheck::getAdminId,tHuifuMchCheck.getAdminId());
+        THuifuMchCheck huifuMchCheck = tHuifuMchCheckService.getOne(queryWrapper);
+        if(huifuMchCheck != null) {
+            tHuifuMchCheck.setModifyDate(new Date());
+            tHuifuMchCheck.setStatus("0");
+            if(tHuifuMchCheck.getType().equals("0")) {
+                if(StringUtils.isNotEmpty(huifuMchCheck.getCardFrontPic())
+                        && StringUtils.isNotEmpty(huifuMchCheck.getLegalCertBackPic()) && StringUtils.isNotEmpty(huifuMchCheck.getLegalCertFrontPic()) ) {
+                    tHuifuMchCheck.setStatus("1");
+                }
+            } else  {
+                if(StringUtils.isNotEmpty(huifuMchCheck.getCertFrontPic())
+                        && StringUtils.isNotEmpty(huifuMchCheck.getCertBackPic()) && StringUtils.isNotEmpty(huifuMchCheck.getLicensePic())
+                        && StringUtils.isNotEmpty(huifuMchCheck.getRegAcctPic())) {
+                    tHuifuMchCheck.setStatus("1");
+                }
+            }
+            tHuifuMchCheckService.updateById(tHuifuMchCheck);
+            return R.ok();
+        }
         tHuifuMchCheck.setCreateDate(new Date());
         tHuifuMchCheck.setModifyDate(new Date());
         tHuifuMchCheck.setStatus("0");

src/main/java/com/szwl/controller/TProportionController.java

@@ -84,10 +84,12 @@ public class TProportionController {
                 for(TProportionCheck proportionCheck:records){
                     if(proportionCheck.getEquipmentId()!=null){
                         TEquipment equipment = tEquipmentService.getById(proportionCheck.getEquipmentId());
-                        if(StringUtils.isNotEmpty(equipment.getName())){
-                            proportionCheck.setEquipmentName(equipment.getName());
-                        }else {
-                            proportionCheck.setEquipmentName(equipment.getClientId());
+                        if(equipment != null) {
+                            if(StringUtils.isNotEmpty(equipment.getName())){
+                                proportionCheck.setEquipmentName(equipment.getName());
+                            }else {
+                                proportionCheck.setEquipmentName(equipment.getClientId());
+                            }
                         }
                     }
 
@@ -127,10 +129,12 @@ public class TProportionController {
                 for(TProportion proportion:records){
                     if(proportion.getEquipmentId()!=null){
                         TEquipment equipment = tEquipmentService.getById(proportion.getEquipmentId());
-                        if(StringUtils.isNotEmpty(equipment.getName())){
-                            proportion.setEquipmentName(equipment.getName());
-                        }else {
-                            proportion.setEquipmentName(equipment.getClientId());
+                        if(equipment != null) {
+                            if(StringUtils.isNotEmpty(equipment.getName())){
+                                proportion.setEquipmentName(equipment.getName());
+                            }else {
+                                proportion.setEquipmentName(equipment.getClientId());
+                            }
                         }
                     }
                 }
@@ -181,6 +185,21 @@ public class TProportionController {
         query.orderByDesc(TProportionCheck::getCreateDate);
         Page<TProportionCheck> page = new Page<>(current, size, true);
         IPage<TProportionCheck> iPage = tProportionCheckService.page(page, query);
+        List<TProportionCheck> records = iPage.getRecords();
+        if(records.size()>0){
+            for(TProportionCheck proportionCheck:records){
+                if(proportionCheck.getEquipmentId()!=null){
+                    TEquipment equipment = tEquipmentService.getById(proportionCheck.getEquipmentId());
+                    if(equipment != null) {
+                        if(StringUtils.isNotEmpty(equipment.getName())){
+                            proportionCheck.setEquipmentName(equipment.getName());
+                        }else {
+                            proportionCheck.setEquipmentName(equipment.getClientId());
+                        }
+                    }
+                }
+            }
+        }
         return R.ok(iPage);
 
     }
@@ -349,6 +368,7 @@ public class TProportionController {
                 proportionCheck.setAgencyName(tProportion.getAgencyName());
                 proportionCheck.setMerchantName(tProportion.getMerchantName());
                 proportionCheck.setPersonageName(tProportion.getPersonageName());
+                proportionCheck.setEquipmentName(equipment.getName());
                 proportionCheck.setCreateDate(new Date());
                 proportionCheck.setModifyDate(new Date());
                 proportionCheck.setCheckType("0");
@@ -362,6 +382,7 @@ public class TProportionController {
                 tProportion.setMerchantId(merchantId);
                 tProportion.setPersonageId(personageId);
                 tProportion.setEquipmentId(equipment.getId());
+                tProportion.setEquipmentName(equipment.getName());
                 tProportion.setAgencyProportion(BigDecimal.valueOf(0.00));
                 tProportion.setMerchantProportion(BigDecimal.valueOf(0.00));
                 tProportion.setPersonageProportion(BigDecimal.valueOf(0.00));
@@ -374,6 +395,7 @@ public class TProportionController {
                 TProportionCheck proportionCheck = new TProportionCheck();
                 proportionCheck.setAdminId(tProportion.getAdminId());
                 proportionCheck.setEquipmentId(equipment.getId());
+                proportionCheck.setEquipmentName(equipment.getName());
                 proportionCheck.setClientId(tProportion.getClientId());
                 proportionCheck.setType(tProportion.getType());
                 proportionCheck.setProportion(tProportion.getProportion());

src/main/java/com/szwl/model/entity/TAdmin.java

@@ -114,7 +114,7 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "短信验证码")
     private String code;
 
-    @ApiModelProperty(value = "支付平台  0或null为汇聚，1为杉德支付")
+    @ApiModelProperty(value = "支付平台  0或null为汇聚，1为汇付支付")
     private String payPlatform;
 
     private String logoRule;