add:重点工程数据同步

src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java

@@ -248,7 +248,7 @@ public class OutSourcedController extends BaseController {
         //}
         pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID());
         outsourcedService.save(pd);
-        pd.put("pictList",strings);
+        map.put("sendPicturesList",JSON.toJSONString(strings));
         map.put("dockData", JSON.toJSONString(pd));
         map.put("result", errInfo);
         return map;
@@ -271,6 +271,7 @@ public class OutSourcedController extends BaseController {
         pd = this.getPageData();
         outsourcedService.delete(pd);
         map.put("result", errInfo);                //返回结果
+        map.put("dockData", JSON.toJSONString(pd));                //返回结果
         return map;
     }
 
@@ -298,7 +299,7 @@ public class OutSourcedController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
-
+        ArrayList<String> sendPicturesList = new ArrayList<>();
 
         if (null != file && !file.isEmpty()) {
             String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -312,6 +313,7 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile);
             pd.put("UNITS_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("UNITS_APTITUDE")+"@@"+fileName);
         }
         if (null != file1 && !file1.isEmpty()) {
             String suffixName = file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -325,6 +327,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile);
             pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("MEASURES")+"@@"+fileName);
+
         }
         if (null != file2 && !file2.isEmpty()) {
             String suffixName = file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -338,6 +342,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file2, fileName, Const.FILEPATHFILE + ffile);
             pd.put("MANAGE_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("MANAGE_APTITUDE")+"@@"+fileName);
+
         }
         if (null != file3 && !file3.isEmpty()) {
             String suffixName = file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -351,6 +357,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file3, fileName, Const.FILEPATHFILE + ffile);
             pd.put("DESIGE", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("DESIGE")+"@@"+fileName);
+
         }
         if (null != file4 && !file4.isEmpty()) {
             String suffixName = file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -364,6 +372,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file4, fileName, Const.FILEPATHFILE + ffile);
             pd.put("ATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("ATTACHMENTS")+"@@"+fileName);
+
         }
         if (null != file5 && !file5.isEmpty()) {
             String suffixName = file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -377,6 +387,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file5, fileName, Const.FILEPATHFILE + ffile);
             pd.put("RECORDS", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("RECORDS")+"@@"+fileName);
+
         }
         if (null != file6 && !file6.isEmpty()) {
             String suffixName = file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -390,6 +402,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file6, fileName, Const.FILEPATHFILE + ffile);
             pd.put("SHEET", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("SHEET")+"@@"+fileName);
+
         }
         if (null != file7 && !file7.isEmpty()) {
             String suffixName = file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -403,6 +417,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file7, fileName, Const.FILEPATHFILE + ffile);
             pd.put("EXAMINATION", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("EXAMINATION")+"@@"+fileName);
+
         }
         if (null != file8 && !file8.isEmpty()) {
             String suffixName = file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -416,6 +432,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file8, fileName, Const.FILEPATHFILE + ffile);
             pd.put("OATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName);
+            sendPicturesList.add(pd.getString("OATTACHMENTS")+"@@"+fileName);
+
         }
 
         if (null != file9 && file9.length > 0) {
@@ -449,13 +467,11 @@ public class OutSourcedController extends BaseController {
 
         }
         // 把自己添加到辖区单位
-        //if (!pd.getString("INVOLVING_CORPS").contains(Jurisdiction.getCORPINFO_ID())) {
-        //involvingCorps = pd.getString("INVOLVING_CORPS");
-
         pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID());
-        //}
         outsourcedService.edit(pd);
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(pd));
+        map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
         return map;
     }
 

src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java

@@ -103,6 +103,7 @@ public class PersonnelManagementController extends BaseController {
         String state = personnelmanagementService.IsJudgeCreator(getPageData().getString("PERSONNELMANAGEMENT_ID"));
         if ("1".equals(state)) {
             personnelmanagementService.edit(pd);
+            map.put("dockData", JSON.toJSONString(pd));
         } else {
             errInfo = "fail";
             map.put("result", errInfo);
@@ -177,6 +178,8 @@ public class PersonnelManagementController extends BaseController {
             String ArrayDATA_IDS[] = DATA_IDS.split(",");
             personnelmanagementService.deleteAll(ArrayDATA_IDS);
             errInfo = "success";
+            map.put("dockData", JSON.toJSONString(pd));                //返回结果
+
         } else {
             errInfo = "fail";
         }
@@ -330,6 +333,7 @@ public class PersonnelManagementController extends BaseController {
         personnelmanagementService.editPassword(updateUser);
 
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(updateUser));
         return map;
     }
 

src/main/java/com/zcloud/controller/keyProjects/UnitsController.java

@@ -94,6 +94,7 @@ public class UnitsController extends BaseController {
 		String state = unitsService.IsJudgeCreator(pd.getString("UNITS_ID"));
 		if("1".equals(state)){
 			unitsService.delete(pd);
+			map.put("dockData", JSON.toJSONString(pd));                //返回结果
 		}else{
 			errInfo = "fail";
 			map.put("result", errInfo);
@@ -147,6 +148,7 @@ public class UnitsController extends BaseController {
 		unitsService.edit(pd);
 
 		map.put("result", errInfo);
+		map.put("dockData", JSON.toJSONString(pd));
 		return map;
 	}
 
@@ -253,6 +255,7 @@ public class UnitsController extends BaseController {
 			String ArrayDATA_IDS[] = DATA_IDS.split(",");
 			unitsService.deleteAll(ArrayDATA_IDS);
 			errInfo = "success";
+			map.put("dockData", JSON.toJSONString(pd));                //返回结果
 		} else {
 			errInfo = "fail";
 		}

src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java

@@ -73,6 +73,7 @@ public class VideoManagerController extends BaseController {
 		pd = this.getPageData();
 		videomanagerService.delete(pd);
 		map.put("result", errInfo);				//返回结果
+		map.put("dockData", JSON.toJSONString(pd));				//返回结果
 		return map;
 	}
 

src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java

@@ -77,6 +77,7 @@ public class VideoResourcesController extends BaseController {
         pd = this.getPageData();
         videoResourcesService.delete(pd);
         map.put("result", errInfo);                //返回结果
+        map.put("dockData", JSON.toJSONString(pd));                //返回结果
         return map;
     }
 
@@ -189,6 +190,7 @@ public class VideoResourcesController extends BaseController {
             String ArrayDATA_IDS[] = DATA_IDS.split(",");
             videoResourcesService.deleteAll(ArrayDATA_IDS);
             errInfo = "success";
+            map.put("dockData", JSON.toJSONString(pd));                //返回结果
         } else {
             errInfo = "error";
         }

src/main/resources/application-dev.properties

@@ -1,13 +1,13 @@
 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no1.url=jdbc:mysql://192.168.0.247:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
-datasource.no1.password=root
+datasource.no1.password=Mysql@zcloud88888
 
 
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no2.url=jdbc:mysql://192.168.0.247:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=root
-datasource.no2.password=root
+datasource.no2.password=Mysql@zcloud88888
 
 #druid???
 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource