[修复]向两江推送投拆任务不能同步

pom.xml

@@ -57,8 +57,8 @@
                 <spring.profile>dev</spring.profile>
                 <nacos.server.username>nacos</nacos.server.username>
                 <nacos.server.password>mxkj123..</nacos.server.password>
-                <nacos.server.address>127.0.0.1:8848</nacos.server.address>
-                <nacos.server.namespace>b98a94e3-baf2-45bd-b0a8-cffcf0fc607f</nacos.server.namespace>
+                <nacos.server.address>172.20.21.8:8848</nacos.server.address>
+                <nacos.server.namespace>823425f6-a668-46bb-b916-9a451221c24d</nacos.server.namespace>
                 <nacos.server.group>zfjg</nacos.server.group>
             </properties>
             <activation>
@@ -435,7 +435,11 @@
                     <nonFilteredFileExtensions>
                         <nonFilteredFileExtension>xls</nonFilteredFileExtension>
                         <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ttc</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>txt</nonFilteredFileExtension>
                     </nonFilteredFileExtensions>
+                    <encoding>utf-8</encoding>
                 </configuration>
             </plugin>
         </plugins>

zfjg-common/zfjg-common-core/src/main/java/com/zfjg/common/core/utils/DateUtils.java

@@ -18,8 +18,7 @@ import java.util.*;
  *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static final String DATETIME_FORMAT_DAY = "yyyyMMdd";
 
     public static String YYYY = "yyyy";
@@ -43,7 +42,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
-    private final static  String s = "{\n" +
+    //todo: 这个之后可能会改为接口 排队节假日
+    private final static String s = "{\n" +
             "        \"01-01\": {\n" +
             "            \"holiday\": true,\n" +
             "            \"name\": \"元旦\",\n" +
@@ -296,8 +296,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
-    {
+    public static Date getNowDate() {
         return new Date();
     }
 
@@ -306,44 +305,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      *
      * @return String
      */
-    public static String getDate()
-    {
+    public static String getDate() {
         return dateTimeNow(YYYY_MM_DD);
     }
 
-    public static final String getTime()
-    {
+    public static final String getTime() {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
 
-    public static final String dateTimeNow()
-    {
+    public static final String dateTimeNow() {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
 
-    public static final String dateTimeNow(final String format)
-    {
+    public static final String dateTimeNow(final String format) {
         return parseDateToStr(format, new Date());
     }
 
-    public static final String dateTime(final Date date)
-    {
+    public static final String dateTime(final Date date) {
         return parseDateToStr(YYYY_MM_DD, date);
     }
 
-    public static final String parseDateToStr(final String format, final Date date)
-    {
+    public static final String parseDateToStr(final String format, final Date date) {
         return new SimpleDateFormat(format).format(date);
     }
 
-    public static final Date dateTime(final String format, final String ts)
-    {
-        try
-        {
+    public static final Date dateTime(final String format, final String ts) {
+        try {
             return new SimpleDateFormat(format).parse(ts);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -351,8 +340,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
-    {
+    public static final String datePath() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -360,8 +348,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
-    {
+    public static final String dateTime() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -369,18 +356,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
-    {
-        if (str == null)
-        {
+    public static Date parseDate(Object str) {
+        if (str == null) {
             return null;
         }
-        try
-        {
+        try {
             return parseDate(str.toString(), parsePatterns);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             return null;
         }
     }
@@ -388,8 +370,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
-    {
+    public static Date getServerStartDate() {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -397,8 +378,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算两个时间差
      */
-    public static String getDatePoor(Date endDate, Date nowDate)
-    {
+    public static String getDatePoor(Date endDate, Date nowDate) {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;
@@ -419,8 +399,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDateTime ==> Date
      */
-    public static Date toDate(LocalDateTime temporalAccessor)
-    {
+    public static Date toDate(LocalDateTime temporalAccessor) {
         ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
@@ -428,8 +407,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDate ==> Date
      */
-    public static Date toDate(LocalDate temporalAccessor)
-    {
+    public static Date toDate(LocalDate temporalAccessor) {
         LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
@@ -510,13 +488,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         }
         Map<String, Object> maps = new HashMap<>();
         //工作日后实际时间:
-        maps.put("lastDate" , lastDate);
+        maps.put("lastDate", lastDate);
         //工作日后实际日期:
-        maps.put("lastTime" , lastTime);
+        maps.put("lastTime", lastTime);
         //实际天数
-        maps.put("timeout" , timeout);
+        maps.put("timeout", timeout);
         //节假日天数
-        maps.put("timeouts" , timeouts);
+        maps.put("timeouts", timeouts);
         return lastDate;
     }
 
@@ -572,7 +550,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      */
     public static Date formatDateTime(Date dateTime) {
         if (dateTime.toString().contains("Z")) {
-            if(dateTime.toString().length() < 20){
+            if (dateTime.toString().length() < 20) {
                 try {
                     SimpleDateFormat sdf = new SimpleDateFormat(DATETIME_FORMAT_DEFAULT4);
                     sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
@@ -581,7 +559,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            }else{
+            } else {
                 try {
                     SimpleDateFormat sdf = new SimpleDateFormat(DATETIME_FORMAT_DEFAULT2);
                     sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
@@ -597,6 +575,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         }
         return null;
     }
+
     /**
      * 将Date日期转换为String
      *
@@ -618,10 +597,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // 修复时间字符串转换时时间格式不兼容的形式 fixme
         if (Objects.nonNull(date) && date.matches("\\d{4}-\\d{1,2}-\\d{1,2} \\d{2}:\\d{2}:\\d{2}")) {
             dtf = new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS);
-        } else if(Objects.nonNull(date) && date.matches("\\d{4}-\\d{1,2}-\\d{1,2}")) {
+        } else if (Objects.nonNull(date) && date.matches("\\d{4}-\\d{1,2}-\\d{1,2}")) {
             dtf = new SimpleDateFormat(YYYY_MM_DD);
         } else {
-            throw new RuntimeException("时间字符串为空或时间格式不符合["+YYYY_MM_DD_HH_MM_SS+"，"+YYYY_MM_DD+"]");
+            throw new RuntimeException("时间字符串为空或时间格式不符合[" + YYYY_MM_DD_HH_MM_SS + "，" + YYYY_MM_DD + "]");
         }
         Date ldt = null;
         try {
@@ -708,9 +687,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取指定日期第二天凌晨时间
      */
-    public static Date getNextMorningByDate(Date date){
+    public static Date getNextMorningByDate(Date date) {
         Calendar calendar = Calendar.getInstance();
-        calendar.setTimeInMillis(date.getTime()+24*3600*1000);
+        calendar.setTimeInMillis(date.getTime() + 24 * 3600 * 1000);
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
@@ -721,14 +700,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      * 获取月度第一天
      */
     public static Date getFirstMonthDay(Date dt) {
-        if (ObjectUtils.isEmpty(dt)){
+        if (ObjectUtils.isEmpty(dt)) {
             dt = new Date();
         }
         //获取当前月第一天：
         Calendar ca = Calendar.getInstance();
         ca.setTime(dt);
         // ca.add(Calendar.MONTH, 0); 此方法可以获取前n月或后n月
-        ca.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
+        ca.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天
         ca.set(Calendar.HOUR, 0);
         ca.set(Calendar.MINUTE, 0);
         ca.set(Calendar.SECOND, 0);
@@ -739,18 +718,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      * 获取月度最后一天
      */
     public static Date getLastMonthDay(Date dt) {
-        if (ObjectUtils.isEmpty(dt)){
+        if (ObjectUtils.isEmpty(dt)) {
             dt = new Date();
         }
         //获取当前月最后一天
         Calendar ca = Calendar.getInstance();
         ca.setTime(dt);
         ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
-        ca.set(Calendar.HOUR, 23-12);
+        ca.set(Calendar.HOUR, 23 - 12);
         ca.set(Calendar.MINUTE, 59);
         ca.set(Calendar.SECOND, 59);
 
-        return  ca.getTime();
+        return ca.getTime();
     }
 
 
@@ -758,7 +737,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      * 获取指定日期的开始日期
      */
     public static Date getStartOfDay(Date dt) {
-        if (ObjectUtils.isEmpty(dt)){
+        if (ObjectUtils.isEmpty(dt)) {
             dt = new Date();
         }
         //获取当前月第一天：
@@ -775,14 +754,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      * 获取指定日期的结束日期
      */
     public static Date getEndOfDay(Date dt) {
-        if (ObjectUtils.isEmpty(dt)){
+        if (ObjectUtils.isEmpty(dt)) {
             dt = new Date();
         }
         //获取当前月第一天：
         Calendar ca = Calendar.getInstance();
         ca.setTime(dt);
         // ca.add(Calendar.MONTH, 0); 此方法可以获取前n月或后n月
-        ca.set(Calendar.HOUR, 23-12);
+        ca.set(Calendar.HOUR, 23 - 12);
         ca.set(Calendar.MINUTE, 59);
         ca.set(Calendar.SECOND, 59);
         return ca.getTime();
@@ -804,6 +783,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String getDay(Date date, String formate) {
         return getDateFormat(date, formate);
     }
+
     /**
      * 计算两个日期之间相差的分钟数
      *
@@ -834,39 +814,39 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     }
 
     /**
-     *@Author ht
-     *@Date 2020/12/2 15:27
+     * @Author ht
+     * @Date 2020/12/2 15:27
      * 今年一月一号
      */
     public static Date getThisYear() {
         Date time = new Date();
         try {
-            Calendar currCal=Calendar.getInstance();
+            Calendar currCal = Calendar.getInstance();
             Calendar calendar = Calendar.getInstance();
             calendar.clear();
-            calendar.set(Calendar.YEAR,currCal.get(Calendar.YEAR));
+            calendar.set(Calendar.YEAR, currCal.get(Calendar.YEAR));
             time = calendar.getTime();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return time;
     }
 
-    public static Date getBefore(int before){
+    public static Date getBefore(int before) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
-        calendar.add(Calendar.DATE,-before);
+        calendar.add(Calendar.DATE, -before);
         return calendar.getTime();
     }
 
     /**
      * 当前时间往后推多久
      */
-    public static Date pushTime(long time){
-        return new Date(DateUtils.getNowDate().getTime()+time);
+    public static Date pushTime(long time) {
+        return new Date(DateUtils.getNowDate().getTime() + time);
     }
 
-    public static Date strToDate(String str){
+    public static Date strToDate(String str) {
         Date date = null;
         try {
             date = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(str);

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/mapper/enforce/job/EnforceJobMapper.java

@@ -11,6 +11,7 @@ import com.zfjg.manage.api.vo.enforce.job.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -238,4 +239,6 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
     List<EnforceJobDTO> getDeadlineTime();
 
     void updateNull(EnforceJob enforceJob);
+
+    EnforceJob getRealJobById(Serializable id);
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/enforce/job/IEnforceJobService.java

@@ -12,6 +12,7 @@ import com.zfjg.manage.api.search.enforce.job.EnforceJobQuery;
 import com.zfjg.manage.api.vo.enforce.job.*;
 import org.apache.ibatis.annotations.Param;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -445,4 +446,11 @@ public interface IEnforceJobService extends IService<EnforceJob> {
     void checkStaticNoticeResult(EnforceJob enforceJob, String staticNoticeResult, ExecuteStepEnum executeStep);
 
 
+    /**
+     * 获取真实job
+     * @param id
+     * @return
+     */
+    EnforceJob getRealJobById(Serializable id);
+
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/job/EnforceJobServiceImpl.java

@@ -80,6 +80,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -3246,4 +3247,9 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
         }
     }
 
+
+    @Override
+    public EnforceJob getRealJobById(Serializable id) {
+        return this.baseMapper.getRealJobById(id);
+    }
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/sync/remote/DefaultLjZfjgSyncDataService.java

@@ -129,15 +129,13 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService{
             log.info("未开启两江数据推送接口");
             return;
         }
-        String enforceOrgId = MapUtil.getStr(obj, "enforceOrgId");
-        String jobType = MapUtil.getStr(obj, "jobType");
-        if (!JobTypeEnum.REPORT.getValue().equals(jobType) || !checkIsLjData(enforceOrgId)) {
-            log.warn("不是两江或举报投诉任务不进行同步：{}", obj);
-            return;
-        }
         if (checkParams(obj, "id")) {
-            EnforceJob enforceJob = Optional.ofNullable(enforceJobService.getById((Serializable) obj.get("id")))
+            EnforceJob enforceJob = Optional.ofNullable(enforceJobService.getRealJobById((Serializable) obj.get("id")))
                     .orElse(new EnforceJob());
+            if (!JobTypeEnum.REPORT.getValue().equals(enforceJob.getJobType()) || !checkIsLjData(enforceJob.getEnforceOrgId())) {
+                log.warn("不是两江举报投诉任务不进行同步：{}", enforceJob);
+                return;
+            }
             map2Obj(obj, enforceJob);
             request("/enforce_job", enforceJob, true);
             if (JobTypeEnum.REPORT.getValue().equals(enforceJob.getJobType())) {

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceJobMapper.xml

@@ -1773,6 +1773,9 @@
             AND deadline_time IS NULL
             AND last_enforce_date IS NOT NULL
     </select>
+    <select id="getRealJobById" resultType="com.zfjg.manage.api.domain.enforce.job.EnforceJob">
+        select * from enforce_job where id = #{id}
+    </select>
     <update id="updateNull">
         update enforce_job set forward_time = #{forwardTime},approve_user_id = #{approveUserId},approve_user_name = #{approveUserName}
         where id = #{id}

zfjg-modules/zfjg-sync/src/main/java/com/zfjg/sync/modules/job/service/impl/EnforceJobServiceImpl.java

@@ -129,14 +129,14 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
                 Set<Long> ids = enforceApproves.stream().map(item -> item.getApproveJobId()).collect(Collectors.<Long>toSet());
                 IEnforceApproveService enforceApproveService = SpringUtils.getBean(IEnforceApproveService.class);
                 enforceApproveService.removeByIds(ids);
-                enforceApproveService.saveBatch(enforceApproves);
+                enforceApproveService.saveOrUpdateBatch(enforceApproves);
             }
             List<EnforceApproveDetail> enforceApproveDetails = archiveEnforceJob.getEnforceApproveDetails();
             // 更新任务审批流程
             if (CollectionUtils.isNotEmpty(enforceApproveDetails)) {
                 Set<Long> ids = enforceApproveDetails.stream().map(item -> item.getApproveJobId()).collect(Collectors.<Long>toSet());
                 enforceApproveDetailsService.removeByIds(ids);
-                enforceApproveDetailsService.saveBatch(enforceApproveDetails);
+                enforceApproveDetailsService.saveOrUpdateBatch(enforceApproveDetails);
             }
         }
 
@@ -211,6 +211,7 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
             );
         }
     }
+
     /**
      * 添加或更新举报投诉
      *