Merge branch '1212-八项作业迁移' into czks1.0

# Conflicts:
#	src/main/java/com/zcloud/controller/system/LoginController.java

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<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("boardList").toString());
 						for (JSONObject json : list) {
 							PageData board = new PageData();

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) {

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"));
+		//String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER"));
-		pageData.put("WORK_USER",workUser);
+		//pageData.put("WORK_USER",workUser);
 		return pageData;
 	}
 

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"));
+		//String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER"));
-		pageData.put("PROJECT_MANAGER",workUser);
+		//pageData.put("PROJECT_MANAGER",workUser);
 		return pageData;
 	}
 

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/

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
 	</sql>
 
 	<!-- 字段用于新增 -->
@@ -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
 	</sql>
 
 	<!-- 字段值 -->
@@ -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}
 	</sql>
 
 	<!-- 新增-->
@@ -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

src/main/resources/mybatis/datasource/system/UsersMapper.xml

@@ -251,7 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<!-- 通过USERNAME获取数据 -->
 	<select id="findByUsername" parameterType="pd" resultType="pd" >
 		select
-			<include refid="Fieldf"></include> ,dept.name as deptName
+			<include refid="Fieldf"></include> ,f.USER_IDENTITY,dept.name as deptName
 		from
 			<include refid="tableName"></include> f
 		LEFT JOIN OA_DEPARTMENT dept on f.DEPARTMENT_ID = dept.DEPARTMENT_ID