Procházet zdrojové kódy

按时间字段查询无效

Guos před 1 týdnem
rodič
revize
8a2844eb32

+ 27 - 27
fs-admin/src/main/java/com/fs/task/SgTestController.java

@@ -1,27 +1,27 @@
-//package com.fs.task;
-//
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.annotation.Resource;
-//
-///**
-// * @description:
-// * @author: Guos
-// * @time: 2025/10/23 下午2:18
-// */
-//@RestController
-//@RequestMapping("/sg/test")
-//public class SgTestController {
-//
-//    @Resource
-//    private SyncTuLinStudentInfoTask syncTuLinStudentInfoTask;
-//
-//
-//    @RequestMapping("/execute")
-//    public void execute(){
-//        syncTuLinStudentInfoTask.execute();
-//    }
-//
-//
-//}
+package com.fs.task;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @description:
+ * @author: Guos
+ * @time: 2025/10/23 下午2:18
+ */
+@RestController
+@RequestMapping("/sg/test")
+public class SgTestController {
+
+    @Resource
+    private SyncTuLinStudentInfoTask syncTuLinStudentInfoTask;
+
+
+    @RequestMapping("/execute")
+    public void execute(){
+        syncTuLinStudentInfoTask.execute();
+    }
+
+
+}

+ 1 - 1
fs-admin/src/main/resources/logback.xml

@@ -72,7 +72,7 @@
     </appender>
 
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.fs" level="info" />
+	<logger name="com.fs" level="debug" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

+ 7 - 0
fs-service/src/main/java/com/fs/crm/param/CrmCustomerListQueryParam.java

@@ -1,6 +1,7 @@
 package com.fs.crm.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
 
@@ -96,5 +97,11 @@ public class CrmCustomerListQueryParam extends BaseQueryParam
 
     private String[] receiveTimeList;
 
+    /** 开始时间 */
+    private String beginTime;
+
+    /** 结束时间 */
+    private String endTime;
+
 
 }

+ 22 - 22
fs-service/src/main/java/com/fs/tulin/service/impl/TulinInfoSyncLogServiceImpl.java

@@ -74,28 +74,28 @@ public class TulinInfoSyncLogServiceImpl implements ITulinInfoSyncLogService {
                 }
             }
         }
-//        if(activeProfile.equals("dev")) {
-//            log.info("线下开始执行数据同步");
-//            for (QwExUserInfo qwExUserInfo : qwExUserInfos) {
-//                StudentInfo studentInfo = new StudentInfo();
-//                BeanUtils.copyProperties(qwExUserInfo, studentInfo);
-//                studentInfo.setAppid("wx6688e6b9b6fb8700");
-//                studentInfo.setColumn_name(ColumnNameEnum.GYBNX.getName());
-//                studentInfo.setPharmacy_id(PharmacyEnum.YJKYSY.getPharmacyId());
-//                studentInfo.setService_phone("15141712344");
-//                List<PeriodInfo> periodInfos = tulinInfoSyncLogMapper.selectPeriodInfo(qwExUserInfo.getFs_user_id());
-//                if(CollectionUtils.isNotEmpty(periodInfos)){
-//                    studentInfo.setPeriod_name(periodInfos.get(0).getCourseName());
-//                }
-//                try {
-//                    TulinInfoSyncLog tulinInfoSyncLog = SyncStudentInfoService.send(PROD_URL,PROD_CORPID, studentInfo);
-//                    tulinInfoSyncLog.setFsUserId(qwExUserInfo.getFs_user_id());
-//                    insert(tulinInfoSyncLog);
-//                } catch (JsonProcessingException e) {
-//                    throw new RuntimeException(e);
-//                }
-//            }
-//        }
+        if(activeProfile.equals("dev")) {
+            log.info("线下开始执行数据同步");
+            for (QwExUserInfo qwExUserInfo : qwExUserInfos) {
+                StudentInfo studentInfo = new StudentInfo();
+                BeanUtils.copyProperties(qwExUserInfo, studentInfo);
+                studentInfo.setAppid("wx6688e6b9b6fb8700");
+                studentInfo.setColumn_name(ColumnNameEnum.GYBNX.getName());
+                studentInfo.setPharmacy_id(PharmacyEnum.YJKYSY.getPharmacyId());
+                studentInfo.setService_phone("15141712344");
+                List<PeriodInfo> periodInfos = tulinInfoSyncLogMapper.selectPeriodInfo(qwExUserInfo.getFs_user_id());
+                if(CollectionUtils.isNotEmpty(periodInfos)){
+                    studentInfo.setPeriod_name(periodInfos.get(0).getCourseName());
+                }
+                try {
+                    TulinInfoSyncLog tulinInfoSyncLog = SyncStudentInfoService.send(PROD_URL,PROD_CORPID, studentInfo);
+                    tulinInfoSyncLog.setFsUserId(qwExUserInfo.getFs_user_id());
+                    insert(tulinInfoSyncLog);
+                } catch (JsonProcessingException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
     }
 
 

+ 3 - 3
fs-service/src/main/resources/application-dev.yml

@@ -43,9 +43,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://139.186.77.83:3306/ylrz_his_scrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                    username: Rtroot
-                    password: Rtroot
+                    url: jdbc:mysql://127.0.0.1:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: 1101165230
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量