Merge branch 'dev-lqc'

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

@@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -82,8 +82,9 @@ public class FosterwxCashWorkClientController {
         if (null == fosterwxCashWorkwxMobile) return AjaxResult.error("该账号未划入变现分组");
 
         LocalDate now = LocalDate.now();
-        LocalDateTime firstDateTime = LocalDateTime.of(now, LocalTime.MIN);
         LocalDateTime lastDateTime = LocalDateTime.now();
+        // 只获取一个小时前的
+        LocalDateTime firstDateTime = lastDateTime.minusHours(1);
 
         LambdaQueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
         // 企微任务
@@ -98,7 +99,7 @@ public class FosterwxCashWorkClientController {
         List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListList = fosterwxCashScheduleTaskListService.list(fosterwxCashScheduleTaskListLambdaQueryWrapper);
 
         List<FosterwxCashBoxClientInfo> fosterwxCashBoxClientInfoList = new ArrayList<>();
-        fosterwxCashScheduleTaskListList.forEach(fosterwxCashScheduleTaskList -> {
+        for (FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList : fosterwxCashScheduleTaskListList) {
             // fosterwxCashScheduleTaskListService.updateById(new FosterwxCashScheduleTaskList() {{
             //     setId(fosterwxCashScheduleTaskList.getId());
             //     setStatus(5);
@@ -112,6 +113,13 @@ public class FosterwxCashWorkClientController {
             fosterwxCashScheduleTaskMobile.setCreateAt(LocalDateTime.now());
             fosterwxCashScheduleTaskMobile.setUpdateAt(LocalDateTime.now());
 
+            // 如果已经获取到任务过了就不在获取
+            if (fosterwxCashScheduleTaskMobileService.count(new LambdaQueryWrapper<FosterwxCashScheduleTaskMobile>().
+                    eq(FosterwxCashScheduleTaskMobile::getTaskId, fosterwxCashScheduleTaskList.getId()).
+                    eq(FosterwxCashScheduleTaskMobile::getGroupId, fosterwxCashScheduleTaskList.getGroupId()).
+                    eq(FosterwxCashScheduleTaskMobile::getMobileId, fosterwxMobile.getId())) > 0)
+                continue;
+
             fosterwxCashScheduleTaskMobileService.save(fosterwxCashScheduleTaskMobile);
 
             // 获取任务详情
@@ -122,8 +130,9 @@ public class FosterwxCashWorkClientController {
                     last("LIMIT 1"));
             FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
             fosterwxCashBoxClientInfo.setTaskType(fosterwxCashScheduleTaskList.getTaskType());
+            fosterwxCashBoxClientInfo.setId(fosterwxCashScheduleTaskMobile.getId());
             if (3 == fosterwxCashScheduleTaskList.getTaskType()) {
-                LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo> fosterwxCashWorkBoxClientInfoLambdaQueryWrapper = new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>();
+                LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo> fosterwxCashWorkBoxClientInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 // fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid());
                 switch (fosterwxCashWorkwxTaskList.getBoxType()) {
                     case 8:
@@ -175,7 +184,7 @@ public class FosterwxCashWorkClientController {
             }
 
             fosterwxCashBoxClientInfoList.add(fosterwxCashBoxClientInfo);
-        });
+        }
 
         return AjaxResult.success(fosterwxCashBoxClientInfoList);
     }
@@ -269,10 +278,13 @@ public class FosterwxCashWorkClientController {
         return "新增修改成功!";
     }
 
-    @PostMapping(value = "/changeTaskMobileStatus", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PostMapping(value = "/changeStatus", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     @ApiOperation(value = "客户端返回发送状态  根据id更新状态<br>状态(1:待发送;2:发送中;3:已发送;4:已过期;5:发送失败)")
     public Object changeTaskMobileStatus(FosterwxCashScheduleTaskMobile fosterwxCashScheduleTaskMobile) {
-        fosterwxCashScheduleTaskMobileService.updateById(fosterwxCashScheduleTaskMobile);
+        Arrays.asList(fosterwxCashScheduleTaskMobile.getIds().split(",")).forEach(id -> {
+            fosterwxCashScheduleTaskMobile.setId(Integer.valueOf(id));
+            fosterwxCashScheduleTaskMobileService.updateById(fosterwxCashScheduleTaskMobile);
+        });
 
         return AjaxResult.success("更新成功!");
     }

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

@@ -64,6 +64,8 @@ public class FosterwxCashScheduleTaskMobile extends Model<FosterwxCashScheduleTa
     @TableField(exist = false)
     private FosterwxCashMobile fosterwxCashMobile;
 
+    @TableField(exist = false)
+    private String ids;
 
     public Integer getId() {
         return id;
@@ -154,4 +156,12 @@ public class FosterwxCashScheduleTaskMobile extends Model<FosterwxCashScheduleTa
     public void setFosterwxCashMobile(FosterwxCashMobile fosterwxCashMobile) {
         this.fosterwxCashMobile = fosterwxCashMobile;
     }
+
+    public String getIds() {
+        return ids;
+    }
+
+    public void setIds(String ids) {
+        this.ids = ids;
+    }
 }

src/main/resources/application-local.properties

@@ -73,6 +73,7 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxMobilePool/getOutOfServerList,\
   /pangu/server/getTaskInfo,\
   /pangu/server/saveBoxInfo,\
+  /pangu/server/changeStatus,\
   /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0

src/main/resources/application-prod.properties

@@ -67,6 +67,7 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxMobilePool/getOutOfServerList,\
   /pangu/server/getTaskInfo,\
   /pangu/server/saveBoxInfo,\
+  /pangu/server/changeStatus,\
   /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72.redis.rds.aliyuncs.com:6379/0
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=

src/main/resources/application-test.properties

@@ -27,8 +27,6 @@ spring.datasource.dynamic.datasource.crawerdb.driverClassName=com.mysql.cj.jdbc.
 spring.datasource.dynamic.datasource.crawerdb.url=jdbc:mysql://rr-uf612eyd79y526d0dbo.mysql.rds.aliyuncs.com:3306/wechat
 spring.datasource.dynamic.datasource.crawerdb.username=dev
 spring.datasource.dynamic.datasource.crawerdb.password=1qazXSW@
-
-
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.hbm2ddl.auto=update
 #mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
@@ -53,26 +51,26 @@ spring.servlet.multipart.max-file-size=500MB
 xxl.sso.server=https://sso.mokamrp.com/sso
 xxl.sso.logout.path=/logout
 xxl-sso.excluded.paths=/healthy,\
-/pangu/custservice/getRandCustservice,\
-/pangu/promoteCode/getRandPromoteCode,\
-/mochat/weWork/callback,\
-/pangu/fosterwxMobile/getMobileList,\
-/pangu/fosterwxMobile/delMobile,\
-/pangu/fosterwxMobile/editMobile,\
-/pangu/fosterwxMobile/mobileInfo,\
-/pangu/fosterwxMobile/addMobilePro,\
-/pangu/fosterwxMobileWxfriend/wxfriendAddPro,\
-/pangu/fosterwxFlowList/changeStatus,\
-/pangu/fosterwxFlowList/list,\
-/pangu/fosterwxStation/login,\
-/pangu/fosterwxMobilePool/getOutOfServerList,\
-/pangu/server/getTaskInfo,\
-/pangu/server/saveBoxInfo,\
-/pangu/promoteMaxRecord/getPromoteCodeMaxRecord
+  /pangu/custservice/getRandCustservice,\
+  /pangu/promoteCode/getRandPromoteCode,\
+  /mochat/weWork/callback,\
+  /pangu/fosterwxMobile/getMobileList,\
+  /pangu/fosterwxMobile/delMobile,\
+  /pangu/fosterwxMobile/editMobile,\
+  /pangu/fosterwxMobile/mobileInfo,\
+  /pangu/fosterwxMobile/addMobilePro,\
+  /pangu/fosterwxMobileWxfriend/wxfriendAddPro,\
+  /pangu/fosterwxFlowList/changeStatus,\
+  /pangu/fosterwxFlowList/list,\
+  /pangu/fosterwxStation/login,\
+  /pangu/fosterwxMobilePool/getOutOfServerList,\
+  /pangu/server/getTaskInfo,\
+  /pangu/server/saveBoxInfo,\
+  /pangu/server/changeStatus,\
+  /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=
-
 #dataHub
 datahub.endpoint=https://dh-cn-shanghai.aliyuncs.com
 datahub.accessId=LTAI5tEWU1j9H2poG4zWgfEP
@@ -80,16 +78,12 @@ datahub.accessSecret=p9tVmeDeeEENKhfsBsSeYc0F0ggH5b
 datahub.topic=s_hera_api_external_user_test
 datahub.corpTopic=ods_hera_msv_corp_data
 datahub.project=hera
-
 es.host=es-cn-4591gc2fx0001549q.public.elasticsearch.aliyuncs.com
 es.username=elastic
 es.password=moka6_3moka
 es.port=9200
-
 #typer接口
 typer.url=http://new-typer-combine-svc/api
-
 #定时任务全局开关，线上环境需要开启
 cronjob.power=false
-
 springfox.documentation.swagger-ui.enabled=true