添加服务追踪

refined-manager/src/main/java/com/mortals/xhx/busiz/req/SmsThirdPartyReq.java

 package com.mortals.xhx.busiz.req;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
@@ -34,7 +35,7 @@ public class SmsThirdPartyReq {
     /**
      * 内容
      */
-    private JSONObject json;
+    private JSONArray json;
 
 
     public static void main(String[] args) {
@@ -43,7 +44,7 @@ public class SmsThirdPartyReq {
         smsThirdPartyReq.setAppid("12");
         smsThirdPartyReq.setPhone("31");
         smsThirdPartyReq.setType("123");
-        smsThirdPartyReq.setJson(new JSONObject());
+       // smsThirdPartyReq.setJson(new JSONObject());
 
 
         System.out.println(JSON.toJSONString(smsThirdPartyReq));

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java

@@ -88,7 +88,12 @@ public class SyncRegisterUserTaskImpl implements ITaskExcuteService {
 
     private void syncRegisterUsers() {
         //查询本地最大id
-        int count = personService.count(new PersonQuery(), null);
+
+        int count=0;
+        List<PersonEntity> max = personService.getDao().getMax();
+        if(!ObjectUtils.isEmpty(max)){
+            count=max.get(0).getSiteId().intValue();
+        }
         String registerPath = "/inter/Actuary/peopleList";
         String url = host + registerPath;
         Map<String, Object> params = new HashMap<>();
@@ -101,6 +106,7 @@ public class SyncRegisterUserTaskImpl implements ITaskExcuteService {
 
         if (rest.getCode() == YesNoEnum.YES.getValue()) {
             Integer total = rest.getData().getTotal();
+            log.info("total：{}", total);
             if (total > 1) {
                 params = new HashMap<>();
                 params.put("page", 1);
@@ -113,7 +119,7 @@ public class SyncRegisterUserTaskImpl implements ITaskExcuteService {
                 if (restTotal.getCode() == YesNoEnum.YES.getValue()) {
                     //同步所有用户
                     List<DataItem> userList = restTotal.getData().getData();
-                    log.info("注册用户总数量：{}", userList.size());
+                    log.info("注册用户新增数量：{}", userList.size());
                     if (!ObjectUtils.isEmpty(userList)) {
                         List<PersonEntity> newUserList = userList.stream().map(user -> {
                             if (ObjectUtils.isEmpty(user.getIdcardIDCardNo())) {

refined-manager/src/main/java/com/mortals/xhx/module/care/service/impl/CareRecordsServiceImpl.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.care.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.mortals.framework.common.Rest;
@@ -118,7 +119,7 @@ public class CareRecordsServiceImpl extends AbstractCRUDServiceImpl<CareRecordsD
             smsThirdPartyReq.setAppid(apiId);
             smsThirdPartyReq.setPhone(careRecordsEntity.getContact());
             smsThirdPartyReq.setType(ParamKey.SYS_PARAM_SMS_PERSON_CARE_TYPE);
-            smsThirdPartyReq.setJson(new JSONObject());
+            smsThirdPartyReq.setJson(new JSONArray());
 
             Map<String, Object> form = BeanUtil.beanToMap(smsThirdPartyReq, false, true);
             log.info("sms req sendUrl:{}     params:{}", smsSendUrl, JSON.toJSONString(form));

refined-manager/src/main/java/com/mortals/xhx/module/person/dao/PersonDao.java

 package com.mortals.xhx.module.person.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.module.person.model.PersonEntity;
 import java.util.List;
 /**
@@ -14,4 +15,6 @@ import java.util.List;
 public interface  PersonDao extends ICRUDDao<PersonEntity,Long>{
 
 
+    List<PersonEntity> getMax();
+
 }

refined-manager/src/main/java/com/mortals/xhx/module/person/dao/ibatis/PersonDaoImpl.java

@@ -6,6 +6,8 @@ import com.mortals.xhx.module.person.dao.PersonDao;
 import com.mortals.xhx.module.person.model.PersonEntity;
 import java.util.Date;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+
+import java.util.HashMap;
 import java.util.List;
 /**
 * 注册人员DaoImpl DAO接口
@@ -16,6 +18,8 @@ import java.util.List;
 @Repository("personDao")
 public class PersonDaoImpl extends BaseCRUDDaoMybatis<PersonEntity,Long> implements PersonDao {
 
-
-
+    @Override
+    public List<PersonEntity> getMax() {
+        return getSqlSession().selectList(getSqlId("getMaxSourceId"), new HashMap<String, Object>());
+    }
 }

refined-manager/src/main/java/com/mortals/xhx/module/person/service/PersonService.java

 package com.mortals.xhx.module.person.service;
+
 import com.mortals.framework.service.ICRUDCacheService;
-import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.person.dao.PersonDao;
 import com.mortals.xhx.module.person.model.PersonEntity;
-/**
-* PersonService
-*
-* 注册人员 service接口
-*
-* @author zxfei
-* @date 2023-04-09
-*/
-public interface PersonService extends ICRUDCacheService<PersonEntity,Long>{
 
+/**
+ * PersonService
+ * <p>
+ * 注册人员 service接口
+ *
+ * @author zxfei
+ * @date 2023-04-09
+ */
+public interface PersonService extends ICRUDCacheService<PersonEntity, Long> {
 
+    PersonDao getDao();
 
 
 }
\ No newline at end of file

refined-manager/src/main/resources/sqlmap/module/person/PersonMapperExt.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.person.dao.ibatis.PersonDaoImpl">
+
+
+    <select id="getMaxSourceId" parameterType="java.util.HashMap" resultMap="PersonEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_person as a
+        WHERE a.sourceId = (SELECT MAX(b.sourceId) FROM mortals_xhx_person b) ORDER BY a.sourceId DESC;
+    </select>
+
+</mapper>
\ No newline at end of file