Merge branch '20240418_sun' of sckj/mz-cloud into master

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLnstService.java

@@ -16,4 +16,9 @@ public interface RemoteLnstService {
     @PostMapping("/lnst")
     public AjaxResult add(@RequestBody InLnstLrxx lrJbxx, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @PostMapping("/lrxx/tongyuLrxx")
+    public AjaxResult tongyuLrxx(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PostMapping("/lrxx/mrYcxx")
+    public AjaxResult mrYcxx(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLnstFallbackFactory.java

@@ -22,6 +22,16 @@ public class RemoteLnstFallbackFactory implements FallbackFactory<RemoteLnstServ
             public AjaxResult add(InLnstLrxx lrJbxx, String source) {
                 return AjaxResult.error("注册用户失败:" + throwable.getMessage());
             }
+
+            @Override
+            public AjaxResult tongyuLrxx(String source) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult mrYcxx(String source) {
+                return null;
+            }
         };
     }
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/ZwywLrJbxxController.java

@@ -238,4 +238,14 @@ public class ZwywLrJbxxController extends BaseController {
         ExcelUtil<InLnstLrxx> util = new ExcelUtil<InLnstLrxx>(InLnstLrxx.class);
         util.importTemplateExcel(response, "老人基本信息");
     }
+
+    @PostMapping("/tongyuLrxx")
+    public void tongyuLrxx() {
+        zwywLrJbxxService.tongyuLrxx();
+    }
+
+    @PostMapping("/mrYcxx")
+    public void mrYcxx() {
+        zwywLrJbxxService.mrYcxx();
+    }
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/IZwywLrJbxxService.java

@@ -71,4 +71,8 @@ public interface IZwywLrJbxxService
     public Map<String, String> getJg(String jmZjhm, String jg, String tcId);
 
     public void build(String ylCard, String picBase64);
+
+    public void tongyuLrxx();
+
+    public void mrYcxx();
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/YlServer.java

@@ -44,8 +44,9 @@ public class YlServer {
 
         // 查询
         InLnstLrxx lrxx = new InLnstLrxx();
-//        lrxx.setYlcode("1100302424");
-        lrxx.setLrZjhm("220104199607156937");
+//        lrxx.setYlcode("1201626019");
+        lrxx.setLrZjhm("220281199506020537");
+        lrxx.setMchnt("10002253");
         TreeMap<String, Object> lr = new TreeMap<>();
         TreeMap<String, Object> map = new TreeMap<>();
         if (StringUtils.isNotEmpty(lrxx.getYlcode())) {

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywLrJbxxServiceImpl.java

@@ -1197,4 +1197,36 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
         }
         return mchnt.getMchnt();
     }
+
+    public void tongyuLrxx() {
+        List<InLnstLrxx> tyList = zwywLrJbxxMapper.selectList(new LambdaQueryWrapper<InLnstLrxx>()
+                .like(InLnstLrxx::getLrHjdz, "220822"));
+        tyList = tyList.stream().filter(t -> StringUtils.isEmpty(t.getYlcard())).collect(Collectors.toList());
+        for (InLnstLrxx lr: tyList) {
+            if (StringUtils.isAnyEmpty(lr.getYlcode(), lr.getYlcard(), lr.getMchnt())) {
+                EncryptionUtils.decryptForPlaintext(lr);
+                InLnstLrxx query = new InLnstLrxx();
+                query.setLrZjhm(lr.getLrZjhm());
+                query.setMchnt("10002253");
+                JSONObject res = ylServer.ylQuery(query);
+                if (ObjectUtils.isNotEmpty(res) && res.containsKey("respCode") && StringUtils.equals(res.getString("respCode"), "0000")) {
+                    lr.setYlcode(res.getJSONObject("member").getString("memberCode"));
+                    lr.setYlcard(res.getJSONObject("member").getString("cardCode"));
+                    lr.setMchnt("10002253");
+                    if (StringUtils.equals(res.getJSONObject("member").getString("state"), "1")) {
+                        lr.setLzzt("3");
+                        lr.setState("1");
+                    } else {
+                        lr.setLzzt("4");
+                        lr.setState("0");
+                    }
+                    zwywLrJbxxMapper.updateById(lr);
+                }
+            }
+        }
+    }
+
+    public void mrYcxx() {
+
+    }
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java

@@ -106,4 +106,8 @@ public interface ISysJobService
     public void checkDjpdJob();
 
     public void checkGlbtJob();
+
+    public void tongyuLrxx();
+
+    public void mrYcxx();
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.job.mapper.SysJobMapper;
 import com.ruoyi.job.util.CronUtils;
 import com.ruoyi.job.util.ScheduleUtils;
 import com.ruoyi.system.api.RemoteJobService;
+import com.ruoyi.system.api.RemoteLnstService;
 import org.quartz.JobDataMap;
 import org.quartz.JobKey;
 import org.quartz.Scheduler;
@@ -36,6 +37,9 @@ public class SysJobServiceImpl implements ISysJobService
     @Autowired
     private RemoteJobService remoteJobService;
 
+    @Autowired
+    private RemoteLnstService remoteLnstService;
+
     /**
      * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
      */
@@ -278,4 +282,14 @@ public class SysJobServiceImpl implements ISysJobService
     public void checkGlbtJob() {
         remoteJobService.checkGlbtJob(SecurityConstants.INNER);
     }
+
+    @Override
+    public void tongyuLrxx() {
+        remoteLnstService.tongyuLrxx(SecurityConstants.INNER);
+    }
+
+    @Override
+    public void mrYcxx() {
+        remoteLnstService.mrYcxx(SecurityConstants.INNER);
+    }
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -45,4 +45,14 @@ public class RyTask
     {
         sysjob.checkDjpdJob();
     }
+
+    public void tongyuLrxx()
+    {
+        sysjob.tongyuLrxx();
+    }
+
+    public void mrYcxx()
+    {
+        sysjob.mrYcxx();
+    }
 }