区分申泽和七云平台

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bean.*;
-import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.bo.JsonUtils;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
@@ -29,13 +28,11 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
 
-//@Api(value = "/api/app_equipment/index", tags = {"设备信息上传接口"})
 @Api(value = "/indexController", tags = {"设备信息上传接口"})
 @RestController
 @RequestMapping("/api/app_equipment/index")
@@ -82,8 +79,9 @@ public class IndexController { ;
         //有记录，则进行修改
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment _new = list.get(0);
+//        List<TEquipment> list = equipmentService.list(query);
+//        TEquipment _new = list.get(0);
+        TEquipment _new = equipmentService.getOne(query);
 //        Equipment _new = equipmentService.findByClientId(clientId);
         if (_new != null) {
             _new.setNetWorkingMode(netWorkingMode);
@@ -264,6 +262,8 @@ public class IndexController { ;
                         String gtClientId = equipmentApply.getGtClientId();
                         String equimentType = equipmentApply.getEquimentType();
                         String machineType = equipmentApply.getMachineType();
+                        TAdmin admin = adminService.getById(adminId);
+                        String companyType = admin.getCompanyType(); // 公司平台
 
                         String old = "";
                         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
@@ -277,7 +277,6 @@ public class IndexController { ;
                             //表示设备第二次申请了:主要为了区分脱离以及初始化
                             old = "1";
                             //重新修改设备名称
-//                            TEquipment equipment = list.get(0);
                             TEquipment equipment = new TEquipment();
                             if(list2.size()>0){
                                 equipment = list2.get(0);
@@ -290,6 +289,7 @@ public class IndexController { ;
                             equipment.setAdminLevel(adminLevel);
                             equipment.setAdminUserName(adminUserName);
                             equipment.setMachineType(machineType);
+                            equipment.setCompanyType(companyType);
                             if(equipmentApply.getEquimentType().equals("MG320-1")){
                                 if(!equipmentApply.getEquimentType().equals(equipment.getEquimentType())&&equipment.getEquimentType().equals("MG320")){
                                     LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
@@ -349,6 +349,7 @@ public class IndexController { ;
                             equipment.setAdminPwd("123456");
                             equipment.setChannel("1");
                             equipment.setProductTotal(0);
+                            equipment.setCompanyType(companyType);
                             //设置默认规则
                             equipment.setTimeRuleId(Long.valueOf(1));
                             if(equimentType.equals("MG320-1")){
@@ -654,8 +655,7 @@ public class IndexController { ;
     public String updateFlowers(String clientId,String number){
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if(equipment!=null){
             Long id = equipment.getId();
             //修改花型记录数目
@@ -670,9 +670,6 @@ public class IndexController { ;
                 equipmentDescService.save(equipmentDesc1);
             }
             //删除旧花型
-//            List<Filter> filters = new ArrayList<>();
-//            filters.add(Filter.eq("equipmentId", id));
-//            List<Product> list = productService.findList(null, filters, null);
             LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
             queryProduct.eq(TProduct::getEquipmentId,equipment.getId());
             List<TProduct> productList = productService.list(queryProduct);
@@ -692,10 +689,8 @@ public class IndexController { ;
             if(number.equals("30")){
                 saveProductMG1(id);
             }
-//            return JsonMessage.success("success");
             return "success";
         }else {
-//            return JsonMessage.success("error");
             return "error";
         }
     }
@@ -712,8 +707,7 @@ public class IndexController { ;
         if(!StringUtils.isEmpty(equimentType)){
             LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
             query.eq(TEquipment::getClientId,clientId);
-            List<TEquipment> list = equipmentService.list(query);
-            TEquipment equipment = list.get(0);
+            TEquipment equipment = equipmentService.getOne(query);
             equipment.setEquimentType(equimentType);
             equipmentService.updateById(equipment);
         }
@@ -732,8 +726,7 @@ public class IndexController { ;
         if(!StringUtils.isEmpty(longitude)&&!StringUtils.isEmpty(latitude)&&!StringUtils.isEmpty(fullName)){
             LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
             query.eq(TEquipment::getClientId,clientId);
-            List<TEquipment> list = equipmentService.list(query);
-            TEquipment equipment = list.get(0);
+            TEquipment equipment = equipmentService.getOne(query);
             equipment.setLatitude(Double.valueOf(latitude));
             equipment.setLongitude(Double.valueOf(longitude));
             equipment.setFullName(fullName+"-");
@@ -759,11 +752,9 @@ public class IndexController { ;
             String clientId = product.getClientId();
             LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
             query.eq(TEquipment::getClientId,clientId);
-            List<TEquipment> list = equipmentService.list(query);
-            TEquipment equipment = list.get(0);
+            TEquipment equipment = equipmentService.getOne(query);
             Long id = equipment.getId();
             if(StringUtils.isNotEmpty(product.getShowType())){
-//                productService.updateByClientID2(id, product.getRmbPrice(), product.getCodePrice(), product.getProductName(), product.getSellStatus(),product.getShowType());
                 LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
                 queryProduct.eq(TProduct::getEquipmentId,equipment.getId());
                 queryProduct.eq(TProduct::getProductName,product.getProductName());
@@ -785,11 +776,9 @@ public class IndexController { ;
                 tProduct.setCodePrice(BigDecimal.valueOf(product.getCodePrice()));
                 tProduct.setSellStatus(product.getSellStatus());
                 productService.updateById(tProduct);
-//                productService.updateByClientID(id, product.getRmbPrice(), product.getCodePrice(), product.getProductName(), product.getSellStatus());
             }
         }
 
-//        return JsonMessage.success("调价成功");
         return "调价成功";
     }
     public Double tran(Double d){
@@ -811,8 +800,7 @@ public class IndexController { ;
     public String updatePwd(String clientId, String pwdType, String pwd) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment != null) {
             if (!StringUtils.isEmpty(pwdType)) {
                 switch (pwdType) {
@@ -843,10 +831,8 @@ public class IndexController { ;
         }
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         Map<String,String> map = new HashMap<>();
-//        map.put("adminUserName",equipment.getAdminUserName());
         map.put("adminPwd",equipment.getAdminPwd());
         map.put("guestPwd",equipment.getGuestPwd());
         JSONObject jsonObject = new JSONObject();
@@ -870,16 +856,13 @@ public class IndexController { ;
     public String updatePayType(String clientId, String payType) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
-//            return JsonMessage.error("修改支付方式失败");
             return "修改支付方式失败";
         }
         equipment.setPayType(0);
         equipmentService.updateById(equipment);
         return "修改成功";
-//        return JsonMessage.success("修改成功");
     }
 
     /**
@@ -888,11 +871,6 @@ public class IndexController { ;
     @RequestMapping(value = "/sendLog.htm", method = RequestMethod.POST, produces = "text/html;charset=utf-8")
     @ResponseBody
     public String uploadFile(HttpServletRequest request, HttpServletResponse response, String fileName) throws Exception{
-//        String fileName = request.getParameter("fileName");
-//        log.info("filename:"+fileName);
-//        String fileName ="shafei.xls";
-//        file1.length();
-//        String name = request.getParameter("inputName");
         String fileFullPath = "/home/hboxs/log/" + fileName+".txt";
 //        String fileFullPath = "/root/uploadfile/apache-tomcat-8.5.42/" + fileName;
 
@@ -966,21 +944,16 @@ public class IndexController { ;
     public String separate(String clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
-//            return "该设备不存在";
             return "该设备不存在";
         }
         equipmentService.sentMessage(clientId,PushUtils.buildJson("tuoji", "0").toString());
-//        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("tuoji", "0").toString());
         if("xxx".equals(equipment.getClientId().substring(equipment.getClientId().length()-3,equipment.getClientId().length()))){
-//            return JsonMessage.success("脱离成功");
             return "脱离成功";
         }
         equipment.setClientId(equipment.getClientId() + "xxx");
         equipmentService.updateById(equipment);
-//        return JsonMessage.success("脱离成功");
         return "脱离成功";
     }
     /**
@@ -994,13 +967,10 @@ public class IndexController { ;
     public String updateClientId(String clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "该设备不存在";
         }
-//        equipmentService.sentMessage(clientId,PushUtils.buildJson("tuoji", "0").toString());
-//        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("tuoji", "0").toString());
         if("xxx".equals(equipment.getClientId().substring(equipment.getClientId().length()-3,equipment.getClientId().length()))){
             return "脱离成功";
         }
@@ -1020,16 +990,13 @@ public class IndexController { ;
     public String updateContractPN(String clientId, String contactName, String contactPhone) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
-//            return JsonMessage.error("该设备不存在");
             return "该设备不存在";
         }
         equipment.setContactName(contactName);
         equipment.setContactPhone(contactPhone);
         equipmentService.updateById(equipment);
-//        return JsonMessage.success("修改成功");
         return "修改成功";
     }
 
@@ -1041,15 +1008,12 @@ public class IndexController { ;
     public String sentCompanyPhone(String clientId, String companyPhone) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
-//            return JsonMessage.error("该设备不存在");
             return "该设备不存在";
         }
         equipment.setCompanyPhone(companyPhone);
         equipmentService.updateById(equipment);
-//        return JsonMessage.success("修改成功");
         return "修改成功";
     }
     /**
@@ -1060,8 +1024,7 @@ public class IndexController { ;
     public String getQrCodeImgUrl(String clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "404";
         }
@@ -1075,8 +1038,7 @@ public class IndexController { ;
     public String sentSimNo(String clientId, String simNo) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
 //            return JsonMessage.error("该设备不存在");
             return "该设备不存在";
@@ -1094,8 +1056,7 @@ public class IndexController { ;
     public String sendApkVersion(String clientId, String apkVersion) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "该设备不存在";
         }
@@ -1111,8 +1072,7 @@ public class IndexController { ;
     public String equipmentStatus(String clientId, String status) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "该设备不存在";
         }
@@ -1134,8 +1094,7 @@ public class IndexController { ;
     public String updateEqeStatus(String clientId, Integer eqeStatus) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "该设备不存在";
         }
@@ -1158,8 +1117,7 @@ public class IndexController { ;
     public String updateEqeStatusNew(String clientId, Integer eqeStatus,String netTime) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
 //            return JsonMessage.error("该设备不存在");
             return "该设备不存在";
@@ -1184,8 +1142,7 @@ public class IndexController { ;
     public String updateBlock(String clientId, Boolean block) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
 //            return JsonMessage.error("该设备不存在");
             return "该设备不存在";
@@ -1207,8 +1164,7 @@ public class IndexController { ;
     public String updateSleep(String clientId, Boolean is_sleep) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "该设备不存在";
         }
@@ -1231,8 +1187,7 @@ public class IndexController { ;
     public String updateProductTotal(String clientId, Integer productTotal) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "该设备不存在";
         }
@@ -1280,8 +1235,7 @@ public class IndexController { ;
     public String updateParamNew(Integer code, String clientId, @RequestBody List<CommonParamVo> commonParamVos) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "设备不存在";
         }
@@ -1325,8 +1279,7 @@ public class IndexController { ;
     public String updateAloneParam(String code, String clientId,String name,String val) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
 //            return JsonMessage.error("设备不存在");
             return "设备不存在";
@@ -1422,8 +1375,7 @@ public class IndexController { ;
 
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list1 = equipmentService.list(query);
-        TEquipment equipment = list1.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
 //        Equipment equipment = equipmentService.findByClientId(clientId);
 
         if(!equipment.getAdminId().toString().equals(admin.getId().toString())){
@@ -1464,8 +1416,7 @@ public class IndexController { ;
         }
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list1 = equipmentService.list(query);
-        TEquipment equipment = list1.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
         queryProduct.eq(TProduct::getEquipmentId,equipment.getId());
         List<TProduct> products = productService.list(queryProduct);
@@ -1535,8 +1486,7 @@ public class IndexController { ;
         if(!StringUtils.isEmpty(clientId)&&!StringUtils.isEmpty(isMaterialUse)){
             LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
             query.eq(TEquipment::getClientId,clientId);
-            List<TEquipment> list1 = equipmentService.list(query);
-            TEquipment equipment = list1.get(0);
+            TEquipment equipment = equipmentService.getOne(query);
             TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
             equipmentDesc.setIsMaterialUse(isMaterialUse);
             equipmentDescService.updateById(equipmentDesc);
@@ -1553,15 +1503,7 @@ public class IndexController { ;
     public String CardPay(String code, String clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
-//        List<Filter> filters = new ArrayList<>();
-//        if(code.length()<7){
-//            filters.add(Filter.in("adminId", equipment.getAdminId()));
-//        }
-//        filters.add(Filter.in("code", code));
-//        List<PromoCode> list = promoCodeService.findList(null, filters, null);
-//        PromoCode promoCode = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         LambdaQueryWrapper<TPromoCode> query1 = Wrappers.lambdaQuery();
         query1.eq(TPromoCode::getAdminId,equipment.getAdminId());
         query1.eq(TPromoCode::getCode,code);
@@ -1573,7 +1515,6 @@ public class IndexController { ;
         String time = sdf.format(new Date());
         promoCode.setUseDate(time);
         promoCodeService.updateById(promoCode);
-//        return JsonMessage.success("success");
         return "success";
     }
     //验证优惠码
@@ -1582,8 +1523,7 @@ public class IndexController { ;
     public String selectCode(String code, String clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
 
         //验证优惠码
         LambdaQueryWrapper<TPromoCode> query1 = Wrappers.lambdaQuery();
@@ -1661,8 +1601,7 @@ public class IndexController { ;
     public String updateProportion(String clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-        List<TEquipment> list = equipmentService.list(query);
-        TEquipment equipment = list.get(0);
+        TEquipment equipment = equipmentService.getOne(query);
         if(equipment!=null&&equipment.getId()!=null){
             TAdmin admin = adminService.getById(equipment.getAdminId());
             String name = admin.getName();
@@ -1804,8 +1743,7 @@ public class IndexController { ;
         if(!StringUtils.isEmpty(clientId)&&StringUtils.isNotEmpty(couponStatus)){
             LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
             query.eq(TEquipment::getClientId,clientId);
-            List<TEquipment> list = equipmentService.list(query);
-            TEquipment equipment = list.get(0);
+            TEquipment equipment = equipmentService.getOne(query);
             TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
             equipmentDesc.setCouponStatus(couponStatus);
             equipmentDescService.updateById(equipmentDesc);

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 cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,7 +71,6 @@ public class TAdminController {
     @Transactional
     @Audit(type = AuditEnum.INSERT,content = "#loginUser.name + '添加账号'")
     public ResponseModel<?> addLoginUser(@RequestBody @Valid AddLoginUserParam param) {
-//    public ResponseModel<?> addLoginUser(@RequestBody  AddLoginUserParam param) {
         if(StringUtils.isEmpty(param.getEquipmentIds())){
             return R.fail(ResponseCodesEnum.A0001,"机器不能为空");
         }
@@ -108,6 +108,7 @@ public class TAdminController {
         entity.setLoginFailureCount(0);
         entity.setEmail(param.getEmail());
         entity.setPhone(param.getPhone());
+        entity.setCompanyType(param.getCompanyType());  // 公司平台
         //获取父账号信息
         TAdmin parentAdmin = tAdminService.getById(parentId);
         entity.setIfForeign(parentAdmin.getIfForeign());
@@ -160,18 +161,6 @@ public class TAdminController {
             return R.fail(ResponseCodesEnum.A0001);
         }
         param.setAdminId(null);
-//        TAdmin entity = BeanUtil.copyProperties(param,TAdmin.class);
-//        entity.setParentId(parentId);
-////        entity.setParentId(34l);
-//        entity.setIsAdmined(false);
-//        entity.setCreateDate(now);
-//        entity.setModifyDate(now);
-//        entity.setIsLocked(false);
-//        entity.setIsEnabled(true);
-//        entity.setLoginFailureCount(0);
-//        entity.setEmail(param.getEmail());
-//        entity.setPhone(param.getPhone());
-//        tAdminService.save(entity);
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getParentId,parentId);
         query.eq(TAdmin::getId,param.getId());
@@ -237,7 +226,6 @@ public class TAdminController {
     @Transactional
     @Audit(type = AuditEnum.DELETE,content = "#loginUser.name + '删除账号'")
     public ResponseModel<?> deleteLoginUser(@RequestBody @Valid UpdateLoginUserParam param) {
-//    public ResponseModel<?> addLoginUser(@RequestBody  AddLoginUserParam param) {
         //获取当前操作人员
         UserDetailBO loginUser = tokenManager.getLoginUserDetails();
         // 保存用户实体
@@ -365,7 +353,7 @@ public class TAdminController {
     @Transactional
     @Audit(type = AuditEnum.INSERT,content = "#loginUser.name + '注册账号'")
     public ResponseModel<?> save(@RequestBody TAdmin admin) {
-        if(StringUtils.isEmpty(admin.getUsername())||StringUtils.isEmpty(admin.getName())||StringUtils.isEmpty(admin.getPassword())){
+        if(StringUtils.isEmpty(admin.getUsername()) || StringUtils.isEmpty(admin.getName()) || StringUtils.isEmpty(admin.getPassword())){
             return R.fail(ResponseCodesEnum.A0100,"数据有空！");
         }
         if(admin.getIfForeign().equals("0")){
@@ -406,7 +394,8 @@ public class TAdminController {
         }else {
             query2.eq(TMessageCode::getPhone,admin.getEmail());
         }
-        query2.eq(TMessageCode::getType,"0");//0，代表注册验证码
+        //0，代表注册验证码
+        query2.eq(TMessageCode::getType,"0");
         query2.eq(TMessageCode::getStatus,"0");
         List<TMessageCode> messageCodeList = tMessageCodeService.list(query2);
         if(messageCodeList.size()>0){
@@ -423,9 +412,10 @@ public class TAdminController {
             admin.setIsLocked(false);
             //默认是商家
             admin.setType(2);
-//            admin.setIsAdmined(true);
             admin.setPassword(admin.getPassword());
-//            admin.setPassword(DigestUtils.md5Hex(admin.getPassword()));
+            if(admin.getCompanyType().equals("1")) { // 如果是七云平台
+                admin.setTradeMerchantNo("777138500523174"); //七云商户报备号
+            }
             boolean b = tAdminService.save(admin);
 
             tMessageCodeService.saveOrUpdate(tMessageCode);
@@ -464,14 +454,13 @@ public class TAdminController {
     @ApiOperation(value = "登录")
     @PostMapping("/login")
     @Audit(type = AuditEnum.LOGIN,content = "#username + '请求登录'")
-    public ResponseModel<UserDetailBO> login(String username, String password) {
+    public ResponseModel<UserDetailBO> login(String username, String password, String hostName) {
         if(StringUtils.isEmpty(username)||StringUtils.isEmpty(password)){
             return R.fail(ResponseCodesEnum.A0001,"参数有空");
         }
 
         //验证用户名登录
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-//        query.eq(TAdmin::getUsername,username);
         query.eq(TAdmin::getPassword,password);
         query.and(
                 wrapper -> {
@@ -481,6 +470,27 @@ public class TAdminController {
         );
         TAdmin tAdmin = Optional.ofNullable(tAdminService.getOnly(query))
                 .orElseThrow(() -> new BizException(ResponseCodesEnum.L0002));
+
+        // 判断是为申泽用户还是七云用户
+        String companyType = tAdmin.getCompanyType();
+        String SZ = "Sunzee";
+        String SC = "Sevencloud";
+        // 如果不为管理员
+        if(tAdmin.getType() >= 1) {
+            if(SZ.equals(hostName)) {
+                // 如果companyType不为空，且不等于“0”
+                if(StringUtils.isNotEmpty(companyType) && !companyType.equals("0")) {
+                    return R.fail(ResponseCodesEnum.L0002);
+                }
+            }
+            if(SC.equals(hostName)) {
+                // 如果companyType为空，或者不等于“1”
+                if(StringUtils.isEmpty(companyType) || !(companyType.equals("1"))) {
+                    return R.fail(ResponseCodesEnum.L0002);
+                }
+            }
+        }
+        // 添加系统id
         if(StringUtils.isEmpty(tAdmin.getManagerId())){
             String managerId = AdminUtils.encrypt(false, tAdmin.getId());
             tAdmin.setManagerId(managerId);
@@ -554,12 +564,20 @@ public class TAdminController {
             query.eq(TAdmin::getIfForeign,ifForeign);
         }
         if(StringUtils.isNotEmpty(id)){
-            TAdmin byId = tAdminService.getById(id);
-            if(byId==null||byId.getId()==null){
+            TAdmin admin = tAdminService.getById(id);
+            if(admin==null||admin.getId()==null){
                 return R.fail(ResponseCodesEnum.A0001,"没有找到商家");
             }
-            if(byId.getType()<1){
-            }else {
+            // 申泽平台管理员
+            if (admin.getId() == 2738) {
+                query.isNull(TAdmin::getCompanyType).or()
+                        .eq(TAdmin::getCompanyType,"0");
+            }
+            // 七云平台管理员
+            if (admin.getId() == 2739) {
+                query.eq(TAdmin::getCompanyType, "1");
+            }
+            if(admin.getType() > 1){
                 query.eq(TAdmin::getRelationAdminId,id);
             }
         }

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

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -67,15 +68,32 @@ public class TAlarmRecordController {
         if(StringUtils.isEmpty(adminId)){
             return R.fail(ResponseCodesEnum.A0100);
         }
+
         LambdaQueryWrapper<TAlarmRecord> query = Wrappers.lambdaQuery();
         if(admin.getType()>1){
             query.eq(TAlarmRecord::getAdminId,admin.getId());
         }
+        // 申泽平台管理员
+        if (admin.getId() == 2738) {
+            LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+            adminQuery.isNull(TAdmin::getCompanyType).or()
+                    .eq(TAdmin::getCompanyType, "0");
+            List<Long> adminIds = adminService.list(adminQuery).stream()
+                    .map(TAdmin::getId).collect(Collectors.toList());
+            query.in(TAlarmRecord::getAdminId,adminIds);
+        }
+        // 七云平台管理员
+        if (admin.getId() == 2739) {
+            LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+            adminQuery.eq(TAdmin::getCompanyType, "1");
+            List<Long> adminIds = adminService.list(adminQuery).stream()
+                    .map(TAdmin::getId).collect(Collectors.toList());
+            query.in(TAlarmRecord::getAdminId,adminIds);
+        }
         if(StringUtils.isNotEmpty(clientId)){
             LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
             query1.like(TEquipment::getClientId,clientId);
-            List<TEquipment> list = tEquipmentService.list(query1);
-            TEquipment equipment = list.get(0);
+            TEquipment equipment = tEquipmentService.getOnly(query1);
             if(admin.getType()>1){
                if(equipment.getAdminId().toString().equals(adminId)){
                    query.eq(TAlarmRecord::getClientId,equipment.getClientId());
@@ -88,19 +106,6 @@ public class TAlarmRecordController {
         }
         if(StringUtils.isNotEmpty(name)){
             query.like(TAlarmRecord::getName,name);
-/*            LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
-            query1.eq(TEquipment::getName,name);
-            List<TEquipment> list = tEquipmentService.list(query1);
-            TEquipment equipment = list.get(0);
-            if(admin.getType()>1){
-                if(equipment.getName().equals(name)){
-                    query.eq(TAlarmRecord::getName,name);
-                }else {
-                    return R.fail("设备编号出错");
-                }
-            }else {
-                query.eq(TAlarmRecord::getName,name);
-            }*/
         }
         if(startDate!=null){
             query.gt(TAlarmRecord::getOccurrenceTime,startDate);

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

@@ -73,6 +73,23 @@ public class TEquipmentApplyController {
             if(admin.getType()>1){
                 query.eq(TEquipmentApply::getAdminId,adminId);
             }
+            // 申泽平台管理员
+            if (admin.getId() == 2738) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.isNull(TAdmin::getCompanyType).or()
+                        .eq(TAdmin::getCompanyType, "0");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TEquipmentApply::getAdminId,adminIds);
+            }
+            // 七云平台管理员
+            if (admin.getId() == 2739) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.eq(TAdmin::getCompanyType, "1");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TEquipmentApply::getAdminId,adminIds);
+            }
         }
         if(StringUtils.isNotEmpty(userName)){
             LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
@@ -114,6 +131,8 @@ public class TEquipmentApplyController {
                         //判断是否设备初始化
 
                         Long adminId = equipmentApply.getAdminId();
+                        TAdmin tAdmin = adminService.getById(adminId);
+                        String companyType = tAdmin.getCompanyType();
                         String adminLevel = equipmentApply.getAdminLevel();
                         String adminUserName = equipmentApply.getAdminUserName();
                         Integer type = equipmentApply.getType();
@@ -148,6 +167,7 @@ public class TEquipmentApplyController {
                             equipment.setAdminLevel(adminLevel);
                             equipment.setAdminUserName(adminUserName);
                             equipment.setType(type);
+                            equipment.setCompanyType(companyType); //公司平台
                             if(equipmentApply.getEquimentType().equals("MG320-1")){
                                 if(!equipmentApply.getEquimentType().equals(equipment.getEquimentType())&&equipment.getEquimentType().equals("MG320")){
 //                                    List<Filter> filter = new ArrayList<>();
@@ -209,6 +229,7 @@ public class TEquipmentApplyController {
                         equipment.setChannel("1");
                         equipment.setProductTotal(0);
                         equipment.setType(type);
+                        equipment.setCompanyType(companyType); //公司平台
                         //设置默认规则
                         equipment.setTimeRuleId(Long.valueOf(1));
                         if(equimentType.equals("MG320-1")){
@@ -232,7 +253,7 @@ public class TEquipmentApplyController {
                                 equipmentService.sentMessage(equipmentApply.getClientId(), PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                                 PushUtils.push(equipmentApply.getGtClientId(), "", "", PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                             }
-                               }
+                        }
                         equipmentService.save(equipment);
                         equipmentService.sentMessage(equipmentApply.getClientId(), PushUtils.buildJson("statusType", "agreed" + old).toString());
                         PushUtils.push(equipmentApply.getGtClientId(), "【棉花糖】设备初始化申请", "同意", PushUtils.buildJson("statusType", "agreed" + old).toString());
@@ -244,7 +265,7 @@ public class TEquipmentApplyController {
                             saveProductMG1(equipmentId);
                         } else{
                                 saveProduct(equipmentId);
-                            }
+                        }
                         LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
                         query1.eq(TEquipment::getClientId,clientId);
                         List<TEquipment> list1 = equipmentService.list(query1);

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

@@ -86,7 +86,9 @@ public class TEquipmentController {
      */
     @ApiOperation(value = "查找机器列表")
     @PostMapping("/findList")
-    public ResponseModel<IPage<?>> findList(Long id, String clientId, String adminName, String equipmentName, String areaName, String eqeStatus, String machineType, String equimentType, String channel, long current, long size) {
+    public ResponseModel<IPage<?>> findList(Long id, String clientId, String adminName, String equipmentName,
+                                            String areaName, String eqeStatus, String machineType, String equimentType,
+                                            String channel, String companyType, long current, long size) {
 
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         TAdmin admin = tAdminService.getById(id);
@@ -138,6 +140,15 @@ public class TEquipmentController {
         if (StringUtils.isNotEmpty(channel)) {
             query.eq(TEquipment::getChannel, channel);
         }
+        // 公司平台
+        if (StringUtils.isNotEmpty(companyType)) {
+            if(companyType.equals("0")) {
+                query.isNull(TEquipment::getCompanyType)
+                        .or().eq(TEquipment::getCompanyType, companyType);
+            }else {
+                query.eq(TEquipment::getCompanyType, companyType);
+            }
+        }
         query.orderByDesc(TEquipment::getCreateDate);
         Page<TEquipment> page = new Page<>(current, size, true);
         IPage<TEquipment> iPage = tEquipmentService.page(page, query);
@@ -257,8 +268,9 @@ public class TEquipmentController {
     public ResponseModel<TEquipment> findEquipmentByClientId(@RequestParam String clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId, clientId);
-        List<TEquipment> list = tEquipmentService.list(query);
-        TEquipment equipment = list.get(0);
+//        List<TEquipment> list = tEquipmentService.list(query);
+//        TEquipment equipment = list.get(0);
+        TEquipment equipment = tEquipmentService.getOnly(query);
         return R.ok(equipment);
     }
 
@@ -277,17 +289,17 @@ public class TEquipmentController {
     @GetMapping("/getClientIds")
     public ResponseModel<List<String>> getClientIds(@RequestParam String adminId) {
         //查找属于这个商家子账户的设备
-        TAdminEquipment adminEquipment = tAdminEquipmentService.getById(adminId);
-        String equipmentIds = adminEquipment.getEquipmentIds();
+        LambdaQueryWrapper<TEquipment> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TEquipment::getAdminId,adminId);
+        List<TEquipment> list = tEquipmentService.list(queryWrapper);
+//        String equipmentIds = adminEquipment.getEquipmentIds();
         // 分割保存在设备ID保存在list
-        String[] tEquipmentIds = equipmentIds.split(",");
-//        List<String> list = Collections.singletonList(equipmentIds);
-        List<String> list = Arrays.asList(tEquipmentIds);
+//        String[] tEquipmentIds = equipmentIds.split(",");
+//        List<String> list = Arrays.asList(tEquipmentIds);
         List<String> returnList = new ArrayList<>();
         if (list.size() > 0) {
-            for (String id : list) {
-                TEquipment equipment = tEquipmentService.getById(id);
-                returnList.add(equipment.getClientId());
+            for (TEquipment tEquipment : list) {
+                returnList.add(tEquipment.getClientId());
             }
         }
         return R.ok(returnList);
@@ -783,6 +795,15 @@ public class TEquipmentController {
         if (admin.getType() < 2) {
             param.setAdminId(null);
         }
+        // 公司平台
+        // 申泽平台管理员
+        if (admin.getId() == 2738) {
+            param.setCompanyType("0");
+        }
+        // 七云平台管理员
+        if (admin.getId() == 2739) {
+            param.setCompanyType("1");
+        }
         //判断是否有机器id传入
         if (equipmentId != null && equipmentId != "") {
             Long id = Long.valueOf(equipmentId);
@@ -791,12 +812,9 @@ public class TEquipmentController {
             String dminId = String.valueOf(adminId);
             param.setAdminId(dminId);
             //todo 需要区分是否商家子账户
-            machineTotalNum = tEquipmentService.findMachineTotalNum(param);
-            machineUseNum = tEquipmentService.findMachineUseNum(param);
-        } else {
-            machineTotalNum = tEquipmentService.findMachineTotalNum(param);
-            machineUseNum = tEquipmentService.findMachineUseNum(param);
         }
+        machineTotalNum = tEquipmentService.findMachineTotalNum(param);
+        machineUseNum = tEquipmentService.findMachineUseNum(param);
         Map<String, String> map = new HashMap<>();
         map.put("machineTotalNum", machineTotalNum);
         map.put("machineUseNum", machineUseNum);

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -72,6 +73,22 @@ public class TJoinpayMchCheckController {
                     query.eq(TJoinpayMchCheck::getAdminId,list1.get(0).getId());
                 }
             }
+            if (admin.getId() == 2738) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.isNull(TAdmin::getCompanyType).or()
+                        .eq(TAdmin::getCompanyType, "0");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TJoinpayMchCheck::getAdminId,adminIds);
+            }
+            // 七云平台管理员
+            if (admin.getId() == 2739) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.eq(TAdmin::getCompanyType, "1");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TJoinpayMchCheck::getAdminId,adminIds);
+            }
             query.orderByDesc(TJoinpayMchCheck::getCreateDate);
             query.eq(TJoinpayMchCheck::getType,"0");
             Page<TJoinpayMchCheck> page = new Page<>(current, size, true);

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

@@ -33,6 +33,7 @@ import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.szwl.constant.ResponseCodesEnum.A0001;
 import static com.szwl.constant.ResponseCodesEnum.A0002;
@@ -482,11 +483,25 @@ public class TPromoCodeController {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
         if(StringUtils.isNotEmpty(adminId)){
             TAdmin admin = adminService.getById(adminId);
-            if(admin.getType()==0||admin.getType()==1){
-
-            }else {
+            if(admin.getType()!=0 && admin.getType()!=1){
                 query.eq(TPromoCode::getAdminId,adminId);
             }
+            if (admin.getId() == 2738) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.isNull(TAdmin::getCompanyType).or()
+                        .eq(TAdmin::getCompanyType, "0");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TPromoCode::getAdminId,adminIds);
+            }
+            // 七云平台管理员
+            if (admin.getId() == 2739) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.eq(TAdmin::getCompanyType, "1");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TPromoCode::getAdminId,adminIds);
+            }
         }else {
             return R.fail(A0001);
         }
@@ -515,11 +530,26 @@ public class TPromoCodeController {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
         if(StringUtils.isNotEmpty(adminId)){
             TAdmin admin = adminService.getById(adminId);
-            if(admin.getType()==0||admin.getType()==1){
-
-            }else {
+            if(admin.getType()!=0 && admin.getType()!=1){
                 query.eq(TPromoCode::getAdminId,adminId);
             }
+            // 申泽平台管理员
+            if (admin.getId() == 2738) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.isNull(TAdmin::getCompanyType).or()
+                        .eq(TAdmin::getCompanyType, "0");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TPromoCode::getAdminId,adminIds);
+            }
+            // 七云平台管理员
+            if (admin.getId() == 2739) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.eq(TAdmin::getCompanyType, "1");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TPromoCode::getAdminId,adminIds);
+            }
         }else {
             return R.fail(A0001);
         }
@@ -543,8 +573,6 @@ public class TPromoCodeController {
         List<TPromoCode> list = iPage.getRecords();
         List<PromoCodeTarget> promoCodeTargets = promoCodeService.findById(list);
 
-
-
         ExportParams exportParams = new ExportParams("优惠码记录", "sheet1");
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, PromoCodeTarget.class, promoCodeTargets);
 
@@ -554,7 +582,7 @@ public class TPromoCodeController {
                     os = response.getOutputStream();
                 SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
                 response.setContentType("application/vnd.ms-excel;charset=utf-8");
-                response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("订单记录数据导出" + format.format(new Date()) + ".xls", "UTF-8"));
+                response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("优惠码数据" + format.format(new Date()) + ".xls", "UTF-8"));
                 workbook.write(os);
                 return JsonMessage.success("导出成功");
             } catch (Exception e) {

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

@@ -22,6 +22,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -57,6 +58,24 @@ public class TProportionController {
                 query.eq(TProportionCheck::getAdminId,admin.getId());
                 query.in(TProportionCheck::getCheckType,"0","2","3");
             }
+            // 公司平台
+            // 申泽平台管理员
+            if (admin.getId() == 2738) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.isNull(TAdmin::getCompanyType).or()
+                        .eq(TAdmin::getCompanyType, "0");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TProportionCheck::getAdminId,adminIds);
+            }
+            // 七云平台管理员
+            if (admin.getId() == 2739) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.eq(TAdmin::getCompanyType, "1");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TProportionCheck::getAdminId,adminIds);
+            }
             query.orderByDesc(TProportionCheck::getCreateDate);
             Page<TProportionCheck> page = new Page<>(current, size, true);
             IPage<TProportionCheck> iPage = tProportionCheckService.page(page, query);
@@ -82,6 +101,24 @@ public class TProportionController {
             if(admin.getType()>1){
                 query.eq(TProportion::getAdminId,admin.getId());
             }
+            // 公司平台
+            // 申泽平台管理员
+            if (admin.getId() == 2738) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.isNull(TAdmin::getCompanyType).or()
+                        .eq(TAdmin::getCompanyType, "0");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TProportion::getAdminId,adminIds);
+            }
+            // 七云平台管理员
+            if (admin.getId() == 2739) {
+                LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+                adminQuery.eq(TAdmin::getCompanyType, "1");
+                List<Long> adminIds = adminService.list(adminQuery).stream()
+                        .map(TAdmin::getId).collect(Collectors.toList());
+                query.in(TProportion::getAdminId,adminIds);
+            }
             query.orderByDesc(TProportion::getCreateDate);
             Page<TProportion> page = new Page<>(current, size, true);
             IPage<TProportion> iPage = tProportionService.page(page, query);
@@ -116,6 +153,23 @@ public class TProportionController {
         if(type.equals("0")){
             query.eq(TProportionCheck::getCheckType,type);
         }
+        // 申泽平台管理员
+        if (admin.getId() == 2738) {
+            LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+            adminQuery.isNull(TAdmin::getCompanyType).or()
+                    .eq(TAdmin::getCompanyType, "0");
+            List<Long> adminIds = adminService.list(adminQuery).stream()
+                    .map(TAdmin::getId).collect(Collectors.toList());
+            query.in(TProportionCheck::getAdminId,adminIds);
+        }
+        // 七云平台管理员
+        if (admin.getId() == 2739) {
+            LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
+            adminQuery.eq(TAdmin::getCompanyType, "1");
+            List<Long> adminIds = adminService.list(adminQuery).stream()
+                    .map(TAdmin::getId).collect(Collectors.toList());
+            query.in(TProportionCheck::getAdminId,adminIds);
+        }
         if(StringUtils.isNotEmpty(userName)){
             LambdaQueryWrapper<TAdmin> query1 = Wrappers.lambdaQuery();
             query1.eq(TAdmin::getUsername,userName);

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

@@ -2,56 +2,28 @@ package com.szwl.controller;
 
 
 import cn.com.crbank.ommo.exception.MyException;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sun.org.apache.regexp.internal.RE;
-import com.szwl.constant.ResponseCodesEnum;
-import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.bo.R;
-//import com.szwl.model.dto.WechatDTO;
-import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TWechat;
 import com.szwl.model.param.WxBindParam;
-import com.szwl.model.utils.DateUtils;
 import com.szwl.model.utils.HttpClientUtils;
 import com.szwl.service.TAdminService;
 import com.szwl.service.TWechatService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.LaxRedirectStrategy;
-import org.apache.http.util.EntityUtils;
+
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.view.RedirectView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
+
 import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -113,6 +85,7 @@ public class TWechatController {
         }
     }
 
+
     @ApiOperation(value = "绑定微信回调")
     @GetMapping("/callback")
     public R oauthCallback(HttpServletRequest request, HttpServletResponse response) throws IOException {

src/main/java/com/szwl/mapper/xml/TAdminMapper.xml

@@ -36,11 +36,12 @@
         <result column="agency_id" property="agencyId" />
         <result column="merchant_id" property="merchantId" />
         <result column="personage_id" property="personageId" />
+        <result column="company_type" property="companyType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, area_id, email, is_admined, is_enabled, is_locked, locked_date, login_date, login_failure_count, login_ip, trade_merchant_no, name, parent_id, password, notice_id, type, username, phone, is_refund, if_foreign, open, promo_code_open, apply_start_time, apply_end_time, code, pay_platform, relation_admin_id,agency_id,merchant_id,personage_id
+        id, create_date, modify_date, area_id, email, is_admined, is_enabled, is_locked, locked_date, login_date, login_failure_count, login_ip, trade_merchant_no, name, parent_id, password, notice_id, type, username, phone, is_refund, if_foreign, open, promo_code_open, apply_start_time, apply_end_time, code, pay_platform, relation_admin_id,agency_id,merchant_id,personage_id,company_type
     </sql>
     <select id="queryByXml" resultType="com.szwl.model.entity.TAdmin">
         select * from t_admin a

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

@@ -31,8 +31,10 @@ public class TAdmin implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty(value = "创建时间")
     private Date createDate;
 
+    @ApiModelProperty(value = "修改时间")
     private Date modifyDate;
 
     private Long areaId;
@@ -73,16 +75,16 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "当前查看过公告的id;")
     private Long noticeId;
 
-    @ApiModelProperty(value = "类型,0:超管，1，公司人员;2：商家，3：商家子账户")
+    @ApiModelProperty(value = "类型,0:超管，1：公司人员;2：商家，3：商家子账户")
     private Integer type;
 
-    @ApiModelProperty(value = "登录名;")
+    @ApiModelProperty(value = "登录名")
     private String username;
 
-    @ApiModelProperty(value = "电话;")
+    @ApiModelProperty(value = "电话")
     private String phone;
 
-    @ApiModelProperty(value = "是否退款;")
+    @ApiModelProperty(value = "是否退款")
     private String isRefund;
 
     @ApiModelProperty(value = "是否国外;0：国内，1：国外")
@@ -91,7 +93,7 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "是否开启远程开关机")
     private String open;
 
-    @ApiModelProperty(value = "是否开通0折优惠码；0:开通;1：关闭")
+    @ApiModelProperty(value = "是否开通0折优惠码；0:开通，1：关闭")
     private String promoCodeOpen;
 
     @ApiModelProperty(value = "机器连接服务器免审核开始时间")
@@ -100,7 +102,7 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "机器连接服务器免审核结束时间")
     private Date applyEndTime;
 
-    @ApiModelProperty(value = "短信验证码;")
+    @ApiModelProperty(value = "短信验证码")
     private String code;
 
     @ApiModelProperty(value = "支付平台; 0或null为汇聚，1为杉德支付")
@@ -128,4 +130,7 @@ public class TAdmin implements Serializable {
 
     @ApiModelProperty(value = "三级分销商家id")
     private Long personageId;
+
+    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
+    private String companyType;
 }

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

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2022-04-19
+ * @since 2023-06-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -24,157 +24,163 @@ public class TEquipment implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "设备唯一ID")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty(value = "创建时间")
     private Date createDate;
 
+    @ApiModelProperty(value = "修改时间")
     private Date modifyDate;
 
-    @ApiModelProperty(value = "用户id;")
+    @ApiModelProperty(value = "用户ID")
     private Long adminId;
 
-    @ApiModelProperty(value = "用户等级;")
+    @ApiModelProperty(value = "用户等级")
     private String adminLevel;
 
-    @ApiModelProperty(value = "机器超级管理员admin密码;")
+    @ApiModelProperty(value = "机器超级管理员admin密码")
     private String adminPwd;
 
     private Long areaId;
 
-    @ApiModelProperty(value = "柜内湿度;")
+    @ApiModelProperty(value = "柜内湿度")
     private String cabinetHd;
 
-    @ApiModelProperty(value = "炉头温度;")
+    @ApiModelProperty(value = "炉头温度")
     private String cabinetTm;
 
-    @ApiModelProperty(value = "设备编号;")
+    @ApiModelProperty(value = "设备编号")
     private String clientId;
 
-    @ApiModelProperty(value = "机器联系人名称;")
+    @ApiModelProperty(value = "机器联系人名称")
     private String contactName;
 
-    @ApiModelProperty(value = "联系人电话;")
+    @ApiModelProperty(value = "联系人电话")
     private String contactPhone;
 
-    @ApiModelProperty(value = "运营者电话;")
+    @ApiModelProperty(value = "运营者电话")
     private String operationalPhone;
 
     @ApiModelProperty(value = "机器运营者")
     private String operationalName;
 
-    @ApiModelProperty(value = "炉头转速;")
+    @ApiModelProperty(value = "炉头转速")
     private String furnaceSp;
 
-    @ApiModelProperty(value = "炉头温度;")
+    @ApiModelProperty(value = "炉头温度")
     private String furnaceTm;
 
-    @ApiModelProperty(value = "机器guest密码;")
+    @ApiModelProperty(value = "机器guest密码")
     private String guestPwd;
 
-    @ApiModelProperty(value = "true 代表 强制联网使用 ，false 代表 可不联网使用;")
+    @ApiModelProperty(value = "true 代表强制联网使用 ，false 代表可不联网使用")
     private Boolean isNetWork;
 
-    @ApiModelProperty(value = "机器启用状态，true：启用;")
+    @ApiModelProperty(value = "机器启用状态，true：启用")
     private Boolean isUsing;
 
-    @ApiModelProperty(value = "最近刷新时间;")
+    @ApiModelProperty(value = "最近刷新时间")
     private Date lastUpdateTime;
 
-    @ApiModelProperty(value = "经度;")
+    @ApiModelProperty(value = "经度")
     private Double latitude;
 
-    @ApiModelProperty(value = "纬度;")
+    @ApiModelProperty(value = "纬度")
     private Double longitude;
 
-    @ApiModelProperty(value = "管理系统ID;")
+    @ApiModelProperty(value = "管理系统ID")
     private String managerId;
 
     @ApiModelProperty(value = "客户自命名")
     private String selfName;
 
-    @ApiModelProperty(value = "通信方式; 1：个推，2：Mq 如果为null，那么用个推")
+    @ApiModelProperty(value = "通信方式  1：个推，2：Mq 如果为null，那么用个推")
     private String channel;
 
-    @ApiModelProperty(value = "机器名称;")
+    @ApiModelProperty(value = "机器名称")
     private String name;
 
-    @ApiModelProperty(value = "联网方式;")
+    @ApiModelProperty(value = "联网方式")
     private String netWorkingMode;
 
-    @ApiModelProperty(value = "运营商;")
+    @ApiModelProperty(value = "运营商")
     private String operator;
 
-    @ApiModelProperty(value = "支付方式;")
+    @ApiModelProperty(value = "支付方式")
     private Integer payType;
 
-    @ApiModelProperty(value = "销售总数;")
+    @ApiModelProperty(value = "销售总数")
     private Integer productTotal;
 
-    @ApiModelProperty(value = "SIM卡卡号;")
+    @ApiModelProperty(value = "SIM卡卡号")
     private String simNo;
 
-    @ApiModelProperty(value = "设备编号自命名;")
+    @ApiModelProperty(value = "设备编号自命名")
     private String sn;
 
-    @ApiModelProperty(value = "所属商家;")
+    @ApiModelProperty(value = "所属商家")
     private String adminUserName;
 
-    @ApiModelProperty(value = "公司电话;")
+    @ApiModelProperty(value = "公司电话")
     private String companyPhone;
 
-    @ApiModelProperty(value = "0：分账方2个，1：分账方3个，3：分账方4个，3：分账方超4个;")
+    @ApiModelProperty(value = "0：分账方2个，1：分账方3个，3：分账方4个，3：分账方超4个")
     private Integer type;
 
-    @ApiModelProperty(value = "地址全名;")
+    @ApiModelProperty(value = "地址全名")
     private String fullName;
 
-    @ApiModelProperty(value = "最后推送时间;")
+    @ApiModelProperty(value = "最后推送时间")
     private Date pushUpdateTime;
 
-    @ApiModelProperty(value = "广告规则id;")
+    @ApiModelProperty(value = "广告规则ID")
     private Long timeRuleId;
 
-    @ApiModelProperty(value = "实际上的设备id;")
+    @ApiModelProperty(value = "实际上的设备ID")
     private String gtClientId;
 
-    @ApiModelProperty(value = "设备状态 开机为1，关机为0;")
+    @ApiModelProperty(value = "设备状态 开机为1，关机为0")
     private Integer eqeStatus;
 
-    @ApiModelProperty(value = "锁机状态;")
+    @ApiModelProperty(value = "锁机状态")
     private Boolean isBlocked;
 
-    @ApiModelProperty(value = "短信接收者;")
+    @ApiModelProperty(value = "短信接收者")
     private String messageReceiver;
 
-    @ApiModelProperty(value = "睡眠状态，睡眠为true，不睡眠false;")
+    @ApiModelProperty(value = "睡眠状态，睡眠为true，不睡眠false")
     private Boolean isSleep;
 
-    @ApiModelProperty(value = "音量;")
+    @ApiModelProperty(value = "音量")
     private String volume;
 
     @ApiModelProperty(value = "远程开关机的时间戳")
     private String network;
 
-    @ApiModelProperty(value = "PLC版本;")
+    @ApiModelProperty(value = "PLC版本")
     private String plcVersion;
 
-    @ApiModelProperty(value = "apk版本;")
-    private String apkVersion;
-
-    @ApiModelProperty(value = "棉花糖机器类型，mg320,mg301;")
+    @ApiModelProperty(value = "棉花糖机器类型，mg320,mg301")
     private String equimentType;
 
-    @ApiModelProperty(value = "mg280机器到期时间;")
+    @ApiModelProperty(value = "mg280机器到期时间")
     private Date endDate;
 
-    @ApiModelProperty(value = "花型数量;")
+    @ApiModelProperty(value = "花型数量")
     private String flowers;
 
     @ApiModelProperty(value = "设备类型，0：棉花糖，1，爆米花")
     private String machineType;
 
+    @ApiModelProperty(value = "apk版本")
+    private String apkVersion;
+
     @ApiModelProperty(value = "优惠券开关，0：关闭，1：开启")
     private String couponStatus;
 
+    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
+    private String companyType;
+
 }

src/main/java/com/szwl/model/param/AddLoginUserParam.java

@@ -48,4 +48,7 @@ public class AddLoginUserParam {
 
     @ApiModelProperty(value = "机器列表")
     private String equipmentIds;
+
+    @ApiModelProperty("公司平台,0或空为申泽，1为七云")
+    private String companyType;
 }

src/main/java/com/szwl/model/param/UpdateLoginUserParam.java

@@ -45,4 +45,7 @@ public class UpdateLoginUserParam {
 
     @ApiModelProperty(value = "机器列表")
     private String equipmentIds;
+
+    @ApiModelProperty("公司平台,0或空为申泽，1为七云")
+    private String companyType;
 }

src/main/java/com/szwl/model/query/StatisticsParam.java

@@ -52,4 +52,7 @@ public class StatisticsParam {
 
     @ApiModelProperty(value="第几次查询")
     private String test = "1";
+
+    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
+    private String companyType;
 }

src/main/resources/bootstrap.yml

@@ -36,9 +36,9 @@ oauth:
 #    个人测试
 #    http: http://d.freehk.svipss.top
 #    系统测试
-    http: http://szwltest.sunzee.com.cn
+#    http: http://szwltest.sunzee.com.cn
 #    正式服务
-#    http: https://szwlh.sunzee.com.cn
+    http: https://szwlh.sunzee.com.cn
 
 mybatis-plus:
   mapper-locations: classpath:com/szwl/mapper/xml/*.xml