2022-12-06 赵玉瑞 修改产品管理部分问题

ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue

@@ -13,9 +13,9 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('zy_cloths_component')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-        <a-button type="primary" icon="import">导入</a-button>
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
-      </a-upload>
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
 <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java

@@ -9,6 +9,7 @@ import java.io.UnsupportedEncodingException;
 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;
@@ -27,6 +28,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -36,135 +38,144 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+/**
  * @Description: zy_cloths_type
  * @Author: jeecg-boot
- * @Date:   2021-11-10
+ * @Date: 2021-11-10
  * @Version: V1.0
  */
-@Api(tags="zy_cloths_type")
+@Api(tags = "zy_cloths_type")
 @RestController
 @RequestMapping("/base/zyClothsType")
 @Slf4j
 public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClothsTypeService> {
-	@Autowired
+    @Autowired
-	private IZyClothsTypeService zyClothsTypeService;
+    private IZyClothsTypeService zyClothsTypeService;
 
-	/**
+    /**
-	 * 分页列表查询
+     * 分页列表查询
-	 *
+     *
-	 * @param zyClothsType
+     * @param zyClothsType
-	 * @param pageNo
+     * @param pageNo
-	 * @param pageSize
+     * @param pageSize
-	 * @param req
+     * @param req
-	 * @return
+     * @return
-	 */
+     */
-	@AutoLog(value = "zy_cloths_type-分页列表查询")
+    @AutoLog(value = "zy_cloths_type-分页列表查询")
-	@ApiOperation(value="zy_cloths_type-分页列表查询", notes="zy_cloths_type-分页列表查询")
+    @ApiOperation(value = "zy_cloths_type-分页列表查询", notes = "zy_cloths_type-分页列表查询")
-	@GetMapping(value = "/list")
+    @GetMapping(value = "/list")
-	public Result<?> queryPageList(ZyClothsType zyClothsType,
+    public Result<?> queryPageList(ZyClothsType zyClothsType,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-								   HttpServletRequest req) {
+                                   HttpServletRequest req) {
-		QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
+        QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
-		Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize);
+        Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize);
-		IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper);
+        IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper);
-		return Result.OK(pageList);
+        return Result.OK(pageList);
-	}
+    }
 
-	/**
+    /**
-	 *   添加
+     * 添加
-	 *
+     *
-	 * @param zyClothsType
+     * @param zyClothsType
-	 * @return
+     * @return
-	 */
+     */
-	@AutoLog(value = "zy_cloths_type-添加")
+    @AutoLog(value = "zy_cloths_type-添加")
-	@ApiOperation(value="zy_cloths_type-添加", notes="zy_cloths_type-添加")
+    @ApiOperation(value = "zy_cloths_type-添加", notes = "zy_cloths_type-添加")
-	@PostMapping(value = "/add")
+    @PostMapping(value = "/add")
-	public Result<?> add(@RequestBody ZyClothsType zyClothsType) {
+    public Result<?> add(@RequestBody ZyClothsType zyClothsType) {
-		//生成编号 nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）在service层处理
+        //类型名称输入时没有最大长度限制，提交时才提示。前端校验、后台校验
-		zyClothsType.setNums(zyClothsTypeService.generateNumber());
+        //type_name，类型名称，varchar，50，非空，同类型下不重复
-		zyClothsTypeService.save(zyClothsType);
+        String typeName = zyClothsType.getTypeName();
-		return Result.OK("添加成功！");
+        if (!StringUtils.hasText(typeName)) {
-	}
+            return Result.error("类型名称 不能为空");
+        }
+        if (typeName.length() > 10) {
+            return Result.error("类型名称长度不能超过10");
+        }
+        //生成编号 nums，编号，varchar，10，非空，不重复，企业缩写（4）+顺序号（6）在service层处理
+        zyClothsType.setNums(zyClothsTypeService.generateNumber());
+        zyClothsTypeService.save(zyClothsType);
+        return Result.OK("添加成功！");
+    }
 
-	/**
+    /**
-	 *  编辑
+     * 编辑
-	 *
+     *
-	 * @param zyClothsType
+     * @param zyClothsType
-	 * @return
+     * @return
-	 */
+     */
-	@AutoLog(value = "zy_cloths_type-编辑")
+    @AutoLog(value = "zy_cloths_type-编辑")
-	@ApiOperation(value="zy_cloths_type-编辑", notes="zy_cloths_type-编辑")
+    @ApiOperation(value = "zy_cloths_type-编辑", notes = "zy_cloths_type-编辑")
-	@PutMapping(value = "/edit")
+    @PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody ZyClothsType zyClothsType) {
+    public Result<?> edit(@RequestBody ZyClothsType zyClothsType) {
-		zyClothsTypeService.updateById(zyClothsType);
+        zyClothsTypeService.updateById(zyClothsType);
-		return Result.OK("编辑成功!");
+        return Result.OK("编辑成功!");
-	}
+    }
 
-	/**
+    /**
-	 *   通过id删除
+     * 通过id删除
-	 *
+     *
-	 * @param id
+     * @param id
-	 * @return
+     * @return
-	 */
+     */
-	@AutoLog(value = "zy_cloths_type-通过id删除")
+    @AutoLog(value = "zy_cloths_type-通过id删除")
-	@ApiOperation(value="zy_cloths_type-通过id删除", notes="zy_cloths_type-通过id删除")
+    @ApiOperation(value = "zy_cloths_type-通过id删除", notes = "zy_cloths_type-通过id删除")
-	@DeleteMapping(value = "/delete")
+    @DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-		zyClothsTypeService.removeById(id);
+        zyClothsTypeService.removeById(id);
-		return Result.OK("删除成功!");
+        return Result.OK("删除成功!");
-	}
+    }
 
-	/**
+    /**
-	 *  批量删除
+     * 批量删除
-	 *
+     *
-	 * @param ids
+     * @param ids
-	 * @return
+     * @return
-	 */
+     */
-	@AutoLog(value = "zy_cloths_type-批量删除")
+    @AutoLog(value = "zy_cloths_type-批量删除")
-	@ApiOperation(value="zy_cloths_type-批量删除", notes="zy_cloths_type-批量删除")
+    @ApiOperation(value = "zy_cloths_type-批量删除", notes = "zy_cloths_type-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-		this.zyClothsTypeService.removeByIds(Arrays.asList(ids.split(",")));
+        this.zyClothsTypeService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
+        return Result.OK("批量删除成功!");
-	}
+    }
 
-	/**
+    /**
-	 * 通过id查询
+     * 通过id查询
-	 *
+     *
-	 * @param id
+     * @param id
-	 * @return
+     * @return
-	 */
+     */
-	@AutoLog(value = "zy_cloths_type-通过id查询")
+    @AutoLog(value = "zy_cloths_type-通过id查询")
-	@ApiOperation(value="zy_cloths_type-通过id查询", notes="zy_cloths_type-通过id查询")
+    @ApiOperation(value = "zy_cloths_type-通过id查询", notes = "zy_cloths_type-通过id查询")
-	@GetMapping(value = "/queryById")
+    @GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
-		ZyClothsType zyClothsType = zyClothsTypeService.getById(id);
+        ZyClothsType zyClothsType = zyClothsTypeService.getById(id);
-		if(zyClothsType==null) {
+        if (zyClothsType == null) {
-			return Result.error("未找到对应数据");
+            return Result.error("未找到对应数据");
-		}
+        }
-		return Result.OK(zyClothsType);
+        return Result.OK(zyClothsType);
-	}
+    }
 
     /**
-    * 导出excel
+     * 导出excel
-    *
+     *
-    * @param request
+     * @param request
-    * @param zyClothsType
+     * @param zyClothsType
-    */
+     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ZyClothsType zyClothsType) {
         return super.exportXls(request, zyClothsType, ZyClothsType.class, "制衣类型表");
     }
 
     /**
-      * 通过excel导入数据
+     * 通过excel导入数据
-    *
+     *
-    * @param request
+     * @param request
-    * @param response
+     * @param response
-    * @return
+     * @return
-    */
+     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ZyClothsType.class);