diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseCustomDataController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseCustomDataController.java new file mode 100644 index 0000000..51bc34b --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseCustomDataController.java @@ -0,0 +1,103 @@ +package com.aucma.base.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.base.domain.BaseCustomData; +import com.aucma.base.service.IBaseCustomDataService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 自定义数据维护Controller + * + * @author Yinq + * @date 2023-11-08 + */ +@RestController +@RequestMapping("/base/customData") +public class BaseCustomDataController extends BaseController { + @Autowired + private IBaseCustomDataService baseCustomDataService; + + /** + * 查询自定义数据维护列表 + */ + @PreAuthorize("@ss.hasPermi('base:customData:list')") + @GetMapping("/list") + public TableDataInfo list(BaseCustomData baseCustomData) { + startPage(); + List list = baseCustomDataService.selectBaseCustomDataList(baseCustomData); + return getDataTable(list); + } + + /** + * 导出自定义数据维护列表 + */ + @PreAuthorize("@ss.hasPermi('base:customData:export')") + @Log(title = "自定义数据维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseCustomData baseCustomData) { + List list = baseCustomDataService.selectBaseCustomDataList(baseCustomData); + ExcelUtil util = new ExcelUtil(BaseCustomData.class); + util.exportExcel(response, list, "自定义数据维护数据"); + } + + /** + * 获取自定义数据维护详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:customData:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) { + return success(baseCustomDataService.selectBaseCustomDataByObjId(objId)); + } + + /** + * 新增自定义数据维护 + */ + @PreAuthorize("@ss.hasPermi('base:customData:add')") + @Log(title = "自定义数据维护", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseCustomData baseCustomData) { + baseCustomData.setCreatedBy(getUsername()); + baseCustomData.setCreatedTime(DateUtils.getNowDate()); + return toAjax(baseCustomDataService.insertBaseCustomData(baseCustomData)); + } + + /** + * 修改自定义数据维护 + */ + @PreAuthorize("@ss.hasPermi('base:customData:edit')") + @Log(title = "自定义数据维护", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseCustomData baseCustomData) { + baseCustomData.setUpdatedBy(getUsername()); + baseCustomData.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(baseCustomDataService.updateBaseCustomData(baseCustomData)); + } + + /** + * 删除自定义数据维护 + */ + @PreAuthorize("@ss.hasPermi('base:customData:remove')") + @Log(title = "自定义数据维护", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(baseCustomDataService.deleteBaseCustomDataByObjIds(objIds)); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseCustomData.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseCustomData.java new file mode 100644 index 0000000..9ed9bcc --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseCustomData.java @@ -0,0 +1,192 @@ +package com.aucma.base.domain; + +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * 自定义数据维护对象 base_custom_data + * + * @author Yinq + * @date 2023-11-08 + */ +public class BaseCustomData extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long objId; + + /** + * 自定义数据类型(0-MES数据;1-看板数据;2-大屏数据) + */ + @Excel(name = "自定义数据类型", readConverterExp = "0=-MES数据;1-看板数据;2-大屏数据") + private Long customType; + + /** + * 自定义功能 + */ + @Excel(name = "自定义功能") + private String customFunction; + + /** + * 自定义编号 + */ + @Excel(name = "自定义编号") + private String customCode; + + /** + * 自定义数据 + */ + @Excel(name = "自定义数据") + private String customData; + + /** + * 排序 + */ + @Excel(name = "排序") + private Long customSort; + + /** + * 是否标识 + */ + @Excel(name = "是否标识") + private Long isFlag; + + /** + * 创建人 + */ + @Excel(name = "创建人") + private String createdBy; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** + * 更新人 + */ + @Excel(name = "更新人") + private String updatedBy; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + public void setObjId(Long objId) { + this.objId = objId; + } + + public Long getObjId() { + return objId; + } + + public void setCustomType(Long customType) { + this.customType = customType; + } + + public Long getCustomType() { + return customType; + } + + public void setCustomFunction(String customFunction) { + this.customFunction = customFunction; + } + + public String getCustomFunction() { + return customFunction; + } + + public void setCustomCode(String customCode) { + this.customCode = customCode; + } + + public String getCustomCode() { + return customCode; + } + + public void setCustomData(String customData) { + this.customData = customData; + } + + public String getCustomData() { + return customData; + } + + public void setCustomSort(Long customSort) { + this.customSort = customSort; + } + + public Long getCustomSort() { + return customSort; + } + + public void setIsFlag(Long isFlag) { + this.isFlag = isFlag; + } + + public Long getIsFlag() { + return isFlag; + } + + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + public String getCreatedBy() { + return createdBy; + } + + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } + + public Date getCreatedTime() { + return createdTime; + } + + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() { + return updatedBy; + } + + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() { + return updatedTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("customType", getCustomType()) + .append("customFunction", getCustomFunction()) + .append("customCode", getCustomCode()) + .append("customData", getCustomData()) + .append("customSort", getCustomSort()) + .append("remark", getRemark()) + .append("isFlag", getIsFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseCustomDataMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseCustomDataMapper.java new file mode 100644 index 0000000..caa07c2 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseCustomDataMapper.java @@ -0,0 +1,61 @@ +package com.aucma.base.mapper; + +import java.util.List; +import com.aucma.base.domain.BaseCustomData; + +/** + * 自定义数据维护Mapper接口 + * + * @author Yinq + * @date 2023-11-08 + */ +public interface BaseCustomDataMapper +{ + /** + * 查询自定义数据维护 + * + * @param objId 自定义数据维护主键 + * @return 自定义数据维护 + */ + public BaseCustomData selectBaseCustomDataByObjId(Long objId); + + /** + * 查询自定义数据维护列表 + * + * @param baseCustomData 自定义数据维护 + * @return 自定义数据维护集合 + */ + public List selectBaseCustomDataList(BaseCustomData baseCustomData); + + /** + * 新增自定义数据维护 + * + * @param baseCustomData 自定义数据维护 + * @return 结果 + */ + public int insertBaseCustomData(BaseCustomData baseCustomData); + + /** + * 修改自定义数据维护 + * + * @param baseCustomData 自定义数据维护 + * @return 结果 + */ + public int updateBaseCustomData(BaseCustomData baseCustomData); + + /** + * 删除自定义数据维护 + * + * @param objId 自定义数据维护主键 + * @return 结果 + */ + public int deleteBaseCustomDataByObjId(Long objId); + + /** + * 批量删除自定义数据维护 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseCustomDataByObjIds(Long[] objIds); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseCustomDataService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseCustomDataService.java new file mode 100644 index 0000000..7566f6c --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseCustomDataService.java @@ -0,0 +1,61 @@ +package com.aucma.base.service; + +import java.util.List; +import com.aucma.base.domain.BaseCustomData; + +/** + * 自定义数据维护Service接口 + * + * @author Yinq + * @date 2023-11-08 + */ +public interface IBaseCustomDataService +{ + /** + * 查询自定义数据维护 + * + * @param objId 自定义数据维护主键 + * @return 自定义数据维护 + */ + public BaseCustomData selectBaseCustomDataByObjId(Long objId); + + /** + * 查询自定义数据维护列表 + * + * @param baseCustomData 自定义数据维护 + * @return 自定义数据维护集合 + */ + public List selectBaseCustomDataList(BaseCustomData baseCustomData); + + /** + * 新增自定义数据维护 + * + * @param baseCustomData 自定义数据维护 + * @return 结果 + */ + public int insertBaseCustomData(BaseCustomData baseCustomData); + + /** + * 修改自定义数据维护 + * + * @param baseCustomData 自定义数据维护 + * @return 结果 + */ + public int updateBaseCustomData(BaseCustomData baseCustomData); + + /** + * 批量删除自定义数据维护 + * + * @param objIds 需要删除的自定义数据维护主键集合 + * @return 结果 + */ + public int deleteBaseCustomDataByObjIds(Long[] objIds); + + /** + * 删除自定义数据维护信息 + * + * @param objId 自定义数据维护主键 + * @return 结果 + */ + public int deleteBaseCustomDataByObjId(Long objId); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseCustomDataServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseCustomDataServiceImpl.java new file mode 100644 index 0000000..7820064 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseCustomDataServiceImpl.java @@ -0,0 +1,93 @@ +package com.aucma.base.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.base.mapper.BaseCustomDataMapper; +import com.aucma.base.domain.BaseCustomData; +import com.aucma.base.service.IBaseCustomDataService; + +/** + * 自定义数据维护Service业务层处理 + * + * @author Yinq + * @date 2023-11-08 + */ +@Service +public class BaseCustomDataServiceImpl implements IBaseCustomDataService +{ + @Autowired + private BaseCustomDataMapper baseCustomDataMapper; + + /** + * 查询自定义数据维护 + * + * @param objId 自定义数据维护主键 + * @return 自定义数据维护 + */ + @Override + public BaseCustomData selectBaseCustomDataByObjId(Long objId) + { + return baseCustomDataMapper.selectBaseCustomDataByObjId(objId); + } + + /** + * 查询自定义数据维护列表 + * + * @param baseCustomData 自定义数据维护 + * @return 自定义数据维护 + */ + @Override + public List selectBaseCustomDataList(BaseCustomData baseCustomData) + { + return baseCustomDataMapper.selectBaseCustomDataList(baseCustomData); + } + + /** + * 新增自定义数据维护 + * + * @param baseCustomData 自定义数据维护 + * @return 结果 + */ + @Override + public int insertBaseCustomData(BaseCustomData baseCustomData) + { + return baseCustomDataMapper.insertBaseCustomData(baseCustomData); + } + + /** + * 修改自定义数据维护 + * + * @param baseCustomData 自定义数据维护 + * @return 结果 + */ + @Override + public int updateBaseCustomData(BaseCustomData baseCustomData) + { + return baseCustomDataMapper.updateBaseCustomData(baseCustomData); + } + + /** + * 批量删除自定义数据维护 + * + * @param objIds 需要删除的自定义数据维护主键 + * @return 结果 + */ + @Override + public int deleteBaseCustomDataByObjIds(Long[] objIds) + { + return baseCustomDataMapper.deleteBaseCustomDataByObjIds(objIds); + } + + /** + * 删除自定义数据维护信息 + * + * @param objId 自定义数据维护主键 + * @return 结果 + */ + @Override + public int deleteBaseCustomDataByObjId(Long objId) + { + return baseCustomDataMapper.deleteBaseCustomDataByObjId(objId); + } +} diff --git a/aucma-base/src/main/resources/mapper/base/BaseCustomDataMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseCustomDataMapper.xml new file mode 100644 index 0000000..7a5a74d --- /dev/null +++ b/aucma-base/src/main/resources/mapper/base/BaseCustomDataMapper.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + select obj_id, + custom_type, + custom_function, + custom_code, + custom_data, + custom_sort, + remark, + is_flag, + created_by, + created_time, + updated_by, + updated_time + from base_custom_data + + + + + + + + + SELECT seq_base_custom_data.NEXTVAL as objId FROM DUAL + + insert into base_custom_data + + obj_id, + custom_type, + custom_function, + custom_code, + custom_data, + custom_sort, + remark, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{customType}, + #{customFunction}, + #{customCode}, + #{customData}, + #{customSort}, + #{remark}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update base_custom_data + + custom_type = #{customType}, + custom_function = #{customFunction}, + custom_code = #{customCode}, + custom_data = #{customData}, + custom_sort = #{customSort}, + remark = #{remark}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete + from base_custom_data + where obj_id = #{objId} + + + + delete from base_custom_data where obj_id in + + #{objId} + + + \ No newline at end of file diff --git a/aucma-generator/src/main/resources/generator.yml b/aucma-generator/src/main/resources/generator.yml index 0b4735e..687cda1 100644 --- a/aucma-generator/src/main/resources/generator.yml +++ b/aucma-generator/src/main/resources/generator.yml @@ -1,9 +1,9 @@ # 代码生成 gen: # 作者 - author: ruoyi + author: Yinq # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.aucma.system + packageName: com.aucma.production # 自动去除表前缀,默认是false autoRemovePre: false # 表前缀(生成类名不会包含表前缀,多个用逗号分隔)