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(); diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index ed51270e..e69a771a 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -68,6 +68,8 @@ public class LoginController extends BaseController { @Autowired private OffDutyService offdutyService; + @Autowired + private PhotoService photoService; @Value("${czks-useridentity}") private String czksIdentity; @Value("${czks-baseimgpath}") @@ -81,14 +83,6 @@ public class LoginController extends BaseController { private String gwjBaseimgpath; @Value("${gwj-backendaddr}") private String gwjBackendaddr; - - - - - - @Autowired - private PhotoService photoService; - /** * 请求登录验证用户接口 * @@ -208,8 +202,6 @@ public class LoginController extends BaseController { // 后台地址 map.put("BACKENDADDR", gwjBackendaddr); } - - PageData cpd = corpinfoService.findById(pd); //System.out.println(cpd.getString("ISUSE")); if (cpd != null) { 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; } 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/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 diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 0bceee93..925e4e48 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -251,7 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"