收藏夹修改

hunan
liuguijing 1 year ago
parent abcabde513
commit 2fa1b5df03

@ -5,6 +5,7 @@ import com.shxy.xymanager_common.base.BaseController;
import com.shxy.xymanager_common.base.ResponseReult;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.bean.ServiceStatus;
import com.shxy.xymanager_common.entity.TerminalFavors;
import com.shxy.xymanager_common.excelbean.TerminalAndLastPicListExcelModel;
import com.shxy.xymanager_common.excelbean.TerminalListExcelModel;
import com.shxy.xymanager_common.model.*;
@ -55,7 +56,7 @@ public class TerminalController extends BaseController {
@Log(title = "获取设备列表", type = "查询")
public void getTerminalListExcel(HttpServletResponse response) throws IOException {
ServiceBody<List<TerminalListExcelModel>> serviceBody = terminalService.getTerminalListExcel(null);
EasyExcelUtil.createExcel(response,"设备表",serviceBody.getData(), TerminalListExcelModel.class);
EasyExcelUtil.createExcel(response, "设备表", serviceBody.getData(), TerminalListExcelModel.class);
}
@ApiOperation(value = "获取绘制图标", notes = "绘制坐标保存接口", httpMethod = "POST")
@ -271,21 +272,59 @@ public class TerminalController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getOnlineTerminalListExcel")
@Log(title = "导出设备在线和心跳时间和照片时间列表Excel", type = "查询")
public void getOnlineTerminalListExcel(HttpServletResponse response,@Param("type") Integer type) throws IOException {
public void getOnlineTerminalListExcel(HttpServletResponse response, @Param("type") Integer type) throws IOException {
ServiceBody<List<TerminalAndLastPicListExcelModel>> serviceBody = terminalService.getOnlineTerminalList(type);
EasyExcelUtil.createExcel(response,"设备在线表",serviceBody.getData(), TerminalAndLastPicListExcelModel.class);
EasyExcelUtil.createExcel(response, "设备在线表", serviceBody.getData(), TerminalAndLastPicListExcelModel.class);
}
@ApiOperation(value = "新增收藏夹接口", notes = "新增收藏夹接口", httpMethod = "POST")
@ApiOperation(value = "新增设备进收藏夹接口", notes = "新增设备进收藏夹接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/addFavorList")
@Log(title = "新增收藏夹接口", type = "新增")
public ResponseReult<String> addFavorList( @RequestBody FavorVo vo) {
@Log(title = "新增设备进收藏夹接口", type = "新增")
public ResponseReult<String> addFavorList(@RequestBody FavorVo vo) {
ServiceBody<String> serviceBody = terminalService.addFavorList(vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
} }
}
}
@ApiOperation(value = "获取收藏夹接口", notes = "获取收藏夹接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/listFavor")
@Log(title = "获取收藏夹接口", type = "查询")
public ResponseReult<List<TerminalFavors>> getFavorList() {
List<TerminalFavors> serviceBody = terminalService.getFavorList();
return ResponseReult.success(serviceBody);
}
@ApiOperation(value = "新增收藏夹接口", notes = "新增收藏夹接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/addFavor")
@Log(title = "新增收藏夹接口", type = "新增")
public ResponseReult<String> addFavor(@RequestBody TerminalFavors vo) {
String serviceBody = terminalService.addFavor(vo);
return ResponseReult.success(serviceBody);
}
@ApiOperation(value = "修改收藏夹接口", notes = "修改收藏夹接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/updateFavor")
@Log(title = "修改收藏夹接口", type = "修改")
public ResponseReult<String> updateFavor(@RequestBody TerminalFavors vo) {
String serviceBody = terminalService.updateFavor(vo);
return ResponseReult.success(serviceBody);
}
@ApiOperation(value = "删除收藏夹接口", notes = "删除收藏夹接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/deleteFavor")
@Log(title = "删除收藏夹接口", type = "删除")
public ResponseReult<String> deleteFavor(@RequestBody TerminalFavors vo) {
String serviceBody = terminalService.deleteFavor(vo);
return ResponseReult.success(serviceBody);
}
}

@ -1,72 +1,72 @@
# Spring配置
#spring:
# datasource:
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://127.0.0.1:3306/xymp?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: 123456
# type: com.alibaba.druid.pool.DruidDataSource
# servlet:
# multipart:
# # 指定自定义上传目录
# location: http://47.96.238.157/usr/local/home/manager/temp/
spring:
# 数据源配置
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/hunan?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.200.63:3306/xymp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: xymp
password: xymp@123
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 10
# 最小连接池数量
minIdle: 20
# 最大连接池数量
maxActive: 30
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间,单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间,单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单,不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username: root
login-password: 123456
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
servlet:
multipart:
# 指定自定义上传目录
location: http://47.96.238.157/usr/local/home/manager/temp/
#spring:
# # 数据源配置
# datasource:
# type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: com.mysql.cj.jdbc.Driver
# druid:
# # 主库数据源
# master:
# url: jdbc:mysql://192.168.200.63:3306/xymp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: xymp
# password: xymp@123
# # 从库数据源
# slave:
# # 从数据源开关/默认关闭
# enabled: false
# url:
# username:
# password:
# # 初始连接数
# initialSize: 5
# # 最小连接池数量
# minIdle: 10
# # 最大连接池数量
# maxActive: 20
# # 配置获取连接等待超时的时间
# maxWait: 60000
# # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
# timeBetweenEvictionRunsMillis: 60000
# # 配置一个连接在池中最小生存的时间,单位是毫秒
# minEvictableIdleTimeMillis: 300000
# # 配置一个连接在池中最大生存的时间,单位是毫秒
# maxEvictableIdleTimeMillis: 900000
# # 配置检测连接是否有效
# validationQuery: SELECT 1 FROM DUAL
# testWhileIdle: true
# testOnBorrow: false
# testOnReturn: false
# webStatFilter:
# enabled: true
# statViewServlet:
# enabled: true
# # 设置白名单,不填则允许所有访问
# allow:
# url-pattern: /druid/*
# # 控制台管理用户名和密码
# login-username: root
# login-password: 123456
# filter:
# stat:
# enabled: true
# # 慢SQL记录
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: true
# wall:
# config:
# multi-statement-allow: true
# # # 资源信息
# # messages:
# # # 国际化资源文件路径

@ -1,31 +1,11 @@
package com.shxy.xymanager_admin;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.shxy.xymanager_common.config.CustomRsaProperties;
import com.shxy.xymanager_common.dto.*;
import com.shxy.xymanager_common.entity.Lines;
import com.shxy.xymanager_common.entity.RequestResults;
import com.shxy.xymanager_common.entity.TerminalImgAlarmParams;
import com.shxy.xymanager_common.entity.Terminals;
import com.shxy.xymanager_common.enums.CommonStatus;
import com.shxy.xymanager_common.util.*;
import com.shxy.xymanager_dao.dao.*;
import com.shxy.xymanager_service.service.CacheService;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.math.BigInteger;
import java.sql.Time;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@SpringBootTest
class XymanagerAdminApplicationTests {

@ -0,0 +1,18 @@
package com.shxy.xymanager_common.entity;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class TerminalFavors implements Serializable {
private Integer id;
private String name;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,451 @@
package com.shxy.xymanager_common.entity;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class TerminalFavorsExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public TerminalFavorsExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Integer value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Integer value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Integer value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Integer value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Integer value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Integer value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Integer> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Integer> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Integer value1, Integer value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Integer value1, Integer value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("name is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("name is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("name =", value, "name");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("name <>", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("name >", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("name >=", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("name <", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("name <=", value, "name");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("name like", value, "name");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("name not like", value, "name");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("name not in", values, "name");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("name between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("name not between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

@ -13,11 +13,12 @@ import java.util.List;
@ApiModel(value = "收藏对象", description = "收藏对象描述")
public class FavorVo {
@NotEmpty(message = "不能传入空值")
@ApiModelProperty(value = "收藏对象数组", required = true, example = "A0001")
private List<Integer> list;
@ApiModelProperty(value = "是否收藏", example = "0--删除收藏 1--收藏")
private Integer type;
private Integer id;
@ApiModelProperty(value = "是否收藏", example = "0--删除收藏 1--收藏")
private Integer termid;
}

@ -0,0 +1,30 @@
package com.shxy.xymanager_dao.dao;
import com.shxy.xymanager_common.entity.TerminalFavors;
import com.shxy.xymanager_common.entity.TerminalFavorsExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface TerminalFavorsDao {
long countByExample(TerminalFavorsExample example);
int deleteByExample(TerminalFavorsExample example);
int deleteByPrimaryKey(Integer id);
int insert(TerminalFavors record);
int insertSelective(TerminalFavors record);
List<TerminalFavors> selectByExample(TerminalFavorsExample example);
TerminalFavors selectByPrimaryKey(Integer id);
int updateByExampleSelective(@Param("record") TerminalFavors record, @Param("example") TerminalFavorsExample example);
int updateByExample(@Param("record") TerminalFavors record, @Param("example") TerminalFavorsExample example);
int updateByPrimaryKeySelective(TerminalFavors record);
int updateByPrimaryKey(TerminalFavors record);
}

@ -48,6 +48,6 @@ public interface TerminalsDao {
int updateCmd(TerminalIdUpdateVo vo);
int updateFavor(@Param("list") List<Integer> list ,@Param("status") Integer status);
int updateFavor(@Param("id") Integer id ,@Param("termid") Integer termid);
}

@ -253,11 +253,10 @@
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table tableName="terminal_favs"
domainObjectName="TerminalFavs"
mapperName="TerminalFavsDao"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
<table tableName="terminal_favors"
domainObjectName="TerminalFavors"
mapperName="TerminalFavorsDao"
>
<!-- <property name="useActualColumnNames" value="false"/>-->
</table>

@ -0,0 +1,196 @@
<?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.shxy.xymanager_dao.dao.TerminalFavorsDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalFavors">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, create_time, update_time
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalFavorsExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from terminal_favors
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from terminal_favors
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from terminal_favors
where id = #{id,jdbcType=INTEGER}
</delete>
<delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.TerminalFavorsExample">
delete from terminal_favors
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalFavors">
insert into terminal_favors (id, name, create_time,
update_time)
values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalFavors">
insert into terminal_favors
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TerminalFavorsExample" resultType="java.lang.Long">
select count(*) from terminal_favors
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update terminal_favors
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=INTEGER},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update terminal_favors
set id = #{record.id,jdbcType=INTEGER},
name = #{record.name,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalFavors">
update terminal_favors
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalFavors">
update terminal_favors
set name = #{name,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>

@ -651,10 +651,7 @@
<update id="updateFavor">
update terminals
set isfavor = #{status}
where id in
<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
set isfavor = #{id}
where id = #{termid}
</update>
</mapper>

@ -24,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
*
@ -48,6 +45,9 @@ public class DyLevelServiceImpl implements DyLevelService {
@Autowired
TerminalImgAlarmsDao terminalImgAlarmsDao;
@Autowired
TerminalFavorsDao terminalFavorsDao;
@Autowired
CacheService cacheService;
@ -59,7 +59,24 @@ public class DyLevelServiceImpl implements DyLevelService {
@Override
public ServiceBody<DyLineTreeListModel> getdyTreeList(Integer type) {
DyLineTreeListModel model = new DyLineTreeListModel();
ArrayList<DyLineTreeListModel.TerminalBean> favorList = new ArrayList<>();
TerminalFavorsExample example = new TerminalFavorsExample();
List<TerminalFavors> terminalFavors = terminalFavorsDao.selectByExample(example);
HashMap<Integer, DyLineTreeListModel.LineBean> map = new HashMap<>();
ArrayList<DyLineTreeListModel.LineBean> favorlinelist = new ArrayList<>();
for (TerminalFavors item : terminalFavors) {
DyLineTreeListModel.LineBean lineBean = new DyLineTreeListModel.LineBean();
lineBean.setId(item.getId());
lineBean.setName(item.getName());
ArrayList<DyLineTreeListModel.TerminalBean> list = new ArrayList<>();
lineBean.setList(list);
favorlinelist.add(lineBean);
map.put(item.getId(), lineBean);
}
DyLineTreeListModel.DyListBean element = new DyLineTreeListModel.DyListBean();
element.setName("收藏夹");
element.setList(favorlinelist);
element.setId(0);
List<DyLineAndTerminalWithHeartDto> list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
@ -91,10 +108,9 @@ public class DyLevelServiceImpl implements DyLevelService {
lineBean.setBsManufacturer(lineDto.getBsManufacturer());
ArrayList<DyLineTreeListModel.TerminalBean> beanlist = new ArrayList<>();
for (int k = 0; k < termlist.size(); k++){
for (int k = 0; k < termlist.size(); k++) {
totalnum++;
TerminalsWithHeart terminalsWithHeart = termlist.get(k);
DyLineTreeListModel.TerminalBean bean = new DyLineTreeListModel.TerminalBean();
bean.setId(terminalsWithHeart.getId());
bean.setAddress(terminalsWithHeart.getAddress());
@ -134,26 +150,23 @@ public class DyLevelServiceImpl implements DyLevelService {
bean.setOnlinestatus(CommonStatus.DELETE.value());
}
}
if (isfavor!=null && isfavor.intValue() == CommonStatus.EFFECTIVE.value()) {
favorList.add(bean);
if (isfavor != null && isfavor.intValue() != CommonStatus.DELETE.value()) {
DyLineTreeListModel.LineBean lineBean1 = map.get(isfavor);
if (lineBean1 != null) {
lineBean1.getList().add(bean);
}
}
}
lineBean.setList(beanlist);
lineBeans.add(lineBean);
}
DyLineTreeListModel.LineBean element = new DyLineTreeListModel.LineBean();
element.setList(favorList);
element.setName("收藏夹");
element.setBsManufacturer("收藏夹");
element.setId(0);
lineBeans.add(0, element);
dyModel.setList(lineBeans);
dyListBeans.add(dyModel);
}
dyListBeans.add(0, element);
model.setOnlineNum(onlinenum);
model.setTotalNum(totalnum);
model.setList(dyListBeans);
// model.setFavorlist(favorList);
}
return Asserts.success(model);
}
@ -225,9 +238,9 @@ public class DyLevelServiceImpl implements DyLevelService {
List<TerminalPhoto> photoList = terminalPhotoDao.selectPhotosByIdList(photolist);
List<TerminalImgAlarmsDto> imgarlarmsList = new ArrayList<>();
List idlist = new ArrayList<>();
for (TerminalPhoto tp:photoList) {
if (tp.getOrginalId()!=null) {
List idlist = new ArrayList<>();
for (TerminalPhoto tp : photoList) {
if (tp.getOrginalId() != null) {
idlist.add(tp.getOrginalId());
}
}
@ -241,7 +254,7 @@ public class DyLevelServiceImpl implements DyLevelService {
}
beans = TerminalUtils.setTowerPhotoList(requestIp, list, lineMap, termchannelMapMap, terminalMap, termchannelMap, towerMap, photoList,imgarlarmsList);
beans = TerminalUtils.setTowerPhotoList(requestIp, list, lineMap, termchannelMapMap, terminalMap, termchannelMap, towerMap, photoList, imgarlarmsList);
}
model.setList(beans);

@ -74,6 +74,9 @@ public class TerminalServiceImpl implements TerminalService {
@Autowired
CacheService cacheService;
@Autowired
TerminalFavorsDao terminalFavorsDao;
/**
*
@ -685,18 +688,52 @@ public class TerminalServiceImpl implements TerminalService {
@Override
public ServiceBody<String> addFavorList(FavorVo vo) {
Integer type = vo.getType();
List<Integer> list = vo.getList();
if (CollectionUtil.isNotEmpty(list)) {
if (type == null || type.intValue() == 0) {
terminalsDao.updateFavor(list, CommonStatus.DELETE.value());
} else {
terminalsDao.updateFavor(list, CommonStatus.EFFECTIVE.value());
}
}
Integer id = vo.getId();
Integer termid = vo.getTermid();
terminalsDao.updateFavor(id,termid);
return Asserts.success("修改成功");
}
/**
*
*
* @return
*/
@Override
public List<TerminalFavors> getFavorList() {
TerminalFavorsExample example = new TerminalFavorsExample();
List<TerminalFavors> terminalFavors = terminalFavorsDao.selectByExample(example);
return terminalFavors;
}
@Override
public String addFavor(TerminalFavors vo) {
String name = vo.getName();
if (StrUtil.isEmpty(name)) {
Asserts.fail("收藏夹名称不能缺少");
}
TerminalFavorsExample example = new TerminalFavorsExample();
example.createCriteria().andNameEqualTo(name);
List<TerminalFavors> terminalFavors = terminalFavorsDao.selectByExample(example);
if (CollectionUtil.isNotEmpty(terminalFavors)) {
Asserts.fail("收藏夹名称重复");
}
terminalFavorsDao.insertSelective(vo);
return "新增成功";
}
@Override
public String updateFavor(TerminalFavors vo) {
terminalFavorsDao.updateByPrimaryKey(vo);
return "修改成功";
}
@Override
public String deleteFavor(TerminalFavors vo) {
terminalFavorsDao.deleteByPrimaryKey(vo.getId());
return "删除成功";
}
}

@ -1,6 +1,7 @@
package com.shxy.xymanager_service.service;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.entity.TerminalFavors;
import com.shxy.xymanager_common.excelbean.TerminalAndLastPicListExcelModel;
import com.shxy.xymanager_common.excelbean.TerminalListExcelModel;
import com.shxy.xymanager_common.model.*;
@ -136,4 +137,31 @@ public interface TerminalService {
* @return
*/
ServiceBody<String> addFavorList(FavorVo vo);
/**
*
* @return
*/
List<TerminalFavors> getFavorList();
/**
*
* @param vo
* @return
*/
String addFavor(TerminalFavors vo);
/**
*
* @param vo
* @return
*/
String updateFavor(TerminalFavors vo);
/**
*
* @param vo
* @return
*/
String deleteFavor(TerminalFavors vo);
}

Loading…
Cancel
Save