Merge remote-tracking branch 'origin/dev-08xx-fix-bug' into dev

src/main/java/com/tanpu/feo/feojob/controller/DaySubjectController.java

 package com.tanpu.feo.feojob.controller;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.tanpu.common.api.CommonResp;
+import com.tanpu.feo.feojob.dao.user.entity.DaySubjectEntity;
 import com.tanpu.feo.feojob.dto.OrgSyncDto;
 import com.tanpu.feo.feojob.jobs.DaySubJob;
 import com.tanpu.feo.feojob.jobs.OrgSyncByWxcpJob;
@@ -9,13 +11,13 @@ import com.tanpu.feo.feojob.service.OrgSyncByJyzyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @Api(tags = "手动执行 早报推送")
@@ -33,4 +35,15 @@ public class DaySubjectController {
         return CommonResp.success("执行完成");
     }
 
+    @RequestMapping(value = "/sendOneOrgDaySubject", method = RequestMethod.GET)
+    @ApiOperation(value = "单机构早报推送")
+    public CommonResp<String> sendOneOrgDaySubject(@RequestParam String orgId, @RequestParam String date) {
+        List<DaySubjectEntity> daySubjectList = daySubJob.getDaySubject(date, orgId);
+        List<DaySubjectEntity> list = daySubjectList.stream().filter(p -> StringUtils.equals(p.getDsPt(), orgId))
+                .collect(Collectors.toList());
+        String oneMorningTitle = daySubJob.getOneMorningTitle();
+        daySubJob.sendDaySubject(orgId, list, oneMorningTitle);
+        return CommonResp.success("执行完成");
+    }
+
 }

src/main/java/com/tanpu/feo/feojob/feign/shorter/ShorterFeign.java

+package com.tanpu.feo.feojob.feign.shorter;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@FeignClient(value = "shorturl", url = "${tanpu.feo-shorter.svc:}",  path = "/")
+public interface ShorterFeign {
+    @PostMapping("/shorter/get")
+    ShorterResp getShorter(String url);
+}

src/main/java/com/tanpu/feo/feojob/feign/shorter/ShorterResp.java

+package com.tanpu.feo.feojob.feign.shorter;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ShorterResp<T> {
+
+    private int code;
+
+    private String msg;
+
+    private T result;
+
+    public ShorterResp(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public boolean isSuccess() {
+        return code == 200;
+    }
+
+    public boolean isNotSuccess() {
+        return !isSuccess();
+    }
+}

src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java

@@ -65,7 +65,7 @@ public class OrgSyncByWxcpJob {
     @Value("${tanpu.sync.job.skipped:true}")
     private boolean jobSkipped;
 
-    @Scheduled(cron = "0 30 6,10,15 * * ?")   //每日凌晨6点30执行
+    @Scheduled(cron = "0 30 6-19/1 * * ?")   //每日凌晨6点30开始执行
     public void execute() {
         log.info("====== 开始执行OrgSyncByWxcpJob ======");
         try {