From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
index e6eb213..b37b048 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
@@ -5,15 +5,28 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.equipage.entity.Equipage;
+import org.springblade.modules.equipage.excel.EquipageExcel;
+import org.springblade.modules.equipage.excel.EquipageImporter;
import org.springblade.modules.equipage.service.EquipageService;
import org.springblade.modules.equipage.vo.EquipageVo;
+import org.springblade.modules.exam.excel.ExamScoreExcel;
+import org.springblade.modules.exam.excel.ExamScoreImporter;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @author zhongrj
@@ -26,10 +39,12 @@
public class EquipageController {
private final EquipageService equipageService;
+ private final MyAsyncService myAsyncService;
/**
* 自定义分页
- * @param query page,size
+ *
+ * @param query page,size
* @param equipage 装备信息对象
*/
@GetMapping("/page")
@@ -40,6 +55,7 @@
/**
* 新增
+ *
* @param equipage 装备信息对象
*/
@PostMapping("/save")
@@ -50,6 +66,7 @@
/**
* 修改
+ *
* @param equipage 装备信息对象
*/
@PostMapping("/update")
@@ -59,29 +76,78 @@
/**
* 新增或修改
+ *
* @param equipage 装备信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody Equipage equipage) throws Exception {
- if (equipage.getId()==null){
- arg arg = new arg();
- arg.test01(arg.url+"/equipage/save",equipage);
+ public R submit(@RequestBody Equipage equipage) {
+ boolean status = false;
+ if (equipage.getId() == null) {
+ //新增
+ status = equipageService.save(equipage);
+ if (status) {
+ //数据推送
+ String s1 =
+ "insert into sys_equipage(id,name,number,specifications,mode,dept_id,brand,date_for_production,jurisdiction,person_in_charge,num) " +
+ "values(" + "'" + equipage.getId() + "'" + "," +
+ "'" + equipage.getName() + "'" + "," +
+ "'" + equipage.getNumber() + "'" + "," +
+ "'" + equipage.getSpecifications() + "'" + "," +
+ "'" + equipage.getMode() + "'" + "," +
+ "'" + equipage.getDeptId() + "'" + "," +
+ "'" + equipage.getBrand() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(equipage.getDateForProduction()) + "'" + "," +
+ "'" + equipage.getJurisdiction() + "'" + "," +
+ "'" + equipage.getPersonInCharge() + "'" + "," +
+ "'" + equipage.getNum() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
+ } else {
+ //修改
+ status = equipageService.updateById(equipage);
+ if (status) {
+ //内网同步
+ String s1 =
+ "update sys_equipage set name = " + "'" + equipage.getName() + "'" +
+ ",number = " + "'" + equipage.getDeptId() + "'" +
+ ",specifications = " + "'" + equipage.getSpecifications() + "'" +
+ ",mode = " + "'" + equipage.getMode() + "'" +
+ ",dept_id = " + "'" + equipage.getDeptId() + "'" +
+ ",brand = " + "'" + equipage.getBrand() + "'" +
+ ",date_for_production = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(equipage.getDateForProduction()) + "'" +
+ ",jurisdiction = " + "'" + equipage.getJurisdiction() + "'" +
+ ",num = " + "'" + equipage.getNum() + "'" +
+ ",person_in_charge = " + "'" + equipage.getPersonInCharge() + "'" +
+ " " + "where id = " + "'" + equipage.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
}
- return R.status(equipageService.saveOrUpdate(equipage));
+ return R.status(status);
}
/**
* 删除
+ *
* @param ids 装备信息ids 数组
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- arg.sendPostRemoveByIds(arg.url+"/equipage/remove",ids);
+ //内网删除
+ List<Long> list = Func.toLongList(ids);
+ list.forEach(id -> {
+ //内网同步
+ String s1 = "delete from sys_equipage where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ });
return R.status(equipageService.removeByIds(Func.toLongList(ids)));
}
/**
* 详情
+ *
* @param equipage 装备信息对象
*/
@GetMapping("/detail")
@@ -91,4 +157,37 @@
return R.data(detail);
}
+ /**
+ * 导入装备数据
+ *
+ * @param isCovered 1 覆盖 0不覆盖
+ * @return
+ */
+ @PostMapping("import-equipage")
+ @ApiOperation(value = "导入装备数据", notes = "传入excel")
+ public R importExamScore(MultipartFile file, Integer isCovered) {
+ EquipageImporter equipageImporter = new EquipageImporter(equipageService, false);
+ ExcelUtil.save(file, equipageImporter, EquipageExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportEquipage(HttpServletResponse response) {
+ List<EquipageExcel> list = new ArrayList<>();
+ EquipageExcel equipage = new EquipageExcel();
+ equipage.setDeptName("***保安公司");
+ equipage.setName("安全帽");
+ equipage.setMode("S10");
+ equipage.setNum(100);
+ equipage.setPersonInCharge("张三");
+ equipage.setBrand("***有限公司");
+ equipage.setDateForProduction("2021/05/01");
+ list.add(equipage);
+ ExcelUtil.export(response, "装备导入数据模板", "装备导入数据表", list, EquipageExcel.class);
+ }
+
}
--
Gitblit v1.9.3