diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java index dc4d54bf6..ba7a2d577 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java @@ -56,7 +56,7 @@ public class SysDictTypeController extends BaseController { @PostMapping public BaseResponse add(@Validated @RequestBody SysDictType dict) { if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { - return ResultVOUtils.error(500, "新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); + return ResultVOUtils.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); } dictTypeService.insertDictType(dict); return ResultVOUtils.success("新增成功！"); @@ -67,9 +67,9 @@ public class SysDictTypeController extends BaseController { */ @PutMapping public BaseResponse edit(@Validated @RequestBody SysDictType dict) { -// if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { -// return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); -// } + if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { + return ResultVOUtils.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); + } dictTypeService.updateDictType(dict); return ResultVOUtils.success("修改成功！"); } diff --git a/src/main/java/com/glxp/api/entity/auth/SysDictData.java b/src/main/java/com/glxp/api/entity/auth/SysDictData.java index c47ec2f2d..3d9647dc1 100644 --- a/src/main/java/com/glxp/api/entity/auth/SysDictData.java +++ b/src/main/java/com/glxp/api/entity/auth/SysDictData.java @@ -1,5 +1,9 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.glxp.api.constant.Constant; import com.glxp.api.entity.BaseEntity; import lombok.Data; @@ -17,6 +21,7 @@ public class SysDictData extends BaseEntity { /** * 字典编码 */ + @TableId(value = "dictCode",type = IdType.AUTO) private Long dictCode; /** diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java index 464034be0..26e27077b 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java @@ -119,6 +119,13 @@ public class DeviceChangeOrderItemEntity implements Serializable { @TableField(value = "supName") private String supName; + /** + * 来源类型 + */ + @TableField(value = "sourceType") + private String sourceType; + + @TableField(exist = false) private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java index 09e04b23c..8068f94ee 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java @@ -157,6 +157,11 @@ public class DeviceChangeOrderParam { private String productName; private String zczbhhzbapzbh; + /** + * 来源类型 + */ + private String sourceType; + } public void valid(AuthAdmin user) { diff --git a/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java b/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java index 3b59b35b9..c78bd9fb8 100644 --- a/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java @@ -15,7 +15,7 @@ public interface ISysDictDataService { /** * 根据条件分页查询字典数据 * - * @param dictData 字典数据信息 + * @param sysDictDataRequest 字典数据信息 * @return 字典数据集合信息 */ List selectDictDataList(SysDictDataRequest sysDictDataRequest); diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java index 4ccded5ba..3847b55f8 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java @@ -3,14 +3,18 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.SysDictDataMapper; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.SysDictData; +import com.glxp.api.exception.JsonException; import com.glxp.api.exception.ServiceException; import com.glxp.api.req.auth.SysDictDataRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.ISysDictDataService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -21,6 +25,8 @@ import java.util.List; public class SysDictDataServiceImpl implements ISysDictDataService { @Resource SysDictDataMapper baseMapper; + @Resource + CustomerService customerService; @Override @@ -63,24 +69,36 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Override public List insertDictData(SysDictData data) { + AuthAdmin authAdmin = customerService.getUserBean(); + Date date = new Date(); + String userName = authAdmin.getUserName(); + data.setCreateBy(userName); + data.setCreateTime(date); + data.setUpdateBy(userName); + data.setUpdateTime(date); int row = baseMapper.insert(data); if (row > 0) { SysDictDataRequest sysDictDataRequest = new SysDictDataRequest(); sysDictDataRequest.setDictType(data.getDictType()); return baseMapper.selectDictDataList(sysDictDataRequest); } - throw new ServiceException("操作失败"); + throw new JsonException("操作失败"); } @Override public List updateDictData(SysDictData data) { + AuthAdmin authAdmin = customerService.getUserBean(); + Date date = new Date(); + String userName = authAdmin.getUserName(); + data.setUpdateBy(userName); + data.setUpdateTime(date); int row = baseMapper.updateById(data); if (row > 0) { SysDictDataRequest sysDictDataRequest = new SysDictDataRequest(); sysDictDataRequest.setDictType(data.getDictType()); return baseMapper.selectDictDataList(sysDictDataRequest); } - throw new ServiceException("操作失败"); + throw new JsonException("操作失败"); } } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index 1d1c69989..200e87c3e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -1,15 +1,19 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.dao.auth.SysDictDataMapper; import com.glxp.api.dao.auth.SysDictTypeMapper; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.entity.auth.SysDictType; +import com.glxp.api.exception.JsonException; import com.glxp.api.exception.ServiceException; import com.glxp.api.req.auth.SysDictDataRequest; import com.glxp.api.req.auth.SysDictTypeRequest; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; @@ -18,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -30,6 +35,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { private final SysDictTypeMapper baseMapper; private final SysDictDataMapper dictDataMapper; + private final CustomerService customerService; @Override public List selectDictTypeList(SysDictTypeRequest sysDictTypeRequest) { @@ -105,7 +111,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { SysDictData sysDictData = dictDataMapper.exists(sysDictDataRequest); if (sysDictData != null) { - throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); + throw new JsonException(String.format("%1$s已分配,不能删除", dictType.getDictName())); } } baseMapper.deleteBatchIds(Arrays.asList(dictIds)); @@ -126,11 +132,18 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { */ @Override public List insertDictType(SysDictType dict) { + AuthAdmin authAdmin = customerService.getUserBean(); + Date date = new Date(); + String userName = authAdmin.getUserName(); + dict.setCreateBy(userName); + dict.setCreateTime(date); + dict.setUpdateBy(userName); + dict.setUpdateTime(date); int row = baseMapper.insert(dict); if (row > 0) { return new ArrayList<>(); } - throw new ServiceException("操作失败"); + throw new JsonException("操作失败"); } /** @@ -142,7 +155,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { @Override @Transactional(rollbackFor = Exception.class) public List updateDictType(SysDictType dict) { - SysDictType oldDict = baseMapper.selectById(dict.getDictId()); + AuthAdmin authAdmin = customerService.getUserBean(); + Date date = new Date(); + String userName = authAdmin.getUserName(); + dict.setUpdateBy(userName); + dict.setUpdateTime(date); +// SysDictType oldDict = baseMapper.selectById(dict.getDictId()); // dictDataMapper.updateByType(null, new LambdaUpdateWrapper() // .set(SysDictData::getDictType, dict.getDictType()) // .eq(SysDictData::getDictType, oldDict.getDictType())); @@ -152,7 +170,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { sysDictDataRequest.setDictType(dict.getDictType()); return dictDataMapper.selectDictDataList(sysDictDataRequest); } - throw new ServiceException("操作失败"); + throw new JsonException("操作失败"); } /** @@ -166,8 +184,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { SysDictTypeRequest sysDictTypeRequest = new SysDictTypeRequest(); sysDictTypeRequest.setDictType(dict.getDictType()); + sysDictTypeRequest.setDictId(dict.getDictId()); SysDictType exist = baseMapper.exists(sysDictTypeRequest); - if (exist == null) { + if (exist != null) { return Constant.NOT_UNIQUE; } return Constant.UNIQUE; diff --git a/src/main/resources/mybatis/mapper/auth/SysDictDataMapper.xml b/src/main/resources/mybatis/mapper/auth/SysDictDataMapper.xml index 6ba977d9c..956379cb5 100644 --- a/src/main/resources/mybatis/mapper/auth/SysDictDataMapper.xml +++ b/src/main/resources/mybatis/mapper/auth/SysDictDataMapper.xml @@ -54,18 +54,17 @@ - - INSERT INTO sys_dict_data(`dict_code`, `dict_sort`, dict_label, dict_value + INSERT INTO sys_dict_data( `dict_sort`, dict_label, dict_value , dict_type, css_class, list_class, is_default, status, remark, - create_by, create_time, update_by) - values (#{dictCode}, + create_by, create_time, update_by,update_time) + values ( #{dictSort}, #{dictLabel}, #{dictValue}, #{dictType}, #{cssClass}, #{listClass} - , #{isDefault}, #{status}, #{remark}, #{createBy}, #{createTime}, #{updateBy}) + , #{isDefault}, #{status}, #{remark}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}) - - + UPDATE sys_dict_data `dict_code`=#{dictCode}, diff --git a/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml b/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml index a79ab3fab..6f2f3a8f3 100644 --- a/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml +++ b/src/main/resources/mybatis/mapper/auth/SysDictTypeMapper.xml @@ -13,6 +13,7 @@ + @@ -64,25 +65,27 @@ - - INSERT INTO sys_dict_type(`dict_id`, dict_name, `dict_type`, status - create_by, create_time, update_by, update_time) - values (#{dictId}, - #{dictName}, #{dictType}, #{status}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}) + + INSERT INTO sys_dict_type( dict_name, `dict_type`, status, + create_by, create_time, update_by, update_time,remark) + values ( + #{dictName}, #{dictType}, #{status}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}) - + UPDATE sys_dict_type `dict_name`=#{dictName}, dict_type=#{dictType}, `status`=#{status}, + `status`=#{status}, update_time=#{updateTime}, create_by=#{createBy}, `create_time`=#{createTime}, `update_by`=#{updateBy}, + `remark`=#{remark}, WHERE dict_id=#{dictId} @@ -99,11 +102,11 @@ and status = #{status} - - and dict_label = #{dictLabel} + + and dict_id != #{dictId} - - and dict_value = #{dictValue} + + and dict_name = #{dictName} limit 1 diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index c7d95900a..479465253 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -474,6 +474,9 @@ AND basic_udirel.isDisable = true + + AND basic_udirel.attributeType = #{attributeType} + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 1a0e85774..73c1aa341 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -1033,3 +1033,25 @@ VALUES (38030, 46, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (38031, 46, '1', 1, 'auditRemark', '审核详情', 'button', NULL, NULL, NULL, NULL, NULL, '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"审核过程\",\"clickFuc\":\"showApprovalFlowDetail\"}]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +CALL Pro_Temp_ColumnWork('device_change_order_item', 'sourceType', + ' varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''来源类型'' ', + 1); + +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) +VALUES (2091, '字典管理', 1, 8, 'dict', 'system/dict/index', NULL, 1, 0, 'C', '0', '0', 'system:dict:list', NULL, '超级用户', '2024-03-19 14:58:35', NULL, NULL, NULL); + + +insert IGNORE into sys_dict_type values(3, '系统开关', 'sys_normal_disable', '0', 'admin', sysdate(), '', null, '系统开关列表'); +insert IGNORE into sys_dict_data values(6, 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态'); +insert IGNORE into sys_dict_data values(7, 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '停用状态'); + +insert IGNORE into sys_dict_type values(4, '设备来源', 'device_source_type', '0', 'admin', sysdate(), '', null, '设备来源列表'); +insert IGNORE into sys_dict_data values(8, 1, '采购', '1', 'device_source_type', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '采购类型'); +insert IGNORE into sys_dict_data values(9, 2, '赠与', '2', 'device_source_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '赠与类型'); +insert IGNORE into sys_dict_data values(10, 3, '寄售', '3', 'device_source_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '寄售类型'); + + +ALTER TABLE sys_dict_data + MODIFY COLUMN `dict_code` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '字典编码' FIRST; +ALTER TABLE sys_dict_type + MODIFY COLUMN `dict_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '字典主键' FIRST;