20250217_sun

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

@@ -17,4 +17,8 @@ public interface RemoteGljtService {
 
     @PostMapping("/jkzkDj/generateJkzk")
     public AjaxResult generateJkzk(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PostMapping("/qxpz/getQxpz")
+    public AjaxResult getQxpz(@RequestParam("xzqh") String xzqh, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
 }

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

@@ -25,6 +25,11 @@ public class RemoteGljtFallbackFactory implements FallbackFactory<RemoteGljtServ
             public AjaxResult generateJkzk(String source) {
                 return null;
             }
+
+            @Override
+            public AjaxResult getQxpz(String xzqh, String source) {
+                return null;
+            }
         };
     }
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -5,16 +5,19 @@ import com.ruoyi.auth.form.LoginBody;
 import com.ruoyi.auth.form.RegisterBody;
 import com.ruoyi.auth.service.SysLoginService;
 import com.ruoyi.common.core.constant.CacheConstants;
+import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.JwtUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.auth.AuthUtil;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.lnst.domain.InLnstLrxx;
+import com.ruoyi.system.api.RemoteGljtService;
 import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.utils.Encryption;
 import org.apache.commons.lang3.ObjectUtils;
@@ -45,6 +48,9 @@ public class TokenController
     @Autowired
     private SysLoginService sysLoginService;
 
+    @Autowired
+    private RemoteGljtService remoteGljtService;
+
     @PostMapping("login")
     public R<?> login(@RequestBody LoginBody form)
     {
@@ -237,8 +243,25 @@ public class TokenController
 
     @PostMapping("getProgramOpenId")
     public R<String> getProgramOpenId(@RequestBody LoginBody form) {
+        String appId = null;
+        String secret = null;
+        AjaxResult res = remoteGljtService.getQxpz(form.getUsername(), SecurityConstants.INNER);
+        if (ObjectUtils.isNotEmpty(res)) {
+            if (ObjectUtils.isNotEmpty(res.get("data"))) {
+                Map<String, String> data = (Map<String, String>) res.get("data");
+                if (ObjectUtils.isNotEmpty(data)) {
+                    if (data.containsKey("kz6") && data.containsKey("kz7")) {
+                        appId = data.get("kz6");
+                        secret = data.get("kz7");
+                    }
+                }
+            }
+        }
+        if (StringUtils.isAnyEmpty(appId, secret)) {
+            return R.fail("行政区划有误");
+        }
         System.out.println(form.getCode());
-        String requestUrl = getProgramWebAccess(form.getCode());
+        String requestUrl = getProgramWebAccess(form.getCode(), appId, secret);
         System.out.println(requestUrl);
         com.alibaba.fastjson.JSONObject sessionData = httpsRequest(requestUrl, "GET", null);
         System.out.println(sessionData);
@@ -303,15 +326,15 @@ public class TokenController
         return String.format(a, b, c, CODE);
     }
 
-    public static String getProgramWebAccess(String CODE) {
+    public static String getProgramWebAccess(String CODE, String appId, String secret) {
         String a = ResourceUtil.getConfigByName("wx.webAccessTokenhttps");
-        String b = ResourceUtil.getConfigByName("wx.appId");
-        String c = ResourceUtil.getConfigByName("wx.secret");
+        String b = appId;
+        String c = secret;
         return String.format(a, b, c, CODE);
     }
 
     public static void main(String[] args) {
-        String requestUrl = getProgramWebAccess("0a3Ssx1004RWwT17Il000usZ5c4Ssx1j");
+        String requestUrl = getProgramWebAccess("0a3Ssx1004RWwT17Il000usZ5c4Ssx1j", "", "");
         System.out.println(requestUrl);
         com.alibaba.fastjson.JSONObject sessionData = httpsRequest(requestUrl, "GET", null);
         System.out.println(sessionData);

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/controller/GljtQxpzController.java

@@ -103,4 +103,10 @@ public class GljtQxpzController extends BaseController
     {
         return AjaxResult.success(gljtQxpzService.getSpdb());
     }
+
+    @PostMapping("/getQxpz")
+    public AjaxResult getQxpz(String xzqh)
+    {
+        return AjaxResult.success(gljtQxpzService.getQxpz(xzqh));
+    }
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtQxpz.java

@@ -136,18 +136,18 @@ public class GljtQxpz extends BaseEntity
     /** 扩展字段 */
     @Excel(name = "扩展字段")
     @ApiModelProperty(value = "扩展字段")
-    @Size(max = 20, message = "{扩展字段}")
+    @Size(max = 50, message = "{扩展字段}")
     private String kz7;
 
     /** 扩展字段 */
     @Excel(name = "扩展字段")
     @ApiModelProperty(value = "扩展字段")
-    @Size(max = 20, message = "{扩展字段}")
+    @Size(max = 200, message = "{扩展字段}")
     private String kz8;
 
     /** 扩展字段 */
     @Excel(name = "扩展字段")
     @ApiModelProperty(value = "扩展字段")
-    @Size(max = 20, message = "{扩展字段}")
+    @Size(max = 500, message = "{扩展字段}")
     private String kz9;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/IGljtQxpzService.java

@@ -54,4 +54,6 @@ public interface IGljtQxpzService
     public int deleteGljtQxpzByIds(String[] ids);
 
     public Map<String, String> getSpdb();
+
+    public Map<String, Object> getQxpz(String xzqh);
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtQxpzServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.gljt.service.impl;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.security.utils.SecurityUtils;
@@ -193,4 +194,13 @@ public class GljtQxpzServiceImpl implements IGljtQxpzService
         return res;
     }
 
+    @Override
+    public Map<String, Object> getQxpz(String xzqh) {
+        List<Map<String, Object>> map = gljtQxpzMapper.selectMaps(new LambdaQueryWrapper<GljtQxpz>()
+            .like(GljtQxpz::getXzqh, xzqh.substring(0, 6)));
+        if (CollectionUtils.isEmpty(map)) {
+            throw new ServiceException("未查询到该区县配置信息");
+        }
+        return map.get(0);
+    }
 }

ruoyi-ui-gljt/src/views/gljt/qxpz/index.vue

@@ -168,20 +168,20 @@
           <el-input v-model="form.kz5" placeholder="请输入发证机关" />
         </el-form-item>
 
-        <el-form-item label="扩展字段" prop="kz6">
-          <el-input v-model="form.kz6" placeholder="请输入扩展字段" />
+        <el-form-item label="appId" prop="kz6">
+          <el-input v-model="form.kz6" placeholder="请输入appId" />
         </el-form-item>
 
-        <el-form-item label="扩展字段" prop="kz7">
-          <el-input v-model="form.kz7" placeholder="请输入扩展字段" />
+        <el-form-item label="secret" prop="kz7">
+          <el-input v-model="form.kz7" placeholder="请输入secret" />
         </el-form-item>
 
-        <el-form-item label="扩展字段" prop="kz8">
-          <el-input v-model="form.kz8" placeholder="请输入扩展字段" />
+        <el-form-item label="通知通告" prop="kz8">
+          <el-input v-model="form.kz8" placeholder="请输入通知通告" />
         </el-form-item>
 
-        <el-form-item label="扩展字段" prop="kz9">
-          <el-input v-model="form.kz9" placeholder="请输入扩展字段" />
+        <el-form-item label="操作指南" prop="kz9">
+          <file-upload v-model="form.kz9" />
         </el-form-item>
 
       </el-form>
@@ -257,27 +257,6 @@ export default {
         kz5: [
           { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
         ],
-        kz6: [
-          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
-        ],
-        kz7: [
-          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
-        ],
-        kz8: [
-          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
-        ],
-        kz9: [
-          { max: 20, message: '扩展字段不能超过20个字符', trigger: 'blur' },
-        ],
-        createBmjsc: [
-          { max: 60, message: '部门检索串不能超过60个字符', trigger: 'blur' },
-        ],
-        createQhjsc: [
-          { max: 80, message: '区划检索串不能超过80个字符', trigger: 'blur' },
-        ],
-        state: [
-          { required: true, message: "数据状态不能为空", trigger: "blur" },
-        ]
       }
     };
   },