From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java |  204 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 204 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java
new file mode 100644
index 0000000..a134dcd
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java
@@ -0,0 +1,204 @@
+package org.jeecg.modules.eam.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.dto.EamReportProductHazardsDto;
+import org.jeecg.modules.eam.dto.EamReportRepairDto;
+import org.jeecg.modules.eam.entity.EamReportProductHazards;
+import org.jeecg.modules.eam.request.EamReportProductHazardsQuery;
+import org.jeecg.modules.eam.service.IEamReportProductHazardsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 浜у搧瀹夊叏闅愭偅纭
+ * @Author: jeecg-boot
+ * @Date:   2025-07-17
+ * @Version: V1.0
+ */
+@Api(tags="浜у搧瀹夊叏闅愭偅纭")
+@RestController
+@RequestMapping("/eam/eamReportProductHazards")
+@Slf4j
+public class EamReportProductHazardsController extends JeecgController<EamReportProductHazards, IEamReportProductHazardsService> {
+	@Autowired
+	private IEamReportProductHazardsService eamReportProductHazardsService;
+
+	/**
+	 * 鍒嗛〉鍒楄〃鏌ヨ
+	 *
+	 * @param eamReportProductHazardsQuery
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "浜у搧瀹夊叏闅愭偅纭-鍒嗛〉鍒楄〃鏌ヨ")
+	@ApiOperation(value="浜у搧瀹夊叏闅愭偅纭-鍒嗛〉鍒楄〃鏌ヨ", notes="浜у搧瀹夊叏闅愭偅纭-鍒嗛〉鍒楄〃鏌ヨ")
+	@GetMapping(value = "/list")
+	public Result<IPage<EamReportProductHazardsQuery>> queryPageList(EamReportProductHazardsQuery eamReportProductHazardsQuery,
+																@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																HttpServletRequest req) {
+		Page<EamReportProductHazardsQuery> page = new Page<EamReportProductHazardsQuery>(pageNo, pageSize);
+		IPage<EamReportProductHazardsQuery> pageList = eamReportProductHazardsService.pageList(page, eamReportProductHazardsQuery);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   娣诲姞
+	 *
+	 * @param eamReportProductHazards
+	 * @return
+	 */
+	@AutoLog(value = "浜у搧瀹夊叏闅愭偅纭-娣诲姞")
+	@ApiOperation(value="浜у搧瀹夊叏闅愭偅纭-娣诲姞", notes="浜у搧瀹夊叏闅愭偅纭-娣诲姞")
+	//@RequiresPermissions("org.jeecg.modules.mdc:eam_report_product_hazards:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EamReportProductHazards eamReportProductHazards) {
+		eamReportProductHazardsService.save(eamReportProductHazards);
+		return Result.OK("娣诲姞鎴愬姛锛�");
+	}
+
+	/**
+	 *  缂栬緫
+	 *
+	 * @param eamReportProductHazards
+	 * @return
+	 */
+	@AutoLog(value = "浜у搧瀹夊叏闅愭偅纭-缂栬緫")
+	@ApiOperation(value="浜у搧瀹夊叏闅愭偅纭-缂栬緫", notes="浜у搧瀹夊叏闅愭偅纭-缂栬緫")
+	//@RequiresPermissions("org.jeecg.modules.mdc:eam_report_product_hazards:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EamReportProductHazards eamReportProductHazards) {
+		eamReportProductHazardsService.updateById(eamReportProductHazards);
+		return Result.OK("缂栬緫鎴愬姛!");
+	}
+
+	/**
+	 *   閫氳繃id鍒犻櫎
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "浜у搧瀹夊叏闅愭偅纭-閫氳繃id鍒犻櫎")
+	@ApiOperation(value="浜у搧瀹夊叏闅愭偅纭-閫氳繃id鍒犻櫎", notes="浜у搧瀹夊叏闅愭偅纭-閫氳繃id鍒犻櫎")
+	//@RequiresPermissions("org.jeecg.modules.mdc:eam_report_product_hazards:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		if (eamReportProductHazardsService.cancelled(id)){
+			return Result.OK("鍒犻櫎鎴愬姛!");
+		}
+		return Result.error("鍒犻櫎澶辫触!");
+	}
+
+	/**
+	 *  鎵归噺鍒犻櫎
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "浜у搧瀹夊叏闅愭偅纭-鎵归噺鍒犻櫎")
+	@ApiOperation(value="浜у搧瀹夊叏闅愭偅纭-鎵归噺鍒犻櫎", notes="浜у搧瀹夊叏闅愭偅纭-鎵归噺鍒犻櫎")
+	//@RequiresPermissions("org.jeecg.modules.mdc:eam_report_product_hazards:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.eamReportProductHazardsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+	}
+
+	/**
+	 * 閫氳繃id鏌ヨ
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "浜у搧瀹夊叏闅愭偅纭-閫氳繃id鏌ヨ")
+	@ApiOperation(value="浜у搧瀹夊叏闅愭偅纭-閫氳繃id鏌ヨ", notes="浜у搧瀹夊叏闅愭偅纭-閫氳繃id鏌ヨ")
+	@GetMapping(value = "/queryById")
+	public Result<EamReportProductHazards> queryById(@RequestParam(name="id",required=true) String id) {
+		EamReportProductHazards eamReportProductHazards = eamReportProductHazardsService.getById(id);
+		if(eamReportProductHazards==null) {
+			return Result.error("鏈壘鍒板搴旀暟鎹�");
+		}
+		return Result.OK(eamReportProductHazards);
+	}
+
+	 /**
+	  * 鎿嶄綔宸ュ~鎶�
+	  * @param eamReportProductHazardsDto
+	  * @return
+	  */
+	 @ApiOperation(value = "鎿嶄綔宸ュ~鎶�",notes = "鎿嶄綔宸ュ~鎶�")
+	 @PostMapping(value = "/report")
+	public Result<?> report(EamReportProductHazardsDto eamReportProductHazardsDto){
+		 // 鏍¢獙棰嗗彇鏉冮檺
+		 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if (!BusinessCodeConst.PCR0001.equals(user.getPost())) {
+			 return Result.error("濉姤澶辫触,娌℃湁濉姤鏉冮檺锛�,璇风櫥褰曟搷浣滃伐宀椾綅鐢ㄦ埛");
+		 }
+		 if (eamReportProductHazardsDto == null) {
+			 return Result.error("濉姤鐨勫璞′笉鑳戒负绌猴紒");
+		 }else {
+			 boolean b = eamReportProductHazardsService.report(eamReportProductHazardsDto);
+			 if(!b) {
+				 return Result.error("濉姤澶辫触锛岃閲嶈瘯");
+			 }else {
+				 return  Result.OK("濉姤鎴愬姛");
+			 }
+		 }
+	 }
+
+    /**
+    * 瀵煎嚭excel
+    *
+    * @param request
+    * @param eamReportProductHazards
+    */
+    //@RequiresPermissions("org.jeecg.modules.mdc:eam_report_product_hazards:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EamReportProductHazards eamReportProductHazards) {
+        return super.exportXls(request, eamReportProductHazards, EamReportProductHazards.class, "浜у搧瀹夊叏闅愭偅纭");
+    }
+
+    /**
+      * 閫氳繃excel瀵煎叆鏁版嵁
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("eam_report_product_hazards:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, EamReportProductHazards.class);
+    }
+
+}

--
Gitblit v1.9.3