重写接口第二天

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppDictController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/DictController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.appcontroller.enterprise;
+package com.zdxt.enforcementcode.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -17,7 +17,7 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/app")
-public class AppDictController {
+public class DictController {
 
     private final ISysDictDataService dictDataService;
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseInformationController.java

@@ -0,0 +1,52 @@
+package com.zdxt.enforcementcode.controller.app.enterprise;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo;
+import com.zdxt.enforcementcode.service.IEnterpriseUserRefService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/enterprise/enterpriseInfo")
+public class AppEnterpriseInformationController {
+
+    private final IEnterpriseUserRefService enterpriseUserRefService;
+
+    /**
+     * 根据用户ID获取关联的企业信息列表
+     *
+     * @param userId 用户ID
+     * @return 企业信息列表（enterpriseId, enterpriseName, enterpriseNumber）
+     */
+    @SaIgnore
+    @GetMapping("/getEnterpriseInfo")
+    public R<List<Map<String, Object>>> getEnterpriseInfo(@RequestParam Long userId) {
+        if (userId == null) {
+            return R.fail("用户ID不能为空");
+        }
+        List<EnterpriseUserRefVo> refList = enterpriseUserRefService.queryListByUserId(userId);
+        List<Map<String, Object>> dataList = new java.util.ArrayList<>();
+        if (refList != null && !refList.isEmpty()) {
+            for (EnterpriseUserRefVo ref : refList) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("enterpriseId", ref.getEnterpriseId());
+                data.put("enterpriseName", ref.getEnterpriseName());
+                data.put("enterpriseNumber", ref.getEnterpriseNumber());
+                dataList.add(data);
+            }
+        }
+        return R.ok(dataList);
+    }
+
+}

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppEnterpriseMerchantAuthorizationController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseMerchantAuthorizationController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.appcontroller.enterprise;
+package com.zdxt.enforcementcode.controller.app.enterprise;
 
 import com.zdxt.enforcementcode.domain.bo.EnterpriseMerchantAuthorizationBo;
 import com.zdxt.enforcementcode.service.IEnterpriseMerchantAuthorizationService;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 
 @Controller
-@RequestMapping("/app/code/authorization")
+@RequestMapping("/app/enterprise/authorization")
 public class AppEnterpriseMerchantAuthorizationController {
     @Resource
     IEnterpriseMerchantAuthorizationService enterpriseMerchantAuthorizationService;

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppLoginController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppLoginController.java

@@ -1,20 +1,19 @@
-package com.zdxt.enforcementcode.appcontroller.enterprise;
+package com.zdxt.enforcementcode.controller.app.enterprise;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.stp.parameter.SaLoginParameter;
 import cn.hutool.crypto.digest.DigestUtil;
 import com.zdxt.enforcementcode.domain.vo.EnterpriseUserVo;
+import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo;
 import com.zdxt.enforcementcode.service.IEnterpriseUserService;
+import com.zdxt.enforcementcode.service.IEnterpriseUserRefService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
@@ -22,6 +21,7 @@ import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,11 +30,12 @@ import java.util.Map;
 @Slf4j
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/app/enterprise")
+@RequestMapping("/app/enterprise/login")
 public class AppLoginController {
 
     private final IEnterpriseUserService enterpriseUserService;
 
+
     /**
      * AES密钥（与前端一致）
      */
@@ -47,8 +48,8 @@ public class AppLoginController {
      * @return 登录结果（token + 用户信息）
      */
     @SaIgnore
-    @PostMapping("/login")
+    @PostMapping("/do")
-    public R<Map<String, Object>> login(@RequestBody Map<String, String> params) {
+    public R<Map<String, Object>> validate(@RequestBody Map<String, String> params) {
         String secretName = params.get("secretName");
         String secretKey = params.get("secretKey");
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppThirdLogin.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppThirdLoginController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.appcontroller.enterprise;
+package com.zdxt.enforcementcode.controller.app.enterprise;
 
 
 import org.dromara.common.core.domain.R;
@@ -11,8 +11,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Controller
-@RequestMapping("/app/thirdLogin")
+@RequestMapping("/app/enterprise/thirdLogin")
-public class AppThirdLogin {
+public class AppThirdLoginController {
     /**
      * 获取深i企包裹的code
      */
@@ -26,6 +26,4 @@ public class AppThirdLogin {
         result.put("accessSecret", accessSecret);
         return R.ok("获取成功", result);
     }
-
-
 }

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseComplaintController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseComplaintController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.controller;
+package com.zdxt.enforcementcode.controller.web.supervision;
 
 import java.util.List;
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseEvaluateController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseEvaluateController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.controller;
+package com.zdxt.enforcementcode.controller.web.supervision;
 
 import java.util.List;
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseInformationController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseInformationController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.controller;
+package com.zdxt.enforcementcode.controller.web.supervision;
 
 import java.util.List;
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseLawEnforcementController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseLawEnforcementController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.controller;
+package com.zdxt.enforcementcode.controller.web.supervision;
 
 import java.util.List;
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseMerchantAuthorizationController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseMerchantAuthorizationController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.controller;
+package com.zdxt.enforcementcode.controller.web.supervision;
 
 import java.util.List;
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/LawEnforcementEnterpriseController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/LawEnforcementEnterpriseController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.controller;
+package com.zdxt.enforcementcode.controller.web.supervision;
 
 import java.util.List;
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeGenerateHistoryController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/QrCodeGenerateHistoryController.java

@@ -1,4 +1,4 @@
-package com.zdxt.enforcementcode.controller;
+package com.zdxt.enforcementcode.controller.web.supervision;
 
 import java.util.List;
 

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseUserRefService.java

@@ -65,4 +65,20 @@ public interface IEnterpriseUserRefService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询关联的企业信息
+     *
+     * @param userId 用户ID
+     * @return 企业用户关联信息
+     */
+    EnterpriseUserRefVo queryByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询关联的所有企业信息
+     *
+     * @param userId 用户ID
+     * @return 企业用户关联信息列表
+     */
+    List<EnterpriseUserRefVo> queryListByUserId(Long userId);
 }

ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserRefServiceImpl.java

@@ -133,4 +133,24 @@ public class EnterpriseUserRefServiceImpl implements IEnterpriseUserRefService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    /**
+     * 根据用户ID查询关联的企业信息
+     */
+    @Override
+    public EnterpriseUserRefVo queryByUserId(Long userId) {
+        LambdaQueryWrapper<EnterpriseUserRef> lqw = Wrappers.lambdaQuery();
+        lqw.eq(EnterpriseUserRef::getUserId, userId);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 根据用户ID查询关联的所有企业信息
+     */
+    @Override
+    public List<EnterpriseUserRefVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<EnterpriseUserRef> lqw = Wrappers.lambdaQuery();
+        lqw.eq(EnterpriseUserRef::getUserId, userId);
+        return baseMapper.selectVoList(lqw);
+    }
 }

zdxt-web-client/zdxt-enforcement-code-app/src/App.vue

@@ -13,16 +13,10 @@
 </template>
 
 <script setup name="App">
-onMounted(async () => {
 const handleLoadUrl = inject('$provideLoadUrl')
-	const getGoodsnum = inject('$provideGoodsnum')
-	const getLang = inject('$provideLang')
-	const path = handleLoadUrl()
-	if (!['/', '/login'].includes(path)) {
-		await getGoodsnum();
-		await getLang();
-	}
 
+onMounted(async () => {
+	handleLoadUrl()
 });
 </script>
 

zdxt-web-client/zdxt-enforcement-code-app/src/api/Home.js

@@ -4,24 +4,14 @@ export const  boutiqueGoods = "/boutiqueGoods"
 export const  recommendGoods = "/recommendGoods"
 export const userLogin = (params, success, error)  => _post("/appLogin", params, success, error);
 export const testLogin = (params, success, error)  => _post("/app/thirdLogin/testLogin", params, success, error);
-// 企业端用户登录
-export const enterpriseLogin = (params, success, error) => _post("/app/enterprise/login", params, success, error);
 
 //查询字典
 export const getDict = (params, success, error) => _get("/app/queryDict",params,success,error);
 //获取级联街道字典
 export const getRegionCascade = (params, success, error) => _get("/app/code/item/getRegionCascade",params,success,error);
 
-//查询用户关联企业授权信息
-export const getEnterpriseMerchantAuthorization = (params, success, error) => _get("/app/code/authorization/queryList",params,success,error);
-
-//深i企登录
-export const getSiqLoginAuth = (params, success, error) => _post("/app/thirdLogin/siqLogin",params,success,error);
-export const getSiqLoginAuthTest = (params, success, error) => _post("/app/thirdLogin/siqLoginTest",params,success,error);
-
 // 深圳易平台登录
 export const getSzyptLoginAuth = (code, success, error) => _get("/app/thirdLogin/szyptLogin/"+code,null,success,error);
 export const szyptGetToken = (params, success, error) => _get("/app/thirdLogin/szyptGetToken",params,success,error);
 
-// 获取包裹的数据
+
-export const siqCode = (params, success, error) => _get("/app/thirdLogin/getSiqCode",params,success,error);

zdxt-web-client/zdxt-enforcement-code-app/src/api/administrative.js → zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/administrative.js

@@ -1,4 +1,4 @@
-import { _get, _post,_form,_delete } from "../http/index";
+import { _get, _post,_form,_delete } from "../../http/index";
 
 //行政检查预约登记
 export const addEnterpriseLawEnforcement = (params, success, error) => _post("/app/code/enforcement/add",params,success,error)
@@ -16,4 +16,3 @@ export const queryEnterpriseLawEnforcementList = (params, success, error) => _po
 export const queryTotal = (params, success, error) => _get("/app/code/enforcement/queryTotal",params,success,error)
 
 
-

zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce.js → zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/index.js

@@ -1,7 +1,7 @@
 /**
  * 执法端接口
  */
-import { _get, _post,_form,_delete } from "../http/index";
+import { _get, _post,_form,_delete } from "../../http/index";
 
 /**
  * 执法计划列表

zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise.js → zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js

@@ -1,4 +1,24 @@
-import { _get, _post,_form,_delete } from "../http/index";
+import { _get, _post,_form,_delete } from "../../http/index";
+
+// region 重新整理有用的接口
+// 企业端用户登录
+let enterpriseAppBaseUrl = "/app/enterprise";
+
+export const enterpriseLogin = (params, success, error) => _post(enterpriseAppBaseUrl + "/login/do", params, success, error);
+// 获取用户关联的企业信息
+export const getEnterpriseInfo = (params, success, error) => _get(enterpriseAppBaseUrl + "/enterpriseInfo/getEnterpriseInfo", params, success, error);
+//查询用户关联企业授权信息
+export const getEnterpriseMerchantAuthorization = (params, success, error) => _get(enterpriseAppBaseUrl + "/authorization/queryList",params,success,error);
+
+// endregion
+
+
+
+//深i企登录
+export const getSiqLoginAuth = (params, success, error) => _post("/app/thirdLogin/siqLogin",params,success,error);
+export const getSiqLoginAuthTest = (params, success, error) => _post("/app/thirdLogin/siqLoginTest",params,success,error);
+// 获取包裹的数据
+export const siqCode = (params, success, error) => _get("/app/thirdLogin/getSiqCode",params,success,error);
 
 //企业信息登记
 export const addEnterpriseInformation = (params, success, error)  => _post("/app/enterpriseInformation/add", params, success, error);

zdxt-web-client/zdxt-enforcement-code-app/src/http/http.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { $globalStore } from "../common/globalStore"
-// import router from '@/router/home';
+import { $globalRouter } from "../common/globalRouter"
 // import {cache} from '@/store/store';
 // axios.defaults.withCredentials = true
 //const source = axios.CancelToken.source()
@@ -9,7 +9,7 @@ const http =   axios.create({
     contentType : "application/json",
     timeout: 1000 * 500000, // 1 秒
 });
-const router = useRouter();
+const router = $globalRouter;
 //请求拦截器添加head
 http.interceptors.request.use(
     config => {

zdxt-web-client/zdxt-enforcement-code-app/src/router/enforce.js

@@ -65,10 +65,10 @@ const routes = [
     name: "noAccess",
     component: () => import("@/views/noAccess.vue"),
   },
-  // 市外企业信息登记
+  // 市外企业信息登记（执法端）
   {
-    path: "/outsideRegister",
+    path: "/enforce/outsideRegister",
-    name: "outsideRegister",
+    name: "enforceOutsideRegister",
     component: () => import("@/views/enforce/outsideRegister.vue"),
   },
 ];

zdxt-web-client/zdxt-enforcement-code-app/src/router/enforceHome.js

@@ -48,14 +48,14 @@ const routes = [
 		},
 	},
 	//执法端扫码页面-深圳易
-	{
+	/*{
 		path: "/enforce/scanPage_szy",
 		name: "scanPage",
 		component: () => import("@/views/enforce/scanPage_szy.vue"),
 		meta: {
 			isKeepAlive: false,
 		},
-	},
+	},*/
     //执法端扫码页面
 	// {
 	// 	path: "/enforce/scanPageTest",

zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js

@@ -11,6 +11,8 @@ export default defineStore('useCommon', {
 		enterpriseNumber:"",
 		//企业名称
 		enterpriseName:"",
+		//企业ID
+		enterpriseId:"",
 		//当前登录用户ID
 		userId:"",
 		//执法主体
@@ -46,6 +48,10 @@ export default defineStore('useCommon', {
 		 SET_USER_ENTERPRISE_NAME(data){
 		  this.enterpriseName = data;
 		},
+		//设置企业ID
+		SET_USER_ENTERPRISE_ID(data){
+		  this.enterpriseId = data;
+		},
 		//设置用户ID
 		SET_USER_ID(data){
 		  this.userId = data;
@@ -112,6 +118,6 @@ export default defineStore('useCommon', {
 	},
     persist: {
         storage: sessionStorage,
-        pick: ['token', 'userId', 'enterpriseNumber', 'enterpriseName', 'phonenumber', 'orgId', 'hasLaw'],
+        pick: ['token', 'userId', 'enterpriseNumber', 'enterpriseName', 'enterpriseId', 'phonenumber', 'orgId', 'hasLaw'],
     },
 });

zdxt-web-client/zdxt-enforcement-code-app/src/views/Home.vue

@@ -53,7 +53,7 @@
     import * as w6s from 'szient-js-sdk';
     import sha1 from 'crypto-js/sha1';
     import { Loading } from 'vant';
-    import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, siqCode} from '../api/Home';
+    import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, siqCode} from '../api/enterprise';
     import {showSuccessToast} from "vant";
     import 'vant/es/toast/style';
     const {useCommon} = $globalStore;

zdxt-web-client/zdxt-enforcement-code-app/src/views/HomeWx.vue

@@ -50,7 +50,7 @@
     import Vconsolefrom from 'vconsole';
     import * as w6s from 'szient-js-sdk';
     import sha1 from 'crypto-js/sha1';
-    import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest} from '../api/Home';
+    import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest} from '../api/enterprise';
     import {showSuccessToast} from "vant";
     import 'vant/es/toast/style';
 

zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointment-bak.vue

@@ -207,7 +207,7 @@
         addEnterpriseLawEnforcement,
         editEnterpriseLawEnforcement,
         queryEnterpriseLawEnforcementList
-    } from '../../api/administrative'
+    } from '../../api/enforce/administrative'
     import {queryUserInfo} from '../../api/enforce'
     import {queryEnterpriseInfoList} from '../../api/enterprise'
     import {reactive, ref} from "vue";

zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointment.vue

@@ -217,7 +217,7 @@
         addEnterpriseLawEnforcement,
         editEnterpriseLawEnforcement,
         queryEnterpriseLawEnforcementList
-    } from '../../api/administrative'
+    } from '../../api/enforce/administrative'
     import {queryUserInfo} from '../../api/enforce'
     import {queryEnterpriseInfoList} from '../../api/enterprise'
     import {reactive, ref} from "vue";

zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentDetail.vue

@@ -186,7 +186,7 @@
         editEnterpriseLawEnforcementDeputyOrder,
         getByIdToDataFillIn,
         cancelEnterpriseLawEnforcement
-    } from '@/api/administrative'
+    } from '@/api/enforce/administrative'
     import {queryUserInfo} from '../../api/enforce'
     import { queryEnterpriseInfoList } from '@/api/enterprise'
     import { reactive, ref } from "vue";

zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentEdit.vue

@@ -265,7 +265,7 @@
 
     import { showSuccessToast } from 'vant';
     import 'vant/es/toast/style';
-    import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement, editEnterpriseLawEnforcementDeputyOrder, getByIdToDataFillIn} from '../../api/administrative'
+    import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement, editEnterpriseLawEnforcementDeputyOrder, getByIdToDataFillIn} from '../../api/enforce/administrative'
     import {queryUserInfo} from '../../api/enforce'
     import { queryEnterpriseInfoList } from '../../api/enterprise'
     import { reactive, ref } from "vue";

zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentList.vue

@@ -116,7 +116,7 @@
 
 <script setup name="registrationList">
     import {showToast, Toast,showSuccessToast} from "vant";
-    import {queryEnterpriseLawEnforcementList, queryTotal,cancelEnterpriseLawEnforcement} from '@/api/administrative';
+    import {queryEnterpriseLawEnforcementList, queryTotal,cancelEnterpriseLawEnforcement} from '@/api/enforce/administrative';
     import {setGoodsNum} from "@/util/util";
     import {getDict} from "@/api/Home";
     import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";

zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentRelaunch.vue

@@ -267,7 +267,7 @@
 
     import { showSuccessToast } from 'vant';
     import 'vant/es/toast/style';
-    import { getByUserIdAndZero,addEnterpriseLawEnforcement,editEnterpriseLawEnforcement,editEnterpriseLawEnforcementDeputyOrder,getByIdToDataFillIn } from '@/api/administrative'
+    import { getByUserIdAndZero,addEnterpriseLawEnforcement,editEnterpriseLawEnforcement,editEnterpriseLawEnforcementDeputyOrder,getByIdToDataFillIn } from '@/api/enforce/administrative'
     import {queryUserInfo} from '@/api/enforce'
     import { queryEnterpriseInfoList } from '@/api/enterprise'
     import { reactive, ref } from "vue";

zdxt-web-client/zdxt-enforcement-code-app/src/views/common/pdfPngPreview.vue

@@ -7,7 +7,7 @@
 
 <script >
 import {baseUrl} from "@/config/env";
-import {transPdf} from "@/api/enforce.js";
+import {transPdf} from "@/api/enforce";
 
 export default {
   name: 'PdfViewer',

zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/earlyWarning.vue

@@ -170,7 +170,7 @@
       queryRegistrationByEpId
     } from '@/api/enforce';
     import { formattedTimeYYYYmmdd } from'@/util/util';
-    import {queryTotal} from "@/api/administrative";
+    import {queryTotal} from "@/api/enforce/administrative";
 
     const {useCommon, useShopCard} = $globalStore;
 

zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/earlyWarningBak.vue

@@ -133,7 +133,7 @@
       queryListByEnterpriseNumberNew
     } from '@/api/enforce';
     import { formattedTimeYYYYmmdd } from'@/util/util';
-    import {queryTotal} from "@/api/administrative";
+    import {queryTotal} from "@/api/enforce/administrative";
 
     const {useCommon, useShopCard} = $globalStore;
 

zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/enforceNoticeBase.vue

@@ -17,7 +17,7 @@
 <script setup name="enforceNoticeBase">
 import enforcementPlanAdd from '@/views/enforce/enforceNotice.vue';
 import enforcementPlanList from '@/views/enforce/enforceNoticeSystem.vue';
-import {detail} from "@/api/enforce.js";
+import {detail} from "@/api/enforce";
 
 const {useCommon} = $globalStore;
 //路由参数

zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/enterpriseScanPreview.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script setup name="Home">
-    import {getEnterpriseMerchantAuthorization} from '@/api/Home';
+    import {getEnterpriseMerchantAuthorization} from '@/api/enterprise';
     import {queryEarlyWarning} from '../../api/enforce';
     import {getEnterpriseInformation} from '../../api/enterprise'
     import enterpriseBaseInfo from './enterpriseBaseInfo.vue'

zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/noScanFilter.vue

@@ -204,7 +204,7 @@ const props = defineProps( {
     }
     const toRegister = () => {
         router.push({
-            path: "/outsideRegister",
+            path: "/enforce/outsideRegister",
             query: {
               to_path: "/enterpriseScanPreview",
               to_reason: reason.value,

zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/scanQrCode.vue

@@ -79,7 +79,7 @@
 <script setup name="Home">
     import Vconsole from "vconsole";
     import {showFailToast,showToast} from 'vant';
-    import {getEnterpriseMerchantAuthorization} from '@/api/Home';
+    import {getEnterpriseMerchantAuthorization} from '@/api/enterprise';
     import {checkIsExists} from '@/api/enterprise';
     import {checkIsState,getEnterpriseInfoBySj} from '@/api/enforce';
     import {szyptGetToken} from "@/api/Home";

zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/sign.vue

@@ -346,7 +346,7 @@
         addEnterpriseLawEnforcement,
         getByUserIdAndZero,
         queryEnterpriseLawEnforcementList
-    } from "../../api/administrative";
+    } from "../../api/enforce/administrative";
     import entrustFilter from '@/views/enforce/selectEntrustFilter';
 
     const {useCommon, useMy} = $globalStore

zdxt-web-client/zdxt-enforcement-code-app/src/views/enforceHome.vue

@@ -56,7 +56,8 @@
 <script setup name="Home">
     import Vconsolefrom from 'vconsole';
     import {Loading, showFailToast,showToast, showSuccessToast} from 'vant';
-    import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
+    import {getEnterpriseMerchantAuthorization} from '../api/enterprise';
+    import {getSzyptLoginAuth} from '../api/Home';
     import {queryEnforcementNotice} from "@/api/enforce";
 
     const isLoading = ref(true);

zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/companyFilter.vue

@@ -121,7 +121,7 @@
             },
             toRegister() {
                 this.router.push({
-                    path: "/outsideRegister",
+                    path: "/enforce/outsideRegister",
                     query: {
                         to_path: "/appointmentBase",
                     }

zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue

@@ -47,9 +47,10 @@
 import * as w6s from 'szient-js-sdk';
 import sha1 from 'crypto-js/sha1';
 import {Loading} from 'vant';
-    import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, siqCode} from '../../api/Home';
+import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, siqCode} from '../../api/enterprise';
 import {showSuccessToast} from "vant";
 import 'vant/es/toast/style';
+
 const {useCommon} = $globalStore;
 const router = useRouter();
 const route = useRoute();
@@ -123,17 +124,37 @@
 
 const getEnterpriseMerchant = (enterpriseNum, phoneNumber) => {
     getEnterpriseMerchantAuthorization({enterpriseNumber: enterpriseNum, merchantTel: phoneNumber}, success => {
-            console.log('------------->>>: ', success.data[0].enterpriseNumber)
+        //debugger;
-            if (!(success.data == null && success.data.length == 0)) {
+        //console.log('------------->>>: ', success.data[0].enterpriseNumber)
+        if (success.data != null && success.data.length > 0) {
             useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
         }
     }, error => {
     })
 }
 
+// 判断用户信息是否已完整（企业端登录后已写入store）
+const hasUserInfo = () => {
+    return useCommon.userId
+        && useCommon.enterpriseName
+        && useCommon.enterpriseNumber
+        && useCommon.enterpriseId;
+};
+
 onMounted(() => {
     console.log(useCommon.firstLoad);
+    console.log(useCommon);
     isLoading.value = useCommon.firstLoad;
+
+    // 如果store中已存在完整的用户和企业信息，则跳过w6s鉴权
+    if (hasUserInfo()) {
+        console.log("用户信息已存在，跳过w6s鉴权");
+        isLoading.value = false;
+        getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
+        useCommon.SET_IS_FIRST_LOAD(false);
+        return;
+    }
+
     siqCode(null, success => {
         let access_key = "";
         let access_secret = "";
@@ -161,7 +182,7 @@
             console.log("鉴权", res);
         }).catch((err) => {
             console.log("鉴权", err);
-                getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
+            //getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
         });
 
         w6s.ready(() => {
@@ -413,6 +434,7 @@
         background-size: 100% auto;
     }
 }
+
 .loading-div {
     position: absolute;
     top: 45%;

zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseInspectionDetail.vue

@@ -134,7 +134,7 @@
 
 <script setup name="register">
 
-import {getEnterpriseLawEnforcement, cancelEnterpriseLawEnforcement} from '../../api/administrative'
+import {getEnterpriseLawEnforcement, cancelEnterpriseLawEnforcement} from '../../api/enforce/administrative'
 import { reactive, ref } from "vue";
 import {getDict} from "../../api/Home";
 import {queryLinkageById} from "../../api/linkage";

zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/login.vue

@@ -23,9 +23,9 @@
 </template>
 <script setup>
     import {reactive} from 'vue';
-    import {enterpriseLogin} from '../../api/Home';
+    import {enterpriseLogin, getEnterpriseInfo} from '../../api/enterprise';
     import CryptoJS from "crypto-js";
-    import {showFailToast} from 'vant';
+    import {showFailToast, showToast} from 'vant';
     import 'vant/es/toast/style';
 
     const {useCommon} = $globalStore;
@@ -39,11 +39,28 @@
         values.secretKey = Encrypt(values.secretKey);
         enterpriseLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, response => {
             if (response.code === 200) {
-                // 企业端登录成功 → 跳转企业端首页
+                // 企业端登录成功 → 赋值用户基本信息
                 useCommon.SET_USER_PHONENUMBER(response.data.phonenumber.toString());
                 useCommon.SET_USER_ID(response.data.userId);
                 useCommon.SET_TOKEN(response.data.token);
+                //debugger;
+                console.log("message",useCommon.userId);
+                // 分离调用：获取关联的企业信息
+                getEnterpriseInfo({userId: response.data.userId}, res => {
+                    if (res.code === 200 && res.data && Array.isArray(res.data) && res.data.length > 0) {
+                        const firstEnterprise = res.data[0];
+                        useCommon.SET_USER_ENTERPRISE_NUMBER(firstEnterprise.enterpriseNumber || "");
+                        useCommon.SET_USER_ENTERPRISE_NAME(firstEnterprise.enterpriseName || "");
+                        useCommon.SET_USER_ENTERPRISE_ID(firstEnterprise.enterpriseId || "");
+                        if (res.data.length > 1) {
+                            showToast('您关联了多个企业，已默认选择企业：' + (firstEnterprise.enterpriseName || ''));
+                        }
+                    }
                     router.push({name: "enterpriseHome"});
+                }, () => {
+                    // 获取企业信息失败也照常跳转
+                    router.push({name: "enterpriseHome"});
+                });
             } else {
                 showFailToast(response.msg || "登录失败");
             }

zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/registrationEdit.vue

@@ -402,7 +402,7 @@ import {showFailToast, showSuccessToast} from 'vant';
       addEnterpriseLawEnforcement,
       getByUserIdAndZero,
       queryEnterpriseLawEnforcementList
-    } from "../../api/administrative";
+    } from "../../api/enforce/administrative";
     import { baseUrl } from "@/config/env";
     import entrustFilter from '@/views/enforce/selectEntrustFilter';
 

zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enforcement-dev

@@ -1,4 +1,4 @@
 # 执法端开发环境
 VITE_PORT = 12002
-VITE_BASE_URL = 'http://localhost:8181'
+VITE_BASE_URL = 'http://localhost:17000/enf-ep'
 VITE_DEFAULT_LOGIN = '/enforce/login'

zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enterprise-dev

@@ -1,4 +1,4 @@
 # 企业端开发环境
 VITE_PORT = 12001
-VITE_BASE_URL = 'http://localhost:17000/enterprise'
+VITE_BASE_URL = 'http://localhost:17000/ent-ep'
 VITE_DEFAULT_LOGIN = '/enterprise/login'

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enforcement.yml

@@ -4,4 +4,4 @@ server:
   port: 18002
   servlet:
     # 应用的访问路径
-    context-path: /enforcement
+    context-path: /enf-ep

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enterprise.yml

@@ -4,4 +4,4 @@ server:
   port: 18000
   servlet:
     # 应用的访问路径
-    context-path: /enterprise
+    context-path: /ent-ep

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-supervision.yml

@@ -4,4 +4,4 @@ server:
   port: 18001
   servlet:
     # 应用的访问路径
-    context-path: /supervision
+    context-path: /sup-ep

zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml

@@ -25,21 +25,21 @@ spring:
         - id: enterprise-service
           uri: http://localhost:18000
           predicates:
-            - Path=/enterprise/**
+            - Path=/ent-ep/**
           filters:
             - StripPrefix=0
             - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE
         - id: supervision-service
           uri: http://localhost:18001
           predicates:
-            - Path=/supervision/**
+            - Path=/sup-ep/**
           filters:
             - StripPrefix=0
             - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE
         - id: enforcement-service
           uri: http://localhost:18002
           predicates:
-            - Path=/enforcement/**
+            - Path=/enf-ep/**
           filters:
             - StripPrefix=0
             - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE