From 893ce0b7314e9de64e66e610b4e200b1f19ff529 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 8 Mar 2022 21:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictController.java | 31 ++++++++++-------- .../controller/OnlCgformTagController.java | 32 ++++--------------- .../tag/mapper/OnlCgformTagMapper.java | 7 ++-- .../service/impl/OnlCgformTagServiceImpl.java | 21 ++++++++++++ 4 files changed, 50 insertions(+), 41 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index dd18e97f6..7184b847c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -369,22 +369,27 @@ public class SysDictController { Result result = new Result(); try { Integer count = sysDictService.queryExitData(sysDict); + Integer countDictName=sysDictService.queryExitDictName(sysDict); System.out.println("count="+count); - - if (count > 0) { - sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); - } else { - if(sysDict.getIsTagDict() == 1){ - String pinYin = HanYuPinYinUtil.changeToNumberPinYin(sysDict.getDictName()); - sysDict.setDictCode(pinYin); + if (countDictName > 0) { + result.error500("标签名称不能重复"); + }else{ + //判断逻辑删除 + if (count > 0) { + sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); + } else { + if(sysDict.getIsTagDict() == 1){ + String pinYin = HanYuPinYinUtil.changeToNumberPinYin(sysDict.getDictName()); + sysDict.setDictCode(pinYin.replace(" ","_")); + } + sysDict.setCreateTime(new Date()); + sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); + sysDictService.save(sysDict); } - sysDict.setCreateTime(new Date()); - sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); - sysDictService.save(sysDict); + result.success("保存成功！"); + //添加成功后需要刷新缓存 + sysDictService.refreshCache(); } - result.success("保存成功！"); - //添加成功后需要刷新缓存 - sysDictService.refreshCache(); } catch (Exception e) { log.error(e.getMessage(),e); result.error500("操作失败"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index 26e4a7b4e..54ba9f9d0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -3,14 +3,13 @@ package com.jero.modules.tag.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.CommonConstant; import com.jero.common.system.base.controller.JeroController; +import com.jero.generater.modules.online.cgform.controller.OnlCgformApiController; import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; import com.jero.modules.tag.service.IOnlCgformTagService; -import com.jero.modules.utils.HanYuPinYinUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -23,7 +22,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.Map; @@ -46,6 +44,8 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { - Integer count=onlCgformTagService.queryExitData(onlCgformTag); - if (count > 0) { - onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0); - } else { - onlCgformTag.setCreateTime(new Date()); - onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0); - onlCgformTag.setCgformHeadId("48308196e7b04761b533dc31bc899707");//设置文档库-表id - onlCgformTag.setDbIsKey(0); - onlCgformTag.setDbIsNull(1); - onlCgformTag.setDbPointLength(0); - String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt()); - onlCgformTag.setDbFieldName(pinYin.replace(" ","_")); - onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_")); - if(onlCgformTag.getFieldShowType()=="2"){ - onlCgformTag.setDbType("int"); - }else if(onlCgformTag.getFieldShowType()=="5" && onlCgformTag.getFieldShowType()=="6"){ - onlCgformTag.setDbType("Date"); - }else{ - onlCgformTag.setDbType("String"); - } - onlCgformTagService.add(onlCgformTag); - } + onlCgformTagService.add(onlCgformTag); + onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal"); return Result.OK("添加成功！"); } @@ -121,6 +101,7 @@ public class OnlCgformTagController extends JeroController { @Select("select f.id,f.create_by,f.create_time,f.update_by,f.update_time,f.cgform_head_id,\n" + "f.is_model,f.db_field_txt,f.db_field_en_name,\n" + - "f.field_show_type,i.item_text,f.dict_id,f.db_length,\n" + - "f.order_num,f.field_must_input,f.is_show_form,f.is_show_list,\n" + - "f.is_read_only,f.show_area,a.show_area as show_area_name,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" + + "f.field_show_type,i.item_text as field_show_type_name,\n" + + "f.dict_id,f.db_length,f.order_num,f.field_must_input,\n" + + "f.is_show_form,f.is_show_list,f.is_read_only,\n" + + "f.show_area,a.show_area as show_area_name,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" + "f.db_field_name,f.db_is_key,f.db_is_null,f.db_point_length,f.db_type,\n" + "i.en_name as field_show_type_en_name,a.en_name as show_area_en_name\n" + "from onl_cgform_field as f \n" + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 434458801..071babbb7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -43,6 +43,27 @@ public class OnlCgformTagServiceImpl extends ServiceImpl 0) { + onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0); + } else { + onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0); + onlCgformTag.setCgformHeadId("48308196e7b04761b533dc31bc899707");//设置文档库-表id + onlCgformTag.setDbIsKey(0); + onlCgformTag.setDbIsNull(1); + onlCgformTag.setDbPointLength(0); + onlCgformTag.setIsReadOnly(0); + String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt()); + onlCgformTag.setDbFieldName(pinYin.replace(" ","_")); + onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_")); + if(onlCgformTag.getFieldShowType()=="2"){ + onlCgformTag.setDbType("int"); + }else if(onlCgformTag.getFieldShowType()=="5" && onlCgformTag.getFieldShowType()=="6"){ + onlCgformTag.setDbType("Date"); + }else{ + onlCgformTag.setDbType("String"); + } + } Date now = new Date(); onlCgformTag.setCreateTime(now); onlCgformTag.setUpdateTime(now);