From 2856aa062615ab0470329f73138a7916570b515f Mon Sep 17 00:00:00 2001 From: limingyu Date: Thu, 7 Dec 2023 10:30:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=9B=BE=E7=89=87=E5=92=8C=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/LoginController.java | 14 +++++ .../datasource/system/CorpPathMapper.java | 13 ++++ .../service/system/CorpPathService.java | 25 ++++++++ .../system/impl/CorpPathServiceImpl.java | 60 +++++++++++++++++++ .../datasource/system/CorpPathMapper.xml | 53 ++++++++++++++++ 5 files changed, 165 insertions(+) create mode 100644 src/main/java/com/zcloud/mapper/datasource/system/CorpPathMapper.java create mode 100644 src/main/java/com/zcloud/service/system/CorpPathService.java create mode 100644 src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/system/CorpPathMapper.xml diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index d94ab3e4..9b09aaef 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -71,6 +71,9 @@ public class LoginController extends BaseController { @Autowired private PhotoService photoService; + @Autowired + private CorpPathService corpPathService; + /** * 请求登录验证用户接口 * @@ -253,6 +256,17 @@ public class LoginController extends BaseController { session.setAttribute(Const.ISSUPERVISE, dpd.getString("ISSUPERVISE")); //把当前用户放入session FHLOG.save(USERNAME, "成功登录系统", ip); //记录日志 + + //查询该用户或企业的图片和后端地址 + if (!Tools.isEmpty(pd.getString("CORPINFO_ID")) && !pd.getString("CORPINFO_ID").equals("1")) { + PageData pathData = corpPathService.getCorpPathByCorpId(pd); + map.put("picPath",pathData.getString("PIC_PATH")); + map.put("backEndPath", pathData.getString("BACK_END_PATH")); + } else { + PageData pathData = corpPathService.getCorpPathByPersonInfo(pd); + map.put("picPath", pathData.getString("PIC_PATH")); + map.put("backEndPath", pathData.getString("BACK_END_PATH")); + } } } else { token.clear(); diff --git a/src/main/java/com/zcloud/mapper/datasource/system/CorpPathMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/CorpPathMapper.java new file mode 100644 index 00000000..cba8a7f9 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/system/CorpPathMapper.java @@ -0,0 +1,13 @@ +package com.zcloud.mapper.datasource.system; + +import com.zcloud.entity.PageData; + +/** + * 企业图片地址、后端地址访问表 + */ +public interface CorpPathMapper { + + PageData getCorpPathByCorpId(PageData pd); + + PageData getCorpPathByPersonInfo(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/system/CorpPathService.java b/src/main/java/com/zcloud/service/system/CorpPathService.java new file mode 100644 index 00000000..11abaa48 --- /dev/null +++ b/src/main/java/com/zcloud/service/system/CorpPathService.java @@ -0,0 +1,25 @@ +package com.zcloud.service.system; + +import com.zcloud.entity.PageData; + +/** + * 企业图片地址、后端地址访问表 + */ +public interface CorpPathService { + + /** + * 根据企业id获取企业图片、后端路径访问地址 + * @param pd + * @return + * @throws Exception + */ + PageData getCorpPathByCorpId(PageData pd) throws Exception; + + /** + * 根据人员信息获取对应企业图片、后端路径访问地址 + * @param pd + * @return + * @throws Exception + */ + PageData getCorpPathByPersonInfo(PageData pd) throws Exception; +} diff --git a/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java new file mode 100644 index 00000000..10c7e473 --- /dev/null +++ b/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java @@ -0,0 +1,60 @@ +package com.zcloud.service.system.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.system.CorpPathMapper; +import com.zcloud.service.system.CorpPathService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +/** + * 企业图片地址、后端地址访问表 + */ +@Service +public class CorpPathServiceImpl implements CorpPathService { + @Autowired + private CorpPathMapper corpPathMapper; + + @Value("${corp.default.pic-path}") + private String defaultPicPath; + + @Value("${corp.default.back-end-path}") + private String defaultBackEndPath; + + /** + * 根据企业id获取企业图片、后端路径访问地址 + * @param pd + * @return + * @throws Exception + */ + @Override + public PageData getCorpPathByCorpId(PageData pd) throws Exception { + PageData data = corpPathMapper.getCorpPathByCorpId(pd); + if (Tools.isEmpty(data)) { + PageData result = new PageData(); + result.put("PIC_PATH",defaultPicPath); + result.put("BACK_END_PATH", defaultBackEndPath); + return result; + } + return data; + } + + /** + * 根据人员信息获取企业图片、后端路径访问地址 + * @param pd + * @return + * @throws Exception + */ + @Override + public PageData getCorpPathByPersonInfo(PageData pd) throws Exception { + PageData data = corpPathMapper.getCorpPathByPersonInfo(pd); + if ("1".equals(pd.getString("USER_ID")) || Tools.isEmpty(data)) { + PageData result = new PageData(); + result.put("PIC_PATH",defaultPicPath); + result.put("BACK_END_PATH", defaultBackEndPath); + return result; + } + return data; + } +} diff --git a/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml b/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml new file mode 100644 index 00000000..e19a4a9d --- /dev/null +++ b/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml @@ -0,0 +1,53 @@ + + + + + + + SYS_CORP_PATH + + + + + CORP_PATH_ID, + CORPINFO_ID, + PIC_PATH, + BACK_END_PATH + + + + + f.CORP_PATH_ID, + f.CORPINFO_ID, + f.PIC_PATH, + f.BACK_END_PATH + + + + + #{CORP_PATH_ID}, + #{CORPINFO_ID}, + #{PIC_PATH}, + #{BACK_END_PATH} + + + + + + + + From cd71673e7c4d9fd66f8e1110c289d5da7115b698 Mon Sep 17 00:00:00 2001 From: limingyu Date: Thu, 7 Dec 2023 13:50:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=9B=BE=E7=89=87=E5=92=8C=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9C=B0=E5=9D=802?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 3 +++ src/main/resources/application-local.properties | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 5bb49ecc..33812d34 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -61,6 +61,9 @@ spring.main.banner-mode=off # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 +corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.back-end-path=http://192.168.151.57:8092/ + preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ #????? diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 13026235..3862ddd4 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -64,6 +64,9 @@ spring.main.banner-mode=off preventionxgf.api.url=http://192.168.0.79:8088/ qa-regulatory-gwj.api.url=http://192.168.0.79:8092/ +corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.back-end-path=http://192.168.151.57:8092/ + #????? smb.host=39.103.224.166 smb.port=22