Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxFlowListController.java

@@ -66,55 +66,36 @@ public class FosterwxFlowListController extends BaseController<FosterwxFlowList>
         if (fosterwxFlowList.getBusFans() > maxFans / 2.0) {
             // 超过
             // 更新
-            FosterwxFlowList lastPosition = fosterwxFlowListService.getOne(new QueryWrapper<FosterwxFlowList>().eq("pool_id", fosterwxFlowList.getPoolId()).orderByDesc("id").last("Limit 1"));
-            String position = "";
-            if (null == lastPosition) {
-                // 新开账号 需要激活个微池状态
-                position = "1001";
-            } else {
-                position = String.valueOf(Integer.parseInt(lastPosition.getFlowPosition()) + 1);
-            }
             // 设置流量位置
-            fosterwxFlowList.setFlowPosition(position);
+            fosterwxFlowList.setFlowPosition(fosterwxMobilePool.getFlowPosition());
             // 设置状态
             fosterwxFlowList.setStatus(0);
             fosterwxFlowListService.save(fosterwxFlowList);
             // 更新全部位置为超限
-            fosterwxFlowListService.update(new FosterwxFlowList(1), new QueryWrapper<FosterwxFlowList>().eq("pool_id", fosterwxFlowList.getPoolId()));
+            fosterwxFlowListService.update(new FosterwxFlowList() {{
+                setStatus(0);
+            }}, new QueryWrapper<FosterwxFlowList>().eq("pool_id", fosterwxFlowList.getPoolId()));
 
 
             // 更新个微池状态为停用
             fosterwxMobilePool.setStatus(0);
-            fosterwxMobilePool.setFlowPosition(position);
             fosterwxMobilePool.setUpdateUid(fosterwxFlowList.getUpdateUid());
             fosterwxMobilePool.setUpdateAt(LocalDateTime.now());
             fosterwxMobilePoolService.updateById(fosterwxMobilePool);
         } else {
             // 未超过
-            // 查找上一个流量位置
-            FosterwxFlowList lastPosition = fosterwxFlowListService.getOne(new QueryWrapper<FosterwxFlowList>().eq("pool_id", fosterwxFlowList.getPoolId()).orderByDesc("id").last("Limit 1"));
-            String position = "";
-            if (null == lastPosition) {
-                // 新开账号 需要激活个微池状态
-                position = "1001";
+            if (2 != fosterwxMobilePool.getStatus()) {
                 fosterwxMobilePool.setStatus(2);
                 fosterwxMobilePool.setUpdateUid(fosterwxFlowList.getUpdateUid());
                 fosterwxMobilePool.setUpdateAt(LocalDateTime.now());
                 fosterwxMobilePoolService.updateById(fosterwxMobilePool);
-
-            } else {
-                position = String.valueOf(Integer.parseInt(lastPosition.getFlowPosition()) + 1);
             }
+
             // 设置流量位置
-            fosterwxFlowList.setFlowPosition(position);
+            fosterwxFlowList.setFlowPosition(fosterwxMobilePool.getFlowPosition());
             // 设置状态
             fosterwxFlowList.setStatus(1);
             fosterwxFlowListService.save(fosterwxFlowList);
-            // 更新个微池流量位置
-            fosterwxMobilePool.setFlowPosition(position);
-            fosterwxMobilePool.setUpdateUid(fosterwxFlowList.getUpdateUid());
-            fosterwxMobilePool.setUpdateAt(LocalDateTime.now());
-            fosterwxMobilePoolService.updateById(fosterwxMobilePool);
         }
 
 

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileController.java

@@ -96,7 +96,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             return AjaxResult.error("该站点中该手机编码已登陆！请确认！");
         }
         FosterwxStation stationInfo = fosterwxStationService.getOne(new QueryWrapper<FosterwxStation>()
-                .eq("id",addHandle.getRaw().getStationId()));
+                .eq("id", addHandle.getRaw().getStationId()));
         // 新增账号
         this.onInsert(addHandle.getRaw());
         addHandle.getRaw().setMobileCode(String.format("%03d", Integer.parseInt(addHandle.getRaw().getMobileCode())));
@@ -123,6 +123,13 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             // 新增账号
             fosterwxMobileService.update(fosterwxMobile, new QueryWrapper<FosterwxMobile>().eq("id", id));
             fosterwxMobile = fosterwxMobileService.getById(id);
+            // 更新个微池个微二维码及企微appid
+            FosterwxMobile finalFosterwxMobile = fosterwxMobile;
+            fosterwxMobilePoolService.update(new FosterwxMobilePool() {{
+                setCodeUrl(finalFosterwxMobile.getCodeUrl());
+                setWxAppid(finalFosterwxMobile.getWxAppid());
+                setUpdateAt(LocalDateTime.now());
+            }}, new QueryWrapper<FosterwxMobilePool>().eq("pool_index", fosterwxMobile.getMobileUnioCode()));
             // 判断开始做任务时间是否设置了
             AjaxResult ajaxResult = null;
             if (null != fosterwxMobile.getTaskStartAt() && oldVO.getTaskStartAt() == null) {
@@ -199,7 +206,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             return AjaxResult.error(HttpStatus.LOGIN_ERROR, HttpMsg.needLogin);
         }
         //.补足三位数
-        addHandle.getRaw().setMobileCode(String.format("%03d",Integer.parseInt(addHandle.getRaw().getMobileCode())));
+        addHandle.getRaw().setMobileCode(String.format("%03d", Integer.parseInt(addHandle.getRaw().getMobileCode())));
         this.onInsert(addHandle.getRaw());
         Boolean res = fosterwxMobileService.save(addHandle.getRaw());
         if (res) {
@@ -394,6 +401,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         Map<Integer, String> field = new HashMap<>(2);
         field.put(0, "mobileUnioCode");
         field.put(1, "codeUrl");
+        field.put(2, "wxAppid");
         List<Map<String, String>> row;
         try {
             row = Analysis.analysis(file, field);
@@ -404,23 +412,30 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         StringBuffer sb = new StringBuffer();
         row.forEach(map -> {
             LambdaQueryWrapper<FosterwxMobile> fosterwxMobileLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            fosterwxMobileLambdaQueryWrapper.eq(FosterwxMobile::getMobileCode, map.get("mobileUnioCode"));
+            fosterwxMobileLambdaQueryWrapper.eq(FosterwxMobile::getMobileUnioCode, map.get("mobileUnioCode"));
             // 手机唯一编码不存在
             if (fosterwxMobileService.count(fosterwxMobileLambdaQueryWrapper) == 0)
                 sb.append("手机唯一编码:" + map.get("mobileUnioCode") + "不存在<br>");
         });
 
-        if (sb.length() > 0) return AjaxResult.error(sb.toString());
+        if (sb.length() > 0) return AjaxResult.error(sb.toString().substring(0, sb.length() - 4));
 
         row.forEach(map -> {
             LambdaQueryWrapper<FosterwxMobile> fosterwxMobileLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            fosterwxMobileLambdaQueryWrapper.eq(FosterwxMobile::getMobileCode, map.get("mobileUnioCode"));
+            fosterwxMobileLambdaQueryWrapper.eq(FosterwxMobile::getMobileUnioCode, map.get("mobileUnioCode"));
 
             FosterwxMobile updateVO = new FosterwxMobile();
             updateVO.setCodeUrl(map.get("codeUrl"));
+            updateVO.setWxAppid(map.get("wxAppid"));
             updateVO.setUpdateAt(LocalDateTime.now());
 
             fosterwxMobileService.update(updateVO, fosterwxMobileLambdaQueryWrapper);
+
+            FosterwxMobilePool fosterwxMobilePool = new FosterwxMobilePool();
+            fosterwxMobilePool.setCodeUrl(map.get("codeUrl"));
+            fosterwxMobilePool.setWxAppid(map.get("wxAppid"));
+            fosterwxMobilePool.setUpdateAt(LocalDateTime.now());
+            fosterwxMobilePoolService.update(fosterwxMobilePool, new QueryWrapper<FosterwxMobilePool>().eq("pool_index", map.get("mobileUnioCode")));
         });
 
         return AjaxResult.success(HttpMsg.importSuccess);

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxFlowList.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -19,16 +17,10 @@ import java.time.LocalDateTime;
  * @since 2021-07-30
  */
 @TableName("pan_fosterwx_flow_list")
-@AllArgsConstructor
-@NoArgsConstructor
 public class FosterwxFlowList extends Model<FosterwxFlowList> {
 
     private static final long serialVersionUID = 1L;
 
-    public FosterwxFlowList(Integer status) {
-        this.status = status;
-    }
-
     /**
      * ID
      */