From 519c0be3e75075a1616bdab5a71ff1346fb6dcb9 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 21 Dec 2023 17:46:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java | 4 ++-- .../com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java index 991d6f6e..08dea783 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java @@ -83,8 +83,8 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService { public PageData findById(PageData pd)throws Exception{ PageData pageData = GFblindboardMapper.findById(pd); //调用接口 获取用户信息 - String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); - pageData.put("WORK_USER",workUser); + //String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); + //pageData.put("WORK_USER",workUser); return pageData; } diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java index 5a86ee6b..aa3a24c2 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java @@ -82,8 +82,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService { public PageData findById(PageData pd)throws Exception{ PageData pageData = GFhighworkMapper.findById(pd); //调用接口 获取用户信息 - String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); - pageData.put("PROJECT_MANAGER",workUser); + //String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); + //pageData.put("PROJECT_MANAGER",workUser); return pageData; } From 195b9d4de0439e5affbe6a487d43749d8e6e03ac Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Fri, 22 Dec 2023 09:22:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/gf/AppGFBlindBoardController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index dbf58c1d..095bc093 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -405,8 +405,8 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); GFblindboardService.edit(pd2); log.put("ACTION", "作业负责人通过"); - GFblindBoardInfoService.delete(pd); if(pd.get("boardList")!=null){ + GFblindBoardInfoService.delete(pd); List list = (List) JSON.parse(pd.get("boardList").toString()); for (JSONObject json : list) { PageData board = new PageData(); From 0e22d459751624395adc0d5126564a97d66e700a Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Fri, 22 Dec 2023 17:09:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/gf/ConfinedSpaceMapper.xml | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml index 5dbd21d5..fe3e59d0 100644 --- a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml @@ -73,7 +73,9 @@ f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, - f.ACCEPT_CONFESS_USER_SIGNER_TIME + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.WORK_LATITUDE, + f.WORK_LONGITUDE @@ -137,7 +139,9 @@ ACCEPT_CONFESS_DEPARTMENT_ID, ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, - ACCEPT_CONFESS_USER_SIGNER_TIME + ACCEPT_CONFESS_USER_SIGNER_TIME, + WORK_LATITUDE, + WORK_LONGITUDE @@ -202,7 +206,9 @@ #{ACCEPT_CONFESS_DEPARTMENT_ID}, #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, - #{ACCEPT_CONFESS_USER_SIGNER_TIME} + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{WORK_LATITUDE}, + #{WORK_LONGITUDE} @@ -487,6 +493,8 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, (SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -615,6 +623,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT a.ANALYZE_TIME from GF_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -845,6 +855,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from GF_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -1067,6 +1079,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT a.ANALYZE_TIME from gf_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY From 46b42395710666c4b896a2e71240cefdcb2a27ac Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Sat, 23 Dec 2023 11:36:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?add:=20app=E7=94=A8=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=97=B6=E5=80=99=E5=90=8E=E5=8F=B0=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/LoginController.java | 31 +++++++++++++++++++ src/main/resources/application-dev.properties | 11 +++++++ .../mybatis/datasource/system/UsersMapper.xml | 2 +- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index d94ab3e4..e69a771a 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -70,7 +70,19 @@ public class LoginController extends BaseController { @Autowired private PhotoService photoService; + @Value("${czks-useridentity}") + private String czksIdentity; + @Value("${czks-baseimgpath}") + private String czksBaseimgpath; + @Value("${czks-backendaddr}") + private String czksBackendaddr; + @Value("${gwj-useridentity}") + private String gwjIdentity; + @Value("${gwj-baseimgpath}") + private String gwjBaseimgpath; + @Value("${gwj-backendaddr}") + private String gwjBackendaddr; /** * 请求登录验证用户接口 * @@ -171,6 +183,25 @@ public class LoginController extends BaseController { map.put("failMsg", "帐号已锁定，请联系管理员"); return map; } + // 判断是不是沧州矿石的用户 + if (czksIdentity.equals(pd.getString("USER_IDENTITY"))) { + // 沧州矿石的用户 + // 用户标识 + map.put("USER_IDENTITY", czksIdentity); + // 图片路径 + map.put("baseImgPath", czksBaseimgpath); + // 后台地址 + map.put("BACKENDADDR", czksBackendaddr); + } + if ("".equals(pd.getString("USER_IDENTITY"))) { + // 港股的用户 + // 用户标识 + map.put("USER_IDENTITY", gwjIdentity); + // 图片路径 + map.put("baseImgPath", gwjBaseimgpath); + // 后台地址 + map.put("BACKENDADDR", gwjBackendaddr); + } PageData cpd = corpinfoService.findById(pd); //System.out.println(cpd.getString("ISUSE")); if (cpd != null) { diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 6dd4d9ea..c0c9adec 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -93,3 +93,14 @@ mq.group.eightWork=scheduled_tasks_eightWork corp.default.pic-path=https://qgqy.qhdsafety.com/file/ corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/ + + +#用户标识 +# 沧州矿石 +czks-useridentity=CZKS +czks-baseimgpath=https://wwag.qhdsafety.com/file/ +czks-backendaddr=http://192.168.0.79:8091/ +# 港务局 +gwj-useridentity=GWJ +gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ +gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 59ce3768..9ed6e5db 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -249,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"