| dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| dao/src/main/resources/mapper/BannerMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| dao/src/main/resources/mapper/MonitorMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java
@@ -15,22 +15,22 @@ @TableId(type = IdType.AUTO) private Long id; //æå±äºº private Long userId; private String kind; private String size; private String name; private String macId; private String state; private Long lampId; //çæ§åºåå· private String serialNumber; //æå±ç¯æ private String belongTo; //å°å private String address; //设å¤ç¶æ:å¨çº¿/离线 private String equipmentState; //å·¥ä½ç¶æï¼æ£å¸¸ä½¿ç¨/ç¦æ¢ä½¿ç¨ private String workState; //ç»å®ç¶æï¼å·²ç»å®/æªç»å® private String bindingState; //夿³¨ private String note; //æ¥å ¥æ¶é´ private LocalDateTime createTime; } dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ package com.sandu.ximon.dao.mapper; import com.sandu.common.domain.BaseMapper; import com.sandu.ximon.dao.domain.Monitor; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper public interface MonitorMapper extends BaseMapper<Monitor> { List<Monitor> listMonitorByKeyword(String keyword, String equipmentState1, String equipmentState2, String bindingState1, String bindingState2); } dao/src/main/resources/mapper/BannerMapper.xml
@@ -10,13 +10,6 @@ <result property="position" column="position" jdbcType="INTEGER"/> <result property="author" column="author" jdbcType="VARCHAR"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <result property="type" column="type" jdbcType="INTEGER"/> </resultMap> <sql id="Base_Column_List"> id,username,password, icon,email,mobile, nick_name,note,create_time, login_time,update_time,status </sql> </mapper> dao/src/main/resources/mapper/MonitorMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.sandu.ximon.dao.mapper.MonitorMapper"> <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Monitor"> <id property="id" column="id" jdbcType="BIGINT"/> <result property="userId" column="user_id" jdbcType="VARCHAR"/> <result property="serialNumber" column="serial_number" jdbcType="VARCHAR"/> <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/> <result property="address" column="address" jdbcType="VARCHAR"/> <result property="equipmentState" column="equipment_state" jdbcType="VARCHAR"/> <result property="workState" column="work_state" jdbcType="VARCHAR"/> <result property="bindingState" column="binding_state" jdbcType="VARCHAR"/> <result property="note" column="note" jdbcType="VARCHAR"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> </resultMap> <select id="listMonitorByKeyword" resultType="com.sandu.ximon.dao.domain.Monitor"> SELECT * FROM monitor WHERE serial_number LIKE CONCAT(CONCAT('%', #{keyword}), '%') or belong_to LIKE CONCAT(CONCAT('%', #{keyword}), '%') and equipment_state = #{equipmentState1} or equipment_state = #{equipmentState2} and binding_state = #{bindingState1} or binding_state = #{bindingState2}; </select> </mapper> ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,45 @@ package com.sandu.ximon.admin.controller; import com.sandu.common.domain.ResponseVO; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.param.MonitorParam; import com.sandu.ximon.admin.service.MonitorService; import com.sandu.ximon.dao.domain.Monitor; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/v1/admin/monitor") public class MonitorController { private final MonitorService monitorService; @GetMapping public ResponseVO<Object> listMonitor() { List<Monitor> list = monitorService.listMonitor(); return ResponseUtil.successPage(list); } /** * æ¨¡ç³æ¥è¯¢ * * @return */ @GetMapping("/listMonitorByKeyword") public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) { List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam); return ResponseUtil.successPage(list); } @PostMapping("/delete/{id}") public ResponseVO<Object> deleteMonitor(@PathVariable Long id) { boolean result = monitorService.deleteMonitor(id); if (result) { return ResponseUtil.success(null); } else { return ResponseUtil.fail("æä½å¤±è´¥"); } } } ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ package com.sandu.ximon.admin.param; import lombok.Data; import javax.validation.constraints.NotEmpty; @Data public class MonitorParam { private String keyword; @NotEmpty private String equipmentState; @NotEmpty private String bindingState; } ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,94 @@ package com.sandu.ximon.admin.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sandu.common.execption.BusinessException; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.param.BannerParam; import com.sandu.ximon.admin.param.MonitorParam; import com.sandu.ximon.dao.domain.Banner; import com.sandu.ximon.dao.domain.Monitor; import com.sandu.ximon.dao.mapper.MonitorMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; @Service @AllArgsConstructor public class MonitorService extends BaseServiceImpl<MonitorMapper, Monitor> { private final MonitorMapper monitorMapper; /** * æ¥è¯¢å ¨é¨æå头 */ public List<Monitor> listMonitor() { LambdaQueryWrapper<Monitor> wrapper = Wrappers.lambdaQuery(Monitor.class); List<Monitor> list = list(wrapper); return list; } /** * æ¨¡ç³æ¥è¯¢ */ public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) { //设å¤ç¶æ:å¨çº¿/离线/å ¨é¨ String equipmentState1; String equipmentState2; if ("å ¨é¨".equals(monitorParam.getEquipmentState())) { equipmentState1 = "å¨çº¿"; equipmentState2 = "离线"; } else { equipmentState1 = monitorParam.getEquipmentState(); equipmentState2 = monitorParam.getEquipmentState(); } //ç»å®ç¶æï¼å·²ç»å®/æªç»å®/å ¨é¨ String bindingState1; String bindingState2; if ("å ¨é¨".equals(monitorParam.getBindingState())) { bindingState1 = "å·²ç»å®"; bindingState2 = "æªç»å®"; } else { bindingState1 = monitorParam.getBindingState(); bindingState2 = monitorParam.getBindingState(); } return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2); } /** * å 餿å头 * * @param Id * @return */ public boolean deleteMonitor(Long Id) { Monitor monitor = getById(Id); if (monitor == null) { throw new BusinessException("æ¾ä¸å°æå头"); } return removeById(Id); } /** * ç¼è¾æå头 * @param Id * @param monitorParam * @return */ public boolean updateBanner(Long Id, MonitorParam monitorParam) { Monitor monitor = getById(Id); if (monitor == null) { throw new BusinessException("æ¾ä¸å°æå头"); } Monitor update = new Monitor(); update.setId(Id); update.setSerialNumber(monitorParam.()); update.setBannerUrl(bannerParam.getUrl()); update.setId(bannerId); return updateById(update); } }