|
@@ -1,26 +1,24 @@
|
|
|
package com.gyee.frame.controller.ticket;
|
|
|
|
|
|
-
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.google.gson.JsonObject;
|
|
|
import com.gyee.frame.common.dataSources.DataSource;
|
|
|
import com.gyee.frame.common.dataSources.DataSourceType;
|
|
|
import com.gyee.frame.common.domain.AjaxResult;
|
|
|
-import com.gyee.frame.model.ticket.Workticket;
|
|
|
-import com.gyee.frame.service.ticket.WorkticketService;
|
|
|
+import com.gyee.frame.model.ticket.*;
|
|
|
+import com.gyee.frame.service.ticket.*;
|
|
|
+import com.gyee.frame.util.ticket.TicketUtil;
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.List;
|
|
|
-import java.util.Optional;
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
|
* <p>
|
|
|
- * 前端控制器
|
|
|
+ * 前端控制器
|
|
|
* </p>
|
|
|
*
|
|
|
* @author chenmh
|
|
@@ -33,39 +31,298 @@ public class WorkticketController {
|
|
|
@Autowired
|
|
|
WorkticketService workticketService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ WoworktaskService woworktaskService;
|
|
|
+ @Autowired
|
|
|
+ WosafemeasureService wosafemeasureService;
|
|
|
+ @Autowired
|
|
|
+ WosafetybaffleService wosafetybaffleService;
|
|
|
+ @Autowired
|
|
|
+ FjykService fjykService;
|
|
|
+
|
|
|
|
|
|
* 分页查询工作票
|
|
|
+ *
|
|
|
* @param page
|
|
|
* @param type
|
|
|
* @return
|
|
|
*/
|
|
|
@DataSource(value = DataSourceType.TICKET)
|
|
|
@GetMapping(value = "list")
|
|
|
- public AjaxResult getList(@Param("page") Optional<Long> page,
|
|
|
- @Param("type") Optional<String> type){
|
|
|
+ public AjaxResult getList(@RequestParam("page") Optional<Long> page,
|
|
|
+ @RequestParam("type") Optional<String> type) {
|
|
|
Long pageNum = page.orElse(1L);
|
|
|
String ticketType = type.orElse("wind");
|
|
|
|
|
|
IPage<Workticket> ticket = workticketService.selectPage(pageNum, ticketType);
|
|
|
- if(ticket != null)
|
|
|
- return AjaxResult.successData(ticket);
|
|
|
- else
|
|
|
- return AjaxResult.error(4004,"数据读取异常");
|
|
|
+ if (ticket == null)
|
|
|
+ return AjaxResult.error(4004, "数据读取异常");
|
|
|
+
|
|
|
+ return AjaxResult.successData(ticket);
|
|
|
}
|
|
|
|
|
|
|
|
|
- * 根据 id 查询
|
|
|
+ * 根据 id 查询详情
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@DataSource(value = DataSourceType.TICKET)
|
|
|
@GetMapping(value = "detail")
|
|
|
- public AjaxResult getTicketDetail(@Param("id") String id){
|
|
|
+ public AjaxResult getTicketDetail(@RequestParam("id") String id) {
|
|
|
Workticket ticket = workticketService.getById(id);
|
|
|
- if (ticket != null)
|
|
|
- return AjaxResult.successData(ticket);
|
|
|
- else
|
|
|
- return AjaxResult.error(4004,"数据读取异常");
|
|
|
+ if (ticket == null) {
|
|
|
+ return AjaxResult.error(4004, "数据读取异常");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ Woworktask task = woworktaskService.getTask(ticket.getWonum());
|
|
|
+ if (task != null) {
|
|
|
+ ticket.setWorkaddress(task.getAddress());
|
|
|
+ ticket.setWorktask(task.getDescription2());
|
|
|
+ }
|
|
|
+
|
|
|
+ return AjaxResult.successData(ticket);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 根据主单据的 wonum 关联编号查询安全措施
|
|
|
+ *
|
|
|
+ * @param wonum
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @GetMapping(value = "safe/measure")
|
|
|
+ public AjaxResult getSafeMeasure(@RequestParam("wonum") String wonum) {
|
|
|
+
|
|
|
+ List<Wosafemeasure> yxzxaqcs = wosafemeasureService.getListSafeMeasure(wonum, "YXZXAQCS");
|
|
|
+ List<Wosafemeasure> jxzlaqcs = wosafemeasureService.getListSafeMeasure(wonum, "JXZLAQCS");
|
|
|
+
|
|
|
+
|
|
|
+ List<Wosafetybaffle> protectcs = wosafetybaffleService.getListOfProtectMeasure(wonum, "WINDELECZSP");
|
|
|
+
|
|
|
+
|
|
|
+ List<Wosafemeasure> tooluse = wosafemeasureService.getListSafeMeasure(wonum, "AQZYSX");
|
|
|
+
|
|
|
+ Map<String, Object> maps = new HashMap<>();
|
|
|
+ maps.put("yxzxaqcs", yxzxaqcs);
|
|
|
+ maps.put("jxzlaqcs", jxzlaqcs);
|
|
|
+ maps.put("protectcs", protectcs);
|
|
|
+ maps.put("tooluse", tooluse);
|
|
|
+
|
|
|
+ return AjaxResult.successData(maps);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 根据主单据的 wonum 关联编号查询风险预控措施
|
|
|
+ *
|
|
|
+ * @param wonum
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @GetMapping(value = "risk/measure")
|
|
|
+ public AjaxResult getRiskMeasure(@RequestParam("wonum") String wonum) {
|
|
|
+
|
|
|
+ List<Fjyk> principal = fjykService.getListOfRiskMeasure(wonum, "PRINCIPAL");
|
|
|
+
|
|
|
+ List<Fjyk> fiatuser = fjykService.getListOfRiskMeasure(wonum, "FIATUSER");
|
|
|
+
|
|
|
+ Map<String, List> maps = new HashMap<>();
|
|
|
+ maps.put("principalfxyk", principal);
|
|
|
+ maps.put("fiatuserfxyk", fiatuser);
|
|
|
+
|
|
|
+ return AjaxResult.successData(maps);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 根据 id 获取风险预控详情
|
|
|
+ *
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @GetMapping(value = "risk/measure/item")
|
|
|
+ public AjaxResult getRiskDetail(@RequestParam("id") String id) {
|
|
|
+ Fjyk item = fjykService.getById(id);
|
|
|
+ if (item == null)
|
|
|
+ return AjaxResult.error(4004, "数据请求异常");
|
|
|
+
|
|
|
+ return AjaxResult.successData(item);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 编辑ticket
|
|
|
+ *
|
|
|
+ * @param data
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @PostMapping(value = "edit/ticket")
|
|
|
+ public AjaxResult editWorkTicket(@RequestParam("data") String data) {
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(data);
|
|
|
+ Workticket workticket = JSON.toJavaObject(jsonObject, Workticket.class);
|
|
|
+ if (workticket == null)
|
|
|
+ return AjaxResult.error(4004, "数据更新失败");
|
|
|
+
|
|
|
+ boolean result = workticketService.updateById(workticket);
|
|
|
+ if (!result)
|
|
|
+ return AjaxResult.error(4004, "数据更新失败");
|
|
|
+
|
|
|
+ return AjaxResult.success("数据更新成功");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 编辑安全措施
|
|
|
+ *
|
|
|
+ * @param data
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @PostMapping(value = "edit/safe/measure")
|
|
|
+ public AjaxResult editSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
|
|
|
+ if (type.isEmpty())
|
|
|
+ return AjaxResult.error(4004, "数据更新失败");
|
|
|
+
|
|
|
+ if (type.equals("jxzlaqcs") || type.equals("yxzxaqcs") || type.equals("tooluse")) {
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(data);
|
|
|
+ Wosafemeasure measure = JSON.toJavaObject(jsonObject, Wosafemeasure.class);
|
|
|
+
|
|
|
+ boolean result = wosafemeasureService.updateById(measure);
|
|
|
+ if (!result)
|
|
|
+ return AjaxResult.error(4004, "数据更新失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (type.equals("protectcs")) {
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(data);
|
|
|
+ Wosafetybaffle measure = JSON.toJavaObject(jsonObject, Wosafetybaffle.class);
|
|
|
+
|
|
|
+ boolean result = wosafetybaffleService.updateById(measure);
|
|
|
+ if (!result)
|
|
|
+ return AjaxResult.error(4004, "数据更新失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ return AjaxResult.success("数据更新成功");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 根据 wonum 新增安全措施
|
|
|
+ *
|
|
|
+ * @param data
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @PostMapping(value = "add/safe/measure")
|
|
|
+ public AjaxResult addSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
|
|
|
+ if (type.isEmpty())
|
|
|
+ return AjaxResult.error(4004, "数据插入失败");
|
|
|
+
|
|
|
+ if (type.equals("jxzlaqcs") || type.equals("yxzxaqcs") || type.equals("tooluse")) {
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(data);
|
|
|
+ Wosafemeasure measure = JSON.toJavaObject(jsonObject, Wosafemeasure.class);
|
|
|
+ int id = wosafemeasureService.selectMaxId();
|
|
|
+ measure.setId((double) (id + 1));
|
|
|
+ boolean result = wosafemeasureService.save(measure);
|
|
|
+ if (!result)
|
|
|
+ return AjaxResult.error(4004, "数据插入失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (type.equals("protectcs")) {
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(data);
|
|
|
+ Wosafetybaffle measure = JSON.toJavaObject(jsonObject, Wosafetybaffle.class);
|
|
|
+ int id = wosafetybaffleService.selectMaxId();
|
|
|
+ measure.setId((double) (id + 1));
|
|
|
+ boolean result = wosafetybaffleService.save(measure);
|
|
|
+ if (!result)
|
|
|
+ return AjaxResult.error(4004, "数据插入失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ return AjaxResult.success("数据添加成功");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 批量删除安全措施
|
|
|
+ *
|
|
|
+ * @param data
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @PostMapping(value = "delete/safe/measure")
|
|
|
+ public AjaxResult deleteSafeMeasure(@RequestParam("list") String data) {
|
|
|
+ Map map = TicketUtil.formatSafeMeasure(data);
|
|
|
+ List listS = (List) map.get("safemeasure");
|
|
|
+ List listW = (List) map.get("safetybaffle");
|
|
|
+
|
|
|
+ if (listS != null && listS.size() > 0) {
|
|
|
+ int code = wosafemeasureService.deleteSafeMeasure(listS);
|
|
|
+ if (code <= 0)
|
|
|
+ return AjaxResult.error(4004, "数据删除失败");
|
|
|
+ }
|
|
|
+ if (listW != null && listW.size() > 0) {
|
|
|
+ int code = wosafetybaffleService.deleteSafeMeasure(listW);
|
|
|
+ if (code <= 0)
|
|
|
+ return AjaxResult.success("数据删除失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ return AjaxResult.success("数据删除成功");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 根据 id 删除风险预控
|
|
|
+ *
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @PostMapping(value = "delete/risk/measure")
|
|
|
+ public AjaxResult deleteRiskMeasure(@RequestParam("id") String id) {
|
|
|
+ boolean result = fjykService.removeById(id);
|
|
|
+ if (!result)
|
|
|
+ return AjaxResult.error(4004, "数据删除失败");
|
|
|
+
|
|
|
+ return AjaxResult.success("数据删除成功");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 编辑风险预控
|
|
|
+ *
|
|
|
+ * @param data
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @PostMapping(value = "edit/risk/measure")
|
|
|
+ public AjaxResult editRiskMeasure(@RequestParam("data") String data) {
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(data);
|
|
|
+ Fjyk fjyk = JSON.toJavaObject(jsonObject, Fjyk.class);
|
|
|
+
|
|
|
+ boolean result = fjykService.updateById(fjyk);
|
|
|
+ if (!result)
|
|
|
+ return AjaxResult.error(4004, "数据更新失败");
|
|
|
+
|
|
|
+ return AjaxResult.success("数据更新成功");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 根据 wonum 新增风险预控
|
|
|
+ *
|
|
|
+ * @param data
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataSource(value = DataSourceType.TICKET)
|
|
|
+ @PostMapping(value = "add/risk/measure")
|
|
|
+ public AjaxResult addRiskMeasure(@RequestParam("data") String data) {
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(data);
|
|
|
+ Fjyk fjyk = JSON.toJavaObject(jsonObject, Fjyk.class);
|
|
|
+ if (fjyk == null)
|
|
|
+ return AjaxResult.error(4004, "数据插入失败");
|
|
|
+
|
|
|
+ int id = fjykService.selectMaxId();
|
|
|
+ fjyk.setId((double) (id + 1));
|
|
|
+
|
|
|
+ boolean save = fjykService.save(fjyk);
|
|
|
+ if (!save)
|
|
|
+ return AjaxResult.error(4004, "数据插入失败");
|
|
|
+
|
|
|
+ return AjaxResult.success("数据添加成功");
|
|
|
}
|
|
|
}
|
|
|
|