修改定时任务

eladmin-system/src/main/java/me/zhengjie/modules/dm/messageSendLog/util/SendMessageUtils.java

@@ -11,7 +11,7 @@ import me.zhengjie.utils.StringUtils;
 @Slf4j
 public class SendMessageUtils {
 
-    private static String erpapiUrl = "http://222.84.157.37:25894";
+    private static String erpapiUrl = "http://10.20.2.231:10088";
 
     /**
      * 发送

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/repository/DmUserRepository.java

@@ -24,6 +24,7 @@ import org.springframework.data.repository.query.Param;
 
 import javax.transaction.Transactional;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @website https://el-admin.vip
@@ -87,4 +88,12 @@ public interface DmUserRepository extends JpaRepository<DmUser, String>, JpaSpec
     @Transactional
     @Query(value = "insert into dm_user_menu(user_id,app_menu_id) values(:userId, :appMenuId)", nativeQuery = true)
     void createUserAppMenu(@Param("userId") String userId, @Param("appMenuId") Integer appMenuId);
+
+    /**
+     * 查询所有数据不分页
+     *
+     * @return
+     */
+    @Query(value = "SELECT u.id as id, u.name as name,u.dept_id as deptId,u.sex as sex,u.card_id as cardId  FROM dm_user u", nativeQuery = true)
+    List<Map<String,String>> queryAll();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/service/DmUserService.java

@@ -113,4 +113,10 @@ public interface DmUserService {
      * @param appMenuId
      */
     void createUserAppMenu(String userId, Integer appMenuId);
+
+    /**
+     * 查询所有数据不分页
+     * @return List<DmUserDto>
+     */
+    List<Map<String,String>> queryAll();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/service/impl/DmUserServiceImpl.java

@@ -158,4 +158,9 @@ public class DmUserServiceImpl implements DmUserService {
     public void createUserAppMenu(String userId, Integer appMenuId) {
         dmUserRepository.createUserAppMenu(userId,appMenuId);
     }
+
+    @Override
+    public List<Map<String,String>> queryAll() {
+        return dmUserRepository.queryAll();
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataPushTask.java

@@ -79,7 +79,7 @@ public class ZkDataPushTask {
                 param.put("sort",deptDto.getDeptSort());
                 param.put("operateType",1);
                 String res = HttpRequest.post(fpApi+api)
-                        .form("person",param.toJSONString()).execute().body();
+                        .form("dept",param.toJSONString()).execute().body();
                 log.info("res:"+res);
             }
         }
@@ -87,23 +87,23 @@ public class ZkDataPushTask {
 
     private void pushFeiPuUserData(){
         String api = "openapi/personOperate";
-        List<DmUserDto> dmUserDtoList = dmUserService.queryAll(new DmUserQueryCriteria());
+        List<Map<String,String>> dmUserDtoList = dmUserService.queryAll();
         if(!ObjectUtils.isEmpty(dmUserDtoList)){
-            for(DmUserDto dmUserDto: dmUserDtoList){
+            for(Map<String,String> map: dmUserDtoList){
                 JSONObject param = new JSONObject();
-                param.put("userId",dmUserDto.getId());
-                param.put("userName",dmUserDto.getName());
-                param.put("deptId",dmUserDto.getDept().getId());
+                param.put("userId",map.get("id"));
+                param.put("userName",map.get("name"));
+                param.put("deptId",map.get("deptId"));
                 Integer sex = null;
-                if(StringUtils.isNotBlank(dmUserDto.getSex())){
-                    if(StringUtils.equals("男",dmUserDto.getSex())){
+                if(StringUtils.isNotBlank(map.get("sex"))){
+                    if(StringUtils.equals("男",map.get("sex"))){
                         sex = 2;
-                    } else if(StringUtils.equals("女",dmUserDto.getSex())) {
+                    } else if(StringUtils.equals("女",map.get("sex"))) {
                         sex = 1;
                     }
                 }
                 param.put("sex",sex);
-                param.put("cardId",dmUserDto.getCardid());
+                param.put("cardId",map.get("cardId"));
                 param.put("operateType",1);
                 String res = HttpRequest.post(fpApi+api)
                         .form("person",param.toJSONString()).execute().body();

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -54,7 +54,7 @@ import java.util.*;
 @Component
 public class ZkDataSyncTask {
 
-    private final String erpApiUrl = "http://121.31.41.88:29312";
+    private final String erpApiUrl = "https://portal.caih.com";
     private final String sign = "e34b2f59-0e9d-45ed-a32a-f4abd4381000";
     private final String header_key = "X_AUTO_USER_INFO_HEAD";
     private final String header_value = "{\"id\":\"anonymous\",\"tenantId\":\"caih\"}";

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/UserApiController.java

@@ -72,7 +72,7 @@ public class UserApiController {
 
     private final PasswordEncoder passwordEncoder;
 
-    private final String erpapiUrl = "http://10.19.0.234:30170";
+    private final String erpapiUrl = "https://portal.caih.com";
 
     private final String key = "DMERPYT!@#$QWER2021+{:>";