From 2a96427d46697e1d99e5ad78b3ac441f999dd600 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 27 八月 2025 18:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/controller/RatedLifeController.java | 231 +++++++++++++++++++++++++++++----------------------------
src/main/java/org/jeecg/modules/cms/entity/RatedLife.java | 1
2 files changed, 117 insertions(+), 115 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/controller/RatedLifeController.java b/src/main/java/org/jeecg/modules/cms/controller/RatedLifeController.java
index 0e2ecde..7695f00 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/RatedLifeController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/RatedLifeController.java
@@ -9,6 +9,7 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
@@ -36,125 +37,125 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
- /**
+/**
* @Description: 棰濆畾瀵垮懡
* @Author: jeecg-boot
- * @Date: 2025-07-28
+ * @Date: 2025-07-28
* @Version: V1.0
*/
-@Api(tags="棰濆畾瀵垮懡")
+@Api(tags = "棰濆畾瀵垮懡")
@RestController
@RequestMapping("/cms/ratedLife")
@Slf4j
public class RatedLifeController extends JeecgController<RatedLife, IRatedLifeService> {
- @Autowired
- private IRatedLifeService ratedLifeService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param ratedLife
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "棰濆畾瀵垮懡-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="棰濆畾瀵垮懡-鍒嗛〉鍒楄〃鏌ヨ", notes="棰濆畾瀵垮懡-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<RatedLife>> queryPageList(RatedLife ratedLife,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<RatedLife> queryWrapper = QueryGenerator.initQueryWrapper(ratedLife, req.getParameterMap());
- Page<RatedLife> page = new Page<RatedLife>(pageNo, pageSize);
- IPage<RatedLife> pageList = ratedLifeService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param ratedLife
- * @return
- */
- @AutoLog(value = "棰濆畾瀵垮懡-娣诲姞")
- @ApiOperation(value="棰濆畾瀵垮懡-娣诲姞", notes="棰濆畾瀵垮懡-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:cms_rated_life:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody RatedLife ratedLife) {
- ratedLifeService.save(ratedLife);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param ratedLife
- * @return
- */
- @AutoLog(value = "棰濆畾瀵垮懡-缂栬緫")
- @ApiOperation(value="棰濆畾瀵垮懡-缂栬緫", notes="棰濆畾瀵垮懡-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:cms_rated_life:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody RatedLife ratedLife) {
- ratedLifeService.updateById(ratedLife);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "棰濆畾瀵垮懡-閫氳繃id鍒犻櫎")
- @ApiOperation(value="棰濆畾瀵垮懡-閫氳繃id鍒犻櫎", notes="棰濆畾瀵垮懡-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_rated_life:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- ratedLifeService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "棰濆畾瀵垮懡-鎵归噺鍒犻櫎")
- @ApiOperation(value="棰濆畾瀵垮懡-鎵归噺鍒犻櫎", notes="棰濆畾瀵垮懡-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_rated_life:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.ratedLifeService.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<RatedLife> queryById(@RequestParam(name="id",required=true) String id) {
- RatedLife ratedLife = ratedLifeService.getById(id);
- if(ratedLife==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(ratedLife);
- }
+ @Autowired
+ private IRatedLifeService ratedLifeService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param ratedLife
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param ratedLife
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "棰濆畾瀵垮懡-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "棰濆畾瀵垮懡-鍒嗛〉鍒楄〃鏌ヨ", notes = "棰濆畾瀵垮懡-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<RatedLife>> queryPageList(RatedLife ratedLife,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<RatedLife> queryWrapper = QueryGenerator.initQueryWrapper(ratedLife, req.getParameterMap());
+ Page<RatedLife> page = new Page<RatedLife>(pageNo, pageSize);
+ IPage<RatedLife> pageList = ratedLifeService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param ratedLife
+ * @return
+ */
+ @AutoLog(value = "棰濆畾瀵垮懡-娣诲姞")
+ @ApiOperation(value = "棰濆畾瀵垮懡-娣诲姞", notes = "棰濆畾瀵垮懡-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:cms_rated_life:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody RatedLife ratedLife) {
+ ratedLifeService.save(ratedLife);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param ratedLife
+ * @return
+ */
+ @AutoLog(value = "棰濆畾瀵垮懡-缂栬緫")
+ @ApiOperation(value = "棰濆畾瀵垮懡-缂栬緫", notes = "棰濆畾瀵垮懡-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:cms_rated_life:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody RatedLife ratedLife) {
+ ratedLifeService.updateById(ratedLife);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "棰濆畾瀵垮懡-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "棰濆畾瀵垮懡-閫氳繃id鍒犻櫎", notes = "棰濆畾瀵垮懡-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_rated_life:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ ratedLifeService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "棰濆畾瀵垮懡-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "棰濆畾瀵垮懡-鎵归噺鍒犻櫎", notes = "棰濆畾瀵垮懡-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_rated_life:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.ratedLifeService.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<RatedLife> queryById(@RequestParam(name = "id", required = true) String id) {
+ RatedLife ratedLife = ratedLifeService.getById(id);
+ if (ratedLife == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(ratedLife);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param ratedLife
+ */
//@RequiresPermissions("org.jeecg.modules:cms_rated_life:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, RatedLife ratedLife) {
@@ -162,12 +163,12 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("cms_rated_life:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
diff --git a/src/main/java/org/jeecg/modules/cms/entity/RatedLife.java b/src/main/java/org/jeecg/modules/cms/entity/RatedLife.java
index 743b44c..dea06b6 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/RatedLife.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/RatedLife.java
@@ -55,6 +55,7 @@
/**鍒�鍏稩D*/
@Excel(name = "鍒�鍏稩D", width = 15)
@ApiModelProperty(value = "鍒�鍏稩D")
+ @Dict(dictTable = "cms_cutting_tool",dicCode = "id",dicText = "cutting_code")
private String cuttingId;
/**宸ヤ欢鏉愯川*/
@Excel(name = "宸ヤ欢鏉愯川", width = 15)
--
Gitblit v1.9.3