diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/BaseSensorTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/BaseSensorTypeController.java new file mode 100644 index 0000000..cb05f4f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/BaseSensorTypeController.java @@ -0,0 +1,133 @@ +package com.ruoyi.web.controller.base; + +import java.util.Date; +import java.util.List; + +import com.ruoyi.common.utils.ShiroUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.BaseSensorType; +import com.ruoyi.system.service.IBaseSensorTypeService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 传感器类型Controller + * + * @author wenjy + * @date 2022-02-07 + */ +@Controller +@RequestMapping("/base/sensorType") +public class BaseSensorTypeController extends BaseController +{ + private String prefix = "base/sensorType"; + + @Autowired + private IBaseSensorTypeService baseSensorTypeService; + + @RequiresPermissions("base:sensorType:view") + @GetMapping() + public String sensorType() + { + return prefix + "/sensorType"; + } + + /** + * 查询传感器类型列表 + */ + @RequiresPermissions("base:sensorType:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseSensorType baseSensorType) + { + startPage(); + List list = baseSensorTypeService.selectBaseSensorTypeList(baseSensorType); + return getDataTable(list); + } + + /** + * 导出传感器类型列表 + */ + @RequiresPermissions("base:sensorType:export") + @Log(title = "传感器类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseSensorType baseSensorType) + { + List list = baseSensorTypeService.selectBaseSensorTypeList(baseSensorType); + ExcelUtil util = new ExcelUtil(BaseSensorType.class); + return util.exportExcel(list, "传感器类型数据"); + } + + /** + * 新增传感器类型 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存传感器类型 + */ + @RequiresPermissions("base:sensorType:add") + @Log(title = "传感器类型", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseSensorType baseSensorType) + { + baseSensorType.setCreateBy(ShiroUtils.getLoginName()); + baseSensorType.setCreateTime(new Date()); + return toAjax(baseSensorTypeService.insertBaseSensorType(baseSensorType)); + } + + /** + * 修改传感器类型 + */ + @GetMapping("/edit/{ObjId}") + public String edit(@PathVariable("ObjId") Long ObjId, ModelMap mmap) + { + BaseSensorType baseSensorType = baseSensorTypeService.selectBaseSensorTypeByObjId(ObjId); + mmap.put("baseSensorType", baseSensorType); + return prefix + "/edit"; + } + + /** + * 修改保存传感器类型 + */ + @RequiresPermissions("base:sensorType:edit") + @Log(title = "传感器类型", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseSensorType baseSensorType) + { + baseSensorType.setUpdateBy(ShiroUtils.getLoginName()); + baseSensorType.setUpdateTime(new Date()); + return toAjax(baseSensorTypeService.updateBaseSensorType(baseSensorType)); + } + + /** + * 删除传感器类型 + */ + @RequiresPermissions("base:sensorType:remove") + @Log(title = "传感器类型", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseSensorTypeService.deleteBaseSensorTypeByObjIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 18cfdff..76b2e87 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://121.36.58.109:3306/power_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://121.36.58.109:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: Haiwei123456 url: jdbc:mysql://localhost:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 diff --git a/ruoyi-admin/src/main/resources/templates/base/sensorType/add.html b/ruoyi-admin/src/main/resources/templates/base/sensorType/add.html new file mode 100644 index 0000000..c5ec451 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/base/sensorType/add.html @@ -0,0 +1,45 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/base/sensorType/edit.html b/ruoyi-admin/src/main/resources/templates/base/sensorType/edit.html new file mode 100644 index 0000000..188cdb3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/base/sensorType/edit.html @@ -0,0 +1,46 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/base/sensorType/sensorType.html b/ruoyi-admin/src/main/resources/templates/base/sensorType/sensorType.html new file mode 100644 index 0000000..65f4aac --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/base/sensorType/sensorType.html @@ -0,0 +1,125 @@ + + + + + + +
+
+
+
+
+
    + +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseSensorType.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseSensorType.java new file mode 100644 index 0000000..6a4151a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseSensorType.java @@ -0,0 +1,83 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 传感器类型对象 base_sensor_type + * + * @author wenjy + * @date 2022-02-07 + */ +public class BaseSensorType extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long ObjId; + + /** 类型编号 */ + @Excel(name = "类型编号") + private String sensortypeId; + + /** 类型名称 */ + @Excel(name = "类型名称") + private String sensortypeName; + + /** 是否启用 */ + @Excel(name = "是否启用") + private Long enableFlag; + + public void setObjId(Long ObjId) + { + this.ObjId = ObjId; + } + + public Long getObjId() + { + return ObjId; + } + public void setSensortypeId(String sensortypeId) + { + this.sensortypeId = sensortypeId; + } + + public String getSensortypeId() + { + return sensortypeId; + } + public void setSensortypeName(String sensortypeName) + { + this.sensortypeName = sensortypeName; + } + + public String getSensortypeName() + { + return sensortypeName; + } + public void setEnableFlag(Long enableFlag) + { + this.enableFlag = enableFlag; + } + + public Long getEnableFlag() + { + return enableFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("ObjId", getObjId()) + .append("sensortypeId", getSensortypeId()) + .append("sensortypeName", getSensortypeName()) + .append("enableFlag", getEnableFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseSensorTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseSensorTypeMapper.java new file mode 100644 index 0000000..98b94f8 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseSensorTypeMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseSensorType; + +/** + * 传感器类型Mapper接口 + * + * @author wenjy + * @date 2022-02-07 + */ +public interface BaseSensorTypeMapper +{ + /** + * 查询传感器类型 + * + * @param ObjId 传感器类型主键 + * @return 传感器类型 + */ + public BaseSensorType selectBaseSensorTypeByObjId(Long ObjId); + + /** + * 查询传感器类型列表 + * + * @param baseSensorType 传感器类型 + * @return 传感器类型集合 + */ + public List selectBaseSensorTypeList(BaseSensorType baseSensorType); + + /** + * 新增传感器类型 + * + * @param baseSensorType 传感器类型 + * @return 结果 + */ + public int insertBaseSensorType(BaseSensorType baseSensorType); + + /** + * 修改传感器类型 + * + * @param baseSensorType 传感器类型 + * @return 结果 + */ + public int updateBaseSensorType(BaseSensorType baseSensorType); + + /** + * 删除传感器类型 + * + * @param ObjId 传感器类型主键 + * @return 结果 + */ + public int deleteBaseSensorTypeByObjId(Long ObjId); + + /** + * 批量删除传感器类型 + * + * @param ObjIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseSensorTypeByObjIds(String[] ObjIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseSensorTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseSensorTypeService.java new file mode 100644 index 0000000..ab8197c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseSensorTypeService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseSensorType; + +/** + * 传感器类型Service接口 + * + * @author wenjy + * @date 2022-02-07 + */ +public interface IBaseSensorTypeService +{ + /** + * 查询传感器类型 + * + * @param ObjId 传感器类型主键 + * @return 传感器类型 + */ + public BaseSensorType selectBaseSensorTypeByObjId(Long ObjId); + + /** + * 查询传感器类型列表 + * + * @param baseSensorType 传感器类型 + * @return 传感器类型集合 + */ + public List selectBaseSensorTypeList(BaseSensorType baseSensorType); + + /** + * 新增传感器类型 + * + * @param baseSensorType 传感器类型 + * @return 结果 + */ + public int insertBaseSensorType(BaseSensorType baseSensorType); + + /** + * 修改传感器类型 + * + * @param baseSensorType 传感器类型 + * @return 结果 + */ + public int updateBaseSensorType(BaseSensorType baseSensorType); + + /** + * 批量删除传感器类型 + * + * @param ObjIds 需要删除的传感器类型主键集合 + * @return 结果 + */ + public int deleteBaseSensorTypeByObjIds(String ObjIds); + + /** + * 删除传感器类型信息 + * + * @param ObjId 传感器类型主键 + * @return 结果 + */ + public int deleteBaseSensorTypeByObjId(Long ObjId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseSensorTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseSensorTypeServiceImpl.java new file mode 100644 index 0000000..0f8d8bd --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseSensorTypeServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BaseSensorTypeMapper; +import com.ruoyi.system.domain.BaseSensorType; +import com.ruoyi.system.service.IBaseSensorTypeService; +import com.ruoyi.common.core.text.Convert; + +/** + * 传感器类型Service业务层处理 + * + * @author wenjy + * @date 2022-02-07 + */ +@Service +public class BaseSensorTypeServiceImpl implements IBaseSensorTypeService +{ + @Autowired + private BaseSensorTypeMapper baseSensorTypeMapper; + + /** + * 查询传感器类型 + * + * @param ObjId 传感器类型主键 + * @return 传感器类型 + */ + @Override + public BaseSensorType selectBaseSensorTypeByObjId(Long ObjId) + { + return baseSensorTypeMapper.selectBaseSensorTypeByObjId(ObjId); + } + + /** + * 查询传感器类型列表 + * + * @param baseSensorType 传感器类型 + * @return 传感器类型 + */ + @Override + public List selectBaseSensorTypeList(BaseSensorType baseSensorType) + { + return baseSensorTypeMapper.selectBaseSensorTypeList(baseSensorType); + } + + /** + * 新增传感器类型 + * + * @param baseSensorType 传感器类型 + * @return 结果 + */ + @Override + public int insertBaseSensorType(BaseSensorType baseSensorType) + { + baseSensorType.setCreateTime(DateUtils.getNowDate()); + return baseSensorTypeMapper.insertBaseSensorType(baseSensorType); + } + + /** + * 修改传感器类型 + * + * @param baseSensorType 传感器类型 + * @return 结果 + */ + @Override + public int updateBaseSensorType(BaseSensorType baseSensorType) + { + baseSensorType.setUpdateTime(DateUtils.getNowDate()); + return baseSensorTypeMapper.updateBaseSensorType(baseSensorType); + } + + /** + * 批量删除传感器类型 + * + * @param ObjIds 需要删除的传感器类型主键 + * @return 结果 + */ + @Override + public int deleteBaseSensorTypeByObjIds(String ObjIds) + { + return baseSensorTypeMapper.deleteBaseSensorTypeByObjIds(Convert.toStrArray(ObjIds)); + } + + /** + * 删除传感器类型信息 + * + * @param ObjId 传感器类型主键 + * @return 结果 + */ + @Override + public int deleteBaseSensorTypeByObjId(Long ObjId) + { + return baseSensorTypeMapper.deleteBaseSensorTypeByObjId(ObjId); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseSensorTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseSensorTypeMapper.xml new file mode 100644 index 0000000..3baa68b --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BaseSensorTypeMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + select ObjId, SensorType_Id, SensorType_Name, Enable_Flag, Create_By, Create_Time, Update_By, Update_Time from base_sensor_type + + + + + + + + insert into base_sensor_type + + SensorType_Id, + SensorType_Name, + Enable_Flag, + Create_By, + Create_Time, + Update_By, + Update_Time, + + + #{sensortypeId}, + #{sensortypeName}, + #{enableFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update base_sensor_type + + SensorType_Id = #{sensortypeId}, + SensorType_Name = #{sensortypeName}, + Enable_Flag = #{enableFlag}, + Create_By = #{createBy}, + Create_Time = #{createTime}, + Update_By = #{updateBy}, + Update_Time = #{updateTime}, + + where ObjId = #{ObjId} + + + + delete from base_sensor_type where ObjId = #{ObjId} + + + + delete from base_sensor_type where ObjId in + + #{ObjId} + + + + \ No newline at end of file