|
|
@@ -36,6 +36,8 @@ import com.xt.jygl.common.Constants;
|
|
|
import com.xt.jygl.common.GlobalData;
|
|
|
import com.xt.jygl.common.SearchCondition;
|
|
|
import com.xt.jygl.common.Utils;
|
|
|
+import com.xt.jygl.ftp.Ftp;
|
|
|
+import com.xt.jygl.ftp.FtpUtil;
|
|
|
import com.xt.jygl.ggfwxxgl.jdjc.entity.JdjcfjEntity;
|
|
|
import com.xt.jygl.ggfwxxgl.jdjc.service.JdjcfjService;
|
|
|
import com.xt.jygl.ggfwxxgl.jdtxxx.entity.JdtxxxEntity;
|
|
|
@@ -78,6 +80,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
|
|
|
/**
|
|
|
* 一览信息
|
|
|
+ *
|
|
|
* @param page
|
|
|
* @param model
|
|
|
* @param request
|
|
|
@@ -180,14 +183,19 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
vo.setTaskState(Constants.IS_MY_TASK);
|
|
|
}
|
|
|
}
|
|
|
- } else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID) {
|
|
|
+ } else {
|
|
|
if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
|
|
|
if ("0".equals(entity.getFlowstatus())) {
|
|
|
- vo.setCurrentname("下发");
|
|
|
+ vo.setCurrentname("省级下发");
|
|
|
} else if ("1".equals(entity.getFlowstatus())) {
|
|
|
vo.setCurrentname("地市已同步到省");
|
|
|
} else {
|
|
|
- vo.setCurrentname("");
|
|
|
+ if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
|
|
|
+ vo.setCurrentname("完成");
|
|
|
+ } else {
|
|
|
+ vo.setCurrentname("未提交");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
} else {
|
|
|
if ("0".equals(entity.getFlowstatus())) {
|
|
|
@@ -199,8 +207,6 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- } else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
|
|
|
- vo.setCurrentname("完成");
|
|
|
}
|
|
|
|
|
|
vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
|
|
|
@@ -215,7 +221,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
}
|
|
|
if (isPOST(request)) {
|
|
|
SearchCondition.jdtxpage = page.getPage();
|
|
|
- //cacheSCmap.put("jdtxpage", page.getPage());
|
|
|
+ // cacheSCmap.put("jdtxpage", page.getPage());
|
|
|
CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
|
|
|
}
|
|
|
model.addAttribute("list", voList);
|
|
|
@@ -234,7 +240,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return "ggfwxxgl/jdtxxx/jdtxxxmain";
|
|
|
}
|
|
|
|
|
|
- //删除
|
|
|
+ // 删除
|
|
|
@RequestMapping(value = "/delete")
|
|
|
@ResponseBody
|
|
|
@RequiresPermissions("jdtxxx:delete")
|
|
|
@@ -250,7 +256,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //保存数据
|
|
|
+ // 保存数据
|
|
|
@RequestMapping(value = "/save")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult save(Model model, JdtxxxEntity code, String szdid, String szgkid, String accid, String szgqid, String jyrid) {
|
|
|
@@ -336,7 +342,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //下发保存
|
|
|
+ // 下发保存
|
|
|
@RequestMapping(value = "/savexf")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult savexf(Model model, JdtxxxEntity code, String szdid, String szgkid, String accid, String szgqid, String jyrid) {
|
|
|
@@ -423,7 +429,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //同步 数据
|
|
|
+ // 同步 数据
|
|
|
@RequestMapping(value = "/saveTb")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult saveTb(Model model, String id) {
|
|
|
@@ -431,6 +437,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
JdtxxxEntity entity = jdtxxxService.findOne(id);
|
|
|
|
|
|
entity.setSftb(Constants.YES);
|
|
|
+ entity.setFlowstatus("0");
|
|
|
jdtxxxService.save(entity);
|
|
|
|
|
|
List<JdjcfjEntity> fjlist = jdjcfjService.findByJdjcid(id, "1");
|
|
|
@@ -447,7 +454,6 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
|
|
|
boolean flag = getTbStatus(url, entity.getSzd().getId());
|
|
|
if (flag) {
|
|
|
- entity.setFlowstatus("0");
|
|
|
entity.setTbzt(Constants.YES);
|
|
|
jdtxxxService.save(entity);
|
|
|
} else {
|
|
|
@@ -460,7 +466,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //提交数据
|
|
|
+ // 提交数据
|
|
|
@RequestMapping(value = "/submit")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult submit(Model model, JdtxxxEntity code, String accid, String szdid, String szgkid, String szgqid, String jyrid) {
|
|
|
@@ -545,7 +551,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //退回提交
|
|
|
+ // 退回提交
|
|
|
@RequestMapping(value = "/submitAudit")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult submitAudit(JdtxxxEntity code, String accid) {
|
|
|
@@ -583,7 +589,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //审核流程
|
|
|
+ // 审核流程
|
|
|
@RequestMapping(value = "/audit")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult audit(String shyj, String id, String dqzt, String zghtzje, String flag, String accid) {
|
|
|
@@ -652,13 +658,13 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //编辑信息
|
|
|
+ // 编辑信息
|
|
|
@RequestMapping(value = "/edit")
|
|
|
@RequiresPermissions("jdtxxx:edit")
|
|
|
- public String edit(Model model, String id, String flag,String path,String type) {
|
|
|
+ public String edit(Model model, String id, String flag, String path, String type) {
|
|
|
model.addAttribute("flag", flag);
|
|
|
- model.addAttribute("path",path);
|
|
|
- model.addAttribute("type",type);
|
|
|
+ model.addAttribute("path", path);
|
|
|
+ model.addAttribute("type", type);
|
|
|
JdtxxxEntity entity = jdtxxxService.findOne(id);
|
|
|
JdtxxxVo vo = new JdtxxxVo();
|
|
|
BeanUtils.copyProperties(entity, vo);
|
|
|
@@ -671,6 +677,38 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
|
|
|
List<JdjcfjEntity> list = jdjcfjService.findByJdjcid(id, "1");
|
|
|
if (list != null && list.size() > 0) {
|
|
|
+ if ("0".equals(entity.getFlowstatus())) {
|
|
|
+ for (JdjcfjEntity fj : list) {
|
|
|
+ if (!StringUtils.isEmpty(fj.getFjid())) {
|
|
|
+ if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
|
|
|
+ AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
|
|
|
+ if (acc != null) {
|
|
|
+ try {
|
|
|
+ Ftp f = getftp();
|
|
|
+ // 本地目录
|
|
|
+ String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
|
|
|
+ File newfile = new File(localBaseDir);
|
|
|
+ // 如果文件夹不存在则创建
|
|
|
+ if (!newfile.exists() && !newfile.isDirectory()) {
|
|
|
+ newfile.mkdirs();
|
|
|
+ }
|
|
|
+ // 远程目录
|
|
|
+ String remoteBaseDir = acc.getFilepath();
|
|
|
+ // 下载ftp文件
|
|
|
+ boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
|
|
|
+ if (downflag) {
|
|
|
+ System.out.println("ok");
|
|
|
+ acc.setFjbz("1");
|
|
|
+ accessoryService.save(acc);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
model.addAttribute("fjlist", list);
|
|
|
}
|
|
|
if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
|
|
|
@@ -681,12 +719,12 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return "ggfwxxgl/jdtxxx/jdtxxxedit";
|
|
|
}
|
|
|
|
|
|
- //查看
|
|
|
+ // 查看
|
|
|
@RequestMapping(value = "/view")
|
|
|
- public String view(Model model, String id, String flag, String opflag,String path,String type) {
|
|
|
+ public String view(Model model, String id, String flag, String opflag, String path, String type) {
|
|
|
model.addAttribute("flag", flag);
|
|
|
- model.addAttribute("path",path);
|
|
|
- model.addAttribute("type",type);
|
|
|
+ model.addAttribute("path", path);
|
|
|
+ model.addAttribute("type", type);
|
|
|
JdtxxxEntity entity = jdtxxxService.findOne(id);
|
|
|
JdtxxxVo vo = new JdtxxxVo();
|
|
|
BeanUtils.copyProperties(entity, vo);
|
|
|
@@ -738,16 +776,77 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
|
|
|
List<JdjcfjEntity> zgfjlist = jdjcfjService.findByJdjcid(id, "1");
|
|
|
if (zgfjlist != null && zgfjlist.size() > 0) {
|
|
|
+ for (JdjcfjEntity fj : zgfjlist) {
|
|
|
+ if (!StringUtils.isEmpty(fj.getFjid())) {
|
|
|
+ if (!GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
|
|
|
+ AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
|
|
|
+ if (acc != null) {
|
|
|
+ try {
|
|
|
+ Ftp f = getftp();
|
|
|
+ // 本地目录
|
|
|
+ String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
|
|
|
+ File newfile = new File(localBaseDir);
|
|
|
+ // 如果文件夹不存在则创建
|
|
|
+ if (!newfile.exists() && !newfile.isDirectory()) {
|
|
|
+ newfile.mkdirs();
|
|
|
+ }
|
|
|
+ // 远程目录
|
|
|
+ String remoteBaseDir = acc.getFilepath();
|
|
|
+ // 下载ftp文件
|
|
|
+ boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
|
|
|
+ if (downflag) {
|
|
|
+ System.out.println("ok");
|
|
|
+ acc.setFjbz("1");
|
|
|
+ accessoryService.save(acc);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
model.addAttribute("zgfjlist", zgfjlist);
|
|
|
}
|
|
|
List<JdjcfjEntity> zghfjlist = jdjcfjService.findByJdjcid(id, "2");
|
|
|
if (zghfjlist != null && zghfjlist.size() > 0) {
|
|
|
+ for (JdjcfjEntity fj : zghfjlist) {
|
|
|
+ if (!StringUtils.isEmpty(fj.getFjid())) {
|
|
|
+ if (!GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
|
|
|
+ AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
|
|
|
+ if (acc != null) {
|
|
|
+ try {
|
|
|
+ Ftp f = getftp();
|
|
|
+ // 本地目录
|
|
|
+ String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
|
|
|
+ File newfile = new File(localBaseDir);
|
|
|
+ // 如果文件夹不存在则创建
|
|
|
+ if (!newfile.exists() && !newfile.isDirectory()) {
|
|
|
+ newfile.mkdirs();
|
|
|
+ }
|
|
|
+ // 远程目录
|
|
|
+ String remoteBaseDir = acc.getFilepath();
|
|
|
+ // 下载ftp文件
|
|
|
+ boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
|
|
|
+ if (downflag) {
|
|
|
+ System.out.println("ok");
|
|
|
+ acc.setFjbz("1");
|
|
|
+ accessoryService.save(acc);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
model.addAttribute("zghfjlist", zghfjlist);
|
|
|
}
|
|
|
return "ggfwxxgl/jdtxxx/jdtxxxview";
|
|
|
}
|
|
|
|
|
|
- //新增
|
|
|
+ // 新增
|
|
|
@RequestMapping(value = "/add")
|
|
|
@RequiresPermissions("jdtxxx:add")
|
|
|
public String add(Model model) {
|
|
|
@@ -802,7 +901,7 @@ public class JdtxxxCtl extends BaseWebCtl {
|
|
|
return wr;
|
|
|
}
|
|
|
|
|
|
- //删除附件
|
|
|
+ // 删除附件
|
|
|
@RequestMapping(value = "/delFile")
|
|
|
@ResponseBody
|
|
|
public WebJsonResult delFile(String accid, Model model) {
|
ld_xuhx