From 0d9c44daf2b60b041bc72769568d45f99c5479c5 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Mon, 25 Sep 2023 14:30:37 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=20=E8=AE=A1=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../controller/BaseMonitorInfoController.java | 101 +++++++ .../aucma/base/domain/BaseMonitorInfo.java | 266 ++++++++++++++++++ .../base/mapper/BaseMonitorInfoMapper.java | 61 ++++ .../base/service/IBaseMonitorInfoService.java | 61 ++++ .../impl/BaseMonitorInfoServiceImpl.java | 93 ++++++ .../mapper/base/BaseMonitorInfoMapper.xml | 156 ++++++++++ 7 files changed, 739 insertions(+), 1 deletion(-) create mode 100644 aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorInfoController.java create mode 100644 aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorInfo.java create mode 100644 aucma-base/src/main/java/com/aucma/base/mapper/BaseMonitorInfoMapper.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/IBaseMonitorInfoService.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorInfoServiceImpl.java create mode 100644 aucma-base/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml diff --git a/aucma-admin/src/main/resources/application.yml b/aucma-admin/src/main/resources/application.yml index 6e946ce..a2807ec 100644 --- a/aucma-admin/src/main/resources/application.yml +++ b/aucma-admin/src/main/resources/application.yml @@ -49,7 +49,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 720 # MyBatis配置 mybatis: diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorInfoController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorInfoController.java new file mode 100644 index 0000000..bbb7b09 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorInfoController.java @@ -0,0 +1,101 @@ +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.BaseMonitorInfo; +import com.aucma.base.service.IBaseMonitorInfoService; +import com.aucma.common.utils.poi.ExcelUtil; + +/** + * 计量设备信息Controller + * + * @author Yinq + * @date 2023-09-21 + */ +@RestController +@RequestMapping("/base/monitorInfo") +public class BaseMonitorInfoController extends BaseController { + @Autowired + private IBaseMonitorInfoService baseMonitorInfoService; + + /** + * 查询计量设备信息列表 + */ + @PreAuthorize("@ss.hasPermi('base:monitorInfo:list')") + @GetMapping("/list") + public AjaxResult list(BaseMonitorInfo baseMonitorInfo) { + List list = baseMonitorInfoService.selectBaseMonitorInfoList(baseMonitorInfo); + return success(list); + } + + /** + * 导出计量设备信息列表 + */ + @PreAuthorize("@ss.hasPermi('base:monitorInfo:export')") + @Log(title = "计量设备信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseMonitorInfo baseMonitorInfo) { + List list = baseMonitorInfoService.selectBaseMonitorInfoList(baseMonitorInfo); + ExcelUtil util = new ExcelUtil(BaseMonitorInfo.class); + util.exportExcel(response, list, "计量设备信息数据"); + } + + /** + * 获取计量设备信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:monitorInfo:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) { + return success(baseMonitorInfoService.selectBaseMonitorInfoByObjId(objId)); + } + + /** + * 新增计量设备信息 + */ + @PreAuthorize("@ss.hasPermi('base:monitorInfo:add')") + @Log(title = "计量设备信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseMonitorInfo baseMonitorInfo) { + baseMonitorInfo.setCreatedBy(getUsername()); + baseMonitorInfo.setCreatedTime(DateUtils.getNowDate()); + return toAjax(baseMonitorInfoService.insertBaseMonitorInfo(baseMonitorInfo)); + } + + /** + * 修改计量设备信息 + */ + @PreAuthorize("@ss.hasPermi('base:monitorInfo:edit')") + @Log(title = "计量设备信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseMonitorInfo baseMonitorInfo) { + baseMonitorInfo.setUpdatedBy(getUsername()); + baseMonitorInfo.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(baseMonitorInfoService.updateBaseMonitorInfo(baseMonitorInfo)); + } + + /** + * 删除计量设备信息 + */ + @PreAuthorize("@ss.hasPermi('base:monitorInfo:remove')") + @Log(title = "计量设备信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(baseMonitorInfoService.deleteBaseMonitorInfoByObjIds(objIds)); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorInfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorInfo.java new file mode 100644 index 0000000..0e4a715 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorInfo.java @@ -0,0 +1,266 @@ +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.TreeEntity; + +/** + * 计量设备信息对象 base_monitorinfo + * + * @author Yinq + * @date 2023-09-21 + */ +public class BaseMonitorInfo extends TreeEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long objId; + + /** + * 计量设备编号 + */ + private String monitorCode; + + /** + * 计量设备名称 + */ + @Excel(name = "计量设备名称") + private String monitorName; + + /** + * 计量设备位置 + */ + @Excel(name = "计量设备位置") + private String monitorAddress; + + /** + * 计量设备类型（1-电） + */ + @Excel(name = "计量设备类型", readConverterExp = "1=-电") + private Long monitorType; + + /** + * 计量设备状态（1-启用；2-停用；3-异常） + */ + @Excel(name = "计量设备状态", readConverterExp = "1=-启用；2-停用；3-异常") + private Long monitorStatus; + + /** + * PT值 + */ + @Excel(name = "PT值") + private Long pt; + + /** + * CT值 + */ + @Excel(name = "CT值") + private Long ct; + + /** + * 表具层级 + */ + @Excel(name = "表具层级") + private Long monitorHierarchy; + + /** + * 网络地址 + */ + @Excel(name = "网络地址") + private String monitorNetwork; + + /** + * 启用标识 + */ + @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; + + /** + * 是否虚拟设备（0-是；1-否） + */ + @Excel(name = "是否虚拟设备", readConverterExp = "0=-是；1-否") + private Long isAmmeter; + + public void setObjId(Long objId) { + this.objId = objId; + } + + public Long getObjId() { + return objId; + } + + public void setMonitorCode(String monitorCode) { + this.monitorCode = monitorCode; + } + + public String getMonitorCode() { + return monitorCode; + } + + public void setMonitorName(String monitorName) { + this.monitorName = monitorName; + } + + public String getMonitorName() { + return monitorName; + } + + public void setMonitorAddress(String monitorAddress) { + this.monitorAddress = monitorAddress; + } + + public String getMonitorAddress() { + return monitorAddress; + } + + public void setMonitorType(Long monitorType) { + this.monitorType = monitorType; + } + + public Long getMonitorType() { + return monitorType; + } + + public void setMonitorStatus(Long monitorStatus) { + this.monitorStatus = monitorStatus; + } + + public Long getMonitorStatus() { + return monitorStatus; + } + + public void setPt(Long pt) { + this.pt = pt; + } + + public Long getPt() { + return pt; + } + + public void setCt(Long ct) { + this.ct = ct; + } + + public Long getCt() { + return ct; + } + + public void setMonitorHierarchy(Long monitorHierarchy) { + this.monitorHierarchy = monitorHierarchy; + } + + public Long getMonitorHierarchy() { + return monitorHierarchy; + } + + public void setMonitorNetwork(String monitorNetwork) { + this.monitorNetwork = monitorNetwork; + } + + public String getMonitorNetwork() { + return monitorNetwork; + } + + 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; + } + + public void setIsAmmeter(Long isAmmeter) { + this.isAmmeter = isAmmeter; + } + + public Long getIsAmmeter() { + return isAmmeter; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("parentId", getParentId()) + .append("monitorCode", getMonitorCode()) + .append("monitorName", getMonitorName()) + .append("monitorAddress", getMonitorAddress()) + .append("monitorType", getMonitorType()) + .append("monitorStatus", getMonitorStatus()) + .append("pt", getPt()) + .append("ct", getCt()) + .append("monitorHierarchy", getMonitorHierarchy()) + .append("monitorNetwork", getMonitorNetwork()) + .append("isFlag", getIsFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .append("isAmmeter", getIsAmmeter()) + .toString(); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseMonitorInfoMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseMonitorInfoMapper.java new file mode 100644 index 0000000..803fc32 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseMonitorInfoMapper.java @@ -0,0 +1,61 @@ +package com.aucma.base.mapper; + +import java.util.List; +import com.aucma.base.domain.BaseMonitorInfo; + +/** + * 计量设备信息Mapper接口 + * + * @author Yinq + * @date 2023-09-21 + */ +public interface BaseMonitorInfoMapper +{ + /** + * 查询计量设备信息 + * + * @param objId 计量设备信息主键 + * @return 计量设备信息 + */ + public BaseMonitorInfo selectBaseMonitorInfoByObjId(Long objId); + + /** + * 查询计量设备信息列表 + * + * @param baseMonitorInfo 计量设备信息 + * @return 计量设备信息集合 + */ + public List selectBaseMonitorInfoList(BaseMonitorInfo baseMonitorInfo); + + /** + * 新增计量设备信息 + * + * @param baseMonitorInfo 计量设备信息 + * @return 结果 + */ + public int insertBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo); + + /** + * 修改计量设备信息 + * + * @param baseMonitorInfo 计量设备信息 + * @return 结果 + */ + public int updateBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo); + + /** + * 删除计量设备信息 + * + * @param objId 计量设备信息主键 + * @return 结果 + */ + public int deleteBaseMonitorInfoByObjId(Long objId); + + /** + * 批量删除计量设备信息 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseMonitorInfoByObjIds(Long[] objIds); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseMonitorInfoService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseMonitorInfoService.java new file mode 100644 index 0000000..3a381aa --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseMonitorInfoService.java @@ -0,0 +1,61 @@ +package com.aucma.base.service; + +import java.util.List; +import com.aucma.base.domain.BaseMonitorInfo; + +/** + * 计量设备信息Service接口 + * + * @author Yinq + * @date 2023-09-21 + */ +public interface IBaseMonitorInfoService +{ + /** + * 查询计量设备信息 + * + * @param objId 计量设备信息主键 + * @return 计量设备信息 + */ + public BaseMonitorInfo selectBaseMonitorInfoByObjId(Long objId); + + /** + * 查询计量设备信息列表 + * + * @param baseMonitorInfo 计量设备信息 + * @return 计量设备信息集合 + */ + public List selectBaseMonitorInfoList(BaseMonitorInfo baseMonitorInfo); + + /** + * 新增计量设备信息 + * + * @param baseMonitorInfo 计量设备信息 + * @return 结果 + */ + public int insertBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo); + + /** + * 修改计量设备信息 + * + * @param baseMonitorInfo 计量设备信息 + * @return 结果 + */ + public int updateBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo); + + /** + * 批量删除计量设备信息 + * + * @param objIds 需要删除的计量设备信息主键集合 + * @return 结果 + */ + public int deleteBaseMonitorInfoByObjIds(Long[] objIds); + + /** + * 删除计量设备信息信息 + * + * @param objId 计量设备信息主键 + * @return 结果 + */ + public int deleteBaseMonitorInfoByObjId(Long objId); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorInfoServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorInfoServiceImpl.java new file mode 100644 index 0000000..461a2ad --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorInfoServiceImpl.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.BaseMonitorInfoMapper; +import com.aucma.base.domain.BaseMonitorInfo; +import com.aucma.base.service.IBaseMonitorInfoService; + +/** + * 计量设备信息Service业务层处理 + * + * @author Yinq + * @date 2023-09-21 + */ +@Service +public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService +{ + @Autowired + private BaseMonitorInfoMapper baseMonitorInfoMapper; + + /** + * 查询计量设备信息 + * + * @param objId 计量设备信息主键 + * @return 计量设备信息 + */ + @Override + public BaseMonitorInfo selectBaseMonitorInfoByObjId(Long objId) + { + return baseMonitorInfoMapper.selectBaseMonitorInfoByObjId(objId); + } + + /** + * 查询计量设备信息列表 + * + * @param baseMonitorInfo 计量设备信息 + * @return 计量设备信息 + */ + @Override + public List selectBaseMonitorInfoList(BaseMonitorInfo baseMonitorInfo) + { + return baseMonitorInfoMapper.selectBaseMonitorInfoList(baseMonitorInfo); + } + + /** + * 新增计量设备信息 + * + * @param baseMonitorInfo 计量设备信息 + * @return 结果 + */ + @Override + public int insertBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo) + { + return baseMonitorInfoMapper.insertBaseMonitorInfo(baseMonitorInfo); + } + + /** + * 修改计量设备信息 + * + * @param baseMonitorInfo 计量设备信息 + * @return 结果 + */ + @Override + public int updateBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo) + { + return baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); + } + + /** + * 批量删除计量设备信息 + * + * @param objIds 需要删除的计量设备信息主键 + * @return 结果 + */ + @Override + public int deleteBaseMonitorInfoByObjIds(Long[] objIds) + { + return baseMonitorInfoMapper.deleteBaseMonitorInfoByObjIds(objIds); + } + + /** + * 删除计量设备信息信息 + * + * @param objId 计量设备信息主键 + * @return 结果 + */ + @Override + public int deleteBaseMonitorInfoByObjId(Long objId) + { + return baseMonitorInfoMapper.deleteBaseMonitorInfoByObjId(objId); + } +} diff --git a/aucma-base/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml new file mode 100644 index 0000000..fc1e3b5 --- /dev/null +++ b/aucma-base/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select obj_id, + parent_id, + monitor_code, + monitor_name, + monitor_address, + monitor_type, + monitor_status, + pt, + ct, + monitor_hierarchy, + monitor_network, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + is_ammeter + from base_monitorinfo + + + + + + + + + SELECT seq_base_monitorinfo.NEXTVAL as objId FROM DUAL + + insert into base_monitorinfo + + obj_id, + parent_id, + monitor_code, + monitor_name, + monitor_address, + monitor_type, + monitor_status, + pt, + ct, + monitor_hierarchy, + monitor_network, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + is_ammeter, + + + #{objId}, + #{parentId}, + #{monitorCode}, + #{monitorName}, + #{monitorAddress}, + #{monitorType}, + #{monitorStatus}, + #{pt}, + #{ct}, + #{monitorHierarchy}, + #{monitorNetwork}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{isAmmeter}, + + + + + update base_monitorinfo + + parent_id = #{parentId}, + monitor_code = #{monitorCode}, + monitor_name = #{monitorName}, + monitor_address = #{monitorAddress}, + monitor_type = #{monitorType}, + monitor_status = #{monitorStatus}, + pt = #{pt}, + ct = #{ct}, + monitor_hierarchy = #{monitorHierarchy}, + monitor_network = #{monitorNetwork}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + is_ammeter = #{isAmmeter}, + + where obj_id = #{objId} + + + + delete + from base_monitorinfo + where obj_id = #{objId} + + + + delete from base_monitorinfo where obj_id in + + #{objId} + + + \ No newline at end of file